diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-29 15:43:16 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-29 15:43:16 +0100 |
commit | a665dd60fbf52eccb04980bb040569967a617ebe (patch) | |
tree | 4b64f7abff1a282aa393a1bfa16a7ff50f097e1c /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java | |
parent | 64a09a89451b09aaa54090c2e6373814edb5d0eb (diff) | |
download | open-keychain-a665dd60fbf52eccb04980bb040569967a617ebe.tar.gz open-keychain-a665dd60fbf52eccb04980bb040569967a617ebe.tar.bz2 open-keychain-a665dd60fbf52eccb04980bb040569967a617ebe.zip |
use Proxy.NO_PROXY instead of null value for no proxy
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java | 2 |
1 files changed, 2 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 32d98826d..559c5556f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java @@ -23,6 +23,7 @@ import android.content.SharedPreferences; import android.content.res.Resources; import android.preference.PreferenceManager; +import android.support.annotation.NonNull; import android.support.annotation.Nullable; import org.sufficientlysecure.keychain.Constants; @@ -325,6 +326,7 @@ public class Preferences { else this.parcelableProxy = new ParcelableProxy(hostName, port, type); } + @NonNull public Proxy getProxy() { return parcelableProxy.getProxy(); } |