diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-04-22 01:04:22 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-04-22 01:04:22 +0200 |
| commit | b0c87e2372681d4f2de547b73d41b98d86bd564e (patch) | |
| tree | 9b5f7041d757584a0f646d4a588cb13ef89c6f07 /OpenKeychain/src/main/java/org | |
| parent | 713f6ba6c79b703881e39d9d642b47f8140f8ace (diff) | |
| parent | 09cb00a87c78256f7d085dfde06b61e89ff28a25 (diff) | |
| download | open-keychain-b0c87e2372681d4f2de547b73d41b98d86bd564e.tar.gz open-keychain-b0c87e2372681d4f2de547b73d41b98d86bd564e.tar.bz2 open-keychain-b0c87e2372681d4f2de547b73d41b98d86bd564e.zip | |
Merge pull request #1212 from adithyaphilip/qr-result
Corrected possible null pointer with key import
Diffstat (limited to 'OpenKeychain/src/main/java/org')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java index 81ff87216..bf7e41045 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java @@ -217,7 +217,7 @@ public class ImportKeysListFragment extends ListFragment implements mLoaderState = new BytesLoaderState(bytes, dataUri); } else if (query != null) { Preferences.CloudSearchPrefs cloudSearchPrefs; - if (keyserver != null) { + if (keyserver == null) { cloudSearchPrefs = Preferences.getPreferences(getActivity()).getCloudSearchPrefs(); } else { cloudSearchPrefs = new Preferences.CloudSearchPrefs(true, true, keyserver); |