From 58443c46bed43aa7d4df6a01d18798c7f343436a Mon Sep 17 00:00:00 2001
From: Clark <clark@signal.org>
Date: Mon, 15 Jul 2024 11:03:59 -0400
Subject: [PATCH] Fix username constraint on re-reg from prod->staging.

---
 .../securesms/database/RecipientTable.kt           | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
index 37cbee9333..e1ad0b45f0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
@@ -852,6 +852,8 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     if (id < 0) {
       Log.w(TAG, "[applyStorageSyncContactInsert] Failed to insert. Possibly merging.")
       recipientId = getAndPossiblyMerge(aci = insert.aci.orNull(), pni = insert.pni.orNull(), e164 = insert.number.orNull(), pniVerified = insert.isPniSignatureVerified)
+      resolvePotentialUsernameConflicts(values.getAsString(USERNAME), recipientId)
+
       db.update(TABLE_NAME, values, ID_WHERE, SqlUtil.buildArgs(recipientId))
     } else {
       recipientId = RecipientId.from(id)
@@ -892,6 +894,8 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
       recipientId = getAndPossiblyMerge(aci = update.new.aci.orElse(null), pni = update.new.pni.orElse(null), e164 = update.new.number.orElse(null), pniVerified = update.new.isPniSignatureVerified)
 
       Log.w(TAG, "[applyStorageSyncContactUpdate] Merged into $recipientId")
+      resolvePotentialUsernameConflicts(values.getAsString(USERNAME), recipientId)
+
       db.update(TABLE_NAME, values, ID_WHERE, SqlUtil.buildArgs(recipientId))
     }
 
@@ -928,6 +932,16 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
     AppDependencies.databaseObserver.notifyRecipientChanged(recipientId)
   }
 
+  private fun resolvePotentialUsernameConflicts(username: String?, recipientId: RecipientId) {
+    if (username != null) {
+      writableDatabase
+        .update(TABLE_NAME)
+        .values(USERNAME to null)
+        .where("$USERNAME = ? AND $ID != ?", username, recipientId.serialize())
+        .run()
+    }
+  }
+
   fun applyStorageSyncGroupV1Insert(insert: SignalGroupV1Record) {
     val id = writableDatabase.insertOrThrow(TABLE_NAME, null, getValuesForStorageGroupV1(insert, true))