other way to prevent activity leak in apg deprecation dialog (e49bfec2) · Commits · e / os / Mail

k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSettings.java

+7 −21

Original line number	Diff line number	Diff line
		@@ -8,11 +8,7 @@ import java.util.List;
		import java.util.Map;

		import android.app.Dialog;
		import android.app.DialogFragment;
		import android.app.FragmentTransaction;
		import android.content.Context;
		import android.content.DialogInterface;
		import android.content.DialogInterface.OnDismissListener;
		import android.content.Intent;
		import android.content.SharedPreferences;
		import android.os.AsyncTask;
		@@ -51,12 +47,13 @@ import com.fsck.k9.mailstore.LocalFolder;
		import com.fsck.k9.mailstore.StorageManager;
		import com.fsck.k9.service.MailService;
		import com.fsck.k9.ui.dialog.ApgDeprecationWarningDialog;
		import com.fsck.k9.ui.dialog.ApgDeprecationWarningDialog.ApgDeprecationDialogDismissListener;
		import org.openintents.openpgp.util.OpenPgpAppPreference;
		import org.openintents.openpgp.util.OpenPgpKeyPreference;
		import org.openintents.openpgp.util.OpenPgpUtils;


		public class AccountSettings extends K9PreferenceActivity {
		public class AccountSettings extends K9PreferenceActivity implements ApgDeprecationDialogDismissListener {
		private static final String EXTRA_ACCOUNT = "account";

		private static final int DIALOG_COLOR_PICKER_ACCOUNT = 1;
		@@ -751,23 +748,13 @@ public class AccountSettings extends K9PreferenceActivity {

		private void showApgDeprecationDialog() {
		ApgDeprecationWarningDialog fragment = ApgDeprecationWarningDialog.newInstance();
		fragment.setOnDismissListener(new OnDismissListener() {
		@Override
		public void onDismiss(DialogInterface dialogInterface) {
		// this leaks the activity into the fragment, so make sure to dismiss in onPause!
		mCryptoApp.show();
		fragment.show(getFragmentManager(), APG_DEPRECATION_DIALOG_TAG);
		}
		});

		FragmentTransaction ta = getFragmentManager().beginTransaction();
		ta.add(fragment, APG_DEPRECATION_DIALOG_TAG);
		ta.commitAllowingStateLoss();
		}

		private void dismissApgDeprecationDialogIfDisplayed() {
		DialogFragment dialog = (DialogFragment) getFragmentManager().findFragmentByTag(APG_DEPRECATION_DIALOG_TAG);
		if (dialog != null) {
		dialog.dismiss();
		@Override
		public void onDismissApgDeprecationDialog() {
		if (mCryptoApp != null) {
		mCryptoApp.show();
		}
		}

		@@ -919,7 +906,6 @@ public class AccountSettings extends K9PreferenceActivity {

		@Override
		protected void onPause() {
		dismissApgDeprecationDialogIfDisplayed();
		saveSettings();
		super.onPause();
		}

k9mail/src/main/java/com/fsck/k9/ui/dialog/ApgDeprecationWarningDialog.java

+20 −5

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@ import android.app.DialogFragment;
		import android.content.Context;
		import android.content.DialogInterface;
		import android.content.DialogInterface.OnClickListener;
		import android.content.DialogInterface.OnDismissListener;
		import android.os.Bundle;
		import android.text.method.LinkMovementMethod;
		import android.view.LayoutInflater;
		@@ -19,7 +18,7 @@ import com.fsck.k9.R;

		public class ApgDeprecationWarningDialog extends DialogFragment {

		private OnDismissListener onDismissListener;
		private ApgDeprecationDialogDismissListener onDismissListener;

		public static ApgDeprecationWarningDialog newInstance() {
		return new ApgDeprecationWarningDialog();
		@@ -58,15 +57,31 @@ public class ApgDeprecationWarningDialog extends DialogFragment {
		textView.setMovementMethod(LinkMovementMethod.getInstance());
		}

		public void setOnDismissListener(OnDismissListener onDismissListener) {
		this.onDismissListener = onDismissListener;
		@Override
		public void onAttach(Context context) {
		super.onAttach(context);
		if (context instanceof ApgDeprecationDialogDismissListener) {
		onDismissListener = (ApgDeprecationDialogDismissListener) context;
		} else {
		throw new ClassCastException("An activity displaying this dialog must implement OnDismissListener!");
		}
		}

		@Override
		public void onDetach() {
		super.onDetach();
		onDismissListener = null;
		}

		@Override
		public void onDismiss(DialogInterface dialog) {
		super.onDismiss(dialog);
		if (onDismissListener != null) {
		onDismissListener.onDismiss(dialog);
		onDismissListener.onDismissApgDeprecationDialog();
		}
		}

		public interface ApgDeprecationDialogDismissListener {
		void onDismissApgDeprecationDialog();
		}
		}