fix: auto dismiss when manual rescan is enabled (#51)

* fix: auto dismiss when manual rescan is enabled now if you reschedule a bunch of events outside of the app it will auto dismiss them "onAppResume" if they are far enough in the future even with manual rescan enabled its unclear why this was disabled in this state in the first place * build: hopefully fix build
williscool · Jan 30, 2025 · ec51fe9 · ec51fe9
1 parent aa5e1b4
commit ec51fe9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -44,6 +44,12 @@ android {
                 abortOnError false
             }
         }
+
+      customDebugType {
+        initWith debug
+        matchingFallbacks = ['debug']
+        debuggable true
+      }
     }
 
     sourceSets {

diff --git a/android/app/src/main/java/com/github/quarck/calnotify/app/ApplicationController.kt b/android/app/src/main/java/com/github/quarck/calnotify/app/ApplicationController.kt
@@ -593,6 +593,8 @@ object ApplicationController : EventMovedHandler {
     ): Boolean {
         var ret = false
 
+        DevLog.info(LOG_TAG, "Event ${eventId} - checking if should auto remove, oldStartTime $oldStartTime,  newStartTime $newStartTime,  newAlertTime $newAlertTime, ")
+
         if (newStartTime - oldStartTime > Consts.EVENT_MOVE_THRESHOLD) {
             if (newAlertTime > System.currentTimeMillis() + Consts.ALARM_THRESHOLD) {
 

diff --git a/android/app/src/main/java/com/github/quarck/calnotify/app/CalendarReloadManager.kt b/android/app/src/main/java/com/github/quarck/calnotify/app/CalendarReloadManager.kt
@@ -72,6 +72,8 @@ object CalendarReloadManager : CalendarReloadManagerInterface {
             try {
                 val reloadResult = reloadCalendarEventAlert(context, calendar, event, currentTime, movedHandler)
 
+                DevLog.debug(LOG_TAG, "reloadCalendarInternal: Event ${event.eventId} - reloadResult.code ${reloadResult.code} ")
+
                 when (reloadResult.code) {
                 // nothing required
                     ReloadCalendarResultCode.NoChange ->
@@ -154,8 +156,7 @@ object CalendarReloadManager : CalendarReloadManagerInterface {
             calendar: CalendarProviderInterface,
             movedHandler: EventMovedHandler?
     ): Boolean {
-        // don't rescan manually created requests - we won't find most of them
-        val events = db.events.filter { event -> event.origin != EventOrigin.FullManual && event.isNotSpecial }
+        val events = db.events.filter { event -> event.isNotSpecial }
         return reloadCalendarInternal(context, db, events, calendar, movedHandler)
     }
 
@@ -376,4 +377,4 @@ object CalendarReloadManager : CalendarReloadManagerInterface {
 
         return ReloadCalendarResult(ReloadCalendarResultCode.NoChange, event)
     }
-}
+}