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

Commit 3613307d authored Mar 15, 2024 by Ronak Patel

changed 030-preview-watcher-null-check.patch

parent 831b9ca1

Dockerfile

+1 −1

Original line number	Diff line number	Diff line
		@@ -149,7 +149,7 @@ RUN patch -u ${BASE_DIR}/apps/files/js/files.js -i ${TMP_PATCH_DIR}/021-repeated
		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/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/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
		RUN patch -u ${BASE_DIR}/lib/private/L10N/Factory.php -i ${TMP_PATCH_DIR}/032-select-lang-from-session.patch

patches/024-reminder-service-handle-exception.patch

+2 −2

Original line number	Diff line number	Diff line
		--- /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
		--- /apps/dav/lib/CalDAV/Reminder/ReminderService.php 2024-03-15 16:34:18
		+++ /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;

patches/030-preview-watcher-null-check.patch

+3 −10

Original line number	Diff line number	Diff line
		From: Akhil <akhil.potukuchi.ext@murena.com>
		Date: Fri, 25 June 2023 16:30:00 +0530
		Subject: [PATCH] Add a check for null in preview watcher

		If a null argument is passed, an rmdir happens on the entire preview directory.
		This patch avoids this situation.

		--- lib/private/Preview/Watcher.php 2023-10-23 19:06:42.892424278 +0530
		+++ lib/private/Preview/Watcher-new.php 2023-10-23 19:59:31.903638761 +0530
		@@ -61,6 +61,9 @@
		--- ./lib/private/Preview/Watcher.php 2024-03-15 16:35:05
		+++ ./lib/private/Preview/Watcher-new.php 2024-03-15 17:58:12
		@@ -62,6 +62,9 @@
		}

		try {