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

---
 .../org/sufficientlysecure/keychain/operations/UploadOperation.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/UploadOperation.java')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/UploadOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/UploadOperation.java
index d4bbaa9fd..836894f59 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/UploadOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/UploadOperation.java
@@ -95,10 +95,10 @@ public class UploadOperation extends BaseOperation<UploadKeyringParcel> {
 
             if (proxyIsTor) {
                 log.add(LogType.MSG_UPLOAD_PROXY_TOR, 1);
-            } else if (proxy != null && proxy != Proxy.NO_PROXY) {
-                log.add(LogType.MSG_UPLOAD_PROXY, 1, proxy.toString());
-            } else {
+            } else if (proxy == Proxy.NO_PROXY) {
                 log.add(LogType.MSG_UPLOAD_PROXY_DIRECT, 1);
+            } else {
+                log.add(LogType.MSG_UPLOAD_PROXY, 1, proxy.toString());
             }
 
         }
-- 
cgit v1.2.3