diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-22 03:13:04 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-09-30 12:45:15 +0200 |
commit | 08e25747da20e399096a2e0c1c4afcce67898718 (patch) | |
tree | c401bc0bf18a90838e5461a5fc08ac31a342fb17 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java | |
parent | 1d0e9bf60a958dce3ee4605dd08c660331e2d171 (diff) | |
download | open-keychain-08e25747da20e399096a2e0c1c4afcce67898718.tar.gz open-keychain-08e25747da20e399096a2e0c1c4afcce67898718.tar.bz2 open-keychain-08e25747da20e399096a2e0c1c4afcce67898718.zip |
Fix crashes with Fluffys PGP applet
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java index e56652d5f..bd355da19 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java @@ -187,15 +187,17 @@ public class CreateKeyActivity extends BaseNfcActivity { } private boolean containsKeys(byte[] scannedFingerprints) { + if (scannedFingerprints == null) { + return false; + } + // If all fingerprint bytes are 0, the card contains no keys. - boolean cardContainsKeys = false; for (byte b : scannedFingerprints) { if (b != 0) { - cardContainsKeys = true; - break; + return true; } } - return cardContainsKeys; + return false; } @Override |