don't keep an activity reference in CreateKeyFinalFragment

1 files changed, 20 insertions, 26 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 84962915b..b4131b23d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
@@ -54,8 +54,6 @@ public class CreateKeyFinalFragment extends Fragment {
 
     public static final int REQUEST_EDIT_KEY = 0x00008007;
 
-    CreateKeyActivity mCreateKeyActivity;
-
     TextView mNameEdit;
     TextView mEmailEdit;
     CheckBox mUploadCheckbox;
@@ -66,9 +64,6 @@ public class CreateKeyFinalFragment extends Fragment {
 
     SaveKeyringParcel mSaveKeyringParcel;
 
-    /**
-     * Creates new instance of this fragment
-     */
     public static CreateKeyFinalFragment newInstance() {
         CreateKeyFinalFragment frag = new CreateKeyFinalFragment();
 
@@ -90,11 +85,13 @@ public class CreateKeyFinalFragment extends Fragment {
         mEditText = (TextView) view.findViewById(R.id.create_key_edit_text);
         mEditButton = view.findViewById(R.id.create_key_edit_button);
 
+        CreateKeyActivity createKeyActivity = (CreateKeyActivity) getActivity();
+
         // set values
-        mNameEdit.setText(mCreateKeyActivity.mName);
-        if (mCreateKeyActivity.mAdditionalEmails != null && mCreateKeyActivity.mAdditionalEmails.size() > 0) {
-            String emailText = mCreateKeyActivity.mEmail + ", ";
-            Iterator<?> it = mCreateKeyActivity.mAdditionalEmails.iterator();
+        mNameEdit.setText(createKeyActivity.mName);
+        if (createKeyActivity.mAdditionalEmails != null && createKeyActivity.mAdditionalEmails.size() > 0) {
+            String emailText = createKeyActivity.mEmail + ", ";
+            Iterator<?> it = createKeyActivity.mAdditionalEmails.iterator();
             while (it.hasNext()) {
                 Object next = it.next();
                 emailText += next;
@@ -104,7 +101,7 @@ public class CreateKeyFinalFragment extends Fragment {
             }
             mEmailEdit.setText(emailText);
         } else {
-            mEmailEdit.setText(mCreateKeyActivity.mEmail);
+            mEmailEdit.setText(createKeyActivity.mEmail);
         }
 
         mCreateButton.setOnClickListener(new View.OnClickListener() {
@@ -117,7 +114,10 @@ public class CreateKeyFinalFragment extends Fragment {
         mBackButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                mCreateKeyActivity.loadFragment(null, FragAction.TO_LEFT);
+                CreateKeyActivity createKeyActivity = (CreateKeyActivity) getActivity();
+                if (createKeyActivity != null) {
+                    createKeyActivity.loadFragment(null, FragAction.TO_LEFT);
+                }
             }
         });
 
@@ -134,12 +134,6 @@ 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: {
@@ -159,11 +153,11 @@ public class CreateKeyFinalFragment extends Fragment {
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        mCreateKeyActivity = (CreateKeyActivity) getActivity();
+        CreateKeyActivity createKeyActivity = (CreateKeyActivity) getActivity();
 
         if (mSaveKeyringParcel == null) {
             mSaveKeyringParcel = new SaveKeyringParcel();
-            if (mCreateKeyActivity.mUseSmartCardSettings) {
+            if (createKeyActivity.mUseSmartCardSettings) {
                 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,
@@ -180,21 +174,21 @@ public class CreateKeyFinalFragment extends Fragment {
                         4096, null, KeyFlags.ENCRYPT_COMMS | KeyFlags.ENCRYPT_STORAGE, 0L));
             }
             String userId = KeyRing.createUserId(
-                    new KeyRing.UserId(mCreateKeyActivity.mName, mCreateKeyActivity.mEmail, null)
+                    new KeyRing.UserId(createKeyActivity.mName, createKeyActivity.mEmail, null)
             );
             mSaveKeyringParcel.mAddUserIds.add(userId);
             mSaveKeyringParcel.mChangePrimaryUserId = userId;
-            if (mCreateKeyActivity.mAdditionalEmails != null
-                    && mCreateKeyActivity.mAdditionalEmails.size() > 0) {
-                for (String email : mCreateKeyActivity.mAdditionalEmails) {
+            if (createKeyActivity.mAdditionalEmails != null
+                    && createKeyActivity.mAdditionalEmails.size() > 0) {
+                for (String email : createKeyActivity.mAdditionalEmails) {
                     String thisUserId = KeyRing.createUserId(
-                            new KeyRing.UserId(mCreateKeyActivity.mName, email, null)
+                            new KeyRing.UserId(createKeyActivity.mName, email, null)
                     );
                     mSaveKeyringParcel.mAddUserIds.add(thisUserId);
                 }
             }
-            mSaveKeyringParcel.mNewUnlock = mCreateKeyActivity.mPassphrase != null
-                    ? new ChangeUnlockParcel(mCreateKeyActivity.mPassphrase, null)
+            mSaveKeyringParcel.mNewUnlock = createKeyActivity.mPassphrase != null
+                    ? new ChangeUnlockParcel(createKeyActivity.mPassphrase, null)
                     : null;
         }
     }