Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-08-05 04:45:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Store restoreDecision separately in regV5.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-06-25 16:56:22 -04:00
committed by Michelle Tang
parent 2c35a6a3fe
commit e07a3e05bf
22 changed files with 58 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/registration/v2/AppRegistrationStorageController.kt
+3 -11
View File
@@ -27,10 +27,10 @@ import org.signal.core.util.StreamUtil
import org.signal.core.util.crypto.AttachmentSecretProvider
import org.signal.core.util.logging.Log
import org.signal.registration.PreExistingRegistrationData
import org.signal.registration.RestoreDecision
import org.signal.registration.StorageController
import org.signal.registration.StoredProfileData
import org.signal.registration.proto.RegistrationData
import org.signal.registration.proto.RestoreDecision
import org.signal.registration.screens.localbackuprestore.LocalBackupInfo
import org.signal.registration.screens.remotebackuprestore.RemoteBackupRestoreProgress
import org.thoughtcrime.securesms.backup.FullBackupImporter
@@ -244,26 +244,18 @@ class AppRegistrationStorageController(private val context: Context) : StorageCo
SignalStore.svr.masterKeyForInitialDataRestore = MasterKey(data.temporaryMasterKey.toByteArray())
}
applyRestoreDecision(data.restoreDecision)
RegistrationUtil.maybeMarkRegistrationComplete()
}
/**
* Translates the registration module's [RestoreDecision] into the app's [RestoreDecisionState] so the rest of the app
* knows whether we're a fresh account, skipped a restore, or successfully restored data. Only applied while the
* decision is still pending, since the state machine is otherwise terminal.
*/
private fun applyRestoreDecision(decision: RestoreDecision) {
override suspend fun setRestoreDecision(decision: RestoreDecision) = withContext(Dispatchers.IO) {
if (!SignalStore.registration.restoreDecisionState.isDecisionPending) {
return
return@withContext
}
SignalStore.registration.restoreDecisionState = when (decision) {
RestoreDecision.NEW_ACCOUNT -> RestoreDecisionState.NewAccount
RestoreDecision.SKIPPED -> RestoreDecisionState.Skipped
RestoreDecision.COMPLETED -> RestoreDecisionState.Completed
RestoreDecision.UNSET -> return
}
}