diff options
| author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-08-06 01:59:11 +0530 |
|---|---|---|
| committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-08-06 04:40:52 +0530 |
| commit | 37864a9d42436081eb6132dc0c8b1e0868a15272 (patch) | |
| tree | 57056b42101cf9a2ba89ad4f62e9326061114125 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ParcelableProxy.java | |
| parent | 7086a67c2e131542c0ce903e1a5db887deae59fe (diff) | |
| download | open-keychain-37864a9d42436081eb6132dc0c8b1e0868a15272.tar.gz open-keychain-37864a9d42436081eb6132dc0c8b1e0868a15272.tar.bz2 open-keychain-37864a9d42436081eb6132dc0c8b1e0868a15272.zip | |
updated OrbotHelper with silent start
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 | 7 |
1 files changed, 5 insertions, 2 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 b00b03ec7..7e788d04c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ParcelableProxy.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ParcelableProxy.java @@ -51,8 +51,11 @@ public class ParcelableProxy implements Parcelable { if (mProxyHost == null) { return null; } - - return new Proxy(mProxyType, new InetSocketAddress(mProxyHost, mProxyPort)); + /* + * InetSocketAddress.createUnresolved so we can use this method even in the main thread + * (no network call) + */ + return new Proxy(mProxyType, InetSocketAddress.createUnresolved(mProxyHost, mProxyPort)); } protected ParcelableProxy(Parcel in) { |