Bug 1467919 - Don't try to clear PushService data if Push disabled r=baku draft
authorJames Willcox <snorp@snorp.net>
Fri, 29 Jun 2018 13:26:53 -0500
changeset 812657 256f2a069f713f011572491fb095202b8762f50c
parent 811563 3d3ad864aca3f182a13416e6881b060a91ecb28f
push id114622
push userbmo:snorp@snorp.net
push dateFri, 29 Jun 2018 18:41:10 +0000
reviewersbaku
bugs1467919
milestone63.0a1
Bug 1467919 - Don't try to clear PushService data if Push disabled r=baku MozReview-Commit-ID: IkImtSkmUAI
toolkit/components/cleardata/ClearDataService.js
--- a/toolkit/components/cleardata/ClearDataService.js
+++ b/toolkit/components/cleardata/ClearDataService.js
@@ -410,30 +410,38 @@ const PredictorNetworkCleaner = {
              getService(Ci.nsINetworkPredictor);
     np.reset();
     return Promise.resolve();
   },
 };
 
 const PushNotificationsCleaner = {
   deleteByHost(aHost, aOriginAttributes) {
+    if (!Services.prefs.getBoolPref("dom.push.enabled", false)) {
+      return Promise.resolve();
+    }
+
     return new Promise((aResolve, aReject) => {
       let push = Cc["@mozilla.org/push/Service;1"]
                    .getService(Ci.nsIPushService);
       push.clearForDomain(aHost, aStatus => {
         if (!Components.isSuccessCode(aStatus)) {
           aReject();
         } else {
           aResolve();
         }
       });
     });
   },
 
   deleteAll() {
+    if (!Services.prefs.getBoolPref("dom.push.enabled", false)) {
+      return Promise.resolve();
+    }
+
     return new Promise((aResolve, aReject) => {
       let push = Cc["@mozilla.org/push/Service;1"]
                    .getService(Ci.nsIPushService);
       push.clearForDomain("*", aStatus => {
         if (!Components.isSuccessCode(aStatus)) {
           aReject();
         } else {
           aResolve();