moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-23 17:22:16 -05:00
Code Issues Releases Wiki Activity

don't keep an activity reference in CreateKeyFinalFragment

Browse Source
This commit is contained in:
Vincent Breitmoser 2015-05-28 15:02:50 +02:00
parent 8de0d9e6da
commit ee02e110e7
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyFinalFragment.java
View File

@ -54,8 +54,6 @@ public class CreateKeyFinalFragment extends Fragment {
public static final int REQUEST_EDIT_KEY = 0x00008007; public static final int REQUEST_EDIT_KEY = 0x00008007;
CreateKeyActivity mCreateKeyActivity;
TextView mNameEdit; TextView mNameEdit;
TextView mEmailEdit; TextView mEmailEdit;
CheckBox mUploadCheckbox; CheckBox mUploadCheckbox;
@ -66,9 +64,6 @@ public class CreateKeyFinalFragment extends Fragment {
SaveKeyringParcel mSaveKeyringParcel; SaveKeyringParcel mSaveKeyringParcel;
/**
* Creates new instance of this fragment
*/
public static CreateKeyFinalFragment newInstance() { public static CreateKeyFinalFragment newInstance() {
CreateKeyFinalFragment frag = new CreateKeyFinalFragment(); CreateKeyFinalFragment frag = new CreateKeyFinalFragment();
@ -90,11 +85,13 @@ public class CreateKeyFinalFragment extends Fragment {
mEditText = (TextView) view.findViewById(R.id.create_key_edit_text); mEditText = (TextView) view.findViewById(R.id.create_key_edit_text);
mEditButton = view.findViewById(R.id.create_key_edit_button); mEditButton = view.findViewById(R.id.create_key_edit_button);
CreateKeyActivity createKeyActivity = (CreateKeyActivity) getActivity();
// set values // set values
mNameEdit.setText(mCreateKeyActivity.mName); mNameEdit.setText(createKeyActivity.mName);
if (mCreateKeyActivity.mAdditionalEmails != null && mCreateKeyActivity.mAdditionalEmails.size() > 0) { if (createKeyActivity.mAdditionalEmails != null && createKeyActivity.mAdditionalEmails.size() > 0) {
String emailText = mCreateKeyActivity.mEmail + ", "; String emailText = createKeyActivity.mEmail + ", ";
Iterator<?> it = mCreateKeyActivity.mAdditionalEmails.iterator(); Iterator<?> it = createKeyActivity.mAdditionalEmails.iterator();
while (it.hasNext()) { while (it.hasNext()) {
Object next = it.next(); Object next = it.next();
emailText += next; emailText += next;
@ -104,7 +101,7 @@ public class CreateKeyFinalFragment extends Fragment {
} }
mEmailEdit.setText(emailText); mEmailEdit.setText(emailText);
} else { } else {
mEmailEdit.setText(mCreateKeyActivity.mEmail); mEmailEdit.setText(createKeyActivity.mEmail);
} }
mCreateButton.setOnClickListener(new View.OnClickListener() { mCreateButton.setOnClickListener(new View.OnClickListener() {
@ -117,7 +114,10 @@ public class CreateKeyFinalFragment extends Fragment {
mBackButton.setOnClickListener(new View.OnClickListener() { mBackButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
mCreateKeyActivity.loadFragment(null, FragAction.TO_LEFT); CreateKeyActivity createKeyActivity = (CreateKeyActivity) getActivity();
if (createKeyActivity != null) {
createKeyActivity.loadFragment(null, FragAction.TO_LEFT);
}
} }
}); });
@ -133,12 +133,6 @@ public class CreateKeyFinalFragment extends Fragment {
return view; return view;
} }
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
mCreateKeyActivity = (CreateKeyActivity) getActivity();
}
@Override @Override
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
switch (requestCode) { switch (requestCode) {
@ -159,7 +153,7 @@ public class CreateKeyFinalFragment extends Fragment {
public void onActivityCreated(Bundle savedInstanceState) { public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
mCreateKeyActivity = (CreateKeyActivity) getActivity(); CreateKeyActivity createKeyActivity = (CreateKeyActivity) getActivity();
if (mSaveKeyringParcel == null) { if (mSaveKeyringParcel == null) {
mSaveKeyringParcel = new SaveKeyringParcel(); mSaveKeyringParcel = new SaveKeyringParcel();
@ -170,21 +164,21 @@ public class CreateKeyFinalFragment extends Fragment {
mSaveKeyringParcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd( mSaveKeyringParcel.mAddSubKeys.add(new SaveKeyringParcel.SubkeyAdd(
Algorithm.RSA, 4096, null, KeyFlags.ENCRYPT_COMMS | KeyFlags.ENCRYPT_STORAGE, 0L)); Algorithm.RSA, 4096, null, KeyFlags.ENCRYPT_COMMS | KeyFlags.ENCRYPT_STORAGE, 0L));
String userId = KeyRing.createUserId( 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.mAddUserIds.add(userId);
mSaveKeyringParcel.mChangePrimaryUserId = userId; mSaveKeyringParcel.mChangePrimaryUserId = userId;
if (mCreateKeyActivity.mAdditionalEmails != null if (createKeyActivity.mAdditionalEmails != null
&& mCreateKeyActivity.mAdditionalEmails.size() > 0) { && createKeyActivity.mAdditionalEmails.size() > 0) {
for (String email : mCreateKeyActivity.mAdditionalEmails) { for (String email : createKeyActivity.mAdditionalEmails) {
String thisUserId = KeyRing.createUserId( String thisUserId = KeyRing.createUserId(
new KeyRing.UserId(mCreateKeyActivity.mName, email, null) new KeyRing.UserId(createKeyActivity.mName, email, null)
); );
mSaveKeyringParcel.mAddUserIds.add(thisUserId); mSaveKeyringParcel.mAddUserIds.add(thisUserId);
} }
} }
mSaveKeyringParcel.mNewUnlock = mCreateKeyActivity.mPassphrase != null mSaveKeyringParcel.mNewUnlock = createKeyActivity.mPassphrase != null
? new ChangeUnlockParcel(mCreateKeyActivity.mPassphrase, null) ? new ChangeUnlockParcel(createKeyActivity.mPassphrase, null)
: null; : null;
} }
} }