diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-20 22:38:28 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-08-20 22:38:28 +0200 |
| commit | 945764b30f22f5ee2002edfe7f89262f61fbc662 (patch) | |
| tree | 3e641f2925dbee9c70f49735f87f0760444eb590 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java | |
| parent | dd1b27b28f7c84cc10a4dd632b2175d9171f6c72 (diff) | |
| parent | 0f8958afb91c1b28a3509c91d0a7b7b56b9b6343 (diff) | |
| download | open-keychain-945764b30f22f5ee2002edfe7f89262f61fbc662.tar.gz open-keychain-945764b30f22f5ee2002edfe7f89262f61fbc662.tar.bz2 open-keychain-945764b30f22f5ee2002edfe7f89262f61fbc662.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java | 4 |
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(); } |