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

Restore a Local Backup v2

Browse Source
This commit is contained in:
Nicholas Tinsley
2024-04-18 14:44:49 -04:00
committed by Greyson Parrelli
parent 947ab7d48b
commit 62cf3feeaa
22 changed files with 1221 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseSvrPinFragment.java
View File

@@ -23,6 +23,7 @@ import androidx.appcompat.widget.Toolbar;
import com.google.android.material.button.MaterialButton;
import org.thoughtcrime.securesms.LoggingFragment;
import org.thoughtcrime.securesms.PassphraseRequiredActivity;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.keyvalue.SignalStore;
import org.thoughtcrime.securesms.pin.PinOptOutDialog;
@@ -151,8 +152,11 @@ public abstract class BaseSvrPinFragment<ViewModel extends BaseSvrPinViewModel>
protected void closeNavGraphBranch() {
Intent activityIntent = requireActivity().getIntent();
if (activityIntent != null && activityIntent.hasExtra("next_intent")) {
startActivity(activityIntent.getParcelableExtra("next_intent"));
if (activityIntent != null && activityIntent.hasExtra(PassphraseRequiredActivity.NEXT_INTENT_EXTRA)) {
final Intent nextIntent = activityIntent.getParcelableExtra(PassphraseRequiredActivity.NEXT_INTENT_EXTRA);
if (nextIntent != null) {
startActivity(nextIntent);
}
}
requireActivity().finish();