Merge pull request #60607 from nextcloud/backport/60461/stable32
Some checks failed
CodeQL Advanced / Analyze (actions) (push) Has been cancelled
CodeQL Advanced / Analyze (javascript-typescript) (push) Has been cancelled
Integration sqlite / changes (push) Has been cancelled
Psalm static code analysis / static-code-analysis (push) Has been cancelled
Psalm static code analysis / static-code-analysis-security (push) Has been cancelled
Psalm static code analysis / static-code-analysis-ocp (push) Has been cancelled
Psalm static code analysis / static-code-analysis-ncu (push) Has been cancelled
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, --tags ~@large files_features) (push) Has been cancelled
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, capabilities_features) (push) Has been cancelled
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, collaboration_features) (push) Has been cancelled
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, comments_features) (push) Has been cancelled
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, dav_features) (push) Has been cancelled
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, features) (push) Has been cancelled
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, federation_features) (push) Has been cancelled
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, file_conversions) (push) Has been cancelled
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, files_reminders) (push) Has been cancelled
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, filesdrop_features) (push) Has been cancelled
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, ldap_features) (push) Has been cancelled
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, openldap_features) (push) Has been cancelled
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, openldap_numerical_features) (push) Has been cancelled
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, remoteapi_features) (push) Has been cancelled
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, routing_features) (push) Has been cancelled
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, setup_features) (push) Has been cancelled
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, sharees_features) (push) Has been cancelled
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, sharing_features) (push) Has been cancelled
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, theming_features) (push) Has been cancelled
Integration sqlite / integration-sqlite (stable32, 8.1, stable32, videoverification_features) (push) Has been cancelled
Integration sqlite / integration-sqlite-summary (push) Has been cancelled

[stable32] fix(dav): Skip removal of classified activity when not generated anymore
This commit is contained in:
Anna 2026-05-28 09:36:27 +02:00 committed by GitHub
commit 9813ef2a86
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,
) {
}
@ -31,12 +33,17 @@ class RemoveClassifiedEventActivity implements IRepairStep {
* @inheritdoc
*/
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");
}