From 7821a872bd2033718c3ffdd1f5f24f4069e51e63 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Tue, 19 Apr 2022 20:10:10 -0700
Subject: [PATCH] Drop ContactRecords for our own ACI/PNI

---
 ts/services/storageRecordOps.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ts/services/storageRecordOps.ts b/ts/services/storageRecordOps.ts
index e96b273495..813fae98a8 100644
--- a/ts/services/storageRecordOps.ts
+++ b/ts/services/storageRecordOps.ts
@@ -35,7 +35,7 @@ import {
 } from '../util/universalExpireTimer';
 import { ourProfileKeyService } from './ourProfileKey';
 import { isGroupV1, isGroupV2 } from '../util/whatTypeOfConversation';
-import { isValidUuid } from '../types/UUID';
+import { isValidUuid, UUID, UUIDKind } from '../types/UUID';
 import * as preferredReactionEmoji from '../reactions/preferredReactionEmoji';
 import { SignalService as Proto } from '../protobuf';
 import * as log from '../logging/log';
@@ -786,6 +786,10 @@ export async function mergeContactRecord(
     return { hasConflict: false, shouldDrop: true, details: ['invalid uuid'] };
   }
 
+  if (window.storage.user.getOurUuidKind(new UUID(uuid)) !== UUIDKind.Unknown) {
+    return { hasConflict: false, shouldDrop: true, details: ['our own uuid'] };
+  }
+
   const id = window.ConversationController.ensureContactIds({
     e164,
     uuid,