olemd/med-det-samme
1
0
Fork 0
Code Issues Pull requests Projects Releases 4 Packages Wiki Activity Actions

Season end nudge: post once per close, not daily for the lead window

Browse source 
SupplyCheckReceiver re-posted the auto-cancel "Forleng" card on every
daily check for the whole 5-day window, so a dismissed nudge came back
each morning. Remember the season-end epoch day nudged per med (plaintext
pref) and skip re-posting for the same close; a new end date (next year,
or after Forleng) still earns one fresh nudge.
This commit is contained in:
Ole-Morten Duesund 2026-08-17 12:35:20 +02:00
commit 4bbb06d5d0
2 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/no/naiv/meddetsamme/alarm/SupplyCheckReceiver.kt
View file

@ -12,6 +12,7 @@ import no.naiv.meddetsamme.data.MedDatabase
import no.naiv.meddetsamme.domain.ScheduleEngine
import no.naiv.meddetsamme.domain.ScheduleText
import no.naiv.meddetsamme.notify.Notifications
import no.naiv.meddetsamme.settings.SettingsStore
/**
* Daily derived-state check: low stock (inventory ÷ scheduled rate) and
@ -96,7 +97,7 @@ class SupplyCheckReceiver : BroadcastReceiver() {
/**
* Per-med seasonal nudge, post-or-cancel like the digests above:
* - resting and within [SEASON_START_LEAD_DAYS] of the next window → "Start nå";
* - in season and within [SEASON_END_LEAD_DAYS] of its close → "Forleng".
* - in season and within [SEASON_END_LEAD_DAYS] of its close → "Forleng" (once per close).
* Acting on either (or the season simply passing) clears it the next day.
*/
private fun checkSeason(
@ -130,6 +131,10 @@ class SupplyCheckReceiver : BroadcastReceiver() {
val end = ScheduleEngine.currentSeasonEnd(doseTimes, today)
val days = end?.let { ChronoUnit.DAYS.between(today, it) }
if (end != null && days != null && days in 0..SEASON_END_LEAD_DAYS) {
// Once per season close, not daily: a dismissed card stays dismissed.
// Keyed on the end date, so "Forleng" (new end) earns one fresh nudge.
val settings = SettingsStore(context)
if (settings.seasonEndNudgedEpochDay(medId) != end.toEpochDay()) {
Notifications.post(
context, notifId,
Notifications.buildSeasonNotification(
@ -138,6 +143,8 @@ class SupplyCheckReceiver : BroadcastReceiver() {
starting = false,
),
)
settings.setSeasonEndNudgedEpochDay(medId, end.toEpochDay())
}
} else {
Notifications.cancel(context, notifId)
}

10
app/src/main/java/no/naiv/meddetsamme/settings/SettingsStore.kt
View file

@ -66,6 +66,16 @@ class SettingsStore(context: Context) {
get() = prefs.getBoolean("repeat_reminders", true)
set(v) = prefs.edit { putBoolean("repeat_reminders", v) }
/**
* Epoch day of the season close a med was last nudged "Forleng" for. The
* end-of-season card posts once per close, not daily for the whole lead
* window: keyed on the end date so next year's (or an extended) season
* gets a fresh nudge. -1 = never.
*/
fun seasonEndNudgedEpochDay(medId: Long): Long = prefs.getLong("season_end_nudged_$medId", -1)
fun setSeasonEndNudgedEpochDay(medId: Long, endEpochDay: Long) =
prefs.edit { putLong("season_end_nudged_$medId", endEpochDay) }
/** S3/Garage credentials complete — gates the S3 upload path only. */
val isS3Configured: Boolean
get() = !s3Endpoint.isNullOrBlank() && !s3Bucket.isNullOrBlank() &&