From d65b8d7d18a953b98f11a7cdf9938d2516d96ed1 Mon Sep 17 00:00:00 2001 From: Stypox Date: Sat, 22 Feb 2020 11:34:08 +0100 Subject: [PATCH] Address @mauriciocolli suggestions in #2960 Simplify code to enable history button --- .../main/java/org/schabi/newpipe/MainActivity.java | 12 +++--------- .../main/java/org/schabi/newpipe/util/Constants.java | 2 -- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java index 7cd620faa..29dde41c1 100644 --- a/app/src/main/java/org/schabi/newpipe/MainActivity.java +++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java @@ -453,15 +453,9 @@ public class MainActivity extends AppCompatActivity { NavigationHelper.openMainActivity(this); } - if (sharedPreferences.getBoolean(Constants.KEY_ENABLE_WATCH_HISTORY, true)) { - if (DEBUG) Log.d(TAG, "do not show History-menu as its disabled in settings"); - drawerItems.getMenu().findItem(ITEM_ID_HISTORY).setVisible(true); - } - - if (!sharedPreferences.getBoolean(Constants.KEY_ENABLE_WATCH_HISTORY, true)) { - if (DEBUG) Log.d(TAG, "show History-menu as its enabled in settings"); - drawerItems.getMenu().findItem(ITEM_ID_HISTORY).setVisible(false); - } + final boolean isHistoryEnabled = sharedPreferences.getBoolean( + getString(R.string.enable_watch_history_key), true); + drawerItems.getMenu().findItem(ITEM_ID_HISTORY).setVisible(isHistoryEnabled); } @Override diff --git a/app/src/main/java/org/schabi/newpipe/util/Constants.java b/app/src/main/java/org/schabi/newpipe/util/Constants.java index 50350651d..b01b6df6a 100644 --- a/app/src/main/java/org/schabi/newpipe/util/Constants.java +++ b/app/src/main/java/org/schabi/newpipe/util/Constants.java @@ -11,7 +11,5 @@ public class Constants { public static final String KEY_THEME_CHANGE = "key_theme_change"; public static final String KEY_MAIN_PAGE_CHANGE = "key_main_page_change"; - public static final String KEY_ENABLE_WATCH_HISTORY = "enable_watch_history"; - public static final int NO_SERVICE_ID = -1; }