Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 03:09:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '2342-mailbox-setup-stuck' into 'master'

Browse Source 
Ensure that mailbox setup can proceed after activity was destroyed

Closes #2342

See merge request briar/briar!1678
This commit is contained in:
akwizgran
2022-06-26 13:04:34 +00:00
parent ddb759dbb8 1af52b21d5
commit 63060679a3
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() {
boolean needToShow = true;
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 the fragment is already on the back stack, pop back to it
// instead of adding it to the stack again
fm.popBackStackImmediate(SetupDownloadFragment.TAG, 0);
} else {
// if the activity was previously destroyed, the fragment is still
// found, but popping back to it won't work, so we need to handle
// this case and show the fragment again anyway.
needToShow =
!fm.popBackStackImmediate(SetupDownloadFragment.TAG, 0);
}
if (needToShow) {
showFragment(fm, new SetupDownloadFragment(),
SetupDownloadFragment.TAG);
}