diff options
author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-06 15:26:22 +0530 |
---|---|---|
committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-03 20:46:15 +0530 |
commit | 3034db0f71f9dd8e2f4d8838c1803952702f7520 (patch) | |
tree | cb13212845cc5159516a2a0e87b0f3439acfc5ec /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util | |
parent | f4f3a66d8c1d6a3b863eb7a7a6cb47a995609872 (diff) | |
download | open-keychain-3034db0f71f9dd8e2f4d8838c1803952702f7520.tar.gz open-keychain-3034db0f71f9dd8e2f4d8838c1803952702f7520.tar.bz2 open-keychain-3034db0f71f9dd8e2f4d8838c1803952702f7520.zip |
added proxy type
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java | 26 |
1 files changed, 26 insertions, 0 deletions
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 80f0500c6..6a7d6d3eb 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java @@ -21,9 +21,12 @@ package org.sufficientlysecure.keychain.util; import android.content.Context; import android.content.SharedPreferences; +import android.content.res.Resources; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.Constants.Pref; +import org.sufficientlysecure.keychain.R; +import java.net.Proxy; import java.util.ArrayList; import java.util.Arrays; import java.util.ListIterator; @@ -35,6 +38,7 @@ import java.util.Vector; public class Preferences { private static Preferences sPreferences; private SharedPreferences mSharedPreferences; + private Resources mResources; public static synchronized Preferences getPreferences(Context context) { return getPreferences(context, false); @@ -51,6 +55,7 @@ public class Preferences { } private Preferences(Context context) { + mResources = context.getResources(); updateSharedPreferences(context); } @@ -228,6 +233,8 @@ public class Preferences { return mSharedPreferences.getBoolean(Pref.ENCRYPT_FILENAMES, true); } + // proxy preference functions start here + public boolean getUseNormalProxy() { return mSharedPreferences.getBoolean(Constants.Pref.USE_NORMAL_PROXY, false); } @@ -260,13 +267,16 @@ public class Preferences { /** * we store port as String for easy interfacing with EditTextPreference, but return it as an integer + * * @return port number of proxy */ public int getProxyPort() { return Integer.parseInt(mSharedPreferences.getString(Pref.PROXY_PORT, "-1")); } + /** * we store port as String for easy interfacing with EditTextPreference, but return it as an integer + * * @param port proxy port */ public void setProxyPort(String port) { @@ -275,6 +285,22 @@ public class Preferences { editor.commit(); } + public Proxy.Type getProxyType() { + final String typeHttp = mResources.getString(R.string.pref_proxy_type_value_http); + final String typeSocks = mResources.getString(R.string.pref_proxy_type_value_socks); + + String type = mSharedPreferences.getString(Pref.PROXY_TYPE, typeHttp); + + if(type.equals(typeHttp)) return Proxy.Type.HTTP; + else if(type.equals(typeSocks)) return Proxy.Type.SOCKS; + else { // shouldn't happen + Log.e(Constants.TAG, "Invalid Proxy Type in preferences"); + return null; + } + } + + // proxy preference functions ends here + public CloudSearchPrefs getCloudSearchPrefs() { return new CloudSearchPrefs(mSharedPreferences.getBoolean(Pref.SEARCH_KEYSERVER, true), mSharedPreferences.getBoolean(Pref.SEARCH_KEYBASE, true), |