Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 12:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix post transaction tasks not actually running.

Browse Source
This commit is contained in:
Clark
2023-05-22 22:38:35 -04:00
committed by Nicholas
parent 1099128513
commit 0cfd3265ba
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/database/SignalDatabase.kt
View File

@@ -256,12 +256,12 @@ open class SignalDatabase(private val context: Application, databaseSecret: Data
@JvmStatic @JvmStatic
fun runPostSuccessfulTransaction(dedupeKey: String, task: Runnable) { fun runPostSuccessfulTransaction(dedupeKey: String, task: Runnable) {
instance!!.signalReadableDatabase.runPostSuccessfulTransaction(dedupeKey, task) instance!!.signalWritableDatabase.runPostSuccessfulTransaction(dedupeKey, task)
} }
@JvmStatic @JvmStatic
fun runPostSuccessfulTransaction(task: Runnable) { fun runPostSuccessfulTransaction(task: Runnable) {
instance!!.signalReadableDatabase.runPostSuccessfulTransaction(task) instance!!.signalWritableDatabase.runPostSuccessfulTransaction(task)
} }
@JvmStatic @JvmStatic

3
app/src/main/java/org/thoughtcrime/securesms/messages/IncomingMessageObserver.kt
View File

@@ -12,7 +12,6 @@ import kotlinx.collections.immutable.toImmutableSet
import org.signal.core.util.ThreadUtil import org.signal.core.util.ThreadUtil
import org.signal.core.util.concurrent.SignalExecutors import org.signal.core.util.concurrent.SignalExecutors
import org.signal.core.util.logging.Log import org.signal.core.util.logging.Log
import org.signal.core.util.withinTransaction
import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.crypto.ReentrantSessionLock import org.thoughtcrime.securesms.crypto.ReentrantSessionLock
import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.database.SignalDatabase
@@ -397,7 +396,7 @@ class IncomingMessageObserver(private val context: Application) {
val startTime = System.currentTimeMillis() val startTime = System.currentTimeMillis()
ReentrantSessionLock.INSTANCE.acquire().use { ReentrantSessionLock.INSTANCE.acquire().use {
SignalDatabase.rawDatabase.withinTransaction { SignalDatabase.runInTransaction {
val followUpOperations: List<FollowUpOperation> = batch val followUpOperations: List<FollowUpOperation> = batch
.mapNotNull { processEnvelope(bufferedStore, it.envelope, it.serverDeliveredTimestamp) } .mapNotNull { processEnvelope(bufferedStore, it.envelope, it.serverDeliveredTimestamp) }
.flatten() .flatten()