fix some nullpointers from proxy implementation

2015-07-07 17:45:27 +02:00
parent 64cec07b16
commit b1f5290dfa
2 changed files with 8 additions and 3 deletions
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListCloudLoader.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListCloudLoader.java
@@ -103,7 +103,7 @@ public class ImportKeysListCloudLoader
            ArrayList<ImportKeysListEntry> searchResult = CloudSearch.search(
                    mServerQuery,
                    mCloudPrefs,
-                    mParcelableProxy.getProxy()
+                    mParcelableProxy != null ? mParcelableProxy.getProxy() : null
            );

            mEntryList.clear();