started reworking the key creation

4 files changed, 54 insertions, 18 deletions

diff --git a/org_apg/src/org/apg/ui/EditKeyActivity.java b/org_apg/src/org/apg/ui/EditKeyActivity.java
index b0e59a7bf..e00cb7d24 100644
--- a/org_apg/src/org/apg/ui/EditKeyActivity.java
+++ b/org_apg/src/org/apg/ui/EditKeyActivity.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2012 Dominik Schürmann <dominik@dominikschuermann.de>
  * Copyright (C) 2010 Thialfihar <thi@thialfihar.org>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -44,9 +45,13 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.LinearLayout;
+import android.widget.TableRow;
 import android.widget.Toast;
+import android.widget.CompoundButton.OnCheckedChangeListener;
 
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
@@ -149,17 +154,32 @@ public class EditKeyActivity extends BaseActivity {
             }
         }
 
-        mChangePassPhrase = (Button) findViewById(R.id.btn_change_pass_phrase);
+        mChangePassPhrase = (Button) findViewById(R.id.edit_key_btn_change_pass_phrase);
         mChangePassPhrase.setOnClickListener(new OnClickListener() {
             public void onClick(View v) {
                 showDialog(Id.dialog.new_pass_phrase);
             }
         });
 
+        // disable passphrase when no passphrase checkobox is checked!
+        final CheckBox noPassphrase = (CheckBox) findViewById(R.id.edit_key_no_passphrase);
+        noPassphrase.setOnCheckedChangeListener(new OnCheckedChangeListener() {
+
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                if (isChecked) {
+                    mChangePassPhrase.setVisibility(View.GONE);
+                } else {
+                    mChangePassPhrase.setVisibility(View.VISIBLE);
+                }
+
+            }
+        });
+
         // Build layout based on given userIds and keys
         LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
-        LinearLayout container = (LinearLayout) findViewById(R.id.container);
+        LinearLayout container = (LinearLayout) findViewById(R.id.edit_key_container);
         mUserIds = (SectionView) inflater.inflate(R.layout.edit_key_section, container, false);
         mUserIds.setType(Id.type.user_id);
         mUserIds.setUserIds(userIds);
@@ -203,9 +223,9 @@ public class EditKeyActivity extends BaseActivity {
             alert.setMessage(R.string.enterPassPhraseTwice);
 
             LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-            View view = inflater.inflate(R.layout.pass_phrase, null);
-            final EditText input1 = (EditText) view.findViewById(R.id.passPhrase);
-            final EditText input2 = (EditText) view.findViewById(R.id.passPhraseAgain);
+            View view = inflater.inflate(R.layout.passphrase, null);
+            final EditText input1 = (EditText) view.findViewById(R.id.passphrase_passphrase);
+            final EditText input2 = (EditText) view.findViewById(R.id.passphrase_passphrase_again);
 
             alert.setView(view);
 
diff --git a/org_apg/src/org/apg/ui/PublicKeyListActivity.java b/org_apg/src/org/apg/ui/PublicKeyListActivity.java
index e963a2029..5759350ec 100644
--- a/org_apg/src/org/apg/ui/PublicKeyListActivity.java
+++ b/org_apg/src/org/apg/ui/PublicKeyListActivity.java
@@ -53,12 +53,10 @@ public class PublicKeyListActivity extends KeyListActivity {
                 .setIcon(R.drawable.ic_menu_search_list)
                 .setShowAsAction(
                         MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
-        menu.add(0, Id.menu.option.import_keys, 3, R.string.menu_importKeys)
-        // .setIcon(R.drawable.ic_suggestions_add)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
-        menu.add(0, Id.menu.option.export_keys, 4, R.string.menu_exportKeys)
-        // .setIcon(R.drawable.ic_menu_share_holo_light)
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+        menu.add(0, Id.menu.option.import_keys, 3, R.string.menu_importKeys).setShowAsAction(
+                MenuItem.SHOW_AS_ACTION_NEVER | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+        menu.add(0, Id.menu.option.export_keys, 4, R.string.menu_exportKeys).setShowAsAction(
+                MenuItem.SHOW_AS_ACTION_NEVER | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
 
         return true;
     }
diff --git a/org_apg/src/org/apg/ui/SecretKeyListActivity.java b/org_apg/src/org/apg/ui/SecretKeyListActivity.java
index 5359aec8f..2e46ebcd4 100644
--- a/org_apg/src/org/apg/ui/SecretKeyListActivity.java
+++ b/org_apg/src/org/apg/ui/SecretKeyListActivity.java
@@ -49,17 +49,14 @@ public class SecretKeyListActivity extends KeyListActivity implements OnChildCli
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         menu.add(3, Id.menu.option.search, 0, R.string.menu_search)
-                .setIcon(R.drawable.ic_menu_search_list)
+                .setIcon(R.drawable.ic_menu_search)
                 .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
         menu.add(1, Id.menu.option.create, 1, R.string.menu_createKey)
-        // .setIcon(R.drawable.ic_suggestions_add)
                 .setShowAsAction(
                         MenuItem.SHOW_AS_ACTION_IF_ROOM | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
         menu.add(0, Id.menu.option.import_keys, 2, R.string.menu_importKeys)
-        // .setIcon(R.drawable.ic_menu_find_holo_light)
                 .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
         menu.add(0, Id.menu.option.export_keys, 3, R.string.menu_exportKeys)
-        // .setIcon(R.drawable.ic_menu_find_holo_light)
                 .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
 
         return true;
diff --git a/org_apg/src/org/apg/ui/widget/SectionView.java b/org_apg/src/org/apg/ui/widget/SectionView.java
index 565ccb241..c62e84c03 100644
--- a/org_apg/src/org/apg/ui/widget/SectionView.java
+++ b/org_apg/src/org/apg/ui/widget/SectionView.java
@@ -37,9 +37,13 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
+import android.widget.TableRow;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -176,11 +180,10 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
             View view = mInflater.inflate(R.layout.create_key, null);
             dialog.setView(view);
             dialog.setTitle(R.string.title_createKey);
-            dialog.setMessage(R.string.keyCreationElGamalInfo);
 
             boolean wouldBeMasterKey = (mEditors.getChildCount() == 0);
 
-            final Spinner algorithm = (Spinner) view.findViewById(R.id.algorithm);
+            final Spinner algorithm = (Spinner) view.findViewById(R.id.create_key_algorithm);
             Vector<Choice> choices = new Vector<Choice>();
             choices.add(new Choice(Id.choice.algorithm.dsa, getResources().getString(R.string.dsa)));
             if (!wouldBeMasterKey) {
@@ -202,7 +205,7 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
                 }
             }
 
-            final EditText keySize = (EditText) view.findViewById(R.id.size);
+            final EditText keySize = (EditText) view.findViewById(R.id.create_key_size);
 
             dialog.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface di, int id) {
@@ -275,6 +278,24 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
         this.updateEditorsVisible();
     }
 
+    // TODO !!!
+    public void createInitialKey() {
+        mEditors.removeAllViews();
+
+        // create initial key
+        // PGPSecretKey key = new PGPSecretKey();
+
+        // for (PGPSecretKey key : list) {
+        KeyEditor view = (KeyEditor) mInflater.inflate(R.layout.edit_key_key_item, mEditors, false);
+        view.setEditorListener(this);
+        boolean isMasterKey = (mEditors.getChildCount() == 0);
+        // view.setValue(key, isMasterKey);
+        mEditors.addView(view);
+        // }
+
+        this.updateEditorsVisible();
+    }
+
     private void createKey() {
         mProgressDialog = new ProgressDialog(getContext());
         mProgressDialog.setMessage(getContext().getString(R.string.progress_generating));