Merge pull request #456 from Aga-C/fix-quick-filter-long-press

naveensingh · web-flow · commit 24d8c37b1c2a · 2025-01-29T01:16:42.000+05:30
Fixed reverting old filtering on quick filter long press
diff --git a/app/src/main/kotlin/org/fossify/calendar/adapters/QuickFilterEventTypeAdapter.kt b/app/src/main/kotlin/org/fossify/calendar/adapters/QuickFilterEventTypeAdapter.kt
@@ -38,9 +38,11 @@ class QuickFilterEventTypeAdapter(
                 .firstOrNull { eventType -> eventType.id.toString() == quickFilterEventType }
                 ?: return@forEach
             quickFilterEventTypes.add(eventType)
+        }
 
-            if (displayEventTypes.contains(eventType.id.toString())) {
-                activeKeys.add(eventType.id!!)
+        allEventTypes.forEach {
+            if (displayEventTypes.contains(it.id.toString())) {
+                activeKeys.add(it.id!!)
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,11 @@ class QuickFilterEventTypeAdapter(`
`38`	`38`	`.firstOrNull { eventType -> eventType.id.toString() == quickFilterEventType }`
`39`	`39`	`?: return@forEach`
`40`	`40`	`quickFilterEventTypes.add(eventType)`
	`41`	`+ }`
`41`	`42`
`42`		`- if (displayEventTypes.contains(eventType.id.toString())) {`
`43`		`- activeKeys.add(eventType.id!!)`
	`43`	`+ allEventTypes.forEach {`
	`44`	`+ if (displayEventTypes.contains(it.id.toString())) {`
	`45`	`+ activeKeys.add(it.id!!)`
`44`	`46`	`}`
`45`	`47`	`}`
`46`	`48`