aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-01-16 13:50:25 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-01-16 13:58:34 +0100
commitb6f0fb91dad78506f6498eec60de7ea9040e0276 (patch)
tree853a94258b2d75ecc8eea5eaa1c34a4f094d74f7 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java
parent09e992081bbe9b4522b940177bd9bd08d692b94c (diff)
downloadopen-keychain-b6f0fb91dad78506f6498eec60de7ea9040e0276.tar.gz
open-keychain-b6f0fb91dad78506f6498eec60de7ea9040e0276.tar.bz2
open-keychain-b6f0fb91dad78506f6498eec60de7ea9040e0276.zip
show notification if KeyListActivity is spawned with an EXTRA_RESULT
Closes #1029 Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
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.java3
1 files changed, 2 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 e5db48304..e487c8947 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java
@@ -98,7 +98,7 @@ public class FirstTimeActivity extends BaseActivity {
if (srcData != null) {
intent.putExtras(srcData);
}
- startActivityForResult(intent, 0);
+ startActivity(intent);
finish();
}
@@ -107,4 +107,5 @@ public class FirstTimeActivity extends BaseActivity {
public boolean onKeyDown(int keyCode, KeyEvent event) {
return keyCode == KeyEvent.KEYCODE_MENU || super.onKeyDown(keyCode, event);
}
+
}