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) {