Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert panic preferences to standard Preferences code style

Browse Source 
Yes, this is an ugly and old style, but mixing styles only makes it worse.
Plus it breaks the tests in some cases, since it makes Preferences depend
on Resources.
This commit is contained in:
Hans-Christoph Steiner 2018-01-30 21:30:57 +01:00
parent 6260c11efc
commit 2fe7faed6e
4 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/org/fdroid/fdroid/Preferences.java
View File

@ -2,7 +2,6 @@ package org.fdroid.fdroid;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.res.Resources;
import android.os.Build; import android.os.Build;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.util.Log; import android.util.Log;
@ -39,10 +38,6 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
.putString(PREF_LOCAL_REPO_NAME, getDefaultLocalRepoName()) .putString(PREF_LOCAL_REPO_NAME, getDefaultLocalRepoName())
.apply(); .apply();
} }
Resources res = context.getResources();
defaultPreventScreenshots = res.getBoolean(R.bool.defaultPreventScreenshots);
defaultPanicExit = res.getBoolean(R.bool.defaultPanicExit);
defaultHideOnLongPressSearch = res.getBoolean(R.bool.defaultHideOnLongPressSearch);
} }
public static final String PREF_UPD_INTERVAL = "updateInterval"; public static final String PREF_UPD_INTERVAL = "updateInterval";
@ -94,9 +89,9 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
private static final boolean DEFAULT_SHOW_NFC_DURING_SWAP = true; private static final boolean DEFAULT_SHOW_NFC_DURING_SWAP = true;
private static final boolean DEFAULT_FORCE_OLD_INDEX = false; private static final boolean DEFAULT_FORCE_OLD_INDEX = false;
private static final boolean DEFAULT_POST_PRIVILEGED_INSTALL = false; private static final boolean DEFAULT_POST_PRIVILEGED_INSTALL = false;
private final boolean defaultPreventScreenshots; private static final boolean DEFAULT_PREVENT_SCREENSHOTS = false;
private final boolean defaultPanicExit; private static final boolean DEFAULT_PANIC_EXIT = true;
private final boolean defaultHideOnLongPressSearch; private static final boolean DEFAULT_HIDE_ON_LONG_PRESS_SEARCH = false;
public enum Theme { public enum Theme {
light, light,
@ -327,11 +322,11 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
} }
public boolean preventScreenshots() { public boolean preventScreenshots() {
return preferences.getBoolean(PREF_PREVENT_SCREENSHOTS, defaultPreventScreenshots); return preferences.getBoolean(PREF_PREVENT_SCREENSHOTS, DEFAULT_PREVENT_SCREENSHOTS);
} }
public boolean panicExit() { public boolean panicExit() {
return preferences.getBoolean(PREF_PANIC_EXIT, defaultPanicExit); return preferences.getBoolean(PREF_PANIC_EXIT, DEFAULT_PANIC_EXIT);
} }
public boolean panicHide() { public boolean panicHide() {
@ -339,7 +334,7 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
} }
public boolean hideOnLongPressSearch() { public boolean hideOnLongPressSearch() {
return preferences.getBoolean(PREF_HIDE_ON_LONG_PRESS_SEARCH, defaultHideOnLongPressSearch); return preferences.getBoolean(PREF_HIDE_ON_LONG_PRESS_SEARCH, DEFAULT_HIDE_ON_LONG_PRESS_SEARCH);
} }
/** /**

5
app/src/main/res/values/attrs.xml
View File

@ -14,11 +14,6 @@
<attr name="antiFeaturesWarning" format="reference" /> <attr name="antiFeaturesWarning" format="reference" />
</declare-styleable> </declare-styleable>
<!-- Default Preferences -->
<bool name="defaultPreventScreenshots">false</bool>
<bool name="defaultPanicExit">true</bool>
<bool name="defaultHideOnLongPressSearch">false</bool>
<integer name="unhidePin">1337</integer> <integer name="unhidePin">1337</integer>
</resources> </resources>

4
app/src/main/res/xml/preferences.xml
View File

@ -95,13 +95,13 @@
android:title="@string/privacy"> android:title="@string/privacy">
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="@bool/defaultPreventScreenshots" android:defaultValue="false"
android:key="preventScreenshots" android:key="preventScreenshots"
android:summary="@string/preventScreenshots_summary" android:summary="@string/preventScreenshots_summary"
android:title="@string/preventScreenshots_title"/> android:title="@string/preventScreenshots_title"/>
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="@bool/defaultHideOnLongPressSearch" android:defaultValue="false"
android:key="hideOnLongPressSearch" android:key="hideOnLongPressSearch"
android:summary="@string/hide_on_long_search_press_summary" android:summary="@string/hide_on_long_search_press_summary"
android:title="@string/hide_on_long_search_press_title"/> android:title="@string/hide_on_long_search_press_title"/>

2
app/src/main/res/xml/preferences_panic.xml
View File

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"> xmlns:tools="http://schemas.android.com/tools">
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="@bool/defaultPanicExit" android:defaultValue="true"
android:key="pref_panic_exit" android:key="pref_panic_exit"
android:summary="@string/panic_exit_summary" android:summary="@string/panic_exit_summary"
android:title="@string/panic_exit_title"/> android:title="@string/panic_exit_title"/>