From 0cfd3265ba711a8a2ffbdfa64f12a06e72b24d2c Mon Sep 17 00:00:00 2001
From: Clark <clark@signal.org>
Date: Mon, 22 May 2023 22:38:35 -0400
Subject: [PATCH] Fix post transaction tasks not actually running.

---
 .../org/thoughtcrime/securesms/database/SignalDatabase.kt     | 4 ++--
 .../securesms/messages/IncomingMessageObserver.kt             | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SignalDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/SignalDatabase.kt
index da5e3618e7..4a4898b8a8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/SignalDatabase.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/SignalDatabase.kt
@@ -256,12 +256,12 @@ open class SignalDatabase(private val context: Application, databaseSecret: Data
 
     @JvmStatic
     fun runPostSuccessfulTransaction(dedupeKey: String, task: Runnable) {
-      instance!!.signalReadableDatabase.runPostSuccessfulTransaction(dedupeKey, task)
+      instance!!.signalWritableDatabase.runPostSuccessfulTransaction(dedupeKey, task)
     }
 
     @JvmStatic
     fun runPostSuccessfulTransaction(task: Runnable) {
-      instance!!.signalReadableDatabase.runPostSuccessfulTransaction(task)
+      instance!!.signalWritableDatabase.runPostSuccessfulTransaction(task)
     }
 
     @JvmStatic
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.kt
index 31d94ec262..bd1c1cfef9 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.kt
@@ -12,7 +12,6 @@ import kotlinx.collections.immutable.toImmutableSet
 import org.signal.core.util.ThreadUtil
 import org.signal.core.util.concurrent.SignalExecutors
 import org.signal.core.util.logging.Log
-import org.signal.core.util.withinTransaction
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.crypto.ReentrantSessionLock
 import org.thoughtcrime.securesms.database.SignalDatabase
@@ -397,7 +396,7 @@ class IncomingMessageObserver(private val context: Application) {
 
                 val startTime = System.currentTimeMillis()
                 ReentrantSessionLock.INSTANCE.acquire().use {
-                  SignalDatabase.rawDatabase.withinTransaction {
+                  SignalDatabase.runInTransaction {
                     val followUpOperations: List<FollowUpOperation> = batch
                       .mapNotNull { processEnvelope(bufferedStore, it.envelope, it.serverDeliveredTimestamp) }
                       .flatten()