empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Ignore identity updates for self.

Browse source
This commit is contained in:
Cody Henthorne 2022-05-11 14:25:35 -04:00 • committed by Alex Hart
parent 14b2d12895
commit 820277800b
1 changed files with 6 additions and 1 deletions
Show stats 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

@ -29,6 +29,7 @@ import org.whispersystems.signalservice.api.push.ServiceId;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@ -76,7 +77,11 @@ public class SignalBaseIdentityKeyStore {
return SaveResult.NEW;
}
if (!identityRecord.getIdentityKey().equals(identityKey)) {
boolean identityKeyChanged = !identityRecord.getIdentityKey().equals(identityKey);
if (identityKeyChanged && Recipient.self().getId().equals(recipientId) && Objects.equals(SignalStore.account().getAci(), ServiceId.parseOrNull(address.getName()))) {
Log.w(TAG, "Received different identity key for self, ignoring" + " | Existing: " + identityRecord.getIdentityKey().hashCode() + ", New: " + identityKey.hashCode());
} else if (identityKeyChanged) {
Log.i(TAG, "Replacing existing identity for " + address + " | Existing: " + identityRecord.getIdentityKey().hashCode() + ", New: " + identityKey.hashCode());
VerifiedStatus verifiedStatus;