generate single key

2 files changed, 9 insertions, 21 deletions

diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
index 85c3ed9d2..9782d1ac2 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
@@ -116,6 +116,8 @@ public class PgpKeyOperation {
      * @throws PgpGeneralException
      * @throws InvalidAlgorithmParameterException
      */
+
+    // TODO: key flags?
     public PGPSecretKey createKey(int algorithmChoice, int keySize, String passPhrase,
        boolean isMasterKey) throws NoSuchAlgorithmException, PGPException, NoSuchProviderException,
        PgpGeneralException, InvalidAlgorithmParameterException {
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
index 1f9605fb1..4c8a50c90 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java
@@ -290,18 +290,19 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
 
         // fill values for this action
         Bundle data = new Bundle();
+        Boolean isMasterKey;
 
         String passPhrase;
         if (mEditors.getChildCount() > 0) {
             PGPSecretKey masterKey = ((KeyEditor) mEditors.getChildAt(0)).getValue();
             passPhrase = PassphraseCacheService
                     .getCachedPassphrase(mActivity, masterKey.getKeyID());
-
-            data.putByteArray(KeychainIntentService.GENERATE_KEY_MASTER_KEY,
-                    PgpConversionHelper.PGPSecretKeyToBytes(masterKey));
+            isMasterKey = true;
         } else {
             passPhrase = "";
+            isMasterKey = false;
         }
+        data.putBoolean(KeychainIntentService.GENERATE_KEY_MASTER_KEY, isMasterKey);
         data.putString(KeychainIntentService.GENERATE_KEY_SYMMETRIC_PASSPHRASE, passPhrase);
         data.putInt(KeychainIntentService.GENERATE_KEY_ALGORITHM, mNewKeyAlgorithmChoice.getId());
         data.putInt(KeychainIntentService.GENERATE_KEY_KEY_SIZE, mNewKeySize);
@@ -322,30 +323,15 @@ public class SectionView extends LinearLayout implements OnClickListener, Editor
                 if (message.arg1 == KeychainIntentServiceHandler.MESSAGE_OKAY) {
                     // get new key from data bundle returned from service
                     Bundle data = message.getData();
-                    PGPSecretKeyRing newKeyRing = (PGPSecretKeyRing) PgpConversionHelper
-                            .BytesToPGPKeyRing(data
+                    PGPSecretKey newKey = (PGPSecretKey) PgpConversionHelper
+                            .BytesToPGPKey(data
                                     .getByteArray(KeychainIntentService.RESULT_NEW_KEY));
 
-                    boolean isMasterKey = (mEditors.getChildCount() == 0);
-
-                    // take only the key from this ring
-                    PGPSecretKey newKey = null;
-                    @SuppressWarnings("unchecked")
-                    Iterator<PGPSecretKey> it = newKeyRing.getSecretKeys();
-
-                    if (isMasterKey) {
-                        newKey = it.next();
-                    } else {
-                        // first one is the master key
-                        it.next();
-                        newKey = it.next();
-                    }
-
                     // add view with new key
                     KeyEditor view = (KeyEditor) mInflater.inflate(R.layout.edit_key_key_item,
                             mEditors, false);
                     view.setEditorListener(SectionView.this);
-                    view.setValue(newKey, isMasterKey, -1);
+                    view.setValue(newKey, newKey.isMasterKey(), -1);
                     mEditors.addView(view);
                     SectionView.this.updateEditorsVisible();
                 }