Issue 2853 - Settings changes are sometimes not saved if the user quits the app

adblockplus/Api.jsm

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 27 matching lines @@
 
 let {Filter} = require("filterClasses");
 let {FilterNotifier} = require("filterNotifier");
 let {FilterStorage} = require("filterStorage");
 let {defaultMatcher} = require("matcher");
 let {Prefs} = require("prefs");
 let {Subscription, SpecialSubscription, RegularSubscription, DownloadableSubscription, ExternalSubscription} = require("subscriptionClasses");
 let {Synchronizer} = require("synchronizer");
 let {UI} = require("ui");
 
-function initListeners()
-{
-  FilterNotifier.on("save", onSave);
-}
-
-function onSave()
-{
-  Messaging.sendRequest({ type: "Abb:OnSave" });
+function initFilterListeners()
+{
+  FilterNotifier.on("load", onFiltersLoad);
+  FilterNotifier.on("save", onFiltersSave);
+}
+
+function onFiltersLoad()
+{
+  Messaging.sendRequest({ type: "Abb:OnFiltersLoad" });
+}
+
+function onFiltersSave()
+{
+  Messaging.sendRequest({ type: "Abb:OnFiltersSave" });
 }
 
 function getWhitelistingFilter(url)
 {
   let uriObject = Services.io.newURI(url, null, null);
   try
   {
     return defaultMatcher.whitelist.matchesAny(
       uriObject.spec, "DOCUMENT", uriObject.host, false, null);
   }
@@ skipping 100 matching lines @@
       {
         FilterStorage.removeFilter(filter);
         if (filter.subscriptions.length)
           filter.disabled = true;
         filter = getWhitelistingFilter(url);
       }
     }
   },
   initCommunication: function()
   {
-    initListeners();

[Felix Dahlke, 2016/12/21 20:23:25]

Nit: Considering how there's only a single listener and only a single line
needed to register it, how about inlining this?

[diegocarloslima, 2016/12/21 20:29:31]

Actually there is another listener that is already registered by Issue #3247. So
this is required to keep consistency

[Felix Dahlke, 2016/12/21 20:36:20]

Oh, so it seems you need to rebase this patch? Think I suggested to call that
function `initFilterListeners` then for clarity's sake.

[diegocarloslima, 2016/12/21 20:42:03]

Acknowledged.

+    initFilterListeners();
 
     Messaging.addListener((function(data)
     {
       if (!data)
         return {"success": false, "error": "malformed request"};
-
-      if (data["action"] == "getFiltersLoaded")
-        return {"success": true, "value": this.filtersLoaded};
 
       if (!this.filtersLoaded)
         return {"success": false, "error": "filters not loaded"};
 
       switch (data["action"])
       {
         case "getAcceptableAdsEnabled":
           return {"success": true, "value": this.acceptableAdsEnabled};
         case "setAcceptableAdsEnabled":
           if ("enable" in data)
@@ skipping 42 matching lines @@
           {
             this.whitelistSite(data["url"], data["whitelisted"]);
             return {"success": true};
           }
           break;
       }
       return {"success": false, "error": "malformed request"};
     }).bind(this), "AdblockPlus:Api");
   }
 };