From b0297bd035cd54398270aeced025cfae35ee13fe Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Thu, 27 Aug 2026 13:57:52 -0400
Subject: [PATCH] Remove unnecessary mock-numberless config.

---
 .../v2/AppRegistrationStorageController.kt    | 19 -------------------
 .../securesms/util/Environment.kt             |  6 ------
 .../securesms/util/EnvironmentTest.kt         |  5 -----
 3 files changed, 30 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/AppRegistrationStorageController.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/AppRegistrationStorageController.kt
index 0238f81279..79fcdb33dc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/v2/AppRegistrationStorageController.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/v2/AppRegistrationStorageController.kt
@@ -100,7 +100,6 @@ import org.thoughtcrime.securesms.service.DirectoryRefreshListener
 import org.thoughtcrime.securesms.service.LocalBackupListener
 import org.thoughtcrime.securesms.service.RotateSignedPreKeyListener
 import org.thoughtcrime.securesms.util.BackupUtil
-import org.thoughtcrime.securesms.util.Environment
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.whispersystems.signalservice.api.link.TransferArchiveResponse
 import org.whispersystems.signalservice.api.push.UsernameLinkComponents
@@ -291,24 +290,6 @@ class AppRegistrationStorageController(private val context: Context) : StorageCo
       Log.i(TAG, "[onRegistrationFlowFinished] Username reclaim is still pending. Enqueuing a job to handle it.")
       AppDependencies.jobManager.add(ReclaimUsernameAndLinkJob())
     }
-
-    if (Environment.MOCK_PHONE_NUMBERLESS_REGISTRATION) {
-      Log.w(TAG, "[onRegistrationFlowFinished] Mocking a phone-number-less account. Wiping all local knowledge of the E164 and PNI.")
-
-      val pni = SignalStore.account.pni
-
-      SignalStore.account.clearE164AndPni()
-      SignalDatabase.recipients.clearSelfE164AndPni(Recipient.self().id)
-      AppDependencies.recipientCache.clearSelf()
-
-      if (pni != null) {
-        SignalDatabase.oneTimePreKeys.deleteAll(pni)
-        SignalDatabase.signedPreKeys.deleteAll(pni)
-        SignalDatabase.kyberPreKeys.deleteAll(pni)
-      }
-
-      AppDependencies.resetProtocolStores()
-    }
   }
 
   override suspend fun saveUsername(username: String, usernameLink: UsernameLinkComponents) = withContext(Dispatchers.IO) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/Environment.kt b/app/src/main/java/org/thoughtcrime/securesms/util/Environment.kt
index 8bbbdfffc1..9644bbc60f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/Environment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/Environment.kt
@@ -30,12 +30,6 @@ object Environment {
 
   const val PHONENUMBERLESS_REGISTRATION: Boolean = false
 
-  /**
-   * When true, all local knowledge of the user's phone number (E164 and PNI) is wiped once registration completes,
-   * mimicking the experience of an account that has no phone number. Flip manually for local testing.
-   */
-  const val MOCK_PHONE_NUMBERLESS_REGISTRATION: Boolean = false
-
   object Backups {
     @JvmStatic
     fun supportsGooglePlayBilling(): Boolean {
diff --git a/app/src/test/java/org/thoughtcrime/securesms/util/EnvironmentTest.kt b/app/src/test/java/org/thoughtcrime/securesms/util/EnvironmentTest.kt
index 757a2cdb7c..a5bb235fdf 100644
--- a/app/src/test/java/org/thoughtcrime/securesms/util/EnvironmentTest.kt
+++ b/app/src/test/java/org/thoughtcrime/securesms/util/EnvironmentTest.kt
@@ -22,9 +22,4 @@ class EnvironmentTest {
   fun `phone-numberless registration is disabled`() {
     assertThat(Environment.PHONENUMBERLESS_REGISTRATION).isFalse()
   }
-
-  @Test
-  fun `MOCK_PHONE_NUMBERLESS_REGISTRATION is disabled`() {
-    assertThat(Environment.MOCK_PHONE_NUMBERLESS_REGISTRATION).isFalse()
-  }
 }