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

Fix crash in migration job.

Browse Source
This commit is contained in:
Michelle Tang
2025-03-12 21:43:17 -04:00
parent 6dc12ab9b2
commit c54958f0a9
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/migrations/E164FormattingMigrationJob.kt
View File

@@ -9,6 +9,7 @@ import org.signal.core.util.requireLong
import org.signal.core.util.requireNonNullString
import org.signal.core.util.select
import org.signal.core.util.update
import org.signal.core.util.withinTransaction
import org.thoughtcrime.securesms.database.MessageTable
import org.thoughtcrime.securesms.database.RecipientTable
import org.thoughtcrime.securesms.database.RecipientTable.Companion.ACI_COLUMN
@@ -73,7 +74,9 @@ internal class E164FormattingMigrationJob(
val existing: Optional<RecipientId> = SignalDatabase.recipients.getByE164(formattedE164)
if (existing.isPresent) {
Log.w(TAG, "Merging ${existing.get()} and $id", true)
SignalDatabase.recipients.mergeForMigration(existing.get(), id)
SignalDatabase.rawDatabase.withinTransaction {
SignalDatabase.recipients.mergeForMigration(existing.get(), id)
}
Log.w(TAG, "Successfully merged ${existing.get()} and $id", true)
} else {
Log.w(TAG, "Unable to set E164, and it's not a conflict? Crashing.", e)