From e5c8aa26008840550fd824131bc28f449f97852c Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 16 Sep 2023 07:14:33 +0200 Subject: [PATCH] Revert "Removed exception" This reverts commit 720b57b46331fea95f467c495c953552d9226604. --- app/src/main/java/eu/faircode/email/ActivityView.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java index 7c15dede2c..512f64bb77 100644 --- a/app/src/main/java/eu/faircode/email/ActivityView.java +++ b/app/src/main/java/eu/faircode/email/ActivityView.java @@ -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"));