diff options
author | Tim Bray <timbray@gmail.com> | 2014-09-12 08:34:51 -0700 |
---|---|---|
committer | Tim Bray <timbray@gmail.com> | 2014-09-13 21:41:03 -0700 |
commit | 1c32d1df8801968ea6423ee4f1a9160e0c4ff0c3 (patch) | |
tree | 6571fc5b6aca0de6bd23e9acda38caf16d81cc30 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java | |
parent | 36ef8a9a62f32f0843c9e317d493a7f136624dce (diff) | |
download | open-keychain-1c32d1df8801968ea6423ee4f1a9160e0c4ff0c3.tar.gz open-keychain-1c32d1df8801968ea6423ee4f1a9160e0c4ff0c3.tar.bz2 open-keychain-1c32d1df8801968ea6423ee4f1a9160e0c4ff0c3.zip |
Add cloud search tab, lose Keybase/Keyserver tabs, re-organize prefs
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java index aa4621893..bf09997a0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java @@ -220,6 +220,9 @@ public class Preferences { } return servers.toArray(chunks); } + public String getPreferredKeyserver() { + return getKeyServers()[0]; + } public void setKeyServers(String[] value) { SharedPreferences.Editor editor = mSharedPreferences.edit(); @@ -248,6 +251,35 @@ public class Preferences { return mSharedPreferences.getBoolean(Constants.Pref.WRITE_VERSION_HEADER, false); } + public void setSearchKeyserver(boolean searchKeyserver) { + SharedPreferences.Editor editor = mSharedPreferences.edit(); + editor.putBoolean(Pref.SEARCH_KEYSERVER, searchKeyserver); + editor.commit(); + } + public void setSearchKeybase(boolean searchKeybase) { + SharedPreferences.Editor editor = mSharedPreferences.edit(); + editor.putBoolean(Pref.SEARCH_KEYBASE, searchKeybase); + editor.commit(); + } + + public CloudSearchPrefs getCloudSearchPrefs() { + return new CloudSearchPrefs(mSharedPreferences.getBoolean(Pref.SEARCH_KEYSERVER, true), + mSharedPreferences.getBoolean(Pref.SEARCH_KEYBASE, true), + getPreferredKeyserver()); + } + + public static class CloudSearchPrefs { + public final boolean searchKeyserver; + public final boolean searchKeybase; + public final String keyserver; + + public CloudSearchPrefs(boolean searchKeyserver, boolean searchKeybase, String keyserver) { + this.searchKeyserver = searchKeyserver; + this.searchKeybase = searchKeybase; + this.keyserver = keyserver; + } + } + public void updatePreferences() { if (mSharedPreferences.getInt(Constants.Pref.PREF_DEFAULT_VERSION, 0) != Constants.Defaults.PREF_VERSION) { |