From 21a17cc7517105503f590fed4a331186e9030a60 Mon Sep 17 00:00:00 2001
From: Gordon Williams <gw@pur3.co.uk>
Date: Tue, 2 Apr 2024 16:22:12 +0100
Subject: [PATCH] 0.03: Cope with identical duplicate buttons (fix #3260)      
 Set 'n' for buttons in Bangle.btHomeData correctly (avoids adding extra
 buttons on end of advertising)

---
 apps/bthome/ChangeLog     |  4 +++-
 apps/bthome/app.js        | 26 ++++++++++++++++----------
 apps/bthome/boot.js       |  2 +-
 apps/bthome/metadata.json |  2 +-
 apps/bthome/settings.js   | 35 +++++++++++++++++++++--------------
 5 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/apps/bthome/ChangeLog b/apps/bthome/ChangeLog
index 01d23607d..f5ea96ca1 100644
--- a/apps/bthome/ChangeLog
+++ b/apps/bthome/ChangeLog
@@ -1,2 +1,4 @@
 0.01: New App!
-0.02: Fix double-button press if you press the next button within 30s (#3243)
\ No newline at end of file
+0.02: Fix double-button press if you press the next button within 30s (#3243)
+0.03: Cope with identical duplicate buttons (fix #3260)
+      Set 'n' for buttons in Bangle.btHomeData correctly (avoids adding extra buttons on end of advertising)
\ No newline at end of file
diff --git a/apps/bthome/app.js b/apps/bthome/app.js
index 7e9a39531..6fce4ff0b 100644
--- a/apps/bthome/app.js
+++ b/apps/bthome/app.js
@@ -5,20 +5,26 @@ function showMenu() {
   var settings = require("Storage").readJSON("bthome.json",1)||{};
   if (!(settings.buttons instanceof Array))
     settings.buttons = [];
-  var menu = { "": {title:"BTHome", back:load} };
+  var menu = [];
+  menu[""] = {title:"BTHome", back:load };
   settings.buttons.forEach((button,idx) => {
     var img = require("icons").getIcon(button.icon);
-    menu[/*LANG*/"\0"+img+" "+button.name] = function() {
-      Bangle.btHome([{type:"button_event",v:button.v,n:button.n}],{event:true});
-      E.showMenu();
-      E.showMessage("Sending Event");
-      Bangle.buzz();
-      setTimeout(showMenu, 500);
-    };
+    menu.push({
+      title : /*LANG*/"\0"+img+" "+button.name,
+      onchange : function() {
+        Bangle.btHome([{type:"button_event",v:button.v,n:button.n}],{event:true});
+        E.showMenu();
+        E.showMessage("Sending Event");
+        Bangle.buzz();
+        setTimeout(showMenu, 500);
+      }
+    });
   });
-  menu[/*LANG*/"Settings"] = function() {
+  menu.push({
+    title : /*LANG*/"Settings",
+    onchange : function() {
     eval(require("Storage").read("bthome.settings.js"))(()=>showMenu());
-  };
+  }});
   E.showMenu(menu);
 }
 
diff --git a/apps/bthome/boot.js b/apps/bthome/boot.js
index a95d9b5fe..7c9e37f77 100644
--- a/apps/bthome/boot.js
+++ b/apps/bthome/boot.js
@@ -13,7 +13,7 @@ Bangle.btHomeData = [];
   if (settings.buttons instanceof Array) {
     let n = settings.buttons.reduce((n,b)=>b.n>n?b.n:n,-1);
     for (var i=0;i<=n;i++)
-      Bangle.btHomeData.push({type:"button_event",v:"none",n:n});
+      Bangle.btHomeData.push({type:"button_event",v:"none",n:i});
   }
 }
 
diff --git a/apps/bthome/metadata.json b/apps/bthome/metadata.json
index 6fc4a17c2..acc1f5b39 100644
--- a/apps/bthome/metadata.json
+++ b/apps/bthome/metadata.json
@@ -1,7 +1,7 @@
 { "id": "bthome",
   "name": "BTHome",
   "shortName":"BTHome",
-  "version":"0.02",
+  "version":"0.03",
   "description": "Allow your Bangle to advertise with BTHome and send events to Home Assistant via Bluetooth",
   "icon": "icon.png",
   "type": "app",
diff --git a/apps/bthome/settings.js b/apps/bthome/settings.js
index 70f50f2ac..4c84d99de 100644
--- a/apps/bthome/settings.js
+++ b/apps/bthome/settings.js
@@ -67,24 +67,31 @@
   }
 
   function showMenu() {
-    var menu = { "": {title:"BTHome", back:back},
-      /*LANG*/"Show Battery" : {
-        value : !!settings.showBattery,
-        onchange : v=>{
-          settings.showBattery = v;
-          saveSettings();
-        }
+    var menu = [];
+    menu[""] = {title:"BTHome", back:back};
+    menu.push({
+      title : /*LANG*/"Show Battery",
+      value : !!settings.showBattery,
+      onchange : v=>{
+        settings.showBattery = v;
+        saveSettings();
       }
-    };
+    });
     settings.buttons.forEach((button,idx) => {
       var img = require("icons").getIcon(button.icon);
-      menu[/*LANG*/"Button"+(img ? " \0"+img : (idx+1))] = function() {
-        showButtonMenu(button, false);
-      };
+      menu.push({
+        title : /*LANG*/"Button"+(img ? " \0"+img : (idx+1)),
+        onchange : function() {
+          showButtonMenu(button, false);
+        }
+      });
+    });
+    menu.push({
+      title : /*LANG*/"Add Button",
+      onchange : function() {
+        showButtonMenu(undefined, true);
+      }
     });
-    menu[/*LANG*/"Add Button"] = function() {
-      showButtonMenu(undefined, true);
-    };
     E.showMenu(menu);
   }
   showMenu();