From 2fe7faed6e92b93ec6c31af8c774b4cb306521ce Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 30 Jan 2018 21:30:57 +0100
Subject: [PATCH] convert panic preferences to standard Preferences code style

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.
---
 .../java/org/fdroid/fdroid/Preferences.java     | 17 ++++++-----------
 app/src/main/res/values/attrs.xml               |  5 -----
 app/src/main/res/xml/preferences.xml            |  4 ++--
 app/src/main/res/xml/preferences_panic.xml      |  2 +-
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/Preferences.java b/app/src/main/java/org/fdroid/fdroid/Preferences.java
index 53b604cb6..7b59b3c95 100644
--- a/app/src/main/java/org/fdroid/fdroid/Preferences.java
+++ b/app/src/main/java/org/fdroid/fdroid/Preferences.java
@@ -2,7 +2,6 @@ package org.fdroid.fdroid;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.content.res.Resources;
 import android.os.Build;
 import android.preference.PreferenceManager;
 import android.util.Log;
@@ -39,10 +38,6 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
                     .putString(PREF_LOCAL_REPO_NAME, getDefaultLocalRepoName())
                     .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";
@@ -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_FORCE_OLD_INDEX = false;
     private static final boolean DEFAULT_POST_PRIVILEGED_INSTALL = false;
-    private final boolean defaultPreventScreenshots;
-    private final boolean defaultPanicExit;
-    private final boolean defaultHideOnLongPressSearch;
+    private static final boolean DEFAULT_PREVENT_SCREENSHOTS = false;
+    private static final boolean DEFAULT_PANIC_EXIT = true;
+    private static final boolean DEFAULT_HIDE_ON_LONG_PRESS_SEARCH = false;
 
     public enum Theme {
         light,
@@ -327,11 +322,11 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
     }
 
     public boolean preventScreenshots() {
-        return preferences.getBoolean(PREF_PREVENT_SCREENSHOTS, defaultPreventScreenshots);
+        return preferences.getBoolean(PREF_PREVENT_SCREENSHOTS, DEFAULT_PREVENT_SCREENSHOTS);
     }
 
     public boolean panicExit() {
-        return preferences.getBoolean(PREF_PANIC_EXIT, defaultPanicExit);
+        return preferences.getBoolean(PREF_PANIC_EXIT, DEFAULT_PANIC_EXIT);
     }
 
     public boolean panicHide() {
@@ -339,7 +334,7 @@ public final class Preferences implements SharedPreferences.OnSharedPreferenceCh
     }
 
     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);
     }
 
     /**
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 1c59a906b..95581fea5 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -14,11 +14,6 @@
         <attr name="antiFeaturesWarning" format="reference" />
     </declare-styleable>
 
-    <!-- Default Preferences -->
-    <bool name="defaultPreventScreenshots">false</bool>
-    <bool name="defaultPanicExit">true</bool>
-    <bool name="defaultHideOnLongPressSearch">false</bool>
-
     <integer name="unhidePin">1337</integer>
 
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index d165d4e0b..afd16ea34 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -95,13 +95,13 @@
         android:title="@string/privacy">
 
         <CheckBoxPreference
-            android:defaultValue="@bool/defaultPreventScreenshots"
+            android:defaultValue="false"
             android:key="preventScreenshots"
             android:summary="@string/preventScreenshots_summary"
             android:title="@string/preventScreenshots_title"/>
 
         <CheckBoxPreference
-            android:defaultValue="@bool/defaultHideOnLongPressSearch"
+            android:defaultValue="false"
             android:key="hideOnLongPressSearch"
             android:summary="@string/hide_on_long_search_press_summary"
             android:title="@string/hide_on_long_search_press_title"/>
diff --git a/app/src/main/res/xml/preferences_panic.xml b/app/src/main/res/xml/preferences_panic.xml
index 79689c115..275510943 100644
--- a/app/src/main/res/xml/preferences_panic.xml
+++ b/app/src/main/res/xml/preferences_panic.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <CheckBoxPreference
-        android:defaultValue="@bool/defaultPanicExit"
+        android:defaultValue="true"
         android:key="pref_panic_exit"
         android:summary="@string/panic_exit_summary"
         android:title="@string/panic_exit_title"/>