From 4c5ae3cdaa525ca925b5e7229a7c02b89b8cefd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Thu, 13 Mar 2014 19:01:24 +0100
Subject: [PATCH] Readd create key menu items

---
 .../keychain/ui/KeyListActivity.java          | 46 +++++++++++++++----
 .../src/main/res/menu/key_list.xml            | 26 +++++++++--
 .../src/main/res/values/strings.xml           |  1 +
 3 files changed, 59 insertions(+), 14 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);
+            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_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);
+                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);
+    }
+
 }
diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list.xml b/OpenPGP-Keychain/src/main/res/menu/key_list.xml
index addef0c2d..10223522c 100644
--- a/OpenPGP-Keychain/src/main/res/menu/key_list.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_list.xml
@@ -7,14 +7,32 @@
         app:showAsAction="ifRoom|withText"
         android:icon="@drawable/ic_action_add_person"
         android:title="@string/menu_import" />
-    <item
-        android:id="@+id/menu_key_list_export"
-        app:showAsAction="never"
-        android:title="@string/menu_export_keys" />
+
     <item
         android:id="@+id/menu_key_list_search"
         android:title="@string/menu_search"
         android:icon="@drawable/ic_action_search"
         app:actionViewClass="android.support.v7.widget.SearchView"
         app:showAsAction="collapseActionView|ifRoom" />
+
+    <item
+        android:id="@+id/menu_key_list_create"
+        app:showAsAction="never"
+        android:title="@string/menu_create_key" />
+
+    <item
+        android:id="@+id/menu_key_list_create_expert"
+        app:showAsAction="never"
+        android:title="@string/menu_create_key_expert" />
+
+    <item
+        android:id="@+id/menu_key_list_export"
+        app:showAsAction="never"
+        android:title="@string/menu_export_keys" />
+
+    <item
+        android:id="@+id/menu_key_list_secret_export"
+        app:showAsAction="never"
+        android:title="@string/menu_export_secret_keys" />
+
 </menu>
diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 1c7ead403..4b427917f 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -78,6 +78,7 @@
     <string name="menu_import">Import</string>
     <string name="menu_import_from_nfc">Import from NFC</string>
     <string name="menu_export_keys">Export all keys</string>
+    <string name="menu_export_secret_keys">Export all secret keys</string>
     <string name="menu_export_key">Export to file</string>
     <string name="menu_delete_key">Delete key</string>
     <string name="menu_create_key">Create key</string>