Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 09:20:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for restoring a backup after completing registration.

Browse Source
This commit is contained in:
Nicholas Tinsley
2024-07-30 19:54:48 +02:00
committed by mtang-signal
parent 57adab858c
commit 6424c6bc99
12 changed files with 180 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
View File

@@ -187,7 +187,7 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
}
private boolean userCanTransferOrRestore() {
return !SignalStore.registration().isRegistrationComplete() && RemoteConfig.restoreAfterRegistration() && !SignalStore.registration().hasSkippedTransferOrRestore();
return !SignalStore.registration().isRegistrationComplete() && RemoteConfig.restoreAfterRegistration() && !SignalStore.registration().hasSkippedTransferOrRestore() && !SignalStore.registration().hasCompletedRestore();
}
private boolean userMustCreateSignalPin() {
@@ -241,6 +241,7 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
private Intent getTransferOrRestoreIntent() {
Intent intent = RestoreActivity.getIntentForTransferOrRestore(this);
intent.putExtra(NEXT_INTENT_EXTRA, MainActivity.clearTop(this));
return getRoutedIntent(intent, getIntent());
}