Revert "implement proper singleton for MailAccountSyncHelper" (7cff8866) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/accounts/MailAccountSyncHelper.java

+3 −16

Original line number	Diff line number	Diff line
		@@ -28,9 +28,7 @@ public class MailAccountSyncHelper {
		private static final String MAIL_RECEIVER_CLASS = "com.fsck.k9.account.AccountSyncReceiver";
		private static final String ACTION_PREFIX = "foundation.e.accountmanager.account.";

		private static MailAccountSyncHelper instance = null;

		public void accountLoggedIn(Context applicationContext) {
		public static void accountLoggedIn(Context applicationContext) {
		if (applicationContext == null) {
		return;
		}
		@@ -39,7 +37,7 @@ public class MailAccountSyncHelper {
		applicationContext.sendBroadcast(intent);
		}

		public void accountLoggedOut(Context applicationContext, String email) {
		public static void accountLoggedOut(Context applicationContext, String email) {
		if (applicationContext == null \|\| email == null \|\| !email.contains("@")) {
		return;
		}
		@@ -50,7 +48,7 @@ public class MailAccountSyncHelper {
		}

		@TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1)
		private Intent getIntent() {
		private static Intent getIntent() {
		Intent intent = new Intent();
		intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
		intent.setComponent(new ComponentName(MAIL_PACKAGE, MAIL_RECEIVER_CLASS));
		@@ -58,17 +56,6 @@ public class MailAccountSyncHelper {
		}


		public static MailAccountSyncHelper getInstance() {
		if (instance == null) {
		synchronized (MailAccountSyncHelper.class) {
		if (instance == null) {
		instance = new MailAccountSyncHelper();
		}
		}
		}
		return instance;
		}

		private MailAccountSyncHelper() {
		}
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -175,7 +175,7 @@ public class RemoveAccountPreferenceController extends AbstractPreferenceControl
		if (failed) {
		RemoveAccountFailureDialog.show(getTargetFragment());
		} else {
		MailAccountSyncHelper.getInstance().accountLoggedOut(targetActivity.getApplicationContext(), email);
		MailAccountSyncHelper.accountLoggedOut(targetActivity.getApplicationContext(), email);
		targetActivity.finish();
		}
		}, null, mUserHandle);