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

Fix manual restore from remote flow.

Browse Source
This commit is contained in:
Cody Henthorne
2025-10-29 13:03:14 -04:00
parent d261f3ebf5
commit 77e2d58dea
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/org/thoughtcrime/securesms/restore/RestoreActivity.kt
View File

@@ -29,6 +29,9 @@ import org.thoughtcrime.securesms.MainActivity
import org.thoughtcrime.securesms.PassphraseRequiredActivity
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.RestoreDirections
import org.thoughtcrime.securesms.keyvalue.SignalStore
import org.thoughtcrime.securesms.keyvalue.isWantingManualRemoteRestore
import org.thoughtcrime.securesms.registration.ui.restore.RemoteRestoreActivity
import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme
import org.thoughtcrime.securesms.util.TextSecurePreferences
import org.thoughtcrime.securesms.util.navigation.safeNavigate
@@ -74,21 +77,27 @@ class RestoreActivity : BaseActivity() {
when (navTarget) {
NavTarget.NEW_LANDING -> {
if (sharedViewModel.hasNoRestoreMethods()) {
Log.i(TAG, "No restore methods available, skipping")
sharedViewModel.skipRestore()
val nextIntent = sharedViewModel.getNextIntent()
if (nextIntent != null) {
Log.d(TAG, "Launching ${nextIntent.component}")
startActivity(nextIntent)
if (SignalStore.registration.restoreDecisionState.isWantingManualRemoteRestore) {
Log.i(TAG, "User has no available restore methods but previously wanted a remote restore, navigating immediately.")
startActivity(RemoteRestoreActivity.getIntent(this, isOnlyOption = true))
} else {
startActivity(MainActivity.clearTop(this))
Log.i(TAG, "No restore methods available, skipping")
sharedViewModel.skipRestore()
val nextIntent = sharedViewModel.getNextIntent()
if (nextIntent != null) {
Log.d(TAG, "Launching ${nextIntent.component}")
startActivity(nextIntent)
} else {
startActivity(MainActivity.clearTop(this))
}
}
supportFinishAfterTransition()
}
}
NavTarget.LOCAL_RESTORE -> navController.safeNavigate(RestoreDirections.goDirectlyToChooseLocalBackup())
NavTarget.TRANSFER -> navController.safeNavigate(RestoreDirections.goDirectlyToDeviceTransfer())
}