keycreate: add button to revert to default key configuration

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java

@@ -27,7 +27,9 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.TextView;
 
@@ -65,6 +67,8 @@ public class CreateKeyFinalFragment extends Fragment {
     CheckBox mUploadCheckbox;
     View mBackButton;
     View mCreateButton;
+    View mCustomKeyLayout;
+    Button mCustomKeyRevertButton;
 
     SaveKeyringParcel mSaveKeyringParcel;
 
@@ -96,6 +100,8 @@ public class CreateKeyFinalFragment extends Fragment {
         mUploadCheckbox = (CheckBox) view.findViewById(R.id.create_key_upload);
         mBackButton = view.findViewById(R.id.create_key_back_button);
         mCreateButton = view.findViewById(R.id.create_key_next_button);
+        mCustomKeyLayout = view.findViewById(R.id.custom_key_layout);
+        mCustomKeyRevertButton = (Button) view.findViewById(R.id.revert_key_configuration);
 
         CreateKeyActivity createKeyActivity = (CreateKeyActivity) getActivity();
 
@@ -123,6 +129,13 @@ public class CreateKeyFinalFragment extends Fragment {
             }
         });
 
+        mCustomKeyRevertButton.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                keyConfigRevertToDefault();
+            }
+        });
+
         mBackButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -188,7 +201,9 @@ public class CreateKeyFinalFragment extends Fragment {
         switch (requestCode) {
             case REQUEST_EDIT_KEY: {
                 if (resultCode == Activity.RESULT_OK) {
-                    mSaveKeyringParcel = data.getParcelableExtra(EditKeyActivity.EXTRA_SAVE_KEYRING_PARCEL);
+                    SaveKeyringParcel customKeyConfiguration =
+                            data.getParcelableExtra(EditKeyActivity.EXTRA_SAVE_KEYRING_PARCEL);
+                    keyConfigUseCustom(customKeyConfiguration);
                 }
                 break;
             }
@@ -198,54 +213,29 @@ public class CreateKeyFinalFragment extends Fragment {
         }
     }
 
+    public void keyConfigUseCustom(SaveKeyringParcel customKeyConfiguration) {
+        mSaveKeyringParcel = customKeyConfiguration;
+        mCustomKeyLayout.setVisibility(View.VISIBLE);
+    }
+
+    public void keyConfigRevertToDefault() {
+        Activity activity = getActivity();
+        if (activity == null) {
+            return;
+        }
+        mSaveKeyringParcel = createDefaultSaveKeyringParcel((CreateKeyActivity) activity);
+        mCustomKeyLayout.setVisibility(View.GONE);
+    }
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        CreateKeyActivity createKeyActivity = (CreateKeyActivity) getActivity();
-
         // We have a menu item to show in action bar.
         setHasOptionsMenu(true);
 
         if (mSaveKeyringParcel == null) {
-            mSaveKeyringParcel = new SaveKeyringParcel();
+            keyConfigRevertToDefault();
-
-            if (createKeyActivity.mCreateSecurityToken) {
-                mSaveKeyringParcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(Algorithm.RSA,
-                        2048, null, KeyFlags.SIGN_DATA | KeyFlags.CERTIFY_OTHER, 0L));
-                mSaveKeyringParcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(Algorithm.RSA,
-                        2048, null, KeyFlags.ENCRYPT_COMMS | KeyFlags.ENCRYPT_STORAGE, 0L));
-                mSaveKeyringParcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(Algorithm.RSA,
-                        2048, null, KeyFlags.AUTHENTICATION, 0L));
-
-                // use empty passphrase
-                mSaveKeyringParcel.mNewUnlock = new ChangeUnlockParcel(new Passphrase(), null);
-            } else {
-                mSaveKeyringParcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(Algorithm.RSA,
-                        4096, null, KeyFlags.CERTIFY_OTHER, 0L));
-                mSaveKeyringParcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(Algorithm.RSA,
-                        4096, null, KeyFlags.SIGN_DATA, 0L));
-                mSaveKeyringParcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(Algorithm.RSA,
-                        4096, null, KeyFlags.ENCRYPT_COMMS | KeyFlags.ENCRYPT_STORAGE, 0L));
-
-                mSaveKeyringParcel.mNewUnlock = createKeyActivity.mPassphrase != null
-                        ? new ChangeUnlockParcel(createKeyActivity.mPassphrase, null)
-                        : null;
-            }
-            String userId = KeyRing.createUserId(
-                    new KeyRing.UserId(createKeyActivity.mName, createKeyActivity.mEmail, null)
-            );
-            mSaveKeyringParcel.mAddUserIds.add(userId);
-            mSaveKeyringParcel.mChangePrimaryUserId = userId;
-            if (createKeyActivity.mAdditionalEmails != null
-                    && createKeyActivity.mAdditionalEmails.size() > 0) {
-                for (String email : createKeyActivity.mAdditionalEmails) {
-                    String thisUserId = KeyRing.createUserId(
-                            new KeyRing.UserId(createKeyActivity.mName, email, null)
-                    );
-                    mSaveKeyringParcel.mAddUserIds.add(thisUserId);
-                }
-            }
         }
 
         // handle queued actions
@@ -276,6 +266,49 @@ public class CreateKeyFinalFragment extends Fragment {
 
     }
 
+    private static SaveKeyringParcel createDefaultSaveKeyringParcel(CreateKeyActivity createKeyActivity) {
+        SaveKeyringParcel saveKeyringParcel = new SaveKeyringParcel();
+
+        if (createKeyActivity.mCreateSecurityToken) {
+            saveKeyringParcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(Algorithm.RSA,
+                    2048, null, KeyFlags.SIGN_DATA | KeyFlags.CERTIFY_OTHER, 0L));
+            saveKeyringParcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(Algorithm.RSA,
+                    2048, null, KeyFlags.ENCRYPT_COMMS | KeyFlags.ENCRYPT_STORAGE, 0L));
+            saveKeyringParcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(Algorithm.RSA,
+                    2048, null, KeyFlags.AUTHENTICATION, 0L));
+
+            // use empty passphrase
+            saveKeyringParcel.mNewUnlock = new ChangeUnlockParcel(new Passphrase(), null);
+        } else {
+            saveKeyringParcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(Algorithm.RSA,
+                    4096, null, KeyFlags.CERTIFY_OTHER, 0L));
+            saveKeyringParcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(Algorithm.RSA,
+                    4096, null, KeyFlags.SIGN_DATA, 0L));
+            saveKeyringParcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(Algorithm.RSA,
+                    4096, null, KeyFlags.ENCRYPT_COMMS | KeyFlags.ENCRYPT_STORAGE, 0L));
+
+            saveKeyringParcel.mNewUnlock = createKeyActivity.mPassphrase != null
+                    ? new ChangeUnlockParcel(createKeyActivity.mPassphrase, null)
+                    : null;
+        }
+        String userId = KeyRing.createUserId(
+                new KeyRing.UserId(createKeyActivity.mName, createKeyActivity.mEmail, null)
+        );
+        saveKeyringParcel.mAddUserIds.add(userId);
+        saveKeyringParcel.mChangePrimaryUserId = userId;
+        if (createKeyActivity.mAdditionalEmails != null
+                && createKeyActivity.mAdditionalEmails.size() > 0) {
+            for (String email : createKeyActivity.mAdditionalEmails) {
+                String thisUserId = KeyRing.createUserId(
+                        new KeyRing.UserId(createKeyActivity.mName, email, null)
+                );
+                saveKeyringParcel.mAddUserIds.add(thisUserId);
+            }
+        }
+
+        return saveKeyringParcel;
+    }
+
     private void createKey() {
         CreateKeyActivity activity = (CreateKeyActivity) getActivity();
         if (activity == null) {

OpenKeychain/src/main/res/layout/create_key_final_fragment.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <ScrollView
         android:layout_width="match_parent"
@@ -75,6 +76,46 @@
                 android:layout_height="1dip"
                 android:background="?android:attr/listDivider" />
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:id="@+id/custom_key_layout"
+                android:visibility="gone"
+                tools:visibility="visible"
+                >
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingTop="8dp"
+                    android:paddingBottom="8dp">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:layout_gravity="center_vertical"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:text="Using a custom key configuration!" />
+
+                    <Button
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:text="Revert"
+                        android:id="@+id/revert_key_configuration" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dip"
+                    android:background="?android:attr/listDivider" />
+
+            </LinearLayout>
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"