From f6d5365e836b279bf6bcaffa6976ed2a9df72320 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Tue, 30 Aug 2022 12:43:33 -0400 Subject: [PATCH] fixup! Fix some PNI-related issues around change number. --- .../securesms/database/RecipientDatabase.kt | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt index 1a3d6eb7f9..f825a518e1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt @@ -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]