Functional blacklist and whitelist modes

apps/backswipe/boot.js

@@ -1,5 +1,9 @@
 (function () {
-  var settings = require("Storage").readJSON("backswipe.json", 1) || {};
+  var DEFAULTS = {
+    mode: 0,
+    apps: [],
+  };
+  var settings = require("Storage").readJSON("backswipe.json", 1) || DEFAULTS;
 
   // Overrride the default setUI method, so we can save the back button callback
   var setUI = Bangle.setUI;
@@ -32,17 +36,19 @@
     }
   }
 
+  // Check if the back button should be enabled for the current app
+  // app is the src file of the app
   function enabledForApp(app) {
     if (!settings) return true;
-    if (settings.mode === "blacklist") {
+    if (settings.mode === 0) {
-      return !settings.apps.includes(app);
+      return !(settings.apps.filter((a) => a.src === app).length > 0);
-    } else if (settings.mode === "whitelist") {
+    } else if (settings.mode === 1) {
-      return settings.apps.includes(app);
+      return settings.apps.filter((a) => a.src === app).length > 0;
     } else {
-      return settings.mode === "on" ? true : false;
+      return settings.mode === 2 ? true : false;
     }
   }
-  
+
   // Listen to left to right swipe
   Bangle.on("swipe", goBack);
 })();

apps/backswipe/settings.js

@@ -1,60 +1,60 @@
-(function() {
+(function(back) {
     var FILE = 'backswipe.json';
     // Mode can be 'blacklist', 'whitelist', 'on' or 'disabled'
-    // Apps is an array of app names, where all the apps that are there are either blocked or allowed, depending on the mode
+    // Apps is an array of app info objects, where all the apps that are there are either blocked or allowed, depending on the mode
     var DEFAULTS = {
-        'mode': 'blacklist',
+        'mode': 0,
         'apps': []
     };
 
     var settings = {};
     
     var loadSettings = function() {
-        var settings = require('Storage').readJSON(FILE, 1) || DEFAULTS;
+        settings = require('Storage').readJSON(FILE, 1) || DEFAULTS;
-        return settings;
     }
 
     var saveSettings = function(settings) {
         require('Storage').write(FILE, settings);
     }
 
+    // Get all app info files
     var getApps = function() {
-        var apps = require('Storage').list(/\.info$/).map(app => {
+        var apps = require('Storage').list(/\.info$/).map(appInfoFileName => {
-            return app.replace('.info', '');
+            var appInfo = require('Storage').readJSON(appInfoFileName, 1);
+            return appInfo && {
+                'name': appInfo.name,
+                'sortorder': appInfo.sortorder,
+                'src': appInfo.src
+            };
+        }).filter(app => app && !!app.src);
+        apps.sort((a, b) => {
+            var n = (0 | a.sortorder) - (0 | b.sortorder);
+            if (n) return n; // do sortorder first
+            if (a.name < b.name) return -1;
+            if (a.name > b.name) return 1;
+            return 0;
         });
         return apps;
     }
 
-    var getSettings = function() {
-        var settings = loadSettings();
-        return {
-            mode: settings.mode,
-            apps: settings.apps,
-        };
-    }
-
     var showMenu = function() {
-        var settings = getSettings();
         var menu = {
             '': { 'title': 'Backswipe' },
             '< Back': () => {
-                load();
+                back();
-                E.showMenu();
             },
             'Mode': {
                 value: settings.mode,
-                format: v => v,
+                min: 0,
+                max: 3,
+                format: v => ["Blacklist", "Whitelist", "Always On", "Disabled"][v],
                 onchange: v => {
                     settings.mode = v;
+                    saveSettings(settings);
                 },
-                options: ['blacklist', 'whitelist', 'on', 'disabled']
             },
-            'App List': {
+            'App List': () => {
-                value: '',
+                showAppSubMenu();
-                format: v => v,
-                onchange: v => {
-                    showAppSubMenu();
-                }
             }
         };
         
@@ -72,10 +72,11 @@
             }
         };
         settings.apps.forEach(app => {
-            menu[app.app] = () => {
+            menu[app.name] = () => {
                 settings.apps.splice(settings.apps.indexOf(app), 1);
+                saveSettings(settings);
+                showAppSubMenu();
             }
-            saveSettings(settings);
         });
         E.showMenu(menu);
     }
@@ -89,8 +90,8 @@
             }
         };
         apps.forEach(app => {
-            menu[app] = () => {
+            menu[app.name] = () => {
-                settings.apps.push(app);
+                settings.apps.push(app); 
                 saveSettings(settings);
                 showAppSubMenu();
             }