diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-19 17:25:36 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-19 17:25:36 +0100 |
| commit | 3752cdd1322431143ce9c8fa4cba0c9fbf31a12c (patch) | |
| tree | 96765385a3a1d162738a804aaeb10938285c1950 /OpenKeychain/src | |
| parent | 3ac466c9db5f3a10a9d25fd7d85efb71fc7ad5dd (diff) | |
| parent | 491c12d5d3d321e94a0a18219c83702cf4a517e6 (diff) | |
| download | open-keychain-3752cdd1322431143ce9c8fa4cba0c9fbf31a12c.tar.gz open-keychain-3752cdd1322431143ce9c8fa4cba0c9fbf31a12c.tar.bz2 open-keychain-3752cdd1322431143ce9c8fa4cba0c9fbf31a12c.zip | |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java | 3 | ||||
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java | 7 |
2 files changed, 9 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); } + } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java index 7d037f85d..1d9a9cf64 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java @@ -64,6 +64,13 @@ public class KeyListActivity extends DrawerActivity { mExportHelper = new ExportHelper(this); + Intent data = getIntent(); + // If we got an EXTRA_RESULT in the intent, show the notification + if (data != null && data.hasExtra(OperationResult.EXTRA_RESULT)) { + OperationResult result = data.getParcelableExtra(OperationResult.EXTRA_RESULT); + result.createNotify(this).show(); + } + // now setup navigation drawer in DrawerActivity... activateDrawerNavigation(savedInstanceState); } |