From abb4d43f147eaeed8e00593365f9a2eb7768f2b0 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Thu, 29 Sep 2022 16:41:18 -0300
Subject: [PATCH] Don't re-add mailbox intro fragment after activity got
destroyed
---
.../briar/android/mailbox/MailboxActivity.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxActivity.java
index 39908db6c1..1817b7e774 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxActivity.java
@@ -104,10 +104,13 @@ public class MailboxActivity extends BriarActivity {
private void onNotSetup() {
progressBar.setVisibility(INVISIBLE);
- getSupportFragmentManager().beginTransaction()
- .replace(R.id.fragmentContainer, new SetupIntroFragment(),
- SetupIntroFragment.TAG)
- .commit();
+ FragmentManager fm = getSupportFragmentManager();
+ // If we already have a back stack, fragment state was restored after
+ // activity got killed, so don't re-add our fragment again.
+ if (fm.getBackStackEntryCount() == 0) {
+ showFragment(fm, new SetupIntroFragment(), SetupIntroFragment.TAG,
+ false);
+ }
}
private void onShowDownload() {
--
GitLab