From b1f5290dfab8991bf88a226578b1e6ca98bf408c Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Tue, 7 Jul 2015 17:45:27 +0200
Subject: fix some nullpointers from proxy implementation

---
 .../keychain/ui/adapter/ImportKeysListCloudLoader.java                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListCloudLoader.java')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListCloudLoader.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListCloudLoader.java
index c7f69207c..9d3d230d4 100644
--- 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();
-- 
cgit v1.2.3