diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-07-07 17:45:27 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-07-07 17:45:27 +0200 |
| commit | b1f5290dfab8991bf88a226578b1e6ca98bf408c (patch) | |
| tree | 84701d3b91faa1335f96925d52481c54cd955004 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter | |
| parent | 64cec07b163f3673423b12c8cdf600300086fe08 (diff) | |
| download | open-keychain-b1f5290dfab8991bf88a226578b1e6ca98bf408c.tar.gz open-keychain-b1f5290dfab8991bf88a226578b1e6ca98bf408c.tar.bz2 open-keychain-b1f5290dfab8991bf88a226578b1e6ca98bf408c.zip | |
fix some nullpointers from proxy implementation
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListCloudLoader.java | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |