From a2d2da90984a6cc4191d55d349372f1ac5d6259a Mon Sep 17 00:00:00 2001 From: Andrea Torlaschi Date: Tue, 17 May 2016 16:51:44 +0200 Subject: Settings: change CheckBoxPreference to SwitchPreference --- .../java/org/sufficientlysecure/keychain/ui/SettingsActivity.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'OpenKeychain/src/main/java/org') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java index 4fd327c8f..e71846577 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java @@ -30,7 +30,6 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.os.Build; import android.os.Bundle; -import android.preference.CheckBoxPreference; import android.preference.EditTextPreference; import android.preference.ListPreference; import android.preference.Preference; @@ -213,7 +212,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity { }); initializePassphraseCacheSubs( - (CheckBoxPreference) findPreference(Constants.Pref.PASSPHRASE_CACHE_SUBS)); + (SwitchPreference) findPreference(Constants.Pref.PASSPHRASE_CACHE_SUBS)); } } @@ -592,7 +591,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity { || super.isValidFragment(fragmentName); } - private static void initializePassphraseCacheSubs(final CheckBoxPreference mPassphraseCacheSubs) { + private static void initializePassphraseCacheSubs(final SwitchPreference mPassphraseCacheSubs) { mPassphraseCacheSubs.setChecked(sPreferences.getPassphraseCacheSubs()); mPassphraseCacheSubs.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { public boolean onPreferenceChange(Preference preference, Object newValue) { -- cgit v1.2.3 From 2ab55b6767abd516ef86a6289d50ffe4bff2703a Mon Sep 17 00:00:00 2001 From: Andrea Torlaschi Date: Tue, 17 May 2016 17:09:03 +0200 Subject: Settings: remove unuseful initialization --- .../sufficientlysecure/keychain/ui/SettingsActivity.java | 14 -------------- .../org/sufficientlysecure/keychain/util/Preferences.java | 6 ------ 2 files changed, 20 deletions(-) (limited to 'OpenKeychain/src/main/java/org') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java index e71846577..894ce7846 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java @@ -210,9 +210,6 @@ public class SettingsActivity extends AppCompatPreferenceActivity { return false; } }); - - initializePassphraseCacheSubs( - (SwitchPreference) findPreference(Constants.Pref.PASSPHRASE_CACHE_SUBS)); } } @@ -590,15 +587,4 @@ public class SettingsActivity extends AppCompatPreferenceActivity { || ExperimentalPrefsFragment.class.getName().equals(fragmentName) || super.isValidFragment(fragmentName); } - - private static void initializePassphraseCacheSubs(final SwitchPreference mPassphraseCacheSubs) { - mPassphraseCacheSubs.setChecked(sPreferences.getPassphraseCacheSubs()); - mPassphraseCacheSubs.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { - public boolean onPreferenceChange(Preference preference, Object newValue) { - mPassphraseCacheSubs.setChecked((Boolean) newValue); - sPreferences.setPassphraseCacheSubs((Boolean) newValue); - return false; - } - }); - } } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java index 2abd53f62..7ca2875ea 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java @@ -107,12 +107,6 @@ public class Preferences { return mSharedPreferences.getBoolean(Pref.PASSPHRASE_CACHE_SUBS, false); } - public void setPassphraseCacheSubs(boolean value) { - SharedPreferences.Editor editor = mSharedPreferences.edit(); - editor.putBoolean(Pref.PASSPHRASE_CACHE_SUBS, value); - editor.commit(); - } - public boolean getCachedConsolidate() { return mSharedPreferences.getBoolean(Pref.CACHED_CONSOLIDATE, false); } -- cgit v1.2.3