Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-24 19:56:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change ContactRecordProcess to merge identity key/state as a group.

Browse Source
This commit is contained in:
Greyson Parrelli
2022-04-12 13:27:22 -04:00
parent 26d637cafc
commit 27c3fca324
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,7 +104,7 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
SignalServiceAddress address = new SignalServiceAddress(serviceId, e164);
byte[] profileKey = OptionalUtil.or(remote.getProfileKey(), local.getProfileKey()).orElse(null);
String username = OptionalUtil.or(remote.getUsername(), local.getUsername()).orElse("");
IdentityState identityState = remote.getIdentityState();
IdentityState identityState = remote.getIdentityKey().isPresent() ? remote.getIdentityState() : local.getIdentityState();
byte[] identityKey = OptionalUtil.or(remote.getIdentityKey(), local.getIdentityKey()).orElse(null);
boolean blocked = remote.isBlocked();
boolean profileSharing = remote.isProfileSharingEnabled();