issue #75:

if calendarResource isn't a user instead of throwing nullPointerException it will use the default language of the calendar
smclab · Oct 24, 2023 · 4a3f785 · 4a3f785
1 parent 1a51096
commit 4a3f785
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/...ync-web/src/main/java/it/smc/calendar/caldav/sync/listener/DefaultICSContentListener.java b/...ync-web/src/main/java/it/smc/calendar/caldav/sync/listener/DefaultICSContentListener.java
@@ -103,7 +103,7 @@ public void afterContentImported(String ics, Calendar calendar)
 
 					if (calendarBooking != null) {
 						updateBookingAttendees(calendarBooking, vEvent);
-						updateAltDescription(calendarBooking, vEvent);
+						updateAltDescription(calendarBooking, vEvent, calendar);
 
 						long userId = PrincipalThreadLocal.getUserId();
 
@@ -226,7 +226,7 @@ public String beforeContentImported(String ics, Calendar calendar)
 							_calendarBookingLocalService.fetchCalendarBooking(
 								calendar.getCalendarId(), vEventUidValue);
 
-						updateAltDescription(calendarBooking, vEvent);
+						updateAltDescription(calendarBooking, vEvent, calendar);
 					}
 				}
 			}
@@ -455,7 +455,7 @@ protected void updateAllDayDateExport(
 	}
 
 	protected void updateAltDescription(
-			CalendarBooking calendarBooking, VEvent vEvent)
+			CalendarBooking calendarBooking, VEvent vEvent, Calendar calendar)
 		throws PortalException {
 
 		XProperty vEventXAltDesc = (XProperty)vEvent.getProperty("X-ALT-DESC");
@@ -466,8 +466,10 @@ protected void updateAltDescription(
 
 		if (calendarBooking != null) {
 			User calendarBookingUser = getCalendarBookingUser(calendarBooking);
-
-			Locale locale = calendarBookingUser.getLocale();
+
+			Locale locale = Validator.isNotNull(calendarBookingUser) ?
+				calendarBookingUser.getLocale() :
+				LocaleUtil.fromLanguageId(calendar.getDefaultLanguageId());
 
 			String calendarBookingDescription = calendarBooking.getDescription(
 				locale);