aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-08-20 20:44:49 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-08-20 20:44:49 +0200
commit937c91eefaa55ef5bc065b54a4ec9b04c8f3a522 (patch)
tree5e6147c90dee1c15fd78a8e93a14261f79d0a122 /OpenKeychain
parentccc1d2e0063a8ab54673eaa5413cb739317c77ee (diff)
downloadopen-keychain-937c91eefaa55ef5bc065b54a4ec9b04c8f3a522.tar.gz
open-keychain-937c91eefaa55ef5bc065b54a4ec9b04c8f3a522.tar.bz2
open-keychain-937c91eefaa55ef5bc065b54a4ec9b04c8f3a522.zip
Fix nullpointer in first time activity
Diffstat (limited to 'OpenKeychain')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java4
1 files changed, 3 insertions, 1 deletions
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();
}