Make create key wizard step-by-step

5 files changed, 312 insertions, 35 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
index 60cc404b6..2da5511b8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
@@ -39,8 +39,8 @@ public class CreateKeyActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
 
         // pass extras into fragment
-        CreateKeyInputFragment frag =
-                CreateKeyInputFragment.newInstance(
+        CreateKeyNameFragment frag =
+                CreateKeyNameFragment.newInstance(
                         getIntent().getStringExtra(EXTRA_NAME),
                         getIntent().getStringExtra(EXTRA_EMAIL)
                 );
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
new file mode 100644
index 000000000..d9f391149
--- /dev/null
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.sufficientlysecure.keychain.ui;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.ui.CreateKeyActivity.FragAction;
+import org.sufficientlysecure.keychain.ui.widget.EmailEditText;
+
+public class CreateKeyEmailFragment extends Fragment {
+
+    public static final String ARG_NAME = "name";
+    public static final String ARG_EMAIL = "email";
+
+    CreateKeyActivity mCreateKeyActivity;
+    EmailEditText mEmailEdit;
+    View mBackButton;
+    View mNextButton;
+
+    String mName;
+
+    /**
+     * Creates new instance of this fragment
+     */
+    public static CreateKeyEmailFragment newInstance(String name, String email) {
+        CreateKeyEmailFragment frag = new CreateKeyEmailFragment();
+
+        Bundle args = new Bundle();
+        args.putString(ARG_NAME, name);
+        args.putString(ARG_EMAIL, email);
+
+        frag.setArguments(args);
+
+        return frag;
+    }
+
+    /**
+     * Checks if text of given EditText is not empty. If it is empty an error is
+     * set and the EditText gets the focus.
+     *
+     * @param context
+     * @param editText
+     * @return true if EditText is not empty
+     */
+    private static boolean isEditTextNotEmpty(Context context, EditText editText) {
+        boolean output = true;
+        if (editText.getText().toString().length() == 0) {
+            editText.setError(context.getString(R.string.create_key_empty));
+            editText.requestFocus();
+            output = false;
+        } else {
+            editText.setError(null);
+        }
+
+        return output;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.create_key_email_fragment, container, false);
+
+        mEmailEdit = (EmailEditText) view.findViewById(R.id.create_key_email);
+        mBackButton = view.findViewById(R.id.create_key_back_button);
+        mNextButton = view.findViewById(R.id.create_key_next_button);
+
+        // initial values
+        mName = getArguments().getString(ARG_NAME);
+        String email = getArguments().getString(ARG_EMAIL);
+        mEmailEdit.setText(email);
+
+        // focus empty edit fields
+        if (email == null) {
+            mEmailEdit.requestFocus();
+        }
+        mBackButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mCreateKeyActivity.loadFragment(null, null, FragAction.TO_LEFT);
+            }
+        });
+        mNextButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                createKeyCheck();
+            }
+        });
+
+        return view;
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        mCreateKeyActivity = (CreateKeyActivity) getActivity();
+    }
+
+    private void createKeyCheck() {
+        if (isEditTextNotEmpty(getActivity(), mEmailEdit)) {
+
+            CreateKeyPassphraseFragment frag =
+                    CreateKeyPassphraseFragment.newInstance(
+                            mName,
+                            mEmailEdit.getText().toString()
+                    );
+
+            mCreateKeyActivity.loadFragment(null, frag, FragAction.TO_RIGHT);
+        }
+    }
+
+}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
index 920488e3e..dc9f3d4ad 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
@@ -95,7 +95,7 @@ public class CreateKeyFinalFragment extends Fragment {
         mEmailEdit = (TextView) view.findViewById(R.id.email);
         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_create_button);
+        mCreateButton = view.findViewById(R.id.create_key_next_button);
         mEditText = (TextView) view.findViewById(R.id.create_key_edit_text);
         mEditButton = view.findViewById(R.id.create_key_edit_button);
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyNameFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyNameFragment.java
new file mode 100644
index 000000000..50a3bd655
--- /dev/null
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyNameFragment.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.sufficientlysecure.keychain.ui;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+
+import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.ui.CreateKeyActivity.FragAction;
+import org.sufficientlysecure.keychain.ui.widget.EmailEditText;
+import org.sufficientlysecure.keychain.ui.widget.NameEditText;
+
+public class CreateKeyNameFragment extends Fragment {
+
+    public static final String ARG_NAME = "name";
+    public static final String ARG_EMAIL = "email";
+
+    CreateKeyActivity mCreateKeyActivity;
+    NameEditText mNameEdit;
+    View mNextButton;
+
+    String mEmail;
+
+    /**
+     * Creates new instance of this fragment
+     */
+    public static CreateKeyNameFragment newInstance(String name, String email) {
+        CreateKeyNameFragment frag = new CreateKeyNameFragment();
+
+        Bundle args = new Bundle();
+        args.putString(ARG_NAME, name);
+        args.putString(ARG_EMAIL, email);
+
+        frag.setArguments(args);
+
+        return frag;
+    }
+
+    /**
+     * Checks if text of given EditText is not empty. If it is empty an error is
+     * set and the EditText gets the focus.
+     *
+     * @param context
+     * @param editText
+     * @return true if EditText is not empty
+     */
+    private static boolean isEditTextNotEmpty(Context context, EditText editText) {
+        boolean output = true;
+        if (editText.getText().toString().length() == 0) {
+            editText.setError(context.getString(R.string.create_key_empty));
+            editText.requestFocus();
+            output = false;
+        } else {
+            editText.setError(null);
+        }
+
+        return output;
+    }
+
+    private static boolean areEditTextsEqual(Context context, EditText editText1, EditText editText2) {
+        boolean output = true;
+        if (!editText1.getText().toString().equals(editText2.getText().toString())) {
+            editText2.setError(context.getString(R.string.create_key_passphrases_not_equal));
+            editText2.requestFocus();
+            output = false;
+        } else {
+            editText2.setError(null);
+        }
+
+        return output;
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.create_key_name_fragment, container, false);
+
+        mNameEdit = (NameEditText) view.findViewById(R.id.create_key_name);
+        mNextButton = view.findViewById(R.id.create_key_next_button);
+
+        // initial values
+        String name = getArguments().getString(ARG_NAME);
+        mEmail = getArguments().getString(ARG_EMAIL);
+        mNameEdit.setText(name);
+
+        // focus empty edit fields
+        if (name == null) {
+            mNameEdit.requestFocus();
+        }
+        mNextButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                createKeyCheck();
+            }
+        });
+
+        return view;
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        mCreateKeyActivity = (CreateKeyActivity) getActivity();
+    }
+
+    private void createKeyCheck() {
+        if (isEditTextNotEmpty(getActivity(), mNameEdit)) {
+
+            CreateKeyEmailFragment frag =
+                    CreateKeyEmailFragment.newInstance(
+                            mNameEdit.getText().toString(),
+                            mEmail
+                    );
+
+            mCreateKeyActivity.loadFragment(null, frag, FragAction.TO_RIGHT);
+        }
+    }
+
+}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java
index 05408e21e..be77d5042 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyPassphraseFragment.java
@@ -17,6 +17,7 @@
 
 package org.sufficientlysecure.keychain.ui;
 
+import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -28,26 +29,29 @@ import android.widget.EditText;
 
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.ui.CreateKeyActivity.FragAction;
-import org.sufficientlysecure.keychain.ui.widget.EmailEditText;
-import org.sufficientlysecure.keychain.ui.widget.NameEditText;
 import org.sufficientlysecure.keychain.ui.widget.PassphraseEditText;
 
-public class CreateKeyInputFragment extends Fragment {
+public class CreateKeyPassphraseFragment extends Fragment {
 
     public static final String ARG_NAME = "name";
     public static final String ARG_EMAIL = "email";
+
+    // model
+    String mName;
+    String mEmail;
+
+    // view
     CreateKeyActivity mCreateKeyActivity;
-    NameEditText mNameEdit;
-    EmailEditText mEmailEdit;
     PassphraseEditText mPassphraseEdit;
     EditText mPassphraseEditAgain;
-    View mCreateButton;
+    View mBackButton;
+    View mNextButton;
 
     /**
      * Creates new instance of this fragment
      */
-    public static CreateKeyInputFragment newInstance(String name, String email) {
-        CreateKeyInputFragment frag = new CreateKeyInputFragment();
+    public static CreateKeyPassphraseFragment newInstance(String name, String email) {
+        CreateKeyPassphraseFragment frag = new CreateKeyPassphraseFragment();
 
         Bundle args = new Bundle();
         args.putString(ARG_NAME, name);
@@ -94,27 +98,24 @@ public class CreateKeyInputFragment extends Fragment {
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.create_key_input_fragment, container, false);
+        View view = inflater.inflate(R.layout.create_key_passphrase_fragment, container, false);
 
-        mNameEdit = (NameEditText) view.findViewById(R.id.create_key_name);
         mPassphraseEdit = (PassphraseEditText) view.findViewById(R.id.create_key_passphrase);
-        mEmailEdit = (EmailEditText) view.findViewById(R.id.create_key_email);
         mPassphraseEditAgain = (EditText) view.findViewById(R.id.create_key_passphrase_again);
-        mCreateButton = view.findViewById(R.id.create_key_button);
+        mBackButton = view.findViewById(R.id.create_key_back_button);
+        mNextButton = view.findViewById(R.id.create_key_next_button);
 
         // initial values
-        String name = getArguments().getString(ARG_NAME);
-        String email = getArguments().getString(ARG_EMAIL);
-        mNameEdit.setText(name);
-        mEmailEdit.setText(email);
-
-        // focus non-empty edit fields
-        if (name != null && email != null) {
-            mPassphraseEdit.requestFocus();
-        } else if (name != null) {
-            mEmailEdit.requestFocus();
-        }
-        mCreateButton.setOnClickListener(new View.OnClickListener() {
+        mName = getArguments().getString(ARG_NAME);
+        mEmail = getArguments().getString(ARG_EMAIL);
+        mPassphraseEdit.requestFocus();
+        mBackButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                back();
+            }
+        });
+        mNextButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 createKeyCheck();
@@ -125,22 +126,24 @@ public class CreateKeyInputFragment extends Fragment {
     }
 
     @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
         mCreateKeyActivity = (CreateKeyActivity) getActivity();
     }
 
+    private void back() {
+        hideKeyboard();
+        mCreateKeyActivity.loadFragment(null, null, FragAction.TO_LEFT);
+    }
+
     private void createKeyCheck() {
-        if (isEditTextNotEmpty(getActivity(), mNameEdit)
-                && isEditTextNotEmpty(getActivity(), mEmailEdit)
-                && isEditTextNotEmpty(getActivity(), mPassphraseEdit)
+        if (isEditTextNotEmpty(getActivity(), mPassphraseEdit)
                 && areEditTextsEqual(getActivity(), mPassphraseEdit, mPassphraseEditAgain)) {
 
             CreateKeyFinalFragment frag =
                     CreateKeyFinalFragment.newInstance(
-                            mNameEdit.getText().toString(),
-                            mEmailEdit.getText().toString(),
+                            mName,
+                            mEmail,
                             mPassphraseEdit.getText().toString()
                     );