diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-16 00:16:20 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-03-16 00:16:20 +0100 |
| commit | 58450daef403ff6b2120c075f41e1757091d995e (patch) | |
| tree | 39a854a5f613d1fb28eedc80f6b54fc1deaaa0e4 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java | |
| parent | ad9c35f522645ccf551767bf4bbc15d7b73d48ca (diff) | |
| download | open-keychain-58450daef403ff6b2120c075f41e1757091d995e.tar.gz open-keychain-58450daef403ff6b2120c075f41e1757091d995e.tar.bz2 open-keychain-58450daef403ff6b2120c075f41e1757091d995e.zip | |
Fix nullpointer when scanning malformed qr codes
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java index cc8b47971..1c1e5fe99 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java @@ -154,7 +154,7 @@ public class ImportKeysProxyActivity extends FragmentActivity { String fingerprint = null; // example: openpgp4fpr:73EE2314F65FA92EC2390D3A718C070100012282 - if (uri.getScheme().toLowerCase(Locale.ENGLISH).equals(Constants.FINGERPRINT_SCHEME)) { + if (uri != null && uri.getScheme() != null && uri.getScheme().toLowerCase(Locale.ENGLISH).equals(Constants.FINGERPRINT_SCHEME)) { fingerprint = uri.getEncodedSchemeSpecificPart().toLowerCase(Locale.ENGLISH); } |