Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-04 08:08:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Removed exception"

Browse Source 
This reverts commit 720b57b463.
This commit is contained in:
M66B
2023-09-16 07:14:33 +02:00
parent e90392ee6c
commit e5c8aa2600
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/ActivityView.java
View File

@@ -2476,10 +2476,12 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
}
private void onViewThread(Intent intent) {
boolean found = intent.getBooleanExtra("found", false);
if (lastSnackbar != null && lastSnackbar.isShown())
lastSnackbar.dismiss();
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
if (!found && getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
getSupportFragmentManager().popBackStack("thread", FragmentManager.POP_BACK_STACK_INCLUSIVE);
Bundle args = new Bundle();
@@ -2489,7 +2491,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
args.putLong("id", intent.getLongExtra("id", -1));
args.putInt("lpos", intent.getIntExtra("lpos", -1));
args.putBoolean("filter_archive", intent.getBooleanExtra("filter_archive", true));
args.putBoolean("found", intent.getBooleanExtra("found", false));
args.putBoolean("found", found);
args.putString("searched", intent.getStringExtra("searched"));
args.putBoolean("pinned", intent.getBooleanExtra("pinned", false));
args.putString("msgid", intent.getStringExtra("msgid"));