1 files changed, 18 insertions, 37 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyNameFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyNameFragment.java
index 50a3bd655..7480367bb 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyNameFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyNameFragment.java
@@ -24,34 +24,26 @@ 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 mBackButton;
     View mNextButton;
 
-    String mEmail;
-
     /**
      * Creates new instance of this fragment
      */
-    public static CreateKeyNameFragment newInstance(String name, String email) {
+    public static CreateKeyNameFragment newInstance() {
         CreateKeyNameFragment frag = new CreateKeyNameFragment();
 
         Bundle args = new Bundle();
-        args.putString(ARG_NAME, name);
-        args.putString(ARG_EMAIL, email);
 
         frag.setArguments(args);
 
@@ -68,7 +60,7 @@ public class CreateKeyNameFragment extends Fragment {
      */
     private static boolean isEditTextNotEmpty(Context context, EditText editText) {
         boolean output = true;
-        if (editText.getText().toString().length() == 0) {
+        if (editText.getText().length() == 0) {
             editText.setError(context.getString(R.string.create_key_empty));
             editText.requestFocus();
             output = false;
@@ -79,39 +71,31 @@ public class CreateKeyNameFragment extends Fragment {
         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);
+        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);
-        mEmail = getArguments().getString(ARG_EMAIL);
-        mNameEdit.setText(name);
+        mNameEdit.setText(mCreateKeyActivity.mName);
 
         // focus empty edit fields
-        if (name == null) {
+        if (mCreateKeyActivity.mName == null) {
             mNameEdit.requestFocus();
         }
+        mBackButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mCreateKeyActivity.loadFragment(null, FragAction.TO_LEFT);
+            }
+        });
         mNextButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                createKeyCheck();
+                nextClicked();
             }
         });
 
@@ -124,16 +108,13 @@ public class CreateKeyNameFragment extends Fragment {
         mCreateKeyActivity = (CreateKeyActivity) getActivity();
     }
 
-    private void createKeyCheck() {
+    private void nextClicked() {
         if (isEditTextNotEmpty(getActivity(), mNameEdit)) {
+            // save state
+            mCreateKeyActivity.mName = mNameEdit.getText().toString();
 
-            CreateKeyEmailFragment frag =
-                    CreateKeyEmailFragment.newInstance(
-                            mNameEdit.getText().toString(),
-                            mEmail
-                    );
-
-            mCreateKeyActivity.loadFragment(null, frag, FragAction.TO_RIGHT);
+            CreateKeyEmailFragment frag = CreateKeyEmailFragment.newInstance();
+            mCreateKeyActivity.loadFragment(frag, FragAction.TO_RIGHT);
         }
     }