From 937c91eefaa55ef5bc065b54a4ec9b04c8f3a522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Wed, 20 Aug 2014 20:44:49 +0200
Subject: Fix nullpointer in first time activity

---
 .../java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java
index 9811500a2..7b608a0a2 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java
@@ -92,7 +92,9 @@ public class FirstTimeActivity extends ActionBarActivity {
         prefs.setFirstTime(false);
         Intent intent = new Intent(this, KeyListActivity.class);
         // give intent through to display notify
-        intent.putExtras(srcData);
+        if (srcData != null) {
+            intent.putExtras(srcData);
+        }
         startActivityForResult(intent, 0);
         finish();
     }
-- 
cgit v1.2.3