From 420e15c179f48f55681ec184dd55b9ded887ea8a Mon Sep 17 00:00:00 2001
From: Clark <clark@signal.org>
Date: Fri, 1 Dec 2023 08:14:33 -0500
Subject: [PATCH] Fix infinite identity key storage service clash.

---
 .../thoughtcrime/securesms/storage/ContactRecordProcessor.java | 3 ++-
 1 file changed, 2 insertions(+), 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 26959339b4..b090198589 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/ContactRecordProcessor.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/ContactRecordProcessor.java
@@ -184,7 +184,8 @@ public class ContactRecordProcessor extends DefaultStorageRecordProcessor<Signal
     byte[]        identityKey;
 
     if ((remote.getIdentityState() != local.getIdentityState() && remote.getIdentityKey().isPresent()) ||
-        (remote.getIdentityKey().isPresent() && local.getIdentityKey().isEmpty()))
+        (remote.getIdentityKey().isPresent() && local.getIdentityKey().isEmpty()) ||
+        (remote.getIdentityKey().isPresent() && local.getUnregisteredTimestamp() > 0))
     {
       identityState = remote.getIdentityState();
       identityKey   = remote.getIdentityKey().get();