Skip to content

Fix deadlock when dumping configs to db #1789

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SessionHero01 merged 3 commits into from
Dec 17, 2025
Merged

Fix deadlock when dumping configs to db #1789

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c3a3b4
Fix deadlock
simophin Dec 16, 2025
bdcf443
Merge branch 'dev' into fix-deadlock
SessionHero01 Dec 16, 2025
3459506
Merge branch 'dev' into fix-deadlock
SessionHero01 Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 43 additions & 13 deletions app/src/main/java/org/thoughtcrime/securesms/dependencies/ConfigFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package org.thoughtcrime.securesms.dependencies

import androidx.collection.arrayMapOf
import androidx.collection.arraySetOf
import dagger.Lazy
import kotlinx.coroutines.CoroutineScope
Expand Down Expand Up @@ -141,6 +142,7 @@ class ConfigFactory @Inject constructor(
lock.writeLock().lock()
return configs to {
val changed = arraySetOf<UserConfigType>()
var dumped: MutableMap<UserConfigType, ByteArray>? = null

for (type in UserConfigType.entries) {
val config = configs.getConfig(type)
Expand All @@ -149,17 +151,33 @@ class ConfigFactory @Inject constructor(
}

if (config.needsDump()) {
configDatabase.storeConfig(
variant = type.configVariant,
publicKey = requiresCurrentUserAccountId().hexString,
data = config.dump(),
timestamp = clock.currentTimeMills()
)
if (dumped == null) {
dumped = arrayMapOf()
}

dumped[type] = config.dump()
}
}

lock.writeLock().unlock()

// Persist dumped configs
if (dumped != null) {
coroutineScope.launch {
val userAccountId = requiresCurrentUserAccountId()
val currentTimeMs = clock.currentTimeMills()

for ((type, data) in dumped) {
configDatabase.storeConfig(
variant = type.configVariant,
publicKey = userAccountId.hexString,
data = data,
timestamp = currentTimeMs
)
}
}
}

// Notify changes on a coroutine
if (changed.isNotEmpty()) {
coroutineScope.launch {
Expand All @@ -180,19 +198,31 @@ class ConfigFactory @Inject constructor(
configs.groupKeys.needsDump() ||
configs.groupKeys.needsRekey()

if (configs.groupInfo.needsDump() || configs.groupMembers.needsDump() ||
val dumped = if (configs.groupInfo.needsDump() || configs.groupMembers.needsDump() ||
configs.groupKeys.needsDump()) {
configDatabase.storeGroupConfigs(
publicKey = groupId.hexString,
keysConfig = configs.groupKeys.dump(),
infoConfig = configs.groupInfo.dump(),
memberConfig = configs.groupMembers.dump(),
timestamp = clock.currentTimeMills()
Triple(
configs.groupKeys.dump(),
configs.groupInfo.dump(),
configs.groupMembers.dump()
)
} else {
null
}

lock.writeLock().unlock()

if (dumped != null) {
coroutineScope.launch {
configDatabase.storeGroupConfigs(
publicKey = groupId.hexString,
keysConfig = dumped.first,
infoConfig = dumped.second,
memberConfig = dumped.third,
timestamp = clock.currentTimeMills()
)
}
}

// Notify changes on a coroutine
if (changed) {
coroutineScope.launch {
Expand Down