diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-31 23:13:29 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-31 23:13:29 +0200 |
commit | db70fcfdbf63a604ccd4c8977888937161a5a9f1 (patch) | |
tree | 0dc03f291dfa7459a11a1d412bb17c684003eb79 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java | |
parent | 50aea621ba4de844cf6eee077d1f5b14d0247f14 (diff) | |
download | open-keychain-db70fcfdbf63a604ccd4c8977888937161a5a9f1.tar.gz open-keychain-db70fcfdbf63a604ccd4c8977888937161a5a9f1.tar.bz2 open-keychain-db70fcfdbf63a604ccd4c8977888937161a5a9f1.zip |
Create key: design fixes
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java | 8 |
1 files changed, 7 insertions, 1 deletions
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 c74f4c96c..50ff5c753 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java @@ -74,7 +74,7 @@ public class KeyListActivity extends DrawerActivity { @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { - case R.id.menu_key_list_import: + case R.id.menu_key_list_add: importKeys(); return true; @@ -82,6 +82,12 @@ public class KeyListActivity extends DrawerActivity { createKey(); return true; + case R.id.menu_key_list_import_existing_key: + Intent intentImportExisting = new Intent(this, ImportKeysActivity.class); + intentImportExisting.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_FILE_AND_RETURN); + startActivityForResult(intentImportExisting, 0); + return true; + case R.id.menu_key_list_export: mExportHelper.showExportKeysDialog(null, Constants.Path.APP_DIR_FILE, true); return true; |