1 files changed, 20 insertions, 9 deletions

diff --git a/src/js/messaging.js b/src/js/messaging.js
index 40d9e45..1afd993 100644
--- a/src/js/messaging.js
+++ b/src/js/messaging.js
@@ -42,6 +42,10 @@ var onMessage = function(request, sender, callback) {
             µb.assets.get(request.url, callback);
             return;
 
+        case 'reloadAllFilters':
+            µb.reloadAllFilters(callback);
+            return;
+
         default:
             break;
     }
@@ -55,6 +59,10 @@ var onMessage = function(request, sender, callback) {
             µb.contextMenuClientY = request.clientY;
             break;
 
+        case 'forceUpdateAssets':
+            µb.assetUpdater.force();
+            break;
+
         case 'getAppData':
             response = {name: vAPI.app.name, version: vAPI.app.version};
             break;
@@ -67,16 +75,16 @@ var onMessage = function(request, sender, callback) {
             vAPI.tabs.open(request.details);
             break;
 
-        case 'reloadAllFilters':
-            µb.reloadFilterLists(request.switches, request.update);
-            break;
-
         case 'reloadTab':
             if ( vAPI.isNoTabId(request.tabId) === false ) {
                 vAPI.tabs.reload(request.tabId);
             }
             break;
 
+        case 'selectFilterLists':
+            µb.selectFilterLists(request.switches);
+            break;
+
         case 'userSettings':
             response = µb.changeUserSettings(request.name, request.value);
             break;
@@ -634,17 +642,20 @@ var prepEntries = function(entries) {
 
 var getLists = function(callback) {
     var r = {
+        autoUpdate: µb.userSettings.autoUpdate,
         available: null,
-        current: µb.remoteBlacklists,
+        cache: null,
         cosmetic: µb.userSettings.parseAllABPHideFilters,
-        netFilterCount: µb.staticNetFilteringEngine.getFilterCount(),
         cosmeticFilterCount: µb.cosmeticFilteringEngine.getFilterCount(),
-        autoUpdate: µb.userSettings.autoUpdate,
-        userFiltersPath: µb.userFiltersPath,
-        cache: null
+        current: µb.remoteBlacklists,
+        manualUpdate: false,
+        netFilterCount: µb.staticNetFilteringEngine.getFilterCount(),
+        userFiltersPath: µb.userFiltersPath
     };
     var onMetadataReady = function(entries) {
         r.cache = entries;
+        r.manualUpdate = µb.assetUpdater.manualUpdate;
+        r.manualUpdateProgress = µb.assetUpdater.manualUpdateProgress;
         prepEntries(r.cache);
         callback(r);
     };