Bug 1467919 - Don't try to clear PushService data if Push disabled r=baku
MozReview-Commit-ID: IkImtSkmUAI
--- 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();