1224708 - Retrieve FxAccount in background thread.

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: General, defect)

Description

[Vivek Balakrishnan[:vivek]]

This is a followup to bug 1189356 to address the review comments https://bugzilla.mozilla.org/show_bug.cgi?id=1189356#c14

Comment 1

[Vivek Balakrishnan[:vivek]]

Attachment: MozReview Request: Bug 1224708 : Update SyncPreference asynchronously using Loaders r?nalexander

Bug 1224708 : FxAccount check done in background thread. r?nalexander

Comment 2

[Nick Alexander :nalexander [he/him]]

Comment on attachment 8687400 [details]
MozReview Request: Bug 1224708 :  Update SyncPreference asynchronously using Loaders r?nalexander

vivek and I talked today, and we're going to explore using AccountLoader for this rather than managing Task instances locally.

Comment 3

[Vivek Balakrishnan[:vivek]]

Comment on attachment 8687400 [details]
MozReview Request: Bug 1224708 :  Update SyncPreference asynchronously using Loaders r?nalexander

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/25197/diff/1-2/

Comment 4

[Vivek Balakrishnan[:vivek]]

Attachment: 1224708.patch

@Nick/Margaret:
This is an alternate solution to my previous patch and the preference UI updated through SharedPreferences callback.
This solution tries to avoid any dependency between GeckoPrefefenceActivity/Fragment and SyncPreference i.e
SyncPreference reference is not cached or searched for in the above activity/fragment

This patch could potentialy leak the listener in onPrepareForRemoval() which may never be called.

I'm not sure what is the right approach here, please advice.

Comment 5

[Vivek Balakrishnan[:vivek]]

Comment on attachment 8691528 [details] [diff] [review]
1224708.patch

# HG changeset patch
# User vivek <[e-mail]>
# Date 1447788258 -7200
#      Tue Nov 17 21:24:18 2015 +0200
# Node ID 063b051df3bd1fed4c896d8ed0d3674053ce18a1
# Parent  aef06cd725fc577d1b3449e15cec9fa9f578a286
Bug 1224708 :  Update SyncPreference asynchronously using Loaders r?nalexander,margaret

@Nick/Margaret:
This is an alternate solution to my previous patch and the preference UI updated through SharedPreferences callback.
This solution tries to avoid any dependency between GeckoPrefefenceActivity/Fragment and SyncPreference i.e
SyncPreference reference is not cached or searched for in the above activity/fragment

This patch could potentialy leak the listener in onPrepareForRemoval() which may never be called.

I'm not sure what is the right approach here, please advice.

diff --git a/mobile/android/base/android-services.mozbuild b/mobile/android/base/android-services.mozbuild
--- a/mobile/android/base/android-services.mozbuild
+++ b/mobile/android/base/android-services.mozbuild
@@ -845,16 +845,17 @@ sync_java_files = [
     'browserid/verifier/AbstractBrowserIDRemoteVerifierClient.java',
     'browserid/verifier/BrowserIDRemoteVerifierClient10.java',
     'browserid/verifier/BrowserIDRemoteVerifierClient20.java',
     'browserid/verifier/BrowserIDVerifierClient.java',
     'browserid/verifier/BrowserIDVerifierDelegate.java',
     'browserid/verifier/BrowserIDVerifierException.java',
     'browserid/VerifyingPublicKey.java',
     'fxa/AccountLoader.java',
+    'fxa/AccountLoaderNative.java',
     'fxa/activities/CustomColorPreference.java',
     'fxa/activities/FxAccountAbstractActivity.java',
     'fxa/activities/FxAccountAbstractSetupActivity.java',
     'fxa/activities/FxAccountAbstractUpdateCredentialsActivity.java',
     'fxa/activities/FxAccountConfirmAccountActivity.java',
     'fxa/activities/FxAccountConfirmAccountActivityWeb.java',
     'fxa/activities/FxAccountCreateAccountActivity.java',
     'fxa/activities/FxAccountCreateAccountNotAllowedActivity.java',
diff --git a/mobile/android/base/fxa/AccountLoader.java b/mobile/android/base/fxa/AccountLoader.java
--- a/mobile/android/base/fxa/AccountLoader.java
+++ b/mobile/android/base/fxa/AccountLoader.java
@@ -166,16 +166,18 @@ public class AccountLoader extends Async
   }
 
   protected void registerObserver(BroadcastReceiver observer) {
     final IntentFilter intentFilter = new IntentFilter();
     // Android Account added or removed.
     intentFilter.addAction(AccountManager.LOGIN_ACCOUNTS_CHANGED_ACTION);
     // Firefox Account internal state changed.
     intentFilter.addAction(FxAccountConstants.ACCOUNT_STATE_CHANGED_ACTION);
+    // Firefox Account profile state changed.
+    intentFilter.addAction(FxAccountConstants.ACCOUNT_PROFILE_JSON_UPDATED_ACTION);
 
     // null means: "the main thread of the process will be used." We must call
     // onContentChanged on the main thread of the process; this ensures we do.
     final Handler handler = null;
     getContext().registerReceiver(observer, intentFilter, FxAccountConstants.PER_ACCOUNT_TYPE_PERMISSION, handler);
   }
 
   protected void unregisterObserver(BroadcastReceiver observer) {
diff --git a/mobile/android/base/fxa/AccountLoaderNative.java b/mobile/android/base/fxa/AccountLoaderNative.java
new file mode 100644
--- /dev/null
+++ b/mobile/android/base/fxa/AccountLoaderNative.java
@@ -0,0 +1,182 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.gecko.fxa;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.annotation.TargetApi;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Handler;
+import android.content.AsyncTaskLoader;
+
+import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount;
+
+/**
+ * A Loader that queries and updates based on the existence of only Firefox Android Account.
+ *
+ * The loader is similar to @Link{AccountLoader} that is intended to be used with native LoaderManager.
+ * Note: This loader available only on devices running Honeycomb or later Android version.
+ *
+ * The loader returns an Android Account (of either Account type) if an account
+ * exists, and null to indicate no Account is present.
+ *
+ * The loader listens for Accounts added and deleted, and also Accounts being
+ * updated by Sync or another Activity, via the use of
+ * {@link AndroidFxAccount#setState(org.mozilla.gecko.fxa.login.State)}.
+ * Be careful of message loops if you update the account state from an activity
+ * that uses this loader.
+ *
+ * This implementation is based on
+ * <a href="http://www.androiddesignpatterns.com/2012/08/implementing-loaders.html">http://www.androiddesignpatterns.com/2012/08/implementing-loaders.html</a>.
+ */
+public class AccountLoaderNative extends AsyncTaskLoader<Account> {
+  protected Account account = null;
+  protected BroadcastReceiver broadcastReceiver = null;
+
+  @TargetApi(11)
+  public AccountLoaderNative(Context context) {
+    super(context);
+  }
+
+  // Task that performs the asynchronous load **/
+  @Override
+  public Account loadInBackground() {
+    final Context context = getContext();
+    return FirefoxAccounts.getFirefoxAccount(context);
+  }
+
+  // Deliver the results to the registered listener.
+  @Override
+  public void deliverResult(Account data) {
+    if (isReset()) {
+      // The Loader has been reset; ignore the result and invalidate the data.
+      releaseResources(data);
+      return;
+    }
+
+    // Hold a reference to the old data so it doesn't get garbage collected.
+    // We must protect it until the new data has been delivered.
+    Account oldData = account;
+    account = data;
+
+    if (isStarted()) {
+      // If the Loader is in a started state, deliver the results to the
+      // client. The superclass method does this for us.
+      super.deliverResult(data);
+    }
+
+    // Invalidate the old data as we don't need it any more.
+    if (oldData != null && oldData != data) {
+      releaseResources(oldData);
+    }
+  }
+
+  // The Loader’s state-dependent behavior.
+  @Override
+  protected void onStartLoading() {
+    if (account != null) {
+      // Deliver any previously loaded data immediately.
+      deliverResult(account);
+    }
+
+    // Begin monitoring the underlying data source.
+    if (broadcastReceiver == null) {
+      broadcastReceiver = makeNewObserver();
+      registerObserver(broadcastReceiver);
+    }
+
+    if (takeContentChanged() || account == null) {
+      // When the observer detects a change, it should call onContentChanged()
+      // on the Loader, which will cause the next call to takeContentChanged()
+      // to return true. If this is ever the case (or if the current data is
+      // null), we force a new load.
+      forceLoad();
+    }
+  }
+
+  @Override
+  protected void onStopLoading() {
+    // The Loader is in a stopped state, so we should attempt to cancel the
+    // current load (if there is one).
+    cancelLoad();
+
+    // Note that we leave the observer as is. Loaders in a stopped state
+    // should still monitor the data source for changes so that the Loader
+    // will know to force a new load if it is ever started again.
+  }
+
+  @Override
+  protected void onReset() {
+    // Ensure the loader has been stopped.  In CursorLoader and the template
+    // this code follows (see the class comment), this is onStopLoading, which
+    // appears to not set the started flag (see Loader itself).
+    stopLoading();
+
+    // At this point we can release the resources associated with 'mData'.
+    if (account != null) {
+      releaseResources(account);
+      account = null;
+    }
+
+    // The Loader is being reset, so we should stop monitoring for changes.
+    if (broadcastReceiver != null) {
+      final BroadcastReceiver observer = broadcastReceiver;
+      broadcastReceiver = null;
+      unregisterObserver(observer);
+    }
+  }
+
+  @Override
+  public void onCanceled(Account data) {
+    // Attempt to cancel the current asynchronous load.
+    super.onCanceled(data);
+
+    // The load has been canceled, so we should release the resources
+    // associated with 'data'.
+    releaseResources(data);
+  }
+
+  private void releaseResources(Account data) {
+    // For a simple List, there is nothing to do. For something like a Cursor, we
+    // would close it in this method. All resources associated with the Loader
+    // should be released here.
+  }
+
+  // Observer which receives notifications when the data changes.
+  protected BroadcastReceiver makeNewObserver() {
+    final BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
+      @Override
+      public void onReceive(Context context, Intent intent) {
+        // Must be called on the main thread of the process. We register the
+        // broadcast receiver with a null Handler (see registerObserver), which
+        // ensures we're on the main thread when we receive this intent.
+        onContentChanged();
+      }
+    };
+    return broadcastReceiver;
+  }
+
+  protected void registerObserver(BroadcastReceiver observer) {
+    final IntentFilter intentFilter = new IntentFilter();
+    // Android Account added or removed.
+    intentFilter.addAction(AccountManager.LOGIN_ACCOUNTS_CHANGED_ACTION);
+    // Firefox Account internal state changed.
+    intentFilter.addAction(FxAccountConstants.ACCOUNT_STATE_CHANGED_ACTION);
+    // Firefox Account profile state changed.
+    intentFilter.addAction(FxAccountConstants.ACCOUNT_PROFILE_JSON_UPDATED_ACTION);
+
+    // null means: "the main thread of the process will be used." We must call
+    // onContentChanged on the main thread of the process; this ensures we do.
+    final Handler handler = null;
+    getContext().registerReceiver(observer, intentFilter, FxAccountConstants.PER_ACCOUNT_TYPE_PERMISSION, handler);
+  }
+
+  protected void unregisterObserver(BroadcastReceiver observer) {
+    getContext().unregisterReceiver(observer);
+  }
+}
diff --git a/mobile/android/base/preferences/GeckoPreferences.java b/mobile/android/base/preferences/GeckoPreferences.java
--- a/mobile/android/base/preferences/GeckoPreferences.java
+++ b/mobile/android/base/preferences/GeckoPreferences.java
@@ -25,34 +25,40 @@ import org.mozilla.gecko.PrefsHelper;
 import org.mozilla.gecko.R;
 import org.mozilla.gecko.RestrictedProfiles;
 import org.mozilla.gecko.Telemetry;
 import org.mozilla.gecko.TelemetryContract;
 import org.mozilla.gecko.TelemetryContract.Method;
 import org.mozilla.gecko.background.common.GlobalConstants;
 import org.mozilla.gecko.background.healthreport.HealthReportConstants;
 import org.mozilla.gecko.db.BrowserContract.SuggestedSites;
+import org.mozilla.gecko.fxa.AccountLoaderNative;
+import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount;
 import org.mozilla.gecko.restrictions.Restriction;
+import org.mozilla.gecko.sync.ExtendedJSONObject;
 import org.mozilla.gecko.tabqueue.TabQueueHelper;
 import org.mozilla.gecko.updater.UpdateService;
 import org.mozilla.gecko.updater.UpdateServiceHelper;
 import org.mozilla.gecko.util.GeckoEventListener;
 import org.mozilla.gecko.util.HardwareUtils;
 import org.mozilla.gecko.util.InputOptionsUtils;
 import org.mozilla.gecko.util.ThreadUtils;
 import org.mozilla.gecko.widget.FloatingHintEditText;
 
+import android.accounts.Account;
 import android.app.ActionBar;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.Fragment;
 import android.app.FragmentManager;
+import android.app.LoaderManager;
 import android.app.NotificationManager;
 import android.content.ContentResolver;
 import android.content.Context;
+import android.content.Loader;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
@@ -95,16 +101,17 @@ OnPreferenceChangeListener,
 OnSharedPreferenceChangeListener
 {
     private static final String LOGTAG = "GeckoPreferences";
 
     // We have a white background, which makes transitions on
     // some devices look bad. Don't use transitions on those
     // devices.
     private static final boolean NO_TRANSITIONS = HardwareUtils.IS_KINDLE_DEVICE;
+    private static final int ACCOUNT_LOADER_ID = 1;
 
     public static final String NON_PREF_PREFIX = "android.not_a_preference.";
     public static final String INTENT_EXTRA_RESOURCES = "resource";
     public static final String PREFS_TRACKING_PROTECTION_PROMPT_SHOWN = NON_PREF_PREFIX + "trackingProtectionPromptShown";
     public static String PREFS_HEALTHREPORT_UPLOAD_ENABLED = NON_PREF_PREFIX + "healthreport.uploadEnabled";
 
     private static boolean sIsCharEncodingEnabled;
     private boolean mInitialized;
@@ -122,17 +129,17 @@ OnSharedPreferenceChangeListener
     private static final String PREFS_UPDATER_AUTODOWNLOAD = "app.update.autodownload";
     private static final String PREFS_UPDATER_URL = "app.update.url.android";
     private static final String PREFS_GEO_REPORTING = NON_PREF_PREFIX + "app.geo.reportdata";
     private static final String PREFS_GEO_LEARN_MORE = NON_PREF_PREFIX + "geo.learn_more";
     private static final String PREFS_HEALTHREPORT_LINK = NON_PREF_PREFIX + "healthreport.link";
     private static final String PREFS_DEVTOOLS_REMOTE_USB_ENABLED = "devtools.remote.usb.enabled";
     private static final String PREFS_DEVTOOLS_REMOTE_WIFI_ENABLED = "devtools.remote.wifi.enabled";
     private static final String PREFS_DEVTOOLS_REMOTE_LINK = NON_PREF_PREFIX + "remote_debugging.link";
-    private static final String PREFS_SYNC = NON_PREF_PREFIX + "sync";
+    protected static final String PREFS_SYNC = NON_PREF_PREFIX + "sync";
     private static final String PREFS_TRACKING_PROTECTION = "privacy.trackingprotection.state";
     private static final String PREFS_TRACKING_PROTECTION_PB = "privacy.trackingprotection.pbmode.enabled";
     public static final String PREFS_OPEN_URLS_IN_PRIVATE = NON_PREF_PREFIX + "openExternalURLsPrivately";
     public static final String PREFS_VOICE_INPUT_ENABLED = NON_PREF_PREFIX + "voice_input_enabled";
     public static final String PREFS_QRCODE_ENABLED = NON_PREF_PREFIX + "qrcode_enabled";
     private static final String PREFS_ADVANCED = NON_PREF_PREFIX + "advanced.enabled";
     private static final String PREFS_ACCESSIBILITY = NON_PREF_PREFIX + "accessibility.enabled";
     private static final String PREFS_CUSTOMIZE_HOME = NON_PREF_PREFIX + "customize_home";
@@ -168,16 +175,17 @@ OnSharedPreferenceChangeListener
     // accommodate a locale change.
     public static final int RESULT_CODE_LOCALE_DID_CHANGE = 7;
 
     /**
      * Track the last locale so we know whether to redisplay.
      */
     private Locale lastLocale = Locale.getDefault();
     private boolean localeSwitchingIsEnabled;
+    private AccountLoaderCallbacks accountLoaderCallbacks;
 
     private void startActivityForResultChoosingTransition(final Intent intent, final int requestCode) {
         startActivityForResult(intent, requestCode);
         if (NO_TRANSITIONS) {
             overridePendingTransition(0, 0);
         }
     }
 
@@ -393,16 +401,21 @@ OnSharedPreferenceChangeListener
         // capture EXTRA_SHOW_FRAGMENT_TITLE from the intent and store the title ID.
 
         // If launched from notification, explicitly cancel the notification.
         if (intentExtras != null && intentExtras.containsKey(DataReportingNotification.ALERT_NAME_DATAREPORTING_NOTIFICATION)) {
             Telemetry.sendUIEvent(TelemetryContract.Event.LAUNCH, Method.NOTIFICATION, "settings-data-choices");
             NotificationManager notificationManager = (NotificationManager) this.getSystemService(Context.NOTIFICATION_SERVICE);
             notificationManager.cancel(DataReportingNotification.ALERT_NAME_DATAREPORTING_NOTIFICATION.hashCode());
         }
+
+        if (Versions.feature11Plus) {
+            accountLoaderCallbacks = new AccountLoaderCallbacks();
+            getLoaderManager().initLoader(ACCOUNT_LOADER_ID, null, accountLoaderCallbacks);
+        }
     }
 
     /**
      * Initializes the action bar configuration in code.
      *
      * Declaring these attributes in XML does not work on some devices for an unknown reason
      * (e.g. the back button stops working or the logo disappears; see bug 1152314) so we
      * duplicate those attributes in code here. Note: the order of these calls matters.
@@ -555,16 +568,19 @@ OnSharedPreferenceChangeListener
         if (Versions.feature11Plus) {
             // Watch prefs, otherwise we don't reliably get told when they change.
             // See documentation for onSharedPreferenceChange for more.
             // Inexplicably only needed on tablet.
             if (isMultiPane()) {
                 SharedPreferences prefs = GeckoSharedPrefs.forApp(this);
                 prefs.registerOnSharedPreferenceChangeListener(this);
             }
+
+            // Forcing reload as the account may have been deleted while the app was in background.
+            getLoaderManager().restartLoader(ACCOUNT_LOADER_ID, null, accountLoaderCallbacks);
         }
     }
 
     @Override
     public void startActivity(Intent intent) {
         // For settings, we want to be able to pass results up the chain
         // of preference screens so Settings can behave as a single unit.
         // Specifically, when we open a link, we want to back out of all
@@ -1516,9 +1532,36 @@ OnSharedPreferenceChangeListener
         } else {
             intent.putExtra(PreferenceActivity.EXTRA_SHOW_FRAGMENT, GeckoPreferenceFragment.class.getName());
 
             Bundle fragmentArgs = new Bundle();
             fragmentArgs.putString("resource", resource);
             intent.putExtra(PreferenceActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS, fragmentArgs);
         }
     }
+
+    private class AccountLoaderCallbacks implements LoaderManager.LoaderCallbacks<Account> {
+        @Override
+        public Loader<Account> onCreateLoader(int id, Bundle args) {
+            return new AccountLoaderNative(GeckoPreferences.this);
+        }
+
+        @Override
+        public void onLoadFinished(Loader<Account> loader, Account account) {
+            final SharedPreferences sharedPreferences = GeckoSharedPrefs.forApp(GeckoPreferences.this);
+            if (account == null) {
+                sharedPreferences.edit().putString(PREFS_SYNC, null).apply();
+                return;
+            }
+
+            final AndroidFxAccount androidFxAccount = new AndroidFxAccount(GeckoPreferences.this, account);
+            ExtendedJSONObject jsonObject = new ExtendedJSONObject();
+            jsonObject.put("name", account.name);
+            jsonObject.put("profileJSON", androidFxAccount.getProfileJSON());
+            sharedPreferences.edit().putString(PREFS_SYNC, jsonObject.toString()).apply();
+        }
+
+        @Override
+        public void onLoaderReset(Loader<Account> loader) {
+            GeckoSharedPrefs.forApp(GeckoPreferences.this).edit().putString(PREFS_SYNC, null).apply();
+        }
+    }
 }
diff --git a/mobile/android/base/preferences/SyncPreference.java b/mobile/android/base/preferences/SyncPreference.java
--- a/mobile/android/base/preferences/SyncPreference.java
+++ b/mobile/android/base/preferences/SyncPreference.java
@@ -1,52 +1,58 @@
 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko.preferences;
 
-import android.accounts.Account;
+import org.mozilla.gecko.AppConstants;
+import org.mozilla.gecko.R;
+import org.mozilla.gecko.GeckoSharedPrefs;
+import org.mozilla.gecko.Telemetry;
+import org.mozilla.gecko.TelemetryContract;
+import org.mozilla.gecko.TelemetryContract.Method;
+import org.mozilla.gecko.fxa.FxAccountConstants;
+import org.mozilla.gecko.fxa.activities.FxAccountWebFlowActivity;
+import org.mozilla.gecko.fxa.activities.PicassoPreferenceIconTarget;
+import org.mozilla.gecko.sync.ExtendedJSONObject;
+import org.mozilla.gecko.sync.setup.SyncAccounts;
+import org.mozilla.gecko.sync.setup.activities.SetupSyncActivity;
+import org.mozilla.gecko.util.ThreadUtils;
+
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.preference.Preference;
+import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.AttributeSet;
-import android.view.View;
-import android.widget.TextView;
+import android.util.Log;
 
 import com.squareup.picasso.Picasso;
 import com.squareup.picasso.Target;
 
-import org.mozilla.gecko.AppConstants;
-import org.mozilla.gecko.R;
-import org.mozilla.gecko.Telemetry;
-import org.mozilla.gecko.TelemetryContract;
-import org.mozilla.gecko.TelemetryContract.Method;
-import org.mozilla.gecko.fxa.FirefoxAccounts;
-import org.mozilla.gecko.fxa.FxAccountConstants;
-import org.mozilla.gecko.fxa.activities.FxAccountWebFlowActivity;
-import org.mozilla.gecko.fxa.activities.PicassoPreferenceIconTarget;
-import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount;
-import org.mozilla.gecko.sync.ExtendedJSONObject;
-import org.mozilla.gecko.sync.setup.SyncAccounts;
-import org.mozilla.gecko.sync.setup.activities.SetupSyncActivity;
-
-class SyncPreference extends Preference {
+class SyncPreference extends Preference implements SharedPreferences.OnSharedPreferenceChangeListener {
     private static final boolean DEFAULT_TO_FXA = true;
+    public static final String LOGTAG = "SyncPreference";
 
     private final Context mContext;
     private final Target profileAvatarTarget;
 
     public SyncPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
         mContext = context;
-        final float cornerRadius = mContext.getResources().getDimension(R.dimen.fxaccount_profile_image_width) / 2;
-        profileAvatarTarget = new PicassoPreferenceIconTarget(mContext.getResources(), this, cornerRadius);
+        final float cornerRadius = context.getResources().getDimension(R.dimen.fxaccount_profile_image_width) / 2;
+        profileAvatarTarget = new PicassoPreferenceIconTarget(context.getResources(), this, cornerRadius);
+    }
+
+    @Override
+    protected void onAttachedToActivity() {
+        super.onAttachedToActivity();
     }
 
     private void openSync11Settings() {
         // Show Sync setup if no accounts exist; otherwise, show account settings.
         if (SyncAccounts.syncAccountsExist(mContext)) {
             // We don't check for failure here. If you already have Sync set up,
             // then there's nothing we can do.
             SyncAccounts.openSyncSettings(mContext);
@@ -60,56 +66,16 @@ class SyncPreference extends Preference 
         final Intent intent = new Intent(FxAccountConstants.ACTION_FXA_GET_STARTED);
         intent.putExtra(FxAccountWebFlowActivity.EXTRA_ENDPOINT, FxAccountConstants.ENDPOINT_PREFERENCES);
         intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
         mContext.startActivity(intent);
     }
 
     @Override
-    protected void onBindView(View view) {
-        super.onBindView(view);
-
-        Account account = FirefoxAccounts.getFirefoxAccount(mContext);
-        if (account == null) {
-            return;
-        }
-
-        final AndroidFxAccount fxAccount = new AndroidFxAccount(mContext, account);
-        final TextView title = (TextView) view.findViewById(android.R.id.title);
-        final TextView summary = (TextView) view.findViewById(android.R.id.summary);
-        title.setText(fxAccount.getEmail());
-        summary.setVisibility(View.GONE);
-
-        // Updating icons from Java is not supported prior to API 11.
-        if (!AppConstants.Versions.feature11Plus) {
-            return;
-        }
-
-        final ExtendedJSONObject profileJSON = fxAccount.getProfileJSON();
-        if (profileJSON == null) {
-            return;
-        }
-
-        // Avatar URI empty, return early.
-        final String avatarURI = profileJSON.getString(FxAccountConstants.KEY_PROFILE_JSON_AVATAR);
-        if (TextUtils.isEmpty(avatarURI)) {
-            return;
-        }
-
-        Picasso.with(mContext)
-                .load(avatarURI)
-                .centerInside()
-                .resizeDimen(R.dimen.fxaccount_profile_image_width, R.dimen.fxaccount_profile_image_height)
-                .placeholder(R.drawable.sync_avatar_default)
-                .error(R.drawable.sync_avatar_default)
-                .into(profileAvatarTarget);
-    }
-
-    @Override
     protected void onClick() {
         // If we're not defaulting to FxA, just do what we've always done.
         if (!DEFAULT_TO_FXA) {
             openSync11Settings();
             return;
         }
 
         // If there's a legacy Sync account (or a pickled one on disk),
@@ -121,9 +87,87 @@ class SyncPreference extends Preference 
             }
         }
 
         // Otherwise, launch the FxA "Get started" activity, which will
         // dispatch to the right location.
         launchFxASetup();
         Telemetry.sendUIEvent(TelemetryContract.Event.ACTION, Method.SETTINGS, "sync_setup");
     }
+
+    @Override
+    protected void onAttachedToHierarchy(PreferenceManager preferenceManager) {
+        super.onAttachedToHierarchy(preferenceManager);
+        SharedPreferences prefs = GeckoSharedPrefs.forApp(mContext);
+        prefs.registerOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    protected void onPrepareForRemoval() {
+        super.onPrepareForRemoval();
+        SharedPreferences prefs = GeckoSharedPrefs.forApp(mContext);
+        prefs.unregisterOnSharedPreferenceChangeListener(this);
+    }
+
+    private void update(final String email, final ExtendedJSONObject profileJSON) {
+        if (TextUtils.isEmpty(email)) {
+            ThreadUtils.postToUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    setTitle(R.string.pref_sync);
+                    setSummary(R.string.pref_sync_summary);
+                    if (AppConstants.Versions.feature11Plus) {
+                        // Cancel any pending task.
+                        Picasso.with(mContext).cancelRequest(profileAvatarTarget);
+                        // Clear previously set icon.
+                        setIcon(R.drawable.sync_avatar_default);
+                    }
+                }
+            });
+            return;
+        }
+
+        // Update title from account email.
+        ThreadUtils.postToUiThread(new Runnable() {
+            @Override
+            public void run() {
+                setTitle(email);
+                setSummary("");
+            }
+        });
+
+        // Updating icons from Java is not supported prior to API 11.
+        if (!AppConstants.Versions.feature11Plus) {
+            return;
+        }
+
+        if (profileJSON == null) {
+            return;
+        }
+
+        // Avatar URI empty, return early.
+        final String avatarURI = profileJSON.getString(FxAccountConstants.KEY_PROFILE_JSON_AVATAR);
+        if (TextUtils.isEmpty(avatarURI)) {
+            return;
+        }
+
+        Picasso.with(mContext)
+                .load(avatarURI)
+                .centerInside()
+                .resizeDimen(R.dimen.fxaccount_profile_image_width, R.dimen.fxaccount_profile_image_height)
+                .placeholder(R.drawable.sync_avatar_default)
+                .error(R.drawable.sync_avatar_default)
+                .into(profileAvatarTarget);
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
+        if (GeckoPreferences.PREFS_SYNC.equals(key)) {
+            final String jsonString = sharedPreferences.getString(key, null);
+            try {
+                final ExtendedJSONObject jsonObject = new ExtendedJSONObject(jsonString);
+                update(jsonObject.getString("name"), jsonObject.getObject("profileJSON"));
+            } catch (Exception e) {
+                Log.w(LOGTAG, "Failed in json parsing; ignored", e);
+            }
+        }
+    }
 }
diff --git a/mobile/android/base/resources/xml-v11/preferences.xml b/mobile/android/base/resources/xml-v11/preferences.xml
--- a/mobile/android/base/resources/xml-v11/preferences.xml
+++ b/mobile/android/base/resources/xml-v11/preferences.xml
@@ -10,17 +10,17 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:gecko="http://schemas.android.com/apk/res-auto"
                   android:enabled="false">
 
     <org.mozilla.gecko.preferences.SyncPreference android:key="android.not_a_preference.sync"
                                                   android:title="@string/pref_sync"
                                                   android:icon="@drawable/sync_avatar_default"
                                                   android:summary="@string/pref_sync_summary"
-                                                  android:persistent="false" />
+                                                  android:persistent="true" />
 
     <PreferenceScreen android:title="@string/pref_category_general"
                       android:summary="@string/pref_category_general_summary"
                       android:key="android.not_a_preference.general_screen"
                       android:fragment="org.mozilla.gecko.preferences.GeckoPreferenceFragment" >
         <extra android:name="resource"
                android:value="preferences_general"/>
     </PreferenceScreen>
diff --git a/mobile/android/base/resources/xml/preferences.xml b/mobile/android/base/resources/xml/preferences.xml
--- a/mobile/android/base/resources/xml/preferences.xml
+++ b/mobile/android/base/resources/xml/preferences.xml
@@ -10,17 +10,17 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:gecko="http://schemas.android.com/apk/res-auto"
                   android:enabled="false">
 
     <org.mozilla.gecko.preferences.SyncPreference android:key="android.not_a_preference.sync"
                                                   android:title="@string/pref_sync"
                                                   android:summary="@string/pref_sync_summary"
                                                   android:icon="@drawable/sync_avatar_default"
-                                                  android:persistent="false" />
+                                                  android:persistent="true" />
 
     <PreferenceScreen android:title="@string/pref_category_general"
                       android:summary="@string/pref_category_general_summary"
                       android:key="android.not_a_preference.general_screen">
         <intent android:action="android.intent.action.VIEW"
                 android:targetPackage="@string/android_package_name"
                 android:targetClass="org.mozilla.gecko.preferences.GeckoPreferences" >
             <extra

Comment 6

[Vivek Balakrishnan[:vivek]]

Attachment: 1224708.patch

Sorry for spamming.Uploading the correct patch

Comment 7

[Nick Alexander :nalexander [he/him]]

Comment on attachment 8687400 [details]
MozReview Request: Bug 1224708 :  Update SyncPreference asynchronously using Loaders r?nalexander

https://reviewboard.mozilla.org/r/25197/#review23743

nits, and a question (not a blocker).  I *much* prefer this approach with the coupling to the alternate with `SharedPreferences`.  Nice patch!

::: mobile/android/base/preferences/GeckoPreferenceFragment.java:187
(Diff revision 2)
> +        // Forcing reload as the account may have been deleted while the app was in background.

nit: "Force a reload..." or "Force reload...".

Is this necessary?  I feel like the `Loader` should "see" this if it exists and already do the right thing.  Is the issue that the loader sees the event, but it's not really attached when the activity is in the background, so the update doesn't propagate?

Teach me about loaders!

::: mobile/android/base/preferences/GeckoPreferenceFragment.java:260
(Diff revision 2)
> +        return (SyncPreference) getPreferenceManager().findPreference(GeckoPreferences.PREFS_SYNC);

Let's move the null check here and throw `IllegalStateException` if the pref can't be found, so that we can drop the null checks elswewhere.

::: mobile/android/base/preferences/GeckoPreferenceFragment.java:281
(Diff revision 2)
> +            syncPreference.update(new AndroidFxAccount(getActivity(), account));

nit: drop newline.

Comment 8

[Nick Alexander :nalexander [he/him]]

Comment on attachment 8691535 [details] [diff] [review]
1224708.patch

Review of attachment 8691535 [details] [diff] [review]:
-----------------------------------------------------------------

Sorry this took so long to get attention.  I much prefer the alternate patch, so let's polish that up, test it, and land it!

Comment 9

[Vivek Balakrishnan[:vivek]]

Comment on attachment 8687400 [details]
MozReview Request: Bug 1224708 :  Update SyncPreference asynchronously using Loaders r?nalexander

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/25197/diff/2-3/

Comment 10

[Vivek Balakrishnan[:vivek]]

Comment on attachment 8687400 [details]
MozReview Request: Bug 1224708 :  Update SyncPreference asynchronously using Loaders r?nalexander

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/25197/diff/3-4/

Comment 11

[Nick Alexander :nalexander [he/him]]

https://reviewboard.mozilla.org/r/25197/#review24187

My browser state may be confused;  this says I have a pending review.  Posting it, and vivek and I talked on IRC and I think this is fine.

::: mobile/android/base/preferences/GeckoPreferenceFragment.java:272
(Diff revision 2)
> +            if (getSyncPreference() == null) {

This should be the saved `syncPreference`.

Comment 12

[Vivek Balakrishnan[:vivek]]

https://hg.mozilla.org/integration/fx-team/rev/d5193b7ae7c54aea4deaa8bfbc27a07aa45783de
Bug 1224708 :  Update SyncPreference asynchronously using Loaders r=nalexander

Comment 13

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/d5193b7ae7c5