From 08e25747da20e399096a2e0c1c4afcce67898718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Sat, 22 Aug 2015 03:13:04 +0200
Subject: Fix crashes with Fluffys PGP applet

---
 .../org/sufficientlysecure/keychain/ui/CreateKeyActivity.java  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java')

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
-- 
cgit v1.2.3