From 0a18d01801a28cadbb662ea17894a43e9a5e4a41 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Sat, 18 Jul 2026 14:02:33 -0400
Subject: [PATCH] Do not allow re-registers to restore data in regV5.

---
 .../registration/RegistrationEndToEndTest.kt       | 14 ++++++++++++++
 .../VerificationCodeViewModelTest.kt               |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/feature/registration/src/test/java/org/signal/registration/RegistrationEndToEndTest.kt b/feature/registration/src/test/java/org/signal/registration/RegistrationEndToEndTest.kt
index 1ea871f5d5..7c735ee45b 100644
--- a/feature/registration/src/test/java/org/signal/registration/RegistrationEndToEndTest.kt
+++ b/feature/registration/src/test/java/org/signal/registration/RegistrationEndToEndTest.kt
@@ -1387,6 +1387,20 @@ class RegistrationEndToEndTest {
     }
   }
 
+  private fun preExistingRegistrationData(e164: String): PreExistingRegistrationData {
+    return PreExistingRegistrationData(
+      e164 = e164,
+      aci = ACI.from(UUID.randomUUID()),
+      pni = PNI.from(UUID.randomUUID()),
+      servicePassword = "service-password",
+      aep = AccountEntropyPool.generate(),
+      registrationLockEnabled = false,
+      unrestrictedUnidentifiedAccess = false,
+      aciIdentityKeyPair = IdentityKeyPair.generate(),
+      pniIdentityKeyPair = IdentityKeyPair.generate()
+    )
+  }
+
   private fun createMockPermissionsState(): MockMultiplePermissionsState {
     return MockMultiplePermissionsState(
       allPermissionsGranted = true,
diff --git a/feature/registration/src/test/java/org/signal/registration/screens/verificationcode/VerificationCodeViewModelTest.kt b/feature/registration/src/test/java/org/signal/registration/screens/verificationcode/VerificationCodeViewModelTest.kt
index 0644fa7710..9832b1ad47 100644
--- a/feature/registration/src/test/java/org/signal/registration/screens/verificationcode/VerificationCodeViewModelTest.kt
+++ b/feature/registration/src/test/java/org/signal/registration/screens/verificationcode/VerificationCodeViewModelTest.kt
@@ -632,7 +632,7 @@ class VerificationCodeViewModelTest {
 
     viewModel.applyEvent(initialState, VerificationCodeScreenEvents.CodeEntered("123456"), stateEmitter)
 
-    assertThat(emittedEvents[1])
+    assertThat(emittedEvents[2])
       .isInstanceOf<RegistrationFlowEvent.NavigateToScreen>()
       .prop(RegistrationFlowEvent.NavigateToScreen::route)
       .isInstanceOf<RegistrationRoute.PinEntryForSvrRestore>()