No bug - Allow manually syncing a Legacy Sync account.
authorNick Alexander <nalexander@mozilla.com>
Wed, 11 Feb 2015 10:15:11 -0800
changeset 255753 33e8777ce33f5942da70e824125c4d4b6960542c
parent 255752 e6b4bb4cc3937023534874a41d41eb1bdb94d3db
child 255754 08420ee384aef4a36fbdb0bba3847a39d83ac1ed
child 255966 5740efb53e87926b2e052a0b5a433cc493178580
push id4610
push userjlund@mozilla.com
push dateMon, 30 Mar 2015 18:32:55 +0000
treeherdermozilla-beta@4df54044d9ef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone38.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
No bug - Allow manually syncing a Legacy Sync account. We accidentally set the "can account be synced at all" flag to the value of the "should account be synced in response to network activity" flag.
mobile/android/base/reading/ReadingListSyncAdapter.java
mobile/android/base/sync/setup/SyncAccounts.java
--- a/mobile/android/base/reading/ReadingListSyncAdapter.java
+++ b/mobile/android/base/reading/ReadingListSyncAdapter.java
@@ -1,10 +1,9 @@
-/* -*- Mode: Java; c-basic-offset: 2; tab-width: 20; indent-tabs-mode: nil; -*-
- * This Source Code Form is subject to the terms of the Mozilla Public
+/* 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.reading;
 
 import org.mozilla.gecko.fxa.authenticator.AndroidFxAccount;
 
 import android.accounts.Account;
--- a/mobile/android/base/sync/setup/SyncAccounts.java
+++ b/mobile/android/base/sync/setup/SyncAccounts.java
@@ -280,17 +280,17 @@ public class SyncAccounts {
 
     if (!result) {
       Logger.error(LOG_TAG, "Failed to add account " + account + "!");
       return null;
     }
     Logger.debug(LOG_TAG, "Account " + account + " added successfully.");
 
     setSyncAutomatically(account, syncAutomatically);
-    setIsSyncable(account, syncAutomatically);
+    setIsSyncable(account, true);
     Logger.debug(LOG_TAG, "Set account to sync automatically? " + syncAutomatically + ".");
 
     try {
       final String product = GlobalConstants.BROWSER_INTENT_PACKAGE;
       final String profile = Constants.DEFAULT_PROFILE;
       final long version = SyncConfiguration.CURRENT_PREFS_VERSION;
 
       final SharedPreferences.Editor editor = Utils.getSharedPreferences(context, product, username, serverURL, profile, version).edit();