A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
mobile: fix stale reminder times — render-time formatting + valid updatePeriodMillis + self-refresh
Ammar Ahmed942c9287fe23
diff --git a/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/ReminderViewsService.java b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/ReminderViewsService.javaindex 5e9416e39..1d1a40c4a 100644--- a/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/ReminderViewsService.java+++ b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/ReminderViewsService.java@@ -42,11 +42,24 @@ class ReminderRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactor@Overridepublic void onDataSetChanged() {- reminders.clear();SharedPreferences preferences = context.getSharedPreferences("appPreview", Context.MODE_PRIVATE);- Gson gson = new Gson();- reminders = gson.fromJson(preferences.getString("remindersList","[]"), new TypeToken<List<Reminder>>(){}.getType());+ List<Reminder> stored = null;+ try {+ Gson gson = new Gson();+ stored = gson.fromJson(preferences.getString("remindersList", "[]"), new TypeToken<List<Reminder>>(){}.getType());+ } catch (Exception e) {+ Log.e("Reminders", "Could not read the stored reminders list", e);+ }+ List<Reminder> updated = new ArrayList<Reminder>();+ if (stored != null) {+ for (Reminder reminder : stored) {+ if (WidgetUtils.isReminderActive(reminder)) {+ updated.add(reminder);+ }+ }+ }+ reminders = updated;}@Override@@ -71,7 +84,7 @@ class ReminderRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactorif (!useMiniLayout) {views.setTextViewText(R.id.reminder_description, reminder.getDescription());}- views.setTextViewText(R.id.reminder_time, reminder.getFormattedTime());+ views.setTextViewText(R.id.reminder_time, WidgetUtils.formatReminderTime(context, reminder));final Intent fillInIntent = new Intent();final Bundle extras = new Bundle();extras.putString(ReminderViewsService.OpenReminderId, reminder.getId());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.javaindex ec62755ca..dc3aa9ff8 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@@ -16,6 +16,7 @@ public class ReminderWidgetProvider extends AppWidgetProvider {for (int appWidgetId : appWidgetIds) {RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_reminders);updateAppWidget(context, appWidgetManager, appWidgetId, views);+ appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetId, R.id.widget_list_view);}}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.javaindex 0d6b5c7a8..109f01403 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@@ -1,8 +1,14 @@package com.streetwriters.notesnook;import android.app.ActivityOptions;+import android.content.Context;import android.os.Build;import android.os.Bundle;+import android.text.format.DateUtils;++import com.streetwriters.notesnook.datatypes.Reminder;++import java.util.Calendar;/*** Shared helpers for the home screen widgets.@@ -33,4 +39,82 @@ public class WidgetUtils {}return activityOptions.toBundle();}++ /**+ * 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.+ */+ static boolean isReminderActive(Reminder reminder) {+ if (reminder == null) return false;+ if (reminder.isDisabled()) return false;++ long now = System.currentTimeMillis();+ if (reminder.getSnoozeUntil() > now) return true;+ if (!"once".equals(reminder.getMode())) return true;++ long triggerDate = reminder.getTriggerDate() > 0 ? reminder.getTriggerDate() : reminder.getDate();+ return triggerDate > now;+ }++ /**+ * Builds the label shown under a reminder. The app sends us the absolute trigger time plus the+ * parts that never change ("5:00 PM", "12-05-2026, 5:00 PM"); everything that depends on the+ * current time is decided here so it stays right as the widget redraws.+ *+ * Falls back to the pre-formatted string for lists written by an older version of the app.+ */+ static String formatReminderTime(Context context, Reminder reminder) {+ long triggerDate = reminder.getTriggerDate();+ String timeOfDay = reminder.getFormattedTimeOfDay();+ if (triggerDate <= 0 || timeOfDay == null || timeOfDay.isEmpty()) {+ return reminder.getFormattedTime();+ }++ if ("permanent".equals(reminder.getMode())) {+ return context.getString(R.string.reminder_ongoing);+ }++ long now = System.currentTimeMillis();+ if (reminder.getSnoozeUntil() > now) {+ return context.getString(R.string.reminder_snoozed_until, timeOfDay);+ }++ String text;+ long dayOffset = daysFromToday(triggerDate, now);+ if (dayOffset == 0) {+ text = context.getString(R.string.reminder_today, timeOfDay);+ } else if (dayOffset == 1) {+ text = context.getString(R.string.reminder_tomorrow, timeOfDay);+ } else if (dayOffset == -1) {+ text = context.getString(R.string.reminder_yesterday, timeOfDay);+ } else {+ text = reminder.getFormattedDateTime();+ if (text == null || text.isEmpty()) return reminder.getFormattedTime();+ }++ return context.getString(+ triggerDate <= now ? R.string.reminder_last : R.string.reminder_upcoming, text);+ }++ /**+ * Calendar days between two instants. Compares midnights rather than subtracting the raw+ * difference so that "tomorrow" is still tomorrow across a DST change or just before midnight.+ */+ private static long daysFromToday(long time, long now) {+ long target = startOfDay(time);+ long today = startOfDay(now);+ return Math.round((target - today) / (double) DateUtils.DAY_IN_MILLIS);+ }++ private static long startOfDay(long time) {+ Calendar calendar = Calendar.getInstance();+ calendar.setTimeInMillis(time);+ calendar.set(Calendar.HOUR_OF_DAY, 0);+ calendar.set(Calendar.MINUTE, 0);+ calendar.set(Calendar.SECOND, 0);+ calendar.set(Calendar.MILLISECOND, 0);+ return calendar.getTimeInMillis();+ }}diff --git a/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/datatypes/Reminder.java b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/datatypes/Reminder.javaindex 715199ca6..9b9b0fac6 100644--- a/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/datatypes/Reminder.java+++ b/apps/mobile/android/app/src/main/java/com/streetwriters/notesnook/datatypes/Reminder.java@@ -2,13 +2,14 @@ package com.streetwriters.notesnook.datatypes;import androidx.annotation.Keep;-import java.util.concurrent.TimeUnit;-@Keeppublic class Reminder extends BaseItem {private String title;private String description;private String formattedTime;+ private String formattedTimeOfDay; // e.g. "5:00 PM"+ private String formattedDateTime; // e.g. "12-05-2026, 5:00 PM"+ private long triggerDate; // absolute time this reminder next firesprivate String priority; // "silent", "vibrate", "urgent"private long date;private String mode; // "repeat", "once", "permanent"@@ -107,32 +108,27 @@ public class Reminder extends BaseItem {this.formattedTime = formattedTime;}- public String formatTime(long timeInMillis) {- long currentTime = System.currentTimeMillis();- long diff = timeInMillis - currentTime;-- if (diff < TimeUnit.MINUTES.toMillis(1)) {- return "in " + (diff / 1000) + " seconds";- } else if (diff < TimeUnit.HOURS.toMillis(1)) {- long minutes = TimeUnit.MILLISECONDS.toMinutes(diff);- return "in " + minutes + " minute" + (minutes > 1 ? "s" : "");- } else if (diff < TimeUnit.DAYS.toMillis(1)) {- long hours = TimeUnit.MILLISECONDS.toHours(diff);- return "in " + hours + " hour" + (hours > 1 ? "s" : "");- } else if (diff < TimeUnit.DAYS.toMillis(2)) {- return "tomorrow";- } else if (diff < TimeUnit.DAYS.toMillis(7)) {- long days = TimeUnit.MILLISECONDS.toDays(diff);- return "in " + days + " day" + (days > 1 ? "s" : "");- } else if (diff < TimeUnit.DAYS.toMillis(30)) {- long weeks = TimeUnit.MILLISECONDS.toDays(diff) / 7;- return "in " + weeks + " week" + (weeks > 1 ? "s" : "");- } else if (diff < TimeUnit.DAYS.toMillis(365)) {- long months = TimeUnit.MILLISECONDS.toDays(diff) / 30;- return "in " + months + " month" + (months > 1 ? "s" : "");- } else {- long years = TimeUnit.MILLISECONDS.toDays(diff) / 365;- return "in " + years + " year" + (years > 1 ? "s" : "");- }+ public String getFormattedTimeOfDay() {+ return formattedTimeOfDay;+ }++ public void setFormattedTimeOfDay(String formattedTimeOfDay) {+ this.formattedTimeOfDay = formattedTimeOfDay;+ }++ public String getFormattedDateTime() {+ return formattedDateTime;+ }++ public void setFormattedDateTime(String formattedDateTime) {+ this.formattedDateTime = formattedDateTime;+ }++ public long getTriggerDate() {+ return triggerDate;+ }++ public void setTriggerDate(long triggerDate) {+ this.triggerDate = triggerDate;}}\ No newline at end of filediff --git a/apps/mobile/android/app/src/main/res/values/strings.xml b/apps/mobile/android/app/src/main/res/values/strings.xmlindex 1a233ee09..a9ab7f599 100644--- a/apps/mobile/android/app/src/main/res/values/strings.xml+++ b/apps/mobile/android/app/src/main/res/values/strings.xml@@ -9,4 +9,11 @@<string name="note">Note</string><string name="note_description">Add a note to home screen</string><string name="quick_note">Quick note</string>+ <string name="reminder_ongoing">Ongoing</string>+ <string name="reminder_snoozed_until">Snoozed until %1$s</string>+ <string name="reminder_today">Today, %1$s</string>+ <string name="reminder_tomorrow">Tomorrow, %1$s</string>+ <string name="reminder_yesterday">Yesterday, %1$s</string>+ <string name="reminder_upcoming">Upcoming: %1$s</string>+ <string name="reminder_last">Last: %1$s</string></resources>diff --git a/apps/mobile/android/app/src/main/res/xml/widget_reminders_info.xml b/apps/mobile/android/app/src/main/res/xml/widget_reminders_info.xmlindex e9c87362f..d88c14187 100644--- a/apps/mobile/android/app/src/main/res/xml/widget_reminders_info.xml+++ b/apps/mobile/android/app/src/main/res/xml/widget_reminders_info.xml@@ -9,6 +9,6 @@android:targetCellHeight="2"android:resizeMode="horizontal|vertical"android:previewImage="@drawable/reminder_preview"- android:updatePeriodMillis="1024"+ android:updatePeriodMillis="1800000"android:widgetCategory="home_screen"/>\ No newline at end of filediff --git a/apps/mobile/app/services/notifications.ts b/apps/mobile/app/services/notifications.tsindex 73ffa8e45..389beca39 100644--- a/apps/mobile/app/services/notifications.ts+++ b/apps/mobile/app/services/notifications.ts@@ -17,8 +17,12 @@ You should have received a copy of the GNU General Public Licensealong with this program. If not, see <http://www.gnu.org/licenses/>.*/-import { getFormattedReminderTime } from "@notesnook/common";-import { isReminderActive, Reminder } from "@notesnook/core";+import { getFormattedDate, getFormattedReminderTime } from "@notesnook/common";+import {+ getUpcomingReminderTime,+ isReminderActive,+ Reminder+} from "@notesnook/core";import { strings } from "@notesnook/intl";import notifee, {AndroidStyle,@@ -262,6 +266,9 @@ const onEvent = async ({ type, detail }: Event) => {type ReminderWithFormattedTime = Reminder & {formattedTime?: string;+ triggerDate?: number;+ formattedTimeOfDay?: string;+ formattedDateTime?: string;};async function updateRemindersForWidget() {@@ -277,6 +284,16 @@ async function updateRemindersForWidget() {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);}