Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-21 02:08:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix deadlock with nested calls to runBlocking.

Browse Source 
Fixes #14460
This commit is contained in:
Greyson Parrelli
2025-11-28 13:39:07 -05:00
parent fee062e727
commit 2bf3ec60eb
3 changed files with 77 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/thoughtcrime/securesms/backup/v2/ArchiveDatabaseExecutor.kt
View File

@@ -5,8 +5,7 @@
package org.thoughtcrime.securesms.backup.v2
import org.signal.core.util.ThreadUtil
import org.signal.core.util.concurrent.SignalExecutors
import androidx.annotation.VisibleForTesting
import org.thoughtcrime.securesms.dependencies.AppDependencies
import org.thoughtcrime.securesms.util.ThrottledDebouncer
import java.util.concurrent.ExecutionException
@@ -19,7 +18,10 @@ import kotlin.time.Duration.Companion.seconds
*/
object ArchiveDatabaseExecutor {
val executor = Executors.newSingleThreadExecutor(SignalExecutors.NumberedThreadFactory("archive-db", ThreadUtil.PRIORITY_IMPORTANT_BACKGROUND_THREAD))
@VisibleForTesting
const val THREAD_NAME = "archive-db"
private val executor = Executors.newSingleThreadExecutor { Thread(it, THREAD_NAME) }
/**
* By default, downloading/uploading an attachment wants to notify a bunch of database observation listeners. This slams the observer so hard that other
@@ -39,6 +41,10 @@ object ArchiveDatabaseExecutor {
}
fun <T> runBlocking(block: () -> T): T {
if (Thread.currentThread().name.equals(THREAD_NAME)) {
return block()
}
return try {
executor.submit(block).get()
} catch (e: ExecutionException) {

6
app/src/main/java/org/thoughtcrime/securesms/jobs/UploadAttachmentToArchiveJob.kt
View File

@@ -360,10 +360,8 @@ class UploadAttachmentToArchiveJob private constructor(
}
private fun setArchiveTransferStateWithDelayedNotification(attachmentId: AttachmentId, transferState: AttachmentTable.ArchiveTransferState) {
ArchiveDatabaseExecutor.runBlocking {
SignalDatabase.attachments.setArchiveTransferState(attachmentId, transferState, notify = false)
ArchiveDatabaseExecutor.throttledNotifyAttachmentObservers()
}
SignalDatabase.attachments.setArchiveTransferState(attachmentId, transferState, notify = false)
ArchiveDatabaseExecutor.throttledNotifyAttachmentObservers()
}
class Factory : Job.Factory<UploadAttachmentToArchiveJob> {