From 97518b98f57084f92d819d4d3ae8825b60c13570 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 14 Jan 2023 10:40:56 +0100 Subject: [PATCH] catch and ignore ConcurrentModificationException on some other places too --- .../calendar/pro/activities/MainActivity.kt | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt index 245ae0317..b99649ee2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt @@ -1292,8 +1292,11 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { minFetchedSearchTS -= FETCH_INTERVAL eventsHelper.getEvents(minFetchedSearchTS, oldMinFetchedTS) { events -> events.forEach { event -> - if (searchResultEvents.firstOrNull { it.id == event.id && it.startTS == event.startTS } == null) { - searchResultEvents.add(0, event) + try { + if (searchResultEvents.firstOrNull { it.id == event.id && it.startTS == event.startTS } == null) { + searchResultEvents.add(0, event) + } + } catch (ignored: ConcurrentModificationException) { } } @@ -1306,8 +1309,11 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { maxFetchedSearchTS += FETCH_INTERVAL eventsHelper.getEvents(oldMaxFetchedTS, maxFetchedSearchTS) { events -> events.forEach { event -> - if (searchResultEvents.firstOrNull { it.id == event.id && it.startTS == event.startTS } == null) { - searchResultEvents.add(0, event) + try { + if (searchResultEvents.firstOrNull { it.id == event.id && it.startTS == event.startTS } == null) { + searchResultEvents.add(0, event) + } + } catch (ignored: ConcurrentModificationException) { } }