From d9ee88445997a21623b33129fe28466042229696 Mon Sep 17 00:00:00 2001 From: smizrahi Date: Wed, 10 Apr 2024 15:47:17 +0200 Subject: [PATCH] fix(calendar): Fix assertion when is_cycle is set but without c_cycleinfo. Fixes #5950. --- SoObjects/Appointments/SOGoAppointmentFolder.m | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index 5f48ddc73c..aa23464968 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -1289,13 +1289,12 @@ - (void) flattenCycleRecord: (NSDictionary *) theRecord return; } - - if (![content isNotNull]) + if (nil != content) { cycleinfo = [content propertyList]; if (!cycleinfo) { - [self errorWithFormat:@"cyclic record doesn't have cycleinfo -> %@", theRecord]; + [self errorWithFormat:@"cyclic record doesn't have cycleinfo -> %@, %@", theRecord, content]; return; } rules = [cycleinfo objectForKey: @"rules"]; @@ -1303,7 +1302,7 @@ - (void) flattenCycleRecord: (NSDictionary *) theRecord rDates = [cycleinfo objectForKey: @"rDates"]; exDates = [cycleinfo objectForKey: @"exDates"]; } else { - [self errorWithFormat:@"cyclic record doesn't have cycleinfo -> %@", theRecord]; + [self warnWithFormat:@"record has no valid content -> %@, %@", theRecord, content]; } eventTimeZone = nil;