Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-20 06:39:54 +01:00
Code Issues Projects Releases Wiki Activity

Ensure that mailbox setup can proceed after activity was destroyed

Browse Source
This commit is contained in:
Torsten Grote
2022-06-22 11:44:07 -03:00
parent 6bfd7bcc4f
commit 1af52b21d5
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
briar-android/src/main/java/org/briarproject/briar/android/mailbox/MailboxActivity.java
View File

@@ -109,12 +109,18 @@ public class MailboxActivity extends BriarActivity {
} }
private void onShowDownload() { private void onShowDownload() {
boolean needToShow = true;
FragmentManager fm = getSupportFragmentManager(); FragmentManager fm = getSupportFragmentManager();
// if the fragment is already on the back stack, pop back to it
// instead of adding it to the stack again
if (fm.findFragmentByTag(SetupDownloadFragment.TAG) != null) { if (fm.findFragmentByTag(SetupDownloadFragment.TAG) != null) {
// if the fragment is already on the back stack, pop back to it // if the activity was previously destroyed, the fragment is still
// instead of adding it to the stack again // found, but popping back to it won't work, so we need to handle
fm.popBackStackImmediate(SetupDownloadFragment.TAG, 0); // this case and show the fragment again anyway.
} else { needToShow =
!fm.popBackStackImmediate(SetupDownloadFragment.TAG, 0);
}
if (needToShow) {
showFragment(fm, new SetupDownloadFragment(), showFragment(fm, new SetupDownloadFragment(),
SetupDownloadFragment.TAG); SetupDownloadFragment.TAG);
} }