Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

mobile: keep reminders showing in widget after they go off for 3 hours

Ammar Ahmed7f5215403ba6
diff --git a/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/ReminderWidgetProvider.java b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/ReminderWidgetProvider.java
index 4619f594c..bcbfb0233 100644
--- a/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/ReminderWidgetProvider.java
+++ b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/ReminderWidgetProvider.java
@@ -43,7 +43,7 @@ public class ReminderWidgetProvider extends AppWidgetProvider {
// The rows travel with the update itself, so there is no bound service to keep in sync and
// nothing to invalidate separately: every update redraws from the current data.
- List<Reminder> reminders = WidgetUtils.getActiveReminders(context);
+ List<Reminder> reminders = WidgetUtils.getWidgetReminders(context);
RemoteViewsCompat.RemoteCollectionItems.Builder items =
new RemoteViewsCompat.RemoteCollectionItems.Builder();
for (Reminder reminder : reminders) {
diff --git a/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/WidgetUtils.java b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/WidgetUtils.java
index c04ec351c..c23d55c44 100644
--- a/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/WidgetUtils.java
+++ b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/WidgetUtils.java
@@ -25,6 +25,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.TimeUnit;
/**
* Shared helpers for the home screen widgets.
@@ -135,10 +136,10 @@ public class WidgetUtils {
}
/**
- * The reminders the app last wrote out, minus any that have since fired. Reading and filtering
- * happens here so the provider can push the rows straight into the widget.
+ * The reminders the app last wrote out, minus any that have now dropped out of view. Reading
+ * and filtering happens here so the provider can push the rows straight into the widget.
*/
- static List<Reminder> getActiveReminders(Context context) {
+ static List<Reminder> getWidgetReminders(Context context) {
SharedPreferences preferences = context.getSharedPreferences(PREFERENCES, Context.MODE_PRIVATE);
List<Reminder> stored = null;
try {
@@ -152,7 +153,7 @@ public class WidgetUtils {
if (stored == null) return active;
for (Reminder reminder : stored) {
- if (!isReminderActive(reminder)) continue;
+ if (!isVisibleInWidget(reminder)) continue;
if (active.size() >= MAX_REMINDERS) {
Log.w("Reminders", "Widget list truncated to " + MAX_REMINDERS + " reminders");
break;
@@ -211,12 +212,20 @@ public class WidgetUtils {
}
/**
- * Whether a reminder should still be listed. Mirrors isReminderActive() in the core package,
- * which the app applies when it writes the list out. We re-check here because the stored list
- * is only rewritten while the app runs, so one-off reminders would otherwise linger in the
- * widget long after they fired.
+ * How long a reminder keeps its place in the list after going off, so the user can see that it
+ * happened rather than watching it vanish. Must match RECENTLY_PASSED_WINDOW in
+ * services/notifications.ts, which decides what gets written out in the first place.
*/
- static boolean isReminderActive(Reminder reminder) {
+ private static final long RECENTLY_PASSED_WINDOW_MS = TimeUnit.HOURS.toMillis(3);
+
+ /**
+ * Whether a reminder should still be drawn.
+ *
+ * We re-check here rather than trusting the stored list because that list is only rewritten
+ * while the app runs. This is what actually retires a reminder once its grace period is up:
+ * every redraw re-evaluates it against the current time.
+ */
+ static boolean isVisibleInWidget(Reminder reminder) {
if (reminder == null) return false;
if (reminder.isDisabled()) return false;
@@ -225,7 +234,7 @@ public class WidgetUtils {
if (!"once".equals(reminder.getMode())) return true;
long triggerDate = reminder.getTriggerDate() > 0 ? reminder.getTriggerDate() : reminder.getDate();
- return triggerDate > now;
+ return triggerDate > now - RECENTLY_PASSED_WINDOW_MS;
}
/**
diff --git a/apps/mobile/app/services/notifications.ts b/apps/mobile/app/services/notifications.ts
index 389beca39..6dd620b5c 100644
--- a/apps/mobile/app/services/notifications.ts
+++ b/apps/mobile/app/services/notifications.ts
@@ -271,6 +271,8 @@ type ReminderWithFormattedTime = Reminder & {
formattedDateTime?: string;
};
+const RECENTLY_PASSED_WINDOW = 3 * 60 * 60 * 1000;
+
async function updateRemindersForWidget() {
if (Platform.OS === "ios") return;
const reminders: ReminderWithFormattedTime[] = await db.reminders?.all.items(
@@ -280,28 +282,33 @@ async function updateRemindersForWidget() {
sortDirection: "asc"
}
);
- const activeReminders = [];
+ const widgetReminders = [];
if (!reminders) return;
for (const reminder of reminders) {
- if (isReminderActive(reminder)) {
- const triggerDate =
- reminder.snoozeUntil && reminder.snoozeUntil > Date.now()
- ? reminder.snoozeUntil
- : reminder.mode === "repeat"
- ? getUpcomingReminderTime(reminder)
- : reminder.date;
-
- reminder.triggerDate = triggerDate;
- reminder.formattedTimeOfDay = getFormattedDate(triggerDate, "time");
- reminder.formattedDateTime = getFormattedDate(triggerDate, "date-time");
- reminder.formattedTime = getFormattedReminderTime(reminder);
- activeReminders.push(reminder);
- }
+ const triggerDate =
+ reminder.snoozeUntil && reminder.snoozeUntil > Date.now()
+ ? reminder.snoozeUntil
+ : reminder.mode === "repeat"
+ ? getUpcomingReminderTime(reminder)
+ : reminder.date;
+
+ const recentlyPassed =
+ reminder.mode === "once" &&
+ !reminder.disabled &&
+ triggerDate > Date.now() - RECENTLY_PASSED_WINDOW;
+
+ if (!isReminderActive(reminder) && !recentlyPassed) continue;
+
+ reminder.triggerDate = triggerDate;
+ reminder.formattedTimeOfDay = getFormattedDate(triggerDate, "time");
+ reminder.formattedDateTime = getFormattedDate(triggerDate, "date-time");
+ reminder.formattedTime = getFormattedReminderTime(reminder);
+ widgetReminders.push(reminder);
}
NotesnookModule.setString(
"appPreview",
"remindersList",
- JSON.stringify(activeReminders)
+ JSON.stringify(widgetReminders)
);
NotesnookModule.updateReminderWidget();
}