empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix getAndPossiblyMerge to run after successful transaction in case of nested transactions.

Browse source
This commit is contained in:
Clark 2023-11-28 13:04:21 -05:00 • committed by Cody Henthorne
parent 8037494f7a
commit 84a2832a65
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
View file

@ -467,11 +467,9 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
Log.d(TAG, "[getAndPossiblyMerge] Requires a transaction.")
val db = writableDatabase
var transactionSuccessful = false
lateinit var result: ProcessPnpTupleResult
db.beginTransaction()
try {
db.withinTransaction {
result = processPnpTuple(e164 = e164, pni = pni, aci = aci, pniVerified = pniVerified, changeSelf = changeSelf)
if (result.operations.isNotEmpty() || result.requiredInsert) {
@ -480,12 +478,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
Log.i(TAG, "[getAndPossiblyMerge] ($aci, $pniString, $e164String) BreadCrumbs: ${result.breadCrumbs}, Operations: ${result.operations}, RequiredInsert: ${result.requiredInsert}, FinalId: ${result.finalId}")
}
db.setTransactionSuccessful()
transactionSuccessful = true
} finally {
db.endTransaction()
if (transactionSuccessful) {
db.runPostSuccessfulTransaction {
if (result.affectedIds.isNotEmpty()) {
result.affectedIds.forEach { ApplicationDependencies.getDatabaseObserver().notifyRecipientChanged(it) }
RetrieveProfileJob.enqueue(result.affectedIds)