From 1cb97545450079aad8d4d40729e6d72f3eb0cc42 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 17 Jul 2018 15:59:29 +0200 Subject: [PATCH] only show "Install History" Setting when it is actually enabled --- .../views/fragments/PreferencesFragment.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java index a9a9153fe..0e33c3b95 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java +++ b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java @@ -101,6 +101,8 @@ public class PreferencesFragment extends PreferenceFragment private SwitchPreference useTorCheckPref; private Preference updateAutoDownloadPref; private Preference updatePrivilegedExtensionPref; + private CheckBoxPreference keepInstallHistoryPref; + private Preference installHistoryPref; private long currentKeepCacheTime; private int overWifiPrevious; private int overDataPrevious; @@ -114,6 +116,10 @@ public class PreferencesFragment extends PreferenceFragment addPreferencesFromResource(R.xml.preferences); otherPrefGroup = (PreferenceGroup) findPreference("pref_category_other"); + keepInstallHistoryPref = (CheckBoxPreference) findPreference(Preferences.PREF_KEEP_INSTALL_HISTORY); + installHistoryPref = findPreference("installHistory"); + installHistoryPref.setVisible(keepInstallHistoryPref.isChecked()); + useTorCheckPref = (SwitchPreference) findPreference(Preferences.PREF_USE_TOR); enableProxyCheckPref = (SwitchPreference) findPreference(Preferences.PREF_ENABLE_PROXY); updateAutoDownloadPref = findPreference(Preferences.PREF_AUTO_DOWNLOAD_INSTALL_UPDATES); @@ -338,14 +344,12 @@ public class PreferencesFragment extends PreferenceFragment break; case Preferences.PREF_KEEP_INSTALL_HISTORY: - CheckBoxPreference p = (CheckBoxPreference) findPreference(key); - Preference installHistory = findPreference("installHistory"); - if (p.isChecked()) { + if (keepInstallHistoryPref.isChecked()) { InstallHistoryService.register(getActivity()); - installHistory.setVisible(true); + installHistoryPref.setVisible(true); } else { InstallHistoryService.unregister(getActivity()); - installHistory.setVisible(false); + installHistoryPref.setVisible(false); } break; }