diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-06 10:34:13 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-06 10:34:13 +0200 |
commit | 3dbe0033dcf090b0c34f67c2f7440e3023eba060 (patch) | |
tree | 8cb7709cdfccc9275d376febc649c0118a808f6b /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ParcelableProxy.java | |
parent | 8fb3d1e16612cc63cb58a4cbbab38b08e0469ee0 (diff) | |
parent | 37864a9d42436081eb6132dc0c8b1e0868a15272 (diff) | |
download | open-keychain-3dbe0033dcf090b0c34f67c2f7440e3023eba060.tar.gz open-keychain-3dbe0033dcf090b0c34f67c2f7440e3023eba060.tar.bz2 open-keychain-3dbe0033dcf090b0c34f67c2f7440e3023eba060.zip |
Merge pull request #1473 from open-keychain/orbot-helper
Updated OrbotHelper with the latest NetCipher
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) { |