Merge pull request #60461 from nextcloud/bugfix/noid/skip-classified

fix(dav): Skip removal of classified activity when not generated anymore
This commit is contained in:
Joas Schilling 2026-05-20 12:39:29 +02:00 committed by GitHub
commit 4841cad048
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -9,6 +9,7 @@ declare(strict_types=1);
namespace OCA\DAV\Migration;
use OCA\DAV\CalDAV\CalDavBackend;
use OCP\AppFramework\Services\IAppConfig;
use OCP\IDBConnection;
use OCP\Migration\IOutput;
use OCP\Migration\IRepairStep;
@ -17,6 +18,7 @@ class RemoveClassifiedEventActivity implements IRepairStep {
public function __construct(
private IDBConnection $connection,
private IAppConfig $appConfig,
) {
}
@ -33,12 +35,17 @@ class RemoveClassifiedEventActivity implements IRepairStep {
*/
#[\Override]
public function run(IOutput $output) {
if ($this->appConfig->getAppValueBool('checked_for_classified_activity')) {
return;
}
if (!$this->connection->tableExists('activity')) {
return;
}
$deletedEvents = $this->removePrivateEventActivity();
$deletedEvents += $this->removeConfidentialUncensoredEventActivity();
$this->appConfig->setAppValueBool('checked_for_classified_activity', true);
$output->info("Removed $deletedEvents activity entries");
}