moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-01-31 07:00:24 -05:00
Code Issues Releases Wiki Activity

Merge pull request #1212 from adithyaphilip/qr-result

Browse Source 
Corrected possible null pointer with key import
This commit is contained in:
Dominik Schürmann 2015-04-22 01:04:22 +02:00
commit b0c87e2372
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
View File

@ -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);