fix: repeated notifications and wakeup screens (Phase 7 bug fix)

Author: arinadi

app/src/main/java/com/hotbell/radio/alarms/AlarmReceiver.kt

@@ -20,6 +20,10 @@ class AlarmReceiver : BroadcastReceiver() {
         private const val TAG = "AlarmReceiver"
         private const val CHANNEL_ID = "hotbell_alarm_channel"
         private const val CHANNEL_NAME = "HotBell Alarms"
+
+        // simple debounce to avoid multiple triggers in quick succession (Bug fix Phase 7)
+        private val lastTriggerTimes = mutableMapOf<String, Long>()
+        private const val DEBOUNCE_MS = 10000L
     }
 
     override fun onReceive(context: Context, intent: Intent) {
@@ -33,6 +37,14 @@ class AlarmReceiver : BroadcastReceiver() {
         val dismissType = intent.getStringExtra("EXTRA_DISMISS_TYPE") ?: "math"
         val targetPhotoPath = intent.getStringExtra("EXTRA_TARGET_PHOTO_PATH")
 
+        val currentTime = System.currentTimeMillis()
+        val lastTime = lastTriggerTimes[alarmId] ?: 0L
+        if (currentTime - lastTime < DEBOUNCE_MS) {
+            Log.d(TAG, "Duplicate alarm trigger for $alarmId within debounce window. Skipping.")
+            return
+        }
+        lastTriggerTimes[alarmId] = currentTime
+
         Log.d(TAG, "Alarm fired via Broadcast! id=$alarmId, station=$stationName")
 
         // Check skipNext from DB (uses goAsync for coroutine)

app/src/main/java/com/hotbell/radio/ui/wakeup/WakeUpViewModel.kt

@@ -59,14 +59,14 @@ class WakeUpViewModel(application: Application) : AndroidViewModel(application)
     private var alarmStationUuid: String? = null
     private var alarmStationName: String? = null
     private var alarmStationUrl: String? = null
-
     private var flashlightJob: Job? = null
-
     private var fallbackTimeoutJob: Job? = null
 
     // Alarm ID for notification cancellation (Fix #3)
     private var alarmId: String = ""
 
+    private var alarmStarted = false
+
     // Photo Match
     private val _dismissType = MutableStateFlow("math")
     val dismissType: StateFlow<String> = _dismissType.asStateFlow()
@@ -95,6 +95,12 @@ class WakeUpViewModel(application: Application) : AndroidViewModel(application)
     }
 
     fun startAlarm(context: Context, stationUuid: String?, stationName: String?, stationUrl: String? = null) {
+        if (alarmStarted) {
+            android.util.Log.d("WakeUpViewModel", "Alarm already started, skipping")
+            return
+        }
+        alarmStarted = true
+
         android.util.Log.d("WakeUpViewModel", "startAlarm called with stationUuid=$stationUuid, stationName=$stationName, stationUrl=$stationUrl")
 
         // Save station info for snooze

app/src/main/java/com/hotbell/radio/utils/AlarmUtils.kt

@@ -13,22 +13,19 @@ object AlarmUtils {
             set(Calendar.MILLISECOND, 0)
         }
 
-        // Drop seconds/millis from 'now' to allow setting an alarm for the current minute without skipping to tomorrow
-        val nowMinute = Calendar.getInstance().apply {
-            set(Calendar.SECOND, 0)
-            set(Calendar.MILLISECOND, 0)
-        }
-
+        // Use real current time for comparison to ensure strictly future triggers
+        val now = Calendar.getInstance()
+        
         if (daysOfWeek == 0) {
-            // One-time alarm: if time already passed today (comparing only up to minute precision), set for tomorrow
-            if (alarm.before(nowMinute)) {
+            // One-time alarm: if time already passed today, set for tomorrow
+            if (!alarm.after(now)) {
                 alarm.add(Calendar.DAY_OF_MONTH, 1)
             }
             return alarm.timeInMillis
         }
 
         // Repeating alarm: find the next matching day
-        for (i in 0..6) {
+        for (i in 0..14) { // Look further ahead to be safe (though 7 is enough)
             val candidate = Calendar.getInstance().apply {
                 timeInMillis = alarm.timeInMillis
                 add(Calendar.DAY_OF_MONTH, i)
@@ -37,7 +34,8 @@ object AlarmUtils {
             // Our bitmask: bit 0=Sunday, bit 1=Monday, ..., bit 6=Saturday
             val dayBit = candidate.get(Calendar.DAY_OF_WEEK) - 1
             if (daysOfWeek and (1 shl dayBit) != 0) {
-                if (i == 0 && candidate.before(nowMinute)) continue
+                // If today, candidate must be strictly in the future
+                if (i == 0 && !candidate.after(now)) continue
                 return candidate.timeInMillis
             }
         }