Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 831b9ca1 authored by Ronak Patel's avatar Ronak Patel
Browse files

changed 024-reminder-service-handle-exception.patch

parent c3be82e7
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/014-add-mail-usage.patch
RUN patch -u ${BASE_DIR}/core/Command/User/Setting.php -i ${TMP_PATCH_DIR}/018-occ-user-setting.patch
RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated-storage-dialog-fix.patch
RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/3rdparty/sabre/vobject/lib/ITip/Broker.php -i ${TMP_PATCH_DIR}/022-significantchange.patch
# RUN patch -u ${BASE_DIR}/apps/dav/lib/CalDAV/Reminder/ReminderService.php -i ${TMP_PATCH_DIR}/024-reminder-service-handle-exception.patch
RUN patch -u ${BASE_DIR}/apps/dav/lib/CalDAV/Reminder/ReminderService.php -i ${TMP_PATCH_DIR}/024-reminder-service-handle-exception.patch
RUN patch -u ${BASE_DIR}/apps/theming/lib/Themes/CommonThemeTrait.php -i ${TMP_PATCH_DIR}/026-primary-color-fix.patch
# RUN patch -u ${BASE_DIR}/lib/private/Preview/Watcher.php -i ${TMP_PATCH_DIR}/030-preview-watcher-null-check.patch
# RUN patch -u ${BASE_DIR}/lib/private/Template/JSResourceLocator.php -i ${TMP_PATCH_DIR}/031-theme-custom-app-translations.patch
+13 −5
Original line number Diff line number Diff line
--- ./apps/dav/lib/CalDAV/Reminder/ReminderService.php	2023-03-06 21:26:20.835422901 +0530
+++ ./apps/dav/lib/CalDAV/Reminder/ReminderService-new.php	2023-03-06 21:28:49.325422185 +0530
@@ -143,7 +143,13 @@
--- /Users/ronak/Desktop/murena/git-nextcloud/ecloud_dev_example/volumes/nextcloud/html/apps/dav/lib/CalDAV/Reminder/ReminderService.php	2024-03-15 16:34:18
+++ /Users/ronak/Desktop/murena/git-nextcloud/ecloud_dev_example/volumes/nextcloud/html/apps/dav/lib/CalDAV/Reminder/ReminderService-new.php	2024-03-15 17:54:05
@@ -44,6 +44,7 @@
 use Sabre\VObject\ParseException;
 use Sabre\VObject\Recur\EventIterator;
 use Sabre\VObject\Recur\NoInstancesException;
+use Sabre\VObject\Recur\MaxInstancesExceededException;
 
 class ReminderService {
 
@@ -124,7 +125,13 @@
 				continue;
 			}
 
@@ -8,7 +16,7 @@
+			try {
+				$vevent = $this->getVEventByRecurrenceId($vcalendar, $reminder['recurrence_id'], $reminder['is_recurrence_exception']);
+			} catch (MaxInstancesExceededException $e) {
+				$this->logger->debug('Recurrence with too many instances detected, skipping VEVENT', ['exception' => $e]);
+				// $this->logger->debug('Recurrence with too many instances detected, skipping VEVENT', ['exception' => $e]);
+				$this->backend->removeReminder($reminder['id']);
+				continue;
+			}