moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-02 13:32:19 -05:00
Code Issues Releases Wiki Activity

Merge branch 'development' of github.com:open-keychain/open-keychain into development

Browse Source
This commit is contained in:
Dominik Schürmann 2015-01-19 17:25:36 +01:00
commit 3752cdd132
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/FirstTimeActivity.java
View File

@ -98,7 +98,7 @@ public class FirstTimeActivity extends BaseActivity {
if (srcData != null) { if (srcData != null) {
intent.putExtras(srcData); intent.putExtras(srcData);
} }
startActivityForResult(intent, 0); startActivity(intent);
finish(); finish();
} }
@ -107,4 +107,5 @@ public class FirstTimeActivity extends BaseActivity {
public boolean onKeyDown(int keyCode, KeyEvent event) { public boolean onKeyDown(int keyCode, KeyEvent event) {
return keyCode == KeyEvent.KEYCODE_MENU || super.onKeyDown(keyCode, event); return keyCode == KeyEvent.KEYCODE_MENU || super.onKeyDown(keyCode, event);
} }
} }

7
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
View File

@ -64,6 +64,13 @@ public class KeyListActivity extends DrawerActivity {
mExportHelper = new ExportHelper(this); 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... // now setup navigation drawer in DrawerActivity...
activateDrawerNavigation(savedInstanceState); activateDrawerNavigation(savedInstanceState);
} }