Scarriffle/Calendarr-Android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: match sync errors to calendars by id, not name suffix

Browse Source 
The server now includes calendar_id in per-calendar sync-error entries.
Match CalendarFilterSheet's warning icon on (source, calendarId) like
calendarKey() already does everywhere else, instead of a fragile
name-suffix comparison that could false-positive across accounts whose
calendar names happen to overlap.
This commit is contained in:
Guido Schmit
2026-07-02 19:00:49 +02:00
parent a3568fb6f3
commit 382cb717a4
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/scarriffle/calendarr/data/CalendarRepository.kt
View File

@@ -35,8 +35,9 @@ data class LoginResult(val token: String, val username: String, val isAdmin: Boo
data class TotpSetup(val secret: String, val qrUrl: String) data class TotpSetup(val secret: String, val qrUrl: String)
/** A single calendar's sync failure, surfaced alongside a (still-successful) events fetch. */ /** A single calendar's sync failure, surfaced alongside a (still-successful) events fetch.
data class SyncError(val source: String, val name: String, val message: String) * [calendarId] is null for account-wide failures (no single calendar is at fault). */
data class SyncError(val source: String, val name: String, val calendarId: Int?, val message: String)
/** Result of [CalendarRepository.fetchEvents]: the merged events plus any per-calendar sync failures. */ /** Result of [CalendarRepository.fetchEvents]: the merged events plus any per-calendar sync failures. */
data class EventsResult(val events: List<CalEvent>, val errors: List<SyncError>) data class EventsResult(val events: List<CalEvent>, val errors: List<SyncError>)
@@ -322,6 +323,7 @@ class CalendarRepository @Inject constructor(
add(SyncError( add(SyncError(
source = obj.optString("source"), source = obj.optString("source"),
name = obj.optString("name"), name = obj.optString("name"),
calendarId = if (obj.has("calendar_id")) obj.optInt("calendar_id") else null,
message = obj.optString("message"), message = obj.optString("message"),
)) ))
} }

7
app/src/main/java/com/scarriffle/calendarr/ui/calendar/CalendarFilterSheet.kt
View File

@@ -84,10 +84,11 @@ fun CalendarFilterSheet(
} }
rows.forEach { entry -> rows.forEach { entry ->
val visible = entry.key !in hiddenSet val visible = entry.key !in hiddenSet
// Best-effort match: server error `name` is "<account> – <calendar name>", // entry.key is "source:id" (see calendarKey()); match sync errors on the
// so a suffix match on this calendar's own name is reliable enough. // same (source, calendarId) pair the server already attaches to events.
val entryId = entry.key.substringAfter(":")
val hasSyncError = !groupMode && state.syncErrors.any { err -> val hasSyncError = !groupMode && state.syncErrors.any { err ->
err.source == entry.source && err.name.endsWith(entry.name) err.source == entry.source && err.calendarId?.toString() == entryId
} }
Row( Row(
Modifier.fillMaxWidth().padding(vertical = 8.dp), Modifier.fillMaxWidth().padding(vertical = 8.dp),