uploadop: clean up, add logging

2 files changed, 9 insertions, 0 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 7e788d04c..ade75f926 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ParcelableProxy.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ParcelableProxy.java
@@ -19,6 +19,7 @@ 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;
@@ -47,6 +48,7 @@ public class ParcelableProxy implements Parcelable {
         return new ParcelableProxy(null, -1, null);
     }
 
+    @Nullable
     public Proxy getProxy() {
         if (mProxyHost == null) {
             return null;
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 8b2c3c66a..32d98826d 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,8 @@ import android.content.SharedPreferences;
 
 import android.content.res.Resources;
 import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
+
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.Constants.Pref;
 import org.sufficientlysecure.keychain.service.KeyserverSyncAdapterService;
@@ -322,6 +324,11 @@ public class Preferences {
             if (!torEnabled && !normalPorxyEnabled) this.parcelableProxy = new ParcelableProxy(null, -1, null);
             else this.parcelableProxy = new ParcelableProxy(hostName, port, type);
         }
+
+        public Proxy getProxy() {
+            return parcelableProxy.getProxy();
+        }
+
     }
 
     // cloud prefs