Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 02:10:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix PNI prefixing in provisioning message.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-08-09 10:35:54 -04:00
committed by Alex Hart
parent f56a65d30d
commit 1cc7b46555
6 changed files with 17 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/migrations/PniMigrationJob.java
View File

@@ -47,7 +47,7 @@ public class PniMigrationJob extends MigrationJob {
return;
}
PNI pni = PNI.parseOrNull(ApplicationDependencies.getSignalServiceAccountManager().getWhoAmI().getPni());
PNI pni = PNI.parseUnPrefixedOrNull(ApplicationDependencies.getSignalServiceAccountManager().getWhoAmI().getPni());
if (pni == null) {
throw new IOException("Invalid PNI!");

1
app/src/main/java/org/thoughtcrime/securesms/storage/ContactRecordProcessor.java
View File

@@ -134,7 +134,6 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
Log.w(TAG, "Found a ContactRecord without a UUID -- marking as invalid.");
return true;
} else if (remote.getAci().equals(selfAci) ||
remote.getAci().equals(selfPni) ||
(selfPni != null && selfPni.equals(remote.getPni().orElse(null))) ||
(selfE164 != null && remote.getNumber().isPresent() && remote.getNumber().get().equals(selfE164)))
{