diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-29 15:43:16 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-29 15:43:16 +0100 |
| commit | a665dd60fbf52eccb04980bb040569967a617ebe (patch) | |
| tree | 4b64f7abff1a282aa393a1bfa16a7ff50f097e1c /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/UploadOperation.java | |
| parent | 64a09a89451b09aaa54090c2e6373814edb5d0eb (diff) | |
| download | open-keychain-a665dd60fbf52eccb04980bb040569967a617ebe.tar.gz open-keychain-a665dd60fbf52eccb04980bb040569967a617ebe.tar.bz2 open-keychain-a665dd60fbf52eccb04980bb040569967a617ebe.zip | |
use Proxy.NO_PROXY instead of null value for no proxy
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/UploadOperation.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/UploadOperation.java | 6 |
1 files changed, 3 insertions, 3 deletions
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()); } } |