diff options
author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-06-11 01:34:35 +0530 |
---|---|---|
committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-07-03 20:46:15 +0530 |
commit | 65ca77c3cbb5b8bece96e16ff4cd5040ad7884a3 (patch) | |
tree | f709caf08e096366d1ebc5ca5674bf7fc7b1728f /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ParcelableProxy.java | |
parent | 31fac3080e13ef1bd0cf380b3d04c13293259e5f (diff) | |
download | open-keychain-65ca77c3cbb5b8bece96e16ff4cd5040ad7884a3.tar.gz open-keychain-65ca77c3cbb5b8bece96e16ff4cd5040ad7884a3.tar.bz2 open-keychain-65ca77c3cbb5b8bece96e16ff4cd5040ad7884a3.zip |
orbot dialog fragments added
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ParcelableProxy.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ParcelableProxy.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ParcelableProxy.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ParcelableProxy.java index e5bb1deb4..601547fa9 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ParcelableProxy.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ParcelableProxy.java @@ -36,6 +36,9 @@ public class ParcelableProxy implements Parcelable { public ParcelableProxy(String hostName, int port, Proxy.Type type) { mProxyHost = hostName; + + if (hostName == null) return; // represents a null proxy + mProxyPort = port; switch (type) { @@ -51,6 +54,8 @@ public class ParcelableProxy implements Parcelable { } public Proxy getProxy() { + if(mProxyHost == null) return null; + Proxy.Type type = null; switch (mProxyType) { case TYPE_HTTP: |