From c90bb4910f37b906ffb738b0a5fc75984154fa62 Mon Sep 17 00:00:00 2001
From: thyttan <6uuxstm66@mozmail.com⁩>
Date: Mon, 29 Apr 2024 19:02:29 +0200
Subject: [PATCH] backswipe:fix could not blcklist messagegui.new.js

---
 apps/backswipe/ChangeLog     | 3 +++
 apps/backswipe/boot.js       | 4 ++--
 apps/backswipe/metadata.json | 2 +-
 apps/backswipe/settings.js   | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/backswipe/ChangeLog b/apps/backswipe/ChangeLog
index 54ffebfc7..4e81269fe 100644
--- a/apps/backswipe/ChangeLog
+++ b/apps/backswipe/ChangeLog
@@ -1,3 +1,6 @@
 0.01: New App!
 0.02: Don't fire if the app uses swipes already.
 0.03: Only count defined handlers in the handler array.
+0.04: Fix messages auto opened by `messagegui` could not be blacklisted. Needs
+	a refresh by deselecting and reselecting the "Messages" app throught Back Swipe
+	settings.
diff --git a/apps/backswipe/boot.js b/apps/backswipe/boot.js
index d5d54cd59..8ff277634 100644
--- a/apps/backswipe/boot.js
+++ b/apps/backswipe/boot.js
@@ -47,9 +47,9 @@
   function enabledForApp(app) {
     if (!settings) return true;
     if (settings.mode === 0) {
-      return !(settings.apps.filter((a) => a.src === app).length > 0);
+      return !(settings.apps.filter((a) => (a.src===app)||(a.files&&a.files.includes(app))).length > 0); // The `a.src===app` and `a.files&&...` checks are for backwards compatibility. Otherwise only `a.files.includes(app)` is needed.
     } else if (settings.mode === 1) {
-      return settings.apps.filter((a) => a.src === app).length > 0;
+      return settings.apps.filter((a) => (a.src===app)||(a.files&&a.files.includes(app))).length > 0;
     } else {
       return settings.mode === 2 ? true : false;
     }
diff --git a/apps/backswipe/metadata.json b/apps/backswipe/metadata.json
index add609a0f..4324286b5 100644
--- a/apps/backswipe/metadata.json
+++ b/apps/backswipe/metadata.json
@@ -1,7 +1,7 @@
 { "id": "backswipe",
   "name": "Back Swipe",
   "shortName":"BackSwipe",
-  "version":"0.03",
+  "version":"0.04",
   "description": "Service that allows you to use an app's back button using left to right swipe gesture",
   "icon": "app.png",
   "tags": "back,gesture,swipe",
diff --git a/apps/backswipe/settings.js b/apps/backswipe/settings.js
index 42ca7ae7d..c98f706eb 100644
--- a/apps/backswipe/settings.js
+++ b/apps/backswipe/settings.js
@@ -26,7 +26,8 @@
       return appInfo && {
         'name': appInfo.name,
         'sortorder': appInfo.sortorder,
-        'src': appInfo.src
+        'src': appInfo.src,
+        'files': appInfo.files
       };
     }).filter(app => app && !!app.src);
     apps.sort((a, b) => {