diff --git a/apps/activityreminder/app.js b/apps/activityreminder/app.js index 52dec2928..95bdfe6f0 100644 --- a/apps/activityreminder/app.js +++ b/apps/activityreminder/app.js @@ -1,4 +1,10 @@ (function () { + + const activityreminder = require("activityreminder"); + const storage = require("Storage"); + const activityreminder_settings = activityreminder.loadSettings(); + const activityreminder_data = activityreminder.loadData(); + function drawAlert() { E.showPrompt("Inactivity detected", { title: "Activity reminder", @@ -31,13 +37,10 @@ eval(storage.read("activityreminder.settings.js"))(() => load()); } } - - const activityreminder = require("activityreminder"); - const storage = require("Storage"); + g.clear(); Bangle.loadWidgets(); Bangle.drawWidgets(); - const activityreminder_settings = activityreminder.loadSettings(); - const activityreminder_data = activityreminder.loadData(); run(); + })(); \ No newline at end of file diff --git a/apps/activityreminder/boot.js b/apps/activityreminder/boot.js index 86de0e901..c87dde3b2 100644 --- a/apps/activityreminder/boot.js +++ b/apps/activityreminder/boot.js @@ -1,4 +1,15 @@ (function () { + + const activityreminder = require("activityreminder"); + const activityreminder_settings = activityreminder.loadSettings(); + if (activityreminder_settings.enabled) { + const activityreminder_data = activityreminder.loadData(); + if (activityreminder_data.firstLoad) { + activityreminder_data.firstLoad = false; + activityreminder.saveData(activityreminder_data); + } + } + function run() { if (isNotWorn()) return; let now = new Date(); @@ -49,15 +60,8 @@ } }); - - const activityreminder = require("activityreminder"); - const activityreminder_settings = activityreminder.loadSettings(); + if (activityreminder_settings.enabled) { - const activityreminder_data = activityreminder.loadData(); - if (activityreminder_data.firstLoad) { - activityreminder_data.firstLoad = false; - activityreminder.saveData(activityreminder_data); - } setInterval(run, 60000); /* todo in a futur release increase setInterval time to something that is still sensible (5 mins ?)