From 2b17868797cdc3080ebea1d3363ecee79b899780 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Tue, 9 Jun 2026 11:52:09 -0400
Subject: [PATCH] Skip create remote key copy if duplicate is same attachment.

---
 .../org/thoughtcrime/securesms/database/AttachmentTable.kt    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
index 4a7d4088f1..213699bc98 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
@@ -2088,6 +2088,10 @@ class AttachmentTable(
       if (duplicate != null) {
         val (duplicateAttachment, dataFileInfo) = duplicate
 
+        if (duplicateAttachment.attachmentId == attachmentId) {
+          return
+        }
+
         if (duplicateAttachment.remoteLocation != null && duplicateAttachment.remoteDigest != null && dataFileInfo != null) {
           Log.w(TAG, "[createRemoteKeyIfNecessary][$attachmentId] Found duplicate with full remote data. Copying all remote data.")
           writableDatabase