From 677d9e6023e309982352574f173435c29e7ad551 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 28 Aug 2014 13:10:52 +0200
Subject: Fix crash in PgpKeyHelper

---
 .../src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
index 05acb86df..165382bda 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
@@ -95,7 +95,7 @@ public class PgpKeyHelper {
                 break;
             }
         }
-        if (keySize > 0)
+        if (keySize != null && keySize > 0)
             return algorithmStr + ", " + keySize + " bit";
         else
             return algorithmStr;
-- 
cgit v1.2.3