Fix future events

app/build.gradle

@@ -18,7 +18,7 @@ android {
         applicationId "com.tommasoberlose.anotherwidget"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 94
+        versionCode 96
         versionName "2.0.9"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/src/main/java/com/tommasoberlose/anotherwidget/db/EventRepository.kt

@@ -46,7 +46,22 @@ class EventRepository(val context: Context) {
 
     fun getNextEvent(): Event? {
         val nextEvent = getEventByEventId(Preferences.nextEventId)
-        val event = if (nextEvent != null && nextEvent.endDate > Calendar.getInstance().timeInMillis) {
+        val now = Calendar.getInstance().timeInMillis
+        val limit = Calendar.getInstance().apply {
+            timeInMillis = now
+            when (Preferences.showUntil) {
+                0 -> add(Calendar.HOUR, 3)
+                1 -> add(Calendar.HOUR, 6)
+                2 -> add(Calendar.HOUR, 12)
+                3 -> add(Calendar.DAY_OF_MONTH, 1)
+                4 -> add(Calendar.DAY_OF_MONTH, 3)
+                5 -> add(Calendar.DAY_OF_MONTH, 7)
+                6 -> add(Calendar.MINUTE, 30)
+                7 -> add(Calendar.HOUR, 1)
+                else -> add(Calendar.HOUR, 6)
+            }
+        }
+        val event = if (nextEvent != null && nextEvent.endDate > now && nextEvent.startDate < limit.timeInMillis) {
             nextEvent
         } else {
             val events = getEvents()
@@ -107,12 +122,32 @@ class EventRepository(val context: Context) {
         MainWidget.updateWidget(context)
     }
 
-    fun getEvents(): RealmResults<Event> {
+    fun getFutureEvents(): RealmResults<Event> {
         val now = Calendar.getInstance().timeInMillis
         realm.refresh()
         return realm.where(Event::class.java).greaterThan("endDate", now).findAll()
     }
 
+    private fun getEvents(): RealmResults<Event> {
+        val now = Calendar.getInstance().timeInMillis
+        val limit = Calendar.getInstance().apply {
+            timeInMillis = now
+            when (Preferences.showUntil) {
+                0 -> add(Calendar.HOUR, 3)
+                1 -> add(Calendar.HOUR, 6)
+                2 -> add(Calendar.HOUR, 12)
+                3 -> add(Calendar.DAY_OF_MONTH, 1)
+                4 -> add(Calendar.DAY_OF_MONTH, 3)
+                5 -> add(Calendar.DAY_OF_MONTH, 7)
+                6 -> add(Calendar.MINUTE, 30)
+                7 -> add(Calendar.HOUR, 1)
+                else -> add(Calendar.HOUR, 6)
+            }
+        }
+        realm.refresh()
+        return realm.where(Event::class.java).greaterThan("endDate", now).lessThanOrEqualTo("startDate", limit.timeInMillis).findAll()
+    }
+
     fun getEventsCount(): Int = getEvents().size
 
     fun close() {

app/src/main/java/com/tommasoberlose/anotherwidget/helpers/CalendarHelper.kt

@@ -37,23 +37,11 @@ object CalendarHelper {
                 set(Calendar.MINUTE, 0)
                 set(Calendar.HOUR_OF_DAY, 0)
             }
-            val limit = Calendar.getInstance()
+            val limit = Calendar.getInstance().apply {
-            when (Preferences.showUntil) {
+                timeInMillis = begin.timeInMillis
-                0 -> limit.add(Calendar.HOUR, 3)
+                add(Calendar.DAY_OF_YEAR, 2)
-                1 -> limit.add(Calendar.HOUR, 6)
-                2 -> limit.add(Calendar.HOUR, 12)
-                3 -> limit.add(Calendar.DAY_OF_MONTH, 1)
-                4 -> limit.add(Calendar.DAY_OF_MONTH, 3)
-                5 -> limit.add(Calendar.DAY_OF_MONTH, 7)
-                6 -> limit.add(Calendar.MINUTE, 30)
-                7 -> limit.add(Calendar.HOUR, 1)
-                else -> limit.add(Calendar.HOUR, 6)
             }
 
-            val builder = CalendarContract.Instances.CONTENT_URI.buildUpon()
-            ContentUris.appendId(builder, begin.timeInMillis)
-            ContentUris.appendId(builder, limit.timeInMillis)
-
             if (!context.checkGrantedPermission(
                     Manifest.permission.READ_CALENDAR
                 )

app/src/main/java/com/tommasoberlose/anotherwidget/receivers/UpdatesReceiver.kt

@@ -29,12 +29,12 @@ class UpdatesReceiver : BroadcastReceiver() {
             Intent.ACTION_TIME_CHANGED,
             Intent.ACTION_TIMEZONE_CHANGED,
             Intent.ACTION_LOCALE_CHANGED,
+            Intent.ACTION_DATE_CHANGED,
             Actions.ACTION_CALENDAR_UPDATE -> {
                 CalendarHelper.updateEventList(context)
             }
 
             "com.sec.android.widgetapp.APPWIDGET_RESIZE",
-            Intent.ACTION_DATE_CHANGED,
             AlarmManager.ACTION_NEXT_ALARM_CLOCK_CHANGED,
             Actions.ACTION_TIME_UPDATE -> {
                 MainWidget.updateWidget(context)
@@ -53,7 +53,7 @@ class UpdatesReceiver : BroadcastReceiver() {
             if (eventId == null) {
                 removeUpdates(context)
 
-                eventRepository.getEvents().forEach { event ->
+                eventRepository.getFutureEvents().forEach { event ->
                     setEventUpdate(context, event)
                 }
             } else {
@@ -72,6 +72,18 @@ class UpdatesReceiver : BroadcastReceiver() {
                     set(Calendar.MILLISECOND, 0)
                 }
                 val diff = Period(now.timeInMillis, event.startDate)
+                val limit = when (Preferences.showUntil) {
+                    0 -> 1000 * 60 * 60 * 3
+                    1 -> 1000 * 60 * 60 * 6
+                    2 -> 1000 * 60 * 60 * 12
+                    3 -> 1000 * 60 * 60 * 24
+                    4 -> 1000 * 60 * 60 * 24 * 3
+                    5 -> 1000 * 60 * 60 * 24 * 7
+                    6 -> 1000 * 60 * 30
+                    7 -> 1000 * 60 * 60
+                    else -> 1000 * 60 * 60 * 6
+                }
+                if (event.startDate <= limit) {
                     if (event.startDate > now.timeInMillis) {
                         // Update the widget every hour till the event
                         if (diff.hours == 0) {
@@ -99,7 +111,7 @@ class UpdatesReceiver : BroadcastReceiver() {
                                         action = Actions.ACTION_TIME_UPDATE
                                         putExtra(EVENT_ID, event.eventID)
                                     },
-                                0
+                                    PendingIntent.FLAG_UPDATE_CURRENT
                                 )
                             )
                         } else {
@@ -113,7 +125,7 @@ class UpdatesReceiver : BroadcastReceiver() {
                                         action = Actions.ACTION_TIME_UPDATE
                                         putExtra(EVENT_ID, event.eventID)
                                     },
-                                0
+                                    PendingIntent.FLAG_UPDATE_CURRENT
                                 )
                             )
                         }
@@ -134,13 +146,28 @@ class UpdatesReceiver : BroadcastReceiver() {
                             )
                         )
                     }
+                } else {
+                    setExact(
+                        AlarmManager.RTC,
+                        if (event.startDate - limit > now.timeInMillis + 120 * 1000) event.startDate - limit else now.timeInMillis + 120000,
+                        PendingIntent.getBroadcast(
+                            context,
+                            event.eventID.toInt(),
+                            Intent(context, UpdatesReceiver::class.java).apply {
+                                action = Actions.ACTION_TIME_UPDATE
+                                putExtra(EVENT_ID, event.eventID)
+                            },
+                            PendingIntent.FLAG_UPDATE_CURRENT
+                        )
+                    )
+                }
             }
         }
 
         fun removeUpdates(context: Context) {
             with(context.getSystemService(Context.ALARM_SERVICE) as AlarmManager) {
                 val eventRepository = EventRepository(context)
-                eventRepository.getEvents().forEach {
+                eventRepository.getFutureEvents().forEach {
                     cancel(PendingIntent.getBroadcast(context, it.eventID.toInt(), Intent(context, UpdatesReceiver::class.java), 0))
                 }
                 eventRepository.close()