From de27343c245b8bc4b19684dcd46df2249532f5c2 Mon Sep 17 00:00:00 2001
From: Michelle Tang <mtang@signal.org>
Date: Tue, 19 May 2026 10:38:08 -0400
Subject: [PATCH] Update key transparency api.

---
 .../assets/backupTests/account_data_01.binproto | Bin 673 -> 607 bytes
 .../assets/backupTests/account_data_03.binproto | Bin 725 -> 659 bytes
 .../assets/backupTests/account_data_05.binproto | Bin 768 -> 702 bytes
 .../assets/backupTests/account_data_07.binproto | Bin 553 -> 487 bytes
 .../assets/backupTests/account_data_09.binproto | Bin 480 -> 414 bytes
 .../assets/backupTests/account_data_11.binproto | Bin 617 -> 551 bytes
 .../assets/backupTests/account_data_13.binproto | Bin 574 -> 508 bytes
 .../assets/backupTests/account_data_15.binproto | Bin 547 -> 481 bytes
 .../assets/backupTests/account_data_17.binproto | Bin 619 -> 553 bytes
 .../assets/backupTests/account_data_19.binproto | Bin 551 -> 485 bytes
 .../assets/backupTests/account_data_21.binproto | Bin 550 -> 484 bytes
 .../assets/backupTests/account_data_23.binproto | Bin 638 -> 572 bytes
 .../assets/backupTests/account_data_25.binproto | Bin 551 -> 485 bytes
 .../assets/backupTests/account_data_27.binproto | Bin 481 -> 415 bytes
 .../v2/processor/AccountDataArchiveProcessor.kt |   5 ++---
 .../securesms/database/RecipientTable.kt        |  13 +++++++++++++
 .../dependencies/KeyTransparencyApi.kt          |  14 ++++++++++++++
 .../securesms/keyvalue/SettingsValues.java      |   1 +
 lib/archive/src/main/protowire/Backup.proto     |   2 +-
 19 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/app/src/androidTest/assets/backupTests/account_data_01.binproto b/app/src/androidTest/assets/backupTests/account_data_01.binproto
index 3f1b5a506631b3761a980d7b10c80f55bfec67e2..6828727bd9b5430cf7528c318a61f5dace973dc1 100644
GIT binary patch
delta 20
ccmZ3;dY@&2AL}D#uKUazgYPp=E@9FI08o<$SO5S3

delta 87
zcmV-d0I2`p1fd0xP6ea{3ZVqCQ{MqXdO!j*RKdlIi`!+glF<A81J3nFqi1yYwUni$
tx7$}%D1X_|??rPR-@0c`#`C(tPwj{@gq{%dqc;E`Ug+UX)z*_T0xe8tEGGZ}

diff --git a/app/src/androidTest/assets/backupTests/account_data_03.binproto b/app/src/androidTest/assets/backupTests/account_data_03.binproto
index 724edefba1f495dc4c8e8886dd530df06e312fcf..836f134aee0e7ec5a60e645c2fa3f8f7f5864ae8 100644
GIT binary patch
delta 19
bcmcc0I+=BXAImfruE`sNM3^S8VA2HuK(_`D

delta 86
zcmV-c0IC0z1=R(RP6XHl3e~Yv6aqqeKms#V!NrS<+hwwn(EI%Z&h<y5XLR?ql%=J&
s+gDa7f7#IQMROhBx@S(t^SZ%L?T9jjo)Gh+Hvk}B=;2M(){|xeEhRQ9+yDRo

diff --git a/app/src/androidTest/assets/backupTests/account_data_05.binproto b/app/src/androidTest/assets/backupTests/account_data_05.binproto
index 8fbce2f249168e09eaf696af77907b1e9985fcfd..7ecc58e3e7579954f8812c6dbecbc222914d1567 100644
GIT binary patch
delta 20
ccmZo*+s8V=kM$r6*FKhw!FEiOFEi-^07gp&mjD0&

delta 87
zcmV-d0I2`I1%L*SP6dMn3V;Q%Q$7MhdO!j*RKdlIi`!+glF<A81J3nFqi1yYwUni$
tx7$}%D1X_|??rPR-@0c`#`C(tPwj{@gq{%dqc;E`Ug+UX)z*`d0xkBhD`o%y

diff --git a/app/src/androidTest/assets/backupTests/account_data_07.binproto b/app/src/androidTest/assets/backupTests/account_data_07.binproto
index 543723762e043f571f60c7a2090910a70b2262f8..35fc67224f0a3abc6c87cfb21f3d56bb754ba90b 100644
GIT binary patch
delta 20
ccmZ3<@|<~sAL}b7uIEe}gVPx&|6$Yx08t1Bg8%>k

delta 87
zcmV-d0I2`x1E~a%P6ez33aJCJQ)dA}dO!j*RKdlIi`!+glF<A81J3nFqi1yYwUni$
tx7$}%D1X_|??rPR-@0c`#`C(tPwj{@gq{%dqc;E`Ug+UX)z*``0WCDgEK&df

diff --git a/app/src/androidTest/assets/backupTests/account_data_09.binproto b/app/src/androidTest/assets/backupTests/account_data_09.binproto
index aba744ef9e40b2c39de386e6b3e65172d150cbac..cc9faf0a0d7a64853ff20679358a8f5bd9e5d3cc 100644
GIT binary patch
delta 19
bcmaFBJdb&TAIm}}u6Y}S<QXS#X4C}$Lo5bK

delta 86
zcmV-c0IC0;1K<OYP6Xou3gEF)9|1yoKms#V!NrS<+hwwn(EI%Z&h<y5XLR?ql%=J&
s+gDa7f7#IQMROhBx@S(t^SZ%L?T9jjo)Gh+Hvk}B=;2M(){}7oEi^kU761SM

diff --git a/app/src/androidTest/assets/backupTests/account_data_11.binproto b/app/src/androidTest/assets/backupTests/account_data_11.binproto
index 3204db3c3a2eb2f71fc6158eb55be4e2c1dab559..3f36d9a7b058f5f52c58729b286ca08e522bd40b 100644
GIT binary patch
delta 19
bcmaFKvYcgtAImCcuH_qpRxnPsVbTQvM=b_}

delta 86
zcmV-c0IC0{1nC5jP6X@&3hA*@r~yKHKms#V!NrS<+hwwn(EI%Z&h<y5XLR?ql%=J&
s+gDa7f7#IQMROhBx@S(t^SZ%L?T9jjo)Gh+Hvk}B=;2M()|2`HEon+EPXGV_

diff --git a/app/src/androidTest/assets/backupTests/account_data_13.binproto b/app/src/androidTest/assets/backupTests/account_data_13.binproto
index be5e0b63d3ece3269df5228779a09fb9204ac7e0..5b2f7b0a4e375578316cc1b4df5be2b1c674209f 100644
GIT binary patch
delta 20
ccmdnT@`rhXAM1Z6u0Kp0gKHQk3o_{f08_{Z0ssI2

delta 87
zcmV-d0I2``1HJ^1P6fdO3cdreQ+xqJdO!j*RKdlIi`!+glF<A81J3nFqi1yYwUni$
tx7$}%D1X_|??rPR-@0c`#`C(tPwj{@gq{%dqc;E`Ug+UX)z*{G0WDSlEYJV|

diff --git a/app/src/androidTest/assets/backupTests/account_data_15.binproto b/app/src/androidTest/assets/backupTests/account_data_15.binproto
index 1f94e2f82296c87534e2aec86489af6b42258675..d9e200484f30653176da1310e93b2ebf5c7af224 100644
GIT binary patch
delta 20
ccmZ3?@{oCgAL|n)u7^w;gA*Aie`C}I08eBGUjP6A

delta 87
zcmV-d0I2`r1EU0xP6eg|3ZnzDQ(*x@dO!j*RKdlIi`!+glF<A81J3nFqi1yYwUni$
tx7$}%D1X_|??rPR-@0c`#`C(tPwj{@gq{%dqc;E`Ug+UX)z*`=0WB*@EG_^5

diff --git a/app/src/androidTest/assets/backupTests/account_data_17.binproto b/app/src/androidTest/assets/backupTests/account_data_17.binproto
index 190a40715db743c41e9e2164a316e1c1ad671e7a..39563b8669b2f6f2012c6080e05425ee6e3c2687 100644
GIT binary patch
delta 19
bcmaFOvXW(jAIlnMu9X{uRxwVtW6}ixN3jNv

delta 86
zcmV-c0IC0}1nUHlP6X})3hS{_ssTcJKms#V!NrS<+hwwn(EI%Z&h<y5XLR?ql%=J&
s+gDa7f7#IQMROhBx@S(t^SZ%L?T9jjo)Gh+Hvk}B=;2M()|31JEo^KpTL1t6

diff --git a/app/src/androidTest/assets/backupTests/account_data_19.binproto b/app/src/androidTest/assets/backupTests/account_data_19.binproto
index 2320be5aefefb1ebcc12e821a31ad12ff8b5b85b..5855696a9e2df1f621586e9cf39f962246c01614 100644
GIT binary patch
delta 20
ccmZ3^@|1akAL|PyuBS{JgHstN|6<ey08o4fcK`qY

delta 87
zcmV-d0I2`v1E&O#P6et13a10HQ)K}{dO!j*RKdlIi`!+glF<A81J3nFqi1yYwUni$
tx7$}%D1X_|??rPR-@0c`#`C(tPwj{@gq{%dqc;E`Ug+UX)z*`^0WC3|EJgqT

diff --git a/app/src/androidTest/assets/backupTests/account_data_21.binproto b/app/src/androidTest/assets/backupTests/account_data_21.binproto
index 8dd00d3677c99b9acceeb572d444e315773f3435..902a5130c6456726d6cdee7bd9416a627858b61b 100644
GIT binary patch
delta 20
ccmZ3+@`QPUAM0}_t|v?zgHsqM|76q!08lmuaR2}S

delta 87
zcmV-d0I2`u1EvI!P6eq03Z?_GQ)B@`dO!j*RKdlIi`!+glF<A81J3nFqi1yYwUni$
tx7$}%D1X_|??rPR-@0c`#`C(tPwj{@gq{%dqc;E`Ug+UX)z*`@0WB~HEI<GN

diff --git a/app/src/androidTest/assets/backupTests/account_data_23.binproto b/app/src/androidTest/assets/backupTests/account_data_23.binproto
index 04c82c11a87791f05bdff0c32aaa0e13884dea60..b9f67cb6fa62d4069e5da65c560faea23de5c733 100644
GIT binary patch
delta 19
bcmeyzvWI1YAIpAbu00!r_A*WmWYPryOqT}%

delta 86
zcmV-c0IC1H1pWk&P6UAj3jVQDy#YdcKms#V!NrS<+hwwn(EI%Z&h<y5XLR?ql%=J&
s+gDa7f7#IQMROhBx@S(t^SZ%L?T9jjo)Gh+Hvk}B=;2M(){_qcEnojEPXGV_

diff --git a/app/src/androidTest/assets/backupTests/account_data_25.binproto b/app/src/androidTest/assets/backupTests/account_data_25.binproto
index 2a331b84a3250040f4e13522588a7eaa1f50c33d..be7adb176889e8b1c761892cc2d228006844aa4e 100644
GIT binary patch
delta 20
ccmZ3^@|1akAL|PyuBS{JgHstN|6<ey08o4fcK`qY

delta 87
zcmV-d0I2`v1E&O#P6et13a10HQ)K}{dO!j*RKdlIi`!+glF<A81J3nFqi1yYwUni$
tx7$}%D1X_|??rPR-@0c`#`C(tPwj{@gq{%dqc;E`Ug+UX)z*`^0WC3|EJgqT

diff --git a/app/src/androidTest/assets/backupTests/account_data_27.binproto b/app/src/androidTest/assets/backupTests/account_data_27.binproto
index 8208d46c484d2c6ccebda533eb7059f031491ab7..8cf184cdefc3adb247ff13a56495c120afe03287 100644
GIT binary patch
delta 19
bcmaFJJfC@jAIl;puK62-6c{IOVblcxLv997

delta 86
zcmV-c0IC0<1K|UZP6Xrv3gNL*AOS*pKms#V!NrS<+hwwn(EI%Z&h<y5XLR?ql%=J&
s+gDa7f7#IQMROhBx@S(t^SZ%L?T9jjo)Gh+Hvk}B=;2M(){}ApEj7$68~^|S

diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataArchiveProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataArchiveProcessor.kt
index 5bd7e95a95..aeec925e87 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataArchiveProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/processor/AccountDataArchiveProcessor.kt
@@ -156,8 +156,7 @@ object AccountDataArchiveProcessor {
             navigationBarSize = signalStore.settingsValues.useCompactNavigationBar.toRemoteNavigationBarSize()
           ).takeUnless { Environment.IS_INSTRUMENTATION && SignalStore.backup.importedEmptyAndroidSettings },
           bioText = selfRecord.about ?: "",
-          bioEmoji = selfRecord.aboutEmoji ?: "",
-          keyTransparencyData = selfRecord.keyTransparencyData?.toByteString()
+          bioEmoji = selfRecord.aboutEmoji ?: ""
         )
       )
     )
@@ -251,7 +250,7 @@ object AccountDataArchiveProcessor {
       SignalStore.account.usernameLink = null
     }
 
-    SignalDatabase.recipients.setKeyTransparencyData(Recipient.self().aci.get(), accountData.keyTransparencyData?.toByteArray())
+    SignalDatabase.recipients.clearSelfKeyTransparencyData()
 
     SignalDatabase.runPostSuccessfulTransaction { ProfileUtil.handleSelfProfileKeyChange() }
 
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 fb6db85537..d3e72b4e24 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
@@ -43,6 +43,7 @@ import org.signal.core.util.toInt
 import org.signal.core.util.update
 import org.signal.core.util.updateAll
 import org.signal.core.util.withinTransaction
+import org.signal.libsignal.net.KeyTransparency
 import org.signal.libsignal.protocol.IdentityKey
 import org.signal.libsignal.protocol.InvalidKeyException
 import org.signal.libsignal.zkgroup.groups.GroupMasterKey
@@ -67,6 +68,7 @@ import org.thoughtcrime.securesms.database.SignalDatabase.Companion.runPostSucce
 import org.thoughtcrime.securesms.database.SignalDatabase.Companion.sessions
 import org.thoughtcrime.securesms.database.SignalDatabase.Companion.threads
 import org.thoughtcrime.securesms.database.model.DistributionListId
+import org.thoughtcrime.securesms.database.model.KeyTransparencyStore
 import org.thoughtcrime.securesms.database.model.RecipientRecord
 import org.thoughtcrime.securesms.database.model.ThreadRecord
 import org.thoughtcrime.securesms.database.model.databaseprotos.BadgeList
@@ -77,6 +79,7 @@ import org.thoughtcrime.securesms.database.model.databaseprotos.SessionSwitchove
 import org.thoughtcrime.securesms.database.model.databaseprotos.ThreadMergeEvent
 import org.thoughtcrime.securesms.database.model.databaseprotos.Wallpaper
 import org.thoughtcrime.securesms.dependencies.AppDependencies
+import org.thoughtcrime.securesms.dependencies.KeyTransparencyApi
 import org.thoughtcrime.securesms.groups.BadGroupIdException
 import org.thoughtcrime.securesms.groups.GroupId
 import org.thoughtcrime.securesms.groups.GroupId.V1
@@ -2330,6 +2333,9 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
         .values(NEEDS_PNI_SIGNATURE to 0)
         .run()
 
+      Log.i(TAG, "Resetting KT data due to change number.")
+      KeyTransparencyApi.reset(aci = SignalStore.account.requireAci().libSignalAci, field = KeyTransparency.AccountDataField.E164, keyTransparencyStore = KeyTransparencyStore)
+
       SignalDatabase.pendingPniSignatureMessages.deleteAll()
 
       db.setTransactionSuccessful()
@@ -2363,6 +2369,11 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
         rotateStorageId(id)
         StorageSyncHelper.scheduleSyncForDataChange()
       }
+
+      if (id == Recipient.self().id) {
+        Log.i(TAG, "Resetting KT data due to username change.")
+        KeyTransparencyApi.reset(aci = SignalStore.account.requireAci().libSignalAci, field = KeyTransparency.AccountDataField.USERNAME_HASH, keyTransparencyStore = KeyTransparencyStore)
+      }
     }
   }
 
@@ -4099,6 +4110,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
   }
 
   fun clearAllKeyTransparencyData() {
+    Log.i(TAG, "Clearing all key transparency data.")
     writableDatabase
       .update(TABLE_NAME)
       .values(KEY_TRANSPARENCY_DATA to null)
@@ -4107,6 +4119,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
   }
 
   fun clearSelfKeyTransparencyData() {
+    Log.i(TAG, "Clearing self key transparency data.")
     writableDatabase
       .update(TABLE_NAME)
       .values(KEY_TRANSPARENCY_DATA to null)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/dependencies/KeyTransparencyApi.kt b/app/src/main/java/org/thoughtcrime/securesms/dependencies/KeyTransparencyApi.kt
index b18a30cfbc..d57ec69b45 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/dependencies/KeyTransparencyApi.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/dependencies/KeyTransparencyApi.kt
@@ -1,6 +1,8 @@
 package org.thoughtcrime.securesms.dependencies
 
+import org.signal.core.util.logging.Log
 import org.signal.libsignal.keytrans.KeyTransparencyException
+import org.signal.libsignal.net.KeyTransparency
 import org.signal.libsignal.net.KeyTransparency.CheckMode
 import org.signal.libsignal.net.RequestResult
 import org.signal.libsignal.protocol.IdentityKey
@@ -13,6 +15,18 @@ import org.whispersystems.signalservice.api.websocket.SignalWebSocket
  */
 class KeyTransparencyApi(private val unauthWebSocket: SignalWebSocket.UnauthenticatedWebSocket) {
 
+  companion object {
+    val TAG = Log.tag(KeyTransparencyApi::class.java)
+
+    fun reset(aci: ServiceId.Aci, field: KeyTransparency.AccountDataField, keyTransparencyStore: KeyTransparencyStore) {
+      try {
+        KeyTransparency.resetField(aci, field, keyTransparencyStore)
+      } catch (e: IllegalArgumentException) {
+        Log.w(TAG, "Unexpected result when trying to reset KT", e)
+      }
+    }
+  }
+
   suspend fun check(checkMode: CheckMode, aci: ServiceId.Aci, aciIdentityKey: IdentityKey, e164: String?, unidentifiedAccessKey: ByteArray?, usernameHash: ByteArray?, keyTransparencyStore: KeyTransparencyStore): RequestResult<Unit, KeyTransparencyException> {
     return unauthWebSocket.runCatchingWithChatConnection { chatConnection ->
       chatConnection.keyTransparencyClient().check(checkMode, aci, aciIdentityKey, e164, unidentifiedAccessKey, usernameHash, keyTransparencyStore)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.java b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.java
index 42304a05db..853d62bdf4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.java
@@ -566,6 +566,7 @@ public final class SettingsValues extends SignalStoreValues {
   }
 
   public void setAutomaticVerificationEnabled(boolean enabled) {
+    Log.i(TAG, "Setting key transparency enabled to " + enabled);
     putBoolean(AUTOMATIC_VERIFICATION_ENABLED, enabled);
   }
 
diff --git a/lib/archive/src/main/protowire/Backup.proto b/lib/archive/src/main/protowire/Backup.proto
index d7407cb505..512bdafe65 100644
--- a/lib/archive/src/main/protowire/Backup.proto
+++ b/lib/archive/src/main/protowire/Backup.proto
@@ -182,7 +182,7 @@ message AccountData {
   AndroidSpecificSettings androidSpecificSettings = 12;
   string bioText = 13;
   string bioEmoji = 14;
-  optional bytes keyTransparencyData = 15;
+  reserved /*keyTransparencyData*/ 15; // No longer want to persist self-KT data
 }
 
 message Recipient {