From e99690849feb14d526e7617f8ed60ecf76222cae Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 15 May 2026 22:20:42 +0200 Subject: [PATCH] fix(dav): Skip removal of classified activity when not generated anymore Was fixed in Nextcloud 16, so future versions should not generate this anymore. So the delete attempt can be skipped Signed-off-by: Joas Schilling --- apps/dav/lib/Migration/RemoveClassifiedEventActivity.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/dav/lib/Migration/RemoveClassifiedEventActivity.php b/apps/dav/lib/Migration/RemoveClassifiedEventActivity.php index 23cea72d40d00..18534d909f6f8 100644 --- a/apps/dav/lib/Migration/RemoveClassifiedEventActivity.php +++ b/apps/dav/lib/Migration/RemoveClassifiedEventActivity.php @@ -12,11 +12,13 @@ use OCP\IDBConnection; use OCP\Migration\IOutput; use OCP\Migration\IRepairStep; +use OCP\ServerVersion; class RemoveClassifiedEventActivity implements IRepairStep { public function __construct( private IDBConnection $connection, + private ServerVersion $serverVersion, ) { } @@ -37,6 +39,10 @@ public function run(IOutput $output) { return; } + if ($this->serverVersion->getMajorVersion() > 17) { + return; + } + $deletedEvents = $this->removePrivateEventActivity(); $deletedEvents += $this->removeConfidentialUncensoredEventActivity();