Merge remote-tracking branch 'upstream/master' into app-loader

Author: thyttan

android.html

@@ -85,6 +85,7 @@
           <label class="chip tooltip" filterid="ram" data-tooltip="Apps that don't save anything to flash memory">Online</label>
           <label class="chip tooltip" filterid="clkinfo" data-tooltip="Info displayed on clocks, or clocks with info">Clock Info</label>
           <label class="chip tooltip" filterid="health" data-tooltip="Apps for your health">Health</label>
+          <label class="chip tooltip" filterid="fonts" data-tooltip="Extra fonts for non-latin languages">Fonts</label>
           <label class="chip tooltip" filterid="favourites" data-tooltip="Apps that you've liked ❤️">Favourites</label>
         </div>
         <div class="sort-nav hidden">

apps/alarm/ChangeLog

@@ -55,3 +55,4 @@
 	to select an alarm in the main menu.
 0.50: Bangle.js 2: Long touch of alarm in main menu toggle it on/off. Touching the icon on
 	the right will do the same.
+0.51: Fix long-touch to enable alarm/timer not updating time (fix #3804)

apps/alarm/app.js

@@ -87,18 +87,18 @@ function showMainMenu(scroll, group, scrollback) {
   };
   const getGroups = settings.showGroup && !group;
   const groups = getGroups ? {} : undefined;
-  var showAlarm;
   const getIcon = (e)=>{return e.on ? (e.timer ? iconTimerOn : iconAlarmOn) : (e.timer ? iconTimerOff : iconAlarmOff);};
 
   alarms.forEach((e, index) => {
-    showAlarm = !settings.showGroup || (group ? e.group === group : !e.group);
+    const showAlarm = !settings.showGroup || (group ? e.group === group : !e.group);
     if(showAlarm) {
       const label = trimLabel(getLabel(e),40);
       menu[label] = {
         value: e.on,
         onchange: (v, touch) => {
           if (touch && (2==touch.type || 145<touch.x)) { // Long touch or touched icon.
             e.on = v;
+            if (e.on) prepareForSave(e, index);
             saveAndReload();
           } else {
             setTimeout(e.timer ? showEditTimerMenu : showEditAlarmMenu, 10, e, index, undefined, scroller?scroller.scroll:undefined, group);
@@ -328,6 +328,14 @@ function prepareAlarmForSave(alarm, alarmIndex, time, date, temp) {
   }
 }
 
+function prepareForSave(alarm, alarmIndex) {
+  if (alarm.timer) {
+    prepareTimerForSave(alarm, alarmIndex, require("time_utils").decodeTime(alarm.timer));
+  } else {
+    prepareAlarmForSave(alarm, alarmIndex, require("time_utils").decodeTime(alarm.t));
+  }
+}
+
 function saveAndReload() {
   // Before saving revert the dow to the standard format (alarms only!)
   alarms.filter(e => e.timer === undefined).forEach(a => a.dow = handleFirstDayOfWeek(a.dow));
@@ -574,13 +582,7 @@ function enableAll(on) {
       if (confirm) {
         alarms.forEach((alarm, i) => {
           alarm.on = on;
-          if (on) {
-            if (alarm.timer) {
-              prepareTimerForSave(alarm, i, require("time_utils").decodeTime(alarm.timer));
-            } else {
-              prepareAlarmForSave(alarm, i, require("time_utils").decodeTime(alarm.t));
-            }
-          }
+          if (on) prepareForSave(alarm, i);
         });
         saveAndReload();
         showMainMenu();

apps/alarm/metadata.json

@@ -2,7 +2,7 @@
   "id": "alarm",
   "name": "Alarms & Timers",
   "shortName": "Alarms",
-  "version": "0.50",
+  "version": "0.51",
   "description": "Set alarms and timers on your Bangle",
   "icon": "app.png",
   "tags": "tool,alarm",

apps/android/ChangeLog

@@ -43,6 +43,7 @@
 0.40: Ensure we send health 'activity' message to gadgetbridge (added 2v26)
 0.41: When using `actfetch`, fetch historical activity type too
 0.42: Add handling for android STREAM_MUSIC volume level info, emitting on
-      arrival. (Needs Gadgetbridge nightly (either flavor) for now, or stable
+      arrival. (Needs Gadgetbridge nightly (either flavour) for now, or stable
       version 85 when it's out)
-
+0.43: Ensure listRecs doesn't list old-style recorded tracks (Otherwise Gadgetbridge fails parsing the filename)
+0.44: Pass HTTP request timeout to Gadgetbridge

apps/android/lib.js

@@ -232,8 +232,8 @@ exports.gbHandler = (event) => {
     },
     //{t:"listRecs", id:"20230616a"}
     "listRecs": function() {
-      let recs = require("Storage").list(/^recorder\.log.*\.csv$/,{sf:true}).map(s => s.slice(12, 21));
-      if (event.id.length > 2) { // Handle if there was no id supplied. Then we send a list all available recorder logs back.
+      let recs = require("Storage").list(/^recorder\.log.*\.csv$/,{sf:true}).map(s => s.slice(12, 21)).filter(s => s.length>7 /*ignore 'old' tracks without date*/);
+      if (event.id && event.id.length > 2) { // Handle if there was no id supplied. Then we send a list all available recorder logs back.
         let firstNonsyncedIdx = recs.findIndex((logId) => logId > event.id);
         if (-1 == firstNonsyncedIdx) {
           recs = []
@@ -321,6 +321,7 @@ exports.httpHandler = (url,options) => {
   if (options.method) req.method = options.method;
   if (options.body) req.body = options.body;
   if (options.headers) req.headers = options.headers;
+  req.timeout = options.timeout || 30000;
   exports.gbSend(req);
   //create the promise
   var promise = new Promise(function(resolve,reject) {
@@ -329,7 +330,7 @@ exports.httpHandler = (url,options) => {
       //if after "timeoutMillisec" it still hasn't answered -> reject
       delete Bangle.httpRequest[options.id];
       reject("Timeout");
-    },options.timeout||30000)};
+    },req.timeout+500)};
   });
   return promise;
 };

apps/android/metadata.json

@@ -2,7 +2,7 @@
   "id": "android",
   "name": "Android Integration",
   "shortName": "Android",
-  "version": "0.42",
+  "version": "0.44",
   "description": "Display notifications/music/etc sent from the Gadgetbridge app on Android. This replaces the old 'Gadgetbridge' Bangle.js widget.",
   "icon": "app.png",
   "tags": "tool,system,messages,notifications,gadgetbridge",

apps/edgeclk/ChangeLog

@@ -2,3 +2,5 @@
 0.02: Fix reset of progress bars on midnight. Fix display of 100k+ steps.
 0.03: Added option to display weather.
 0.04: Added option to display live updates of step count.
+0.05: Reset graphics before initial clearing of the screen. Helps in some
+      situations if using fastload utils.

apps/edgeclk/app.js

@@ -336,7 +336,7 @@
   /* Startup Process
   ------------------------------------------------------------------------------*/
 
-  g.clear();
+  g.clear(1);
   drawAll();
   startTimers();
   registerEvents();

apps/edgeclk/metadata.json

@@ -2,7 +2,7 @@
   "id": "edgeclk",
   "name": "Edge Clock",
   "shortName": "Edge Clock",
-  "version": "0.04",
+  "version": "0.05",
   "description": "Crisp clock with perfect readability.",
   "readme": "README.md",
   "icon": "app.png",