From a665dd60fbf52eccb04980bb040569967a617ebe Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Thu, 29 Oct 2015 15:43:16 +0100
Subject: use Proxy.NO_PROXY instead of null value for no proxy

---
 .../src/main/java/org/sufficientlysecure/keychain/util/Preferences.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
index 32d98826d..559c5556f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Preferences.java
@@ -23,6 +23,7 @@ import android.content.SharedPreferences;
 
 import android.content.res.Resources;
 import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import org.sufficientlysecure.keychain.Constants;
@@ -325,6 +326,7 @@ public class Preferences {
             else this.parcelableProxy = new ParcelableProxy(hostName, port, type);
         }
 
+        @NonNull
         public Proxy getProxy() {
             return parcelableProxy.getProxy();
         }
-- 
cgit v1.2.3