Merge pull request #6589 from seadowg/modify-db

Always reset transaction after modifying DB
getodk · Feb 7, 2025 · d3f95e1 · d3f95e1
2 parents 256e017 + 84b4957
commit d3f95e1
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/...app/src/main/java/org/odk/collect/android/database/entities/DatabaseEntitiesRepository.kt b/...app/src/main/java/org/odk/collect/android/database/entities/DatabaseEntitiesRepository.kt
@@ -298,15 +298,15 @@ class DatabaseEntitiesRepository(context: Context, dbPath: String) : EntitiesRep
      * function, but that's not available in all the supported versions of Android.
      */
     private fun updateRowIdTables() {
-        databaseConnection.withConnection {
+        databaseConnection.resetTransaction {
             getLists().forEach {
-                writableDatabase.execSQL(
+                execSQL(
                     """
                     DROP TABLE IF EXISTS "${getRowIdTableName(it)}";
                     """.trimIndent()
                 )
 
-                writableDatabase.execSQL(
+                execSQL(
                     """
                     CREATE TABLE "${getRowIdTableName(it)}" AS SELECT _id FROM "$it" ORDER BY _id;
                     """.trimIndent()
@@ -329,7 +329,7 @@ class DatabaseEntitiesRepository(context: Context, dbPath: String) : EntitiesRep
     }
 
     private fun createList(list: String) {
-        databaseConnection.transaction {
+        databaseConnection.resetTransaction {
             val contentValues = ContentValues()
             contentValues.put(ListsTable.COLUMN_NAME, list)
             insertOrThrow(