diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-29 14:50:29 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-29 14:50:29 +0100 |
commit | a1330f78e499840b386ea92e4280e9cdff9407f6 (patch) | |
tree | 16fe0e991164575d088a47e95e4df8885ae99d63 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java | |
parent | e89dba8f245f59afd9e4e3da9c62f98befcb4d47 (diff) | |
download | open-keychain-a1330f78e499840b386ea92e4280e9cdff9407f6.tar.gz open-keychain-a1330f78e499840b386ea92e4280e9cdff9407f6.tar.bz2 open-keychain-a1330f78e499840b386ea92e4280e9cdff9407f6.zip |
uploadop: clean up, add logging
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 | 7 |
1 files changed, 7 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 8b2c3c66a..32d98826d 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,8 @@ import android.content.SharedPreferences; import android.content.res.Resources; import android.preference.PreferenceManager; +import android.support.annotation.Nullable; + import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.Constants.Pref; import org.sufficientlysecure.keychain.service.KeyserverSyncAdapterService; @@ -322,6 +324,11 @@ public class Preferences { if (!torEnabled && !normalPorxyEnabled) this.parcelableProxy = new ParcelableProxy(null, -1, null); else this.parcelableProxy = new ParcelableProxy(hostName, port, type); } + + public Proxy getProxy() { + return parcelableProxy.getProxy(); + } + } // cloud prefs |