bryan
/
BangleApps
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Quick tweaks for recent PR

master
Gordon Williams 2022-04-25 14:02:12 +01:00
parent 0369f1672b
commit d04674305e
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/android/boot.js
View File

@ -51,11 +51,13 @@
}, },
"alarm" : function() { "alarm" : function() {
//wipe existing GB alarms //wipe existing GB alarms
var gbalarms = require("sched").getAlarms().filter(a=>a.appid=="gbalarms"); var sched;
for (var i = 0; i < gbalarms.length; i++) { try { sched = require("sched"); } catch (e) {}
require("sched").setAlarm(gbalarms[i].id, undefined); if (!sched) return; // alarms may not be installed
} var gbalarms = sched.getAlarms().filter(a=>a.appid=="gbalarms");
var alarms = require("sched").getAlarms(); for (var i = 0; i < gbalarms.length; i++)
sched.setAlarm(gbalarms[i].id, undefined);
var alarms = sched.getAlarms();
var time = new Date(); var time = new Date();
var currentTime = time.getHours() * 3600000 + var currentTime = time.getHours() * 3600000 +
time.getMinutes() * 60000 + time.getMinutes() * 60000 +
@ -78,8 +80,8 @@
}; };
alarms.push(a); alarms.push(a);
} }
require("sched").setAlarms(alarms); sched.setAlarms(alarms);
require("sched").reload(); sched.reload();
}, },
}; };
var h = HANDLERS[event.t]; var h = HANDLERS[event.t];

2
apps/sched/lib.js
View File

@ -47,7 +47,7 @@ exports.getTimeToAlarm = function(alarm, time) {
/// Force a reload of the current alarms and widget /// Force a reload of the current alarms and widget
exports.reload = function() { exports.reload = function() {
eval(require("Storage").read("sched.boot.js")); eval(require("Storage").read("sched.boot.js"));
if (WIDGETS["alarm"]) { if (global.WIDGETS && WIDGETS["alarm"]) {
WIDGETS["alarm"].reload(); WIDGETS["alarm"].reload();
Bangle.drawWidgets(); Bangle.drawWidgets();
} }