1 files changed, 25 insertions, 36 deletions

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 4871b5ae2..75f49a426 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
@@ -45,6 +45,7 @@ import org.sufficientlysecure.keychain.service.SaveKeyringParcel.Algorithm;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel.ChangeUnlockParcel;
 import org.sufficientlysecure.keychain.ui.CreateKeyActivity.FragAction;
 import org.sufficientlysecure.keychain.util.Log;
+import org.sufficientlysecure.keychain.util.Passphrase;
 import org.sufficientlysecure.keychain.util.Preferences;
 
 import java.util.ArrayList;
@@ -64,32 +65,15 @@ public class CreateKeyFinalFragment extends Fragment {
     TextView mEditText;
     View mEditButton;
 
-    public static final String ARG_NAME = "name";
-    public static final String ARG_EMAIL = "email";
-    public static final String ARG_ADDITIONAL_EMAILS = "emails";
-    public static final String ARG_PASSPHRASE = "passphrase";
-
-    String mName;
-    String mEmail;
-    ArrayList<String> mAdditionalEmails;
-    String mPassphrase;
-
     SaveKeyringParcel mSaveKeyringParcel;
 
     /**
      * Creates new instance of this fragment
      */
-    public static CreateKeyFinalFragment newInstance(String name, String email,
-                                                     ArrayList<String> additionalEmails,
-                                                     String passphrase) {
+    public static CreateKeyFinalFragment newInstance() {
         CreateKeyFinalFragment frag = new CreateKeyFinalFragment();
 
         Bundle args = new Bundle();
-        args.putString(ARG_NAME, name);
-        args.putString(ARG_EMAIL, email);
-        args.putStringArrayList(ARG_ADDITIONAL_EMAILS, additionalEmails);
-        args.putString(ARG_PASSPHRASE, passphrase);
-
         frag.setArguments(args);
 
         return frag;
@@ -107,17 +91,11 @@ public class CreateKeyFinalFragment extends Fragment {
         mEditText = (TextView) view.findViewById(R.id.create_key_edit_text);
         mEditButton = view.findViewById(R.id.create_key_edit_button);
 
-        // get args
-        mName = getArguments().getString(ARG_NAME);
-        mEmail = getArguments().getString(ARG_EMAIL);
-        mAdditionalEmails = getArguments().getStringArrayList(ARG_ADDITIONAL_EMAILS);
-        mPassphrase = getArguments().getString(ARG_PASSPHRASE);
-
         // set values
-        mNameEdit.setText(mName);
-        if (mAdditionalEmails != null && mAdditionalEmails.size() > 0) {
-            String emailText = mEmail + ", ";
-            Iterator<?> it = mAdditionalEmails.iterator();
+        mNameEdit.setText(mCreateKeyActivity.mName);
+        if (mCreateKeyActivity.mAdditionalEmails != null && mCreateKeyActivity.mAdditionalEmails.size() > 0) {
+            String emailText = mCreateKeyActivity.mEmail + ", ";
+            Iterator<?> it = mCreateKeyActivity.mAdditionalEmails.iterator();
             while (it.hasNext()) {
                 Object next = it.next();
                 emailText += next;
@@ -127,7 +105,7 @@ public class CreateKeyFinalFragment extends Fragment {
             }
             mEmailEdit.setText(emailText);
         } else {
-            mEmailEdit.setText(mEmail);
+            mEmailEdit.setText(mCreateKeyActivity.mEmail);
         }
 
         mCreateButton.setOnClickListener(new View.OnClickListener() {
@@ -140,7 +118,7 @@ public class CreateKeyFinalFragment extends Fragment {
         mBackButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                mCreateKeyActivity.loadFragment(null, null, FragAction.TO_LEFT);
+                mCreateKeyActivity.loadFragment(null, FragAction.TO_LEFT);
             }
         });
 
@@ -157,6 +135,12 @@ public class CreateKeyFinalFragment extends Fragment {
     }
 
     @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        mCreateKeyActivity = (CreateKeyActivity) getActivity();
+    }
+
+    @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
             case REQUEST_EDIT_KEY: {
@@ -186,17 +170,22 @@ public class CreateKeyFinalFragment extends Fragment {
                     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));
-            String userId = KeyRing.createUserId(new KeyRing.UserId(mName, mEmail, null));
+            String userId = KeyRing.createUserId(
+                    new KeyRing.UserId(mCreateKeyActivity.mName, mCreateKeyActivity.mEmail, null)
+            );
             mSaveKeyringParcel.mAddUserIds.add(userId);
             mSaveKeyringParcel.mChangePrimaryUserId = userId;
-            if (mAdditionalEmails != null && mAdditionalEmails.size() > 0) {
-                for (String email : mAdditionalEmails) {
-                    String thisUserId = KeyRing.createUserId(new KeyRing.UserId(mName, email, null));
+            if (mCreateKeyActivity.mAdditionalEmails != null
+                    && mCreateKeyActivity.mAdditionalEmails.size() > 0) {
+                for (String email : mCreateKeyActivity.mAdditionalEmails) {
+                    String thisUserId = KeyRing.createUserId(
+                            new KeyRing.UserId(mCreateKeyActivity.mName, email, null)
+                    );
                     mSaveKeyringParcel.mAddUserIds.add(thisUserId);
                 }
             }
-            mSaveKeyringParcel.mNewUnlock = mPassphrase != null
-                    ? new ChangeUnlockParcel(mPassphrase, null)
+            mSaveKeyringParcel.mNewUnlock = mCreateKeyActivity.mPassphrase != null
+                    ? new ChangeUnlockParcel(mCreateKeyActivity.mPassphrase, null)
                     : null;
         }
     }