use Proxy.NO_PROXY instead of null value for no proxy

1 files changed, 6 insertions, 5 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 ade75f926..7e2328e99 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ParcelableProxy.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ParcelableProxy.java
@@ -17,13 +17,14 @@
 
 package org.sufficientlysecure.keychain.util;
 
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.support.annotation.Nullable;
 
 import java.net.InetSocketAddress;
 import java.net.Proxy;
 
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+
 /**
  * used to simply transport java.net.Proxy objects created using InetSockets between services/activities
  */
@@ -48,10 +49,10 @@ public class ParcelableProxy implements Parcelable {
         return new ParcelableProxy(null, -1, null);
     }
 
-    @Nullable
+    @NonNull
     public Proxy getProxy() {
         if (mProxyHost == null) {
-            return null;
+            return Proxy.NO_PROXY;
         }
         /*
         * InetSocketAddress.createUnresolved so we can use this method even in the main thread