Merge pull request #1843 from frigis1/master

[Android & Sched] - small fixes and updates

apps/android/ChangeLog

@@ -7,3 +7,4 @@
 0.06: Option to keep messages after a disconnect (default false) (fix #1186)
 0.07: Include charging state in battery updates to phone
 0.08: Handling of alarms
+0.09: Alarm vibration, repeat, and auto-snooze now handled by sched

apps/android/README.md

@@ -21,7 +21,6 @@ of Gadgetbridge - making your phone make noise so you can find it.
 * `Keep Msgs` - default is `Off`. When Gadgetbridge disconnects, should Bangle.js
 keep any messages it has received, or should it delete them?
 * `Messages` - launches the messages app, showing a list of messages
-* `Alarms` - opens a submenu where you can set default settings for alarms such as vibration pattern, repeat, and auto snooze 
 
 ## How it works
 

apps/android/boot.js

@@ -67,17 +67,13 @@
           var dow = event.d[j].rep;
           if (!dow) dow = 127; //if no DOW selected, set alarm to all DOW
           var last = (event.d[j].h * 3600000 + event.d[j].m * 60000 < currentTime) ? (new Date()).getDate() : 0;
-          var a = {
-            id : "gb"+j,
-            appid : "gbalarms",
-            on : true,
-            t : event.d[j].h * 3600000 + event.d[j].m * 60000,
-            dow : ((dow&63)<<1) | (dow>>6), // Gadgetbridge sends DOW in a different format
-            last : last,
-            rp : settings.rp,
-            as : settings.as,
-            vibrate : settings.vibrate
-          };
+          var a = require("sched").newDefaultAlarm();
+          a.id = "gb"+j;
+          a.appid = "gbalarms";
+          a.on = true;
+          a.t = event.d[j].h * 3600000 + event.d[j].m * 60000;
+          a.dow = ((dow&63)<<1) | (dow>>6); // Gadgetbridge sends DOW in a different format
+          a.last = last;
           alarms.push(a);
         }
         sched.setAlarms(alarms);

apps/android/metadata.json

@@ -2,7 +2,7 @@
   "id": "android",
   "name": "Android Integration",
   "shortName": "Android",
-  "version": "0.08",
+  "version": "0.09",
   "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/android/settings.js

@@ -25,27 +25,6 @@
       }
     },
     /*LANG*/"Messages" : ()=>load("messages.app.js"),
-    /*LANG*/"Alarms" : () => E.showMenu({
-      "" : { "title" : /*LANG*/"Alarms" },
-      "< Back" : ()=>E.showMenu(mainmenu),
-      /*LANG*/"Vibrate": require("buzz_menu").pattern(settings.vibrate, v => {settings.vibrate = v; updateSettings();}),
-      /*LANG*/"Repeat": {
-        value: settings.rp,
-        format : v=>v?/*LANG*/"Yes":/*LANG*/"No",
-        onchange: v => {
-          settings.rp = v;
-          updateSettings();
-        }
-      },
-      /*LANG*/"Auto snooze": {
-        value: settings.as,
-        format : v=>v?/*LANG*/"Yes":/*LANG*/"No",
-        onchange: v => {
-          settings.as = v;
-          updateSettings();
-        }
-      },
-    })
   };
   E.showMenu(mainmenu);
 })

apps/sched/ChangeLog

@@ -8,3 +8,4 @@
       Correct `decodeTime(t)` to return a more likely expected time
 0.08: add day of week check to getActiveAlarms()
 0.09: Move some functions to new time_utils module
+0.10: Default to sched.js if custom js not found

apps/sched/boot.js

@@ -24,7 +24,7 @@
     will then clearInterval() to get rid of this call so it can proceed
     normally.
     If active[0].js is defined, just run that code as-is and not alarm.js */
-    Bangle.SCHED = setTimeout(active[0].js||'load("sched.js")',t);
+    Bangle.SCHED = setTimeout(require("Storage").read(active[0].js)!==undefined ? active[0].js : 'load("sched.js")',t);
   } else { // check for new alarms at midnight (so day of week works)
     Bangle.SCHED = setTimeout('eval(require("Storage").read("sched.boot.js"))', 86400000 - (Date.now()%86400000));
   }

apps/sched/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "sched",
   "name": "Scheduler",
-  "version": "0.09",
+  "version": "0.10",
   "description": "Scheduling library for alarms and timers",
   "icon": "app.png",
   "type": "scheduler",