From 948eb731adf3310a6e74bafe7281f4e6e7a5bec7 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 28 May 2024 08:40:03 +0200 Subject: [PATCH] Revert "Enable hiding toolbar for new installations" This reverts commit ecfc14f044639a1487fe030ad6be541c57ba877f. --- app/src/main/java/eu/faircode/email/ActivityBase.java | 2 +- app/src/main/java/eu/faircode/email/ApplicationEx.java | 2 -- app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java index 7fa7700c78..ab858076eb 100644 --- a/app/src/main/java/eu/faircode/email/ActivityBase.java +++ b/app/src/main/java/eu/faircode/email/ActivityBase.java @@ -105,7 +105,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc @Override public void setContentView(View view) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - boolean hide_toolbar = prefs.getBoolean("hide_toolbar", true); + boolean hide_toolbar = prefs.getBoolean("hide_toolbar", !BuildConfig.PLAY_STORE_RELEASE); boolean edge_to_edge = prefs.getBoolean("edge_to_edge", false); LayoutInflater inflater = LayoutInflater.from(this); diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java index 7941d311a4..c7c530f939 100644 --- a/app/src/main/java/eu/faircode/email/ApplicationEx.java +++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java @@ -864,8 +864,6 @@ public class ApplicationEx extends Application if (Helper.isAndroid15()) editor.putInt("last_sdk", 0); } else if (version < 2187) { - if (!prefs.contains("hide_toolbar")) - editor.putBoolean("hide_toolbar", !BuildConfig.PLAY_STORE_RELEASE); if (!prefs.contains("delete_unseen")) editor.putBoolean("delete_unseen", false); if (Helper.isPixelBeta()) diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java index e7bc53dafb..4d8e164d2b 100644 --- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java +++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java @@ -1563,7 +1563,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer tvColumnWidth.setText(getString(R.string.title_advanced_column_width, NF.format(column_width))); sbColumnWidth.setProgress(column_width); - swHideToolbar.setChecked(prefs.getBoolean("hide_toolbar", true)); + swHideToolbar.setChecked(prefs.getBoolean("hide_toolbar", !BuildConfig.PLAY_STORE_RELEASE)); swEdgeToEdge.setChecked(prefs.getBoolean("edge_to_edge", false)); swNavOptions.setChecked(prefs.getBoolean("nav_options", true)); swNavCategories.setChecked(prefs.getBoolean("nav_categories", false));