1 files changed, 38 insertions, 12 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
index 9eebbed64..684ee6959 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
@@ -53,19 +53,45 @@ public class KeyListActivity extends DrawerActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
-        case R.id.menu_key_list_import:
-            Intent intentImport = new Intent(this, ImportKeysActivity.class);
-            startActivityForResult(intentImport, 0);
-
-            return true;
-        case R.id.menu_key_list_export:
-            // TODO fix this for unified keylist
-            mExportHelper.showExportKeysDialog(null, Id.type.public_key, Constants.path.APP_DIR_FILE_PUB);
-
-            return true;
-        default:
-            return super.onOptionsItemSelected(item);
+            case R.id.menu_key_list_import:
+                Intent intentImport = new Intent(this, ImportKeysActivity.class);
+                startActivityForResult(intentImport, 0);
+
+                return true;
+            case R.id.menu_key_list_export:
+                // TODO fix this for unified keylist
+                mExportHelper.showExportKeysDialog(null, Id.type.public_key, Constants.path.APP_DIR_FILE_PUB);
+
+                return true;
+            case R.id.menu_key_list_create:
+                createKey();
+
+                return true;
+            case R.id.menu_key_list_create_expert:
+                createKeyExpert();
+
+                return true;
+            case R.id.menu_key_list_secret_export:
+                mExportHelper.showExportKeysDialog(null, Id.type.secret_key, Constants.path.APP_DIR_FILE_SEC);
+
+
+            default:
+                return super.onOptionsItemSelected(item);
         }
     }
 
+    private void createKey() {
+        Intent intent = new Intent(this, EditKeyActivity.class);
+        intent.setAction(EditKeyActivity.ACTION_CREATE_KEY);
+        intent.putExtra(EditKeyActivity.EXTRA_GENERATE_DEFAULT_KEYS, true);
+        intent.putExtra(EditKeyActivity.EXTRA_USER_IDS, ""); // show user id view
+        startActivityForResult(intent, 0);
+    }
+
+    private void createKeyExpert() {
+        Intent intent = new Intent(this, EditKeyActivity.class);
+        intent.setAction(EditKeyActivity.ACTION_CREATE_KEY);
+        startActivityForResult(intent, 0);
+    }
+
 }