Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 04:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix invalid navigation to remote restore activity post registration.

Browse Source
This commit is contained in:
Cody Henthorne
2025-10-22 15:33:43 -04:00
committed by Greyson Parrelli
parent 5f8eaa4f1c
commit 90201a464d
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,10 +25,10 @@ import org.signal.core.util.ThreadUtil
import org.signal.core.util.getParcelableExtraCompat
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.BaseActivity
import org.thoughtcrime.securesms.MainActivity
import org.thoughtcrime.securesms.PassphraseRequiredActivity
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.RestoreDirections
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
@@ -73,9 +73,20 @@ class RestoreActivity : BaseActivity() {
when (navTarget) {
NavTarget.NEW_LANDING -> {
if (!sharedViewModel.hasMultipleRestoreMethods()) {
startActivity(RemoteRestoreActivity.getIntent(this, isOnlyOption = true))
finish()
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)
} else {
startActivity(MainActivity.clearTop(this))
}
supportFinishAfterTransition()
}
}
NavTarget.LOCAL_RESTORE -> navController.safeNavigate(RestoreDirections.goDirectlyToChooseLocalBackup())
@@ -120,7 +131,7 @@ class RestoreActivity : BaseActivity() {
fun onBackupCompletedSuccessfully() {
sharedViewModel.getNextIntent()?.let {
Log.d(TAG, "Launching ${it.component}", Throwable())
Log.d(TAG, "Launching ${it.component}")
startActivity(it)
}

4
app/src/main/java/org/thoughtcrime/securesms/restore/RestoreViewModel.kt
View File

@@ -53,8 +53,8 @@ class RestoreViewModel : ViewModel() {
fun getNextIntent(): Intent? = store.value.nextIntent
fun hasMultipleRestoreMethods(): Boolean {
return getAvailableRestoreMethods().size > 1
fun hasNoRestoreMethods(): Boolean {
return getAvailableRestoreMethods().isEmpty()
}
fun getAvailableRestoreMethods(): List<RestoreMethod> {