From 27c3fca32447a3568561b2b0a242c036f4d8cd13 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 12 Apr 2022 13:27:22 -0400
Subject: [PATCH] Change ContactRecordProcess to merge identity key/state as a
 group.

---
 .../thoughtcrime/securesms/storage/ContactRecordProcessor.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/ContactRecordProcessor.java b/app/src/main/java/org/thoughtcrime/securesms/storage/ContactRecordProcessor.java
index 5facb249f8..1f4dd3ea41 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/ContactRecordProcessor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/ContactRecordProcessor.java
@@ -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();