Add extra transaction protections.

2024-09-12 14:44:09 -04:00 · 2024-09-12 14:44:09 -04:00 · 5c6644d1a1
commit 5c6644d1a1
parent 0d37013481
1 changed files with 6 additions and 2 deletions
--- a/core-util/src/main/java/org/signal/core/util/SQLiteDatabaseExtensions.kt
+++ b/core-util/src/main/java/org/signal/core/util/SQLiteDatabaseExtensions.kt
@ -17,10 +17,14 @@ inline fun <T : SupportSQLiteDatabase, R> T.withinTransaction(block: (T) -> R):
  beginTransaction()
  try {
    val toReturn = block(this)
-    setTransactionSuccessful()
+    if (inTransaction()) {
+      setTransactionSuccessful()
+    }
    return toReturn
  } finally {
-    endTransaction()
+    if (inTransaction()) {
+      endTransaction()
+    }
  }
 }