Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-14 23:18:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add basic re-reg support to regV5.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-01-30 16:57:55 -05:00
parent 85408f2b12
commit 6416df241f
20 changed files with 361 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
demo/registration/src/main/java/org/signal/registration/sample/dependencies/RealNetworkController.kt
View File

@@ -289,6 +289,9 @@ class RealNetworkController(
fcmToken: String?,
skipDeviceTransfer: Boolean
): RegistrationNetworkResult<RegisterAccountResponse, RegisterAccountError> = withContext(Dispatchers.IO) {
check(sessionId != null || recoveryPassword != null) { "Either sessionId or recoveryPassword must be provided" }
check(sessionId == null || recoveryPassword == null) { "Either sessionId or recoveryPassword must be provided, but not both" }
try {
val serviceAttributes = attributes.toServiceAccountAttributes()
val serviceAciPreKeys = aciPreKeys.toServicePreKeyCollection()

2
demo/registration/src/main/java/org/signal/registration/sample/screens/pinsettings/PinSettingsViewModel.kt
View File

@@ -178,7 +178,7 @@ class PinSettingsViewModel(
),
name = null,
pniRegistrationId = RegistrationPreferences.pniRegistrationId,
recoveryPassword = null
recoveryPassword = RegistrationPreferences.masterKey?.deriveRegistrationRecoveryPassword()
)
when (val result = networkController.setAccountAttributes(attributes)) {