Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-07-12 16:57:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixup! Fix some PNI-related issues around change number.

Browse Source
This commit is contained in:
Greyson Parrelli
2022-08-30 12:43:33 -04:00
parent d0ab5f8027
commit f6d5365e83
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt
+1 -12
View File
@@ -2399,18 +2399,7 @@ open class RecipientDatabase(context: Context, databaseHelper: SignalDatabase) :
.run()
}
is PnpOperation.Merge -> {
val primary = getRecord(operation.primaryId)
val secondary = getRecord(operation.secondaryId)
if (primary.serviceId != null && !primary.sidIsPni() && secondary.e164 != null) {
merge(operation.primaryId, operation.secondaryId, inputPni)
} else {
if (!pnpEnabled) {
throw AssertionError("This type of merge is not supported in production!")
}
merge(operation.primaryId, operation.secondaryId, inputPni)
}
merge(operation.primaryId, operation.secondaryId, inputPni)
}
is PnpOperation.SessionSwitchoverInsert -> {
// TODO [pnp]