diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-07-07 19:27:49 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-07-07 19:27:49 +0200 |
| commit | e780d8270f46bbd61a172c67fb803af92ece702c (patch) | |
| tree | b756f9e57f75977f54af6611f12af88c61ca1e23 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListCloudLoader.java | |
| parent | 412d07a373fc91d9a392df69e0e1970f66439303 (diff) | |
| parent | b1f5290dfab8991bf88a226578b1e6ca98bf408c (diff) | |
| download | open-keychain-e780d8270f46bbd61a172c67fb803af92ece702c.tar.gz open-keychain-e780d8270f46bbd61a172c67fb803af92ece702c.tar.bz2 open-keychain-e780d8270f46bbd61a172c67fb803af92ece702c.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListCloudLoader.java')
| -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(); |