From 3c000ffd1a11fd1db689283d8b71a9fd25a06a0d Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 8 Jan 2024 07:40:29 +0100 Subject: [PATCH 1/2] Fixed accepting EULA in some cases --- app/src/main/java/eu/faircode/email/ActivityMain.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityMain.java b/app/src/main/java/eu/faircode/email/ActivityMain.java index d7249bf06e..7a06fb4e5a 100644 --- a/app/src/main/java/eu/faircode/email/ActivityMain.java +++ b/app/src/main/java/eu/faircode/email/ActivityMain.java @@ -464,9 +464,8 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack if ("eula".equals(key)) { boolean eula = prefs.getBoolean(key, false); if (eula) { - // recreate is done without animation - finish(); - startActivity(getIntent()); + // recreate is done without animation, unfortunately + recreate(); } } } From 8ef2dfe77b8ff36cbff8664bc62d7a9636e62292 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 7 Jan 2024 20:29:37 +0100 Subject: [PATCH 2/2] Fixed unified/primary folders navigation --- app/src/main/java/eu/faircode/email/ActivityView.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java index f9c11b61ab..801fb3fead 100644 --- a/app/src/main/java/eu/faircode/email/ActivityView.java +++ b/app/src/main/java/eu/faircode/email/ActivityView.java @@ -774,8 +774,6 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB private void init() { Bundle args = new Bundle(); - long account = getIntent().getLongExtra("account", -1); - FragmentBase fragment; switch (startup) { case "accounts": @@ -784,15 +782,11 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB break; case "folders": fragment = new FragmentFolders(); - args.putLong("account", account); args.putBoolean("unified", true); break; case "primary": fragment = new FragmentFolders(); - if (account < 0) - args.putBoolean("primary", true); - else - args.putLong("account", account); + args.putBoolean("primary", true); break; default: fragment = new FragmentMessages();