Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-19 08:09:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some PNI-related issues around change number.

Browse Source
This commit is contained in:
Greyson Parrelli
2022-08-29 18:06:08 -04:00
parent 29869c93b2
commit f6e000ab97
8 changed files with 52 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore.java
View File

@@ -126,10 +126,9 @@ public class SignalBaseIdentityKeyStore {
}
public boolean isTrustedIdentity(SignalProtocolAddress address, IdentityKey identityKey, IdentityKeyStore.Direction direction) {
Recipient self = Recipient.self();
boolean isSelf = address.getName().equals(self.requireServiceId().toString()) ||
address.getName().equals(self.requireE164());
boolean isSelf = address.getName().equals(SignalStore.account().requireAci().toString()) ||
address.getName().equals(SignalStore.account().requirePni().toString()) ||
address.getName().equals(SignalStore.account().getE164());
if (isSelf) {
return identityKey.equals(SignalStore.account().getAciIdentityKey().getPublicKey());