From 1c037bdeed2504f86600c8605fe4691e6dd90cde Mon Sep 17 00:00:00 2001 From: dab246 Date: Thu, 5 Oct 2023 09:56:32 +0700 Subject: [PATCH] TF-2182 Add video conferences for google event (cherry picked from commit 9ab9a9ba772d1ede2275b8d9ab06123c6259f37b) --- .../extensions/calendar_event_extension.dart | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/lib/features/email/presentation/extensions/calendar_event_extension.dart b/lib/features/email/presentation/extensions/calendar_event_extension.dart index 388143796..ae4d8fad4 100644 --- a/lib/features/email/presentation/extensions/calendar_event_extension.dart +++ b/lib/features/email/presentation/extensions/calendar_event_extension.dart @@ -274,17 +274,26 @@ extension CalendarEventExtension on CalendarEvent { List get videoConferences { if (extensionFields != null && extensionFields!.mapFields.isNotEmpty) { - final videoConferences = extensionFields!.mapFields['X-OPENPAAS-VIDEOCONFERENCE']; - if (videoConferences != null) { - final videoConferencesNotEmpty = videoConferences - .whereNotNull() - .where((link) => link.isNotEmpty) - .toList(); - log('CalendarEventExtension::getListVideoConference: $videoConferencesNotEmpty'); - return videoConferencesNotEmpty; - } - } + final videoConferences = List.empty(growable: true); + final openPaasVideoConferences = extensionFields?.mapFields['X-OPENPAAS-VIDEOCONFERENCE'] + ?.whereNotNull() + .where((link) => link.isNotEmpty) + .toList() ?? []; + log('CalendarEventExtension::openPaasVideoConferences: $openPaasVideoConferences'); + final googleVideoConferences = extensionFields!.mapFields['X-GOOGLE-CONFERENCE'] + ?.whereNotNull() + .where((link) => link.isNotEmpty) + .toList() ?? []; + log('CalendarEventExtension::googleVideoConferences: $googleVideoConferences'); + if (openPaasVideoConferences.isNotEmpty) { + videoConferences.addAll(openPaasVideoConferences); + } + if (googleVideoConferences.isNotEmpty) { + videoConferences.addAll(googleVideoConferences); + } + return videoConferences; + } return []; } } \ No newline at end of file