Merge pull request #4311 from ticalc-travis/sched-update-alarms

Fix snoozing alarm near midnight (ref #4241)

Author: gfwilliams

apps/sched/ChangeLog

@@ -41,3 +41,4 @@
 0.38: Fix timer going off immediately if it was long enough it went to the next day (#4220)
 0.39: Allow a press of the button to stop/snooze the alarm when it's gone off
 0.40: Prevent time-of-day alarms set via setAlarm() that have a time earlier than the current time triggering immediately after #4220 fix; schedule them for tomorrow by default to match original behavior
+0.41: Fix issue with snoozing alarms and timers beyond midnight causing the alarm/timer to go off immediately instead of snoozing

apps/sched/lib.js

@@ -34,13 +34,27 @@ exports.getActiveAlarms = function (alarms, time) {
 // Set up a modified alarm/timer so it's ready to insert into the list of alarms. For timers, they fire the set time from now, and alarms are set to fire at the right time on the right day
 exports.updateAlarm = function(alarm) {
   var time = new Date(), currentTime = timeToMillis(time);
-  if (alarm.timer) { // if it's a timer, set the start time as a time from *now*
-    alarm.t = (currentTime + alarm.timer) % 86400000; // alarm time in day
+  if (alarm.timer) {
+    if (alarm.ot!==undefined) {
+      // if `ot` exists, the timer is currently snoozed. In that case,
+      // `t` is expected to be the time of day the snoozed alarm
+      // should trigger again. If `t` < current time of day, set
+      // `date` to tomorrow to avoid an immediate false trigger.
+      // (#4241)
+      if (alarm.t < currentTime) {
+        let tomorrow = new Date();
+        tomorrow.setDate(tomorrow.getDate() + 1);
+        alarm.date = tomorrow.toLocalISOString().substr(0, 10);
+      }
+    } else {
+      // if it's a new timer, set the start time as a time from *now*
+      alarm.t = (currentTime + alarm.timer) % 86400000; // alarm time in day
+      if (alarm.t < currentTime || alarm.timer>86400000/*24h*/)
+        alarm.date = new Date(time.getTime() + alarm.timer).toLocalISOString().substr(0, 10);
+      else delete alarm.date;
+    }
     alarm.last = 0; // don't need to specify a last day for alarms
     // if timer would have gone on until a later day, set a date (fix #4220)
-    if (alarm.t < currentTime || alarm.timer>86400000/*24h*/)
-      alarm.date = new Date(time.getTime() + alarm.timer).toLocalISOString().substr(0, 10);
-    else delete alarm.date;
   } else { // If it's an alarm, default to triggering tomorrow if time < current time of day (#4232)
     if (alarm.last===undefined) {
       var time = new Date();

apps/sched/metadata.json

@@ -1,7 +1,7 @@
 {
   "id": "sched",
   "name": "Scheduler",
-  "version": "0.40",
+  "version": "0.41",
   "author": "gfwilliams",
   "description": "Scheduling library for alarms and timers",
   "icon": "app.png",

apps/sched/sched.js

@@ -16,29 +16,39 @@ function formatMS(ms) {
   }
 }
 
-function showSnoozeMenu(alarm){
-
-  Bangle.buzz(40);
-
-  function onSnooze(snoozeTime) {
+function snoozeAlarm(alarm, snoozeTime) {
     if (alarm.ot === undefined) {
       alarm.ot = alarm.t;
     }
     let time = new Date();
     let currentTime = (time.getHours()*3600000)+(time.getMinutes()*60000)+(time.getSeconds()*1000);
     alarm.t = currentTime + snoozeTime;
     alarm.t %= 86400000;
+
+    // This makes updateAlarm() recompute the last alarm date so
+    // that it works correctly if we're snoozing beyond midnight
+    delete alarm.last;
+
+    require("sched").updateAlarm(alarm);
     Bangle.emit("alarmSnooze", alarm);
 
     // The updated alarm is still a member of 'alarms'
     // so writing to array writes changes back directly
     require("sched").setAlarms(alarms);
+}
+
+function showSnoozeMenu(alarm){
+
+  Bangle.buzz(40);
+
+  function onSnooze(snoozeTime) {
+    snoozeAlarm(alarm, snoozeTime);
     load();
   }
 
   if(alarm.timer){
 
-    let timerLength=alarm.timer
+    let timerLength=alarm.timer;
     let buttons={ "15s": 15, "30s":30,"1m":60 ,"2m":120,"5m":360};
     let formattedLength = formatMS(timerLength)+"*";
     buttons[formattedLength] = Math.round(timerLength/1000);
@@ -67,7 +77,7 @@ function showAlarm(alarm) {
     message = (alarm.timer
       ? atob("ACQswgD//33vRcGHIQAAABVVVAAAAAAAABVVVAAAAAAAABVVVAAAAAAAABVVVAAAAAAAABVVVAAAAAAAABVVVAAAAAAAAAP/wAAAAAAAAAP/wAAAAAAAAAqqoAPAAAAAAqqqqoP8AAAAKqqqqqv/AAACqqqqqqq/wAAKqqqlWqqvwAAqqqqlVaqrAACqqqqlVVqqAAKqqqqlVVaqgAKqaqqlVVWqgAqpWqqlVVVqoAqlWqqlVVVaoCqlV6qlVVVaqCqVVfqlVVVWqCqVVf6lVVVWqKpVVX/lVVVVqqpVVV/+VVVVqqpVVV//lVVVqqpVVVfr1VVVqqpVVVfr1VVVqqpVVVb/lVVVqqpVVVW+VVVVqqpVVVVVVVVVqiqVVVVVVVVWqCqVVVVVVVVWqCqlVVVVVVVaqAqlVVVVVVVaoAqpVVVVVVVqoAKqVVVVVVWqgAKqlVVVVVaqgACqpVVVVVqqAAAqqlVVVaqoAAAKqqVVWqqgAAACqqqqqqqAAAAAKqqqqqgAAAAAAqqqqoAAAAAAAAqqoAAAAA==")
       : atob("AC0swgF97///RcEpMlVVVVVVf9VVVVVVVVX/9VVf9VVf/1VVV///1Vf9VX///VVX///VWqqlV///1Vf//9aqqqqpf//9V///2qqqqqqn///V///6qqqqqqr///X//+qqoAAKqqv//3//6qoAAAAKqr//3//qqAAAAAAqq//3/+qoAADwAAKqv/3/+qgAADwAACqv/3/aqAAADwAAAqp/19qoAAADwAAAKqfV1qgAAADwAAACqXVWqgAAADwAAACqlVWqAAAADwAAAAqlVWqAAAADwAAAAqlVWqAAAADwAAAAqlVaoAAAADwAAAAKpVaoAAAADwAAAAKpVaoAAAADwAAAAKpVaoAAAAOsAAAAKpVaoAAAAOsAAAAKpVaoAAAAL/AAAAKpVaoAAAAgPwAAAKpVaoAAACAD8AAAKpVWqAAAIAA/AAAqlVWqAAAgAAPwAAqlVWqAACAAADwAAqlVWqgAIAAAAAACqlVVqgAgAAAAAACqVVVqoAAAAAAAAKqVVVaqAAAAAAAAqpVVVWqgAAAAAACqlVVVWqoAAAAAAKqlVVVVqqAAAAAAqqVVVVVaqoAAAAKqpVVVVVeqqoAAKqqtVVVVV/6qqqqqqr/VVVVX/2qqqqqqn/1VVVf/VaqqqqpV/9VVVf9VVWqqlVVf9VVVf1VVVVVVVVX9VQ==")
-    ) + " " + message
+    ) + " " + message;
   }
 
   Bangle.loadWidgets();
@@ -83,14 +93,7 @@ function showAlarm(alarm) {
       return;
     }
     if (sleep==1) {
-      if (alarm.ot === undefined) {
-        alarm.ot = alarm.t;
-      }
-      let time = new Date();
-      let currentTime = (time.getHours()*3600000)+(time.getMinutes()*60000)+(time.getSeconds()*1000);
-      alarm.t = currentTime + settings.defaultSnoozeMillis;
-      alarm.t %= 86400000;
-      Bangle.emit("alarmSnooze", alarm);
+      snoozeAlarm(alarm, settings.defaultSnoozeMillis);
     } else { // sleep=2, stop the alarm
       let del = alarm.del === undefined ? settings.defaultDeleteExpiredTimers : alarm.del;
       if (del) {
@@ -110,11 +113,12 @@ function showAlarm(alarm) {
         }
       }
       Bangle.emit("alarmDismiss", alarm);
+
+      // The updated alarm is still a member of 'alarms'
+      // so writing to array writes changes back directly
+      require("sched").setAlarms(alarms);
     }
 
-    // The updated alarm is still a member of 'alarms'
-    // so writing to array writes changes back directly
-    require("sched").setAlarms(alarms);
     load();
   }
 

apps/tevtimer/ChangeLog

@@ -1,2 +1,3 @@
 0.01: Official release
 0.02: Fix misbehavior if multiple alarms become active at once
+0.03: Fix issues with snoozing timers past midnight (#4241)

apps/tevtimer/alarm.js

@@ -84,6 +84,7 @@ function showAlarm(alarm) {
       let currentTime = (time.getHours()*3600000)+(time.getMinutes()*60000)+(time.getSeconds()*1000);
       alarm.t = currentTime + settings.defaultSnoozeMillis;
       alarm.t %= 86400000;
+      require("sched").updateAlarm(alarm);
       require("sched").setAlarms(alarms);
 
       Bangle.emit("alarmSnooze", alarm);
@@ -105,12 +106,9 @@ function showAlarm(alarm) {
       chainTimer.pause();
     }
     tt.update_system_alarms();
-    alarms = require("sched").getAlarms();
 
     Bangle.emit("alarmDismiss", alarm);
 
-    require("sched").setAlarms(alarms);
-
     if (action === 'halt' || tt.SETTINGS.alarm_return) {
       load('tevtimer.app.js');
     } else {

apps/tevtimer/metadata.json

@@ -3,7 +3,7 @@
   "name": "tev's timer",
   "shortName":"tev's timer",
   "icon": "app.png",
-  "version": "0.02",
+  "version": "0.03",
   "author": "ticalc-travis",
   "description": "A countdown timer app with interval and repeat features",
   "screenshots": [ {"url": "screenshot.png" } ],