Bug 987468 - remove sync delayed notification. r=ttaubert

browser/base/content/browser-syncui.js

@@ -7,7 +7,6 @@ let gSyncUI = {
   DEFAULT_EOL_URL: "https://www.mozilla.org/firefox/?utm_source=synceol",
 
   _obs: ["weave:service:sync:start",
-         "weave:service:sync:delayed",
          "weave:service:quota:remaining",
          "weave:service:setup-complete",
          "weave:service:login:start",
@@ -85,8 +84,6 @@ let gSyncUI = {
     Services.obs.removeObserver(this, "weave:notification:added");
   },
 
-  _wasDelayed: false,
-
   _needsSetup: function SUI__needsSetup() {
     // We want to treat "account needs verification" as "needs setup". So
     // "reach in" to Weave.Status._authManager to check whether we the signed-in
@@ -163,21 +160,6 @@ let gSyncUI = {
     });
   },
 
-  onSyncDelay: function SUI_onSyncDelay() {
-    // basically, we want to just inform users that stuff is going to take a while
-    let title = this._stringBundle.GetStringFromName("error.sync.no_node_found.title");
-    let description = this._stringBundle.GetStringFromName("error.sync.no_node_found");
-    let buttons = [new Weave.NotificationButton(
-      this._stringBundle.GetStringFromName("error.sync.serverStatusButton.label"),
-      this._stringBundle.GetStringFromName("error.sync.serverStatusButton.accesskey"),
-      function() { gSyncUI.openServerStatus(); return true; }
-    )];
-    let notification = new Weave.Notification(
-      title, description, null, Weave.Notifications.PRIORITY_INFO, buttons);
-    Weave.Notifications.replaceTitle(notification);
-    this._wasDelayed = true;
-  },
-
   onLoginFinish: function SUI_onLoginFinish() {
     // Clear out any login failure notifications
     let title = this._stringBundle.GetStringFromName("error.login.title");
@@ -410,12 +392,6 @@ let gSyncUI = {
 
     // Clear out sync failures on a successful sync
     this.clearError(title);
-
-    if (this._wasDelayed && Weave.Status.sync != Weave.NO_SYNC_NODE_FOUND) {
-      title = this._stringBundle.GetStringFromName("error.sync.no_node_found.title");
-      this.clearError(title);
-      this._wasDelayed = false;
-    }
   },
 
   onSyncError: function SUI_onSyncError() {
@@ -487,12 +463,6 @@ let gSyncUI = {
       new Weave.Notification(title, description, null, priority, buttons);
     Weave.Notifications.replaceTitle(notification);
 
-    if (this._wasDelayed && Weave.Status.sync != Weave.NO_SYNC_NODE_FOUND) {
-      title = this._stringBundle.GetStringFromName("error.sync.no_node_found.title");
-      Weave.Notifications.removeAll(title);
-      this._wasDelayed = false;
-    }
-
     this.updateUI();
   },
 
@@ -519,9 +489,6 @@ let gSyncUI = {
       case "weave:ui:sync:error":
         this.onSyncError();
         break;
-      case "weave:service:sync:delayed":
-        this.onSyncDelay();
-        break;
       case "weave:service:quota:remaining":
         this.onQuotaNotice();
         break;

services/sync/locales/en-US/sync.properties

@@ -25,8 +25,6 @@ error.logout.description = Sync encountered an error while connecting.  It's pro
 error.sync.title = Error While Syncing
 error.sync.description = Sync encountered an error while syncing: %1$S.  Sync will automatically retry this action.
 error.sync.prolonged_failure = Sync has not been able to complete during the last %1$S days. Please check your network settings.
-error.sync.no_node_found = The Sync server is a little busy right now, but you don't need to do anything about it.  We'll start syncing your data as soon as we can!
-error.sync.no_node_found.title = Sync Delay
 error.sync.serverStatusButton.label = Server Status
 error.sync.serverStatusButton.accesskey = V
 error.sync.needUpdate.description = You need to update Firefox Sync to continue syncing your data.

services/sync/modules/service.js

@@ -690,7 +690,6 @@ Sync11Service.prototype = {
       // to succeed, since that probably means we just don't have storage.
       if (this.clusterURL == "" && !this._clusterManager.setCluster()) {
         this.status.sync = NO_SYNC_NODE_FOUND;
-        Svc.Obs.notify("weave:service:sync:delayed");
         return true;
       }