fix(Session): Prevent immediate token invalidation

Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
2026-02-24 19:41:30 +01:00
1108 changed files with 6590 additions and 8312 deletions
@@ -73,7 +73,7 @@ body:
      options:
        - "32"
        - "33"
-        - "34 (master)"
+        - "master"
    validations:
      required: true
  - type: dropdown
@@ -23,7 +23,3 @@
 - [ ] [Backports requested](https://github.com/nextcloud/backportbot/#usage) where applicable (ex: critical bugfixes)
 - [ ] [Labels added](https://github.com/nextcloud/server/labels) where applicable (ex: bug/enhancement, `3. to review`, feature component)
 - [ ] [Milestone added](https://github.com/nextcloud/server/milestones) for target branch/version (ex: 32.x for `stable32`)
-
-## AI (if applicable)
-
- [ ] The content of this PR was partly or fully generated using AI
@@ -1,45 +0,0 @@
-# SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
-# SPDX-License-Identifier: AGPL-3.0-or-later
-
-name: Auto-label bug reports
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  add-version-label:
-    if: contains(github.event.issue.title, '[Bug]')
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-    steps:
-      - name: Extract version number and apply label
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
-        with:
-          script: |
-            const body = context.payload.issue.body || '';
-            const normalizedBody = body.replace(/\r\n?/g, '\n');
-            let label = '';
-
-            // Extract Nextcloud Server version number from a block like:
-            // ### Nextcloud Server version
-            // 32
-            const versionMatch = normalizedBody.match(/### Nextcloud Server version\s*\n+([0-9]{1,3})\b/);
-            let nextcloudVersion = null;
-            if (versionMatch) {
-              nextcloudVersion = parseInt(versionMatch[1], 10);
-              label = nextcloudVersion + '-feedback';
-            }
-            
-            if (label) {
-              try {
-                await github.rest.issues.addLabels({
-                  issue_number: context.issue.number,
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  labels: [label]
-                });
-              } catch (error) {
-                core.setFailed(`Failed to add label "${label}": ${error.message || error}`);
-              }
-            }
@@ -37,13 +37,13 @@ jobs:
        persist-credentials: false

    - name: Initialize CodeQL
-      uses: github/codeql-action/init@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
+      uses: github/codeql-action/init@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
      with:
        languages: ${{ matrix.language }}
        build-mode: ${{ matrix.build-mode }}
        config-file: ./.github/codeql-config.yml

    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
+      uses: github/codeql-action/analyze@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
      with:
        category: "/language:${{matrix.language}}"
@@ -171,7 +171,7 @@ jobs:
        run: ./node_modules/cypress/bin/cypress install

      - name: Run ${{ matrix.containers == 'component' && 'component' || 'E2E' }} cypress tests
-        uses: cypress-io/github-action@bc22e01685c56e89e7813fd8e26f33dc47f87e15 # v7.1.5
+        uses: cypress-io/github-action@84d178e4bbce871e23f2ffa3085898cde0e4f0ec # v7.1.2
        with:
          # We already installed the dependencies in the init job
          install: false
@@ -195,7 +195,7 @@ jobs:
          SETUP_TESTING: ${{ matrix.containers == 'setup' && 'true' || '' }}

      - name: Upload snapshots and videos
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        if: always()
        with:
          name: snapshots_${{ matrix.containers }}
@@ -218,7 +218,7 @@ jobs:
        run: docker exec nextcloud-e2e-test-server_${{ env.APP_NAME }} tar -cvjf - data > data.tar

      - name: Upload data archive
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
        if: failure() && matrix.containers != 'component'
        with:
          name: nc_data_${{ matrix.containers }}
@@ -71,7 +71,7 @@ jobs:
            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

        - name: Set up Python
-          uses: LizardByte/actions/actions/setup_python@70bb8d394d1c92f6113aeec6ae9cc959a5763d15 # v2026.227.200013
+          uses: LizardByte/actions/actions/setup_python@9bf3ef783775e17fe6b8dde3585d94ec570b93c2 # v2026.212.22356
          with:
            python-version: '2.7'

@@ -63,7 +63,7 @@ jobs:
          ref: ${{ github.event.pull_request.head.ref }}

      - name: Run before measurements
-        uses: nextcloud/profiler@6a74c915048285b35b8e1cd96c0835a635945044
+        uses: nextcloud/profiler@6801ee10fc80f10b444388fb6ca9b36ad8a2ea83
        with:
          run: |
            curl -s -X PROPFIND -u test:test http://localhost:8080/remote.php/dav/files/test
@@ -85,7 +85,7 @@ jobs:

      - name: Run after measurements
        id: compare
-        uses: nextcloud/profiler@6a74c915048285b35b8e1cd96c0835a635945044
+        uses: nextcloud/profiler@6801ee10fc80f10b444388fb6ca9b36ad8a2ea83
        with:
          run: |
            curl -s -X PROPFIND -u test:test http://localhost:8080/remote.php/dav/files/test
@@ -99,7 +99,7 @@ jobs:

      - name: Upload profiles
        if: always()
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f
        with:
          name: profiles
          path: |
@@ -50,7 +50,6 @@ jobs:
        run: |
          composer remove nextcloud/ocp --dev --no-scripts
          composer i
-          git restore lib/composer/composer

      - name: Rector
        run: composer run rector
@@ -20,7 +20,7 @@ jobs:
      issues: write

    steps:
-    - uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v9
+    - uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v9
      with:
        repo-token: ${{ secrets.COMMAND_BOT_PAT }}
        stale-issue-message: >
@@ -88,7 +88,7 @@ jobs:

      - name: Upload Security Analysis results to GitHub
        if: always()
-        uses: github/codeql-action/upload-sarif@89a39a4e59826350b863aa6b6252a07ad50cf83e # v3
+        uses: github/codeql-action/upload-sarif@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v3
        with:
          sarif_file: results.sarif

@@ -23,7 +23,7 @@ OC.L10N.register(
    "Could not reload comments" : "Kon reactie niet opnieuw laden",
    "Failed to mark comments as read" : "Kon reacties niet als gelezen markeren",
    "Unable to load the comments list" : "Kan reactielijst niet laden",
-    "No comments yet, start the conversation!" : "Nog geen reacties, start het gesprek!",
+    "No comments yet, start the conversation!" : "Nog geen reacties, start de discussie!",
    "No more messages" : "Geen berichten meer",
    "Retry" : "Opnieuw proberen",
    "_1 new comment_::_{unread} new comments_" : ["1 nieuwe reactie","{unread} nieuwe reacties"],
@@ -21,7 +21,7 @@
    "Could not reload comments" : "Kon reactie niet opnieuw laden",
    "Failed to mark comments as read" : "Kon reacties niet als gelezen markeren",
    "Unable to load the comments list" : "Kan reactielijst niet laden",
-    "No comments yet, start the conversation!" : "Nog geen reacties, start het gesprek!",
+    "No comments yet, start the conversation!" : "Nog geen reacties, start de discussie!",
    "No more messages" : "Geen berichten meer",
    "Retry" : "Opnieuw proberen",
    "_1 new comment_::_{unread} new comments_" : ["1 nieuwe reactie","{unread} nieuwe reacties"],
@@ -89,7 +89,7 @@ $server->httpRequest->setUrl(Server::get(IRequest::class)->getRequestUri());
 /** @var string $baseuri defined in remote.php */
 $server->setBaseUri($baseuri);
 // Add plugins
-$server->addPlugin(new MaintenancePlugin(Server::get(IConfig::class), Server::get(IL10nFactory::class)->get('dav')));
+$server->addPlugin(new MaintenancePlugin(Server::get(IConfig::class), \OCP\Server::get(IL10nFactory::class)->get('dav')));
 $server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend));
 $server->addPlugin(new Plugin());

@@ -77,7 +77,6 @@ return array(
    'OCA\\DAV\\CalDAV\\Federation\\FederatedCalendarFactory' => $baseDir . '/../lib/CalDAV/Federation/FederatedCalendarFactory.php',
    'OCA\\DAV\\CalDAV\\Federation\\FederatedCalendarImpl' => $baseDir . '/../lib/CalDAV/Federation/FederatedCalendarImpl.php',
    'OCA\\DAV\\CalDAV\\Federation\\FederatedCalendarMapper' => $baseDir . '/../lib/CalDAV/Federation/FederatedCalendarMapper.php',
-    'OCA\\DAV\\CalDAV\\Federation\\FederatedCalendarObject' => $baseDir . '/../lib/CalDAV/Federation/FederatedCalendarObject.php',
    'OCA\\DAV\\CalDAV\\Federation\\FederatedCalendarSyncService' => $baseDir . '/../lib/CalDAV/Federation/FederatedCalendarSyncService.php',
    'OCA\\DAV\\CalDAV\\Federation\\FederationSharingService' => $baseDir . '/../lib/CalDAV/Federation/FederationSharingService.php',
    'OCA\\DAV\\CalDAV\\Federation\\Protocol\\CalendarFederationProtocolV1' => $baseDir . '/../lib/CalDAV/Federation/Protocol/CalendarFederationProtocolV1.php',
@@ -92,7 +92,6 @@ class ComposerStaticInitDAV
        'OCA\\DAV\\CalDAV\\Federation\\FederatedCalendarFactory' => __DIR__ . '/..' . '/../lib/CalDAV/Federation/FederatedCalendarFactory.php',
        'OCA\\DAV\\CalDAV\\Federation\\FederatedCalendarImpl' => __DIR__ . '/..' . '/../lib/CalDAV/Federation/FederatedCalendarImpl.php',
        'OCA\\DAV\\CalDAV\\Federation\\FederatedCalendarMapper' => __DIR__ . '/..' . '/../lib/CalDAV/Federation/FederatedCalendarMapper.php',
-        'OCA\\DAV\\CalDAV\\Federation\\FederatedCalendarObject' => __DIR__ . '/..' . '/../lib/CalDAV/Federation/FederatedCalendarObject.php',
        'OCA\\DAV\\CalDAV\\Federation\\FederatedCalendarSyncService' => __DIR__ . '/..' . '/../lib/CalDAV/Federation/FederatedCalendarSyncService.php',
        'OCA\\DAV\\CalDAV\\Federation\\FederationSharingService' => __DIR__ . '/..' . '/../lib/CalDAV/Federation/FederationSharingService.php',
        'OCA\\DAV\\CalDAV\\Federation\\Protocol\\CalendarFederationProtocolV1' => __DIR__ . '/..' . '/../lib/CalDAV/Federation/Protocol/CalendarFederationProtocolV1.php',
@@ -236,7 +236,6 @@ OC.L10N.register(
    "Failed to check file size: %1$s" : "Dateigröße konnte nicht überprüft werden: %1$s",
    "Could not open file: %1$s (%2$d), file does seem to exist" : "Datei konnte nicht geöffnet werden: %1$s (%2$d), Datei scheint aber zu existieren",
    "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Datei konnte nicht geöffnet werden: %1$s (%2$d), Datei scheint nicht zu existieren",
-    "Failed to get size for : %1$s" : "Größe konnte nicht ermittelt werden für: %1$s",
    "Encryption not ready: %1$s" : "Verschlüsselung nicht bereit: %1$s",
    "Failed to open file: %1$s" : "Datei konnte nicht geöffnet werden: %1$s",
    "Failed to unlink: %1$s" : "Fehler beim Aufheben der Verknüpfung: %1$s",
@@ -234,7 +234,6 @@
    "Failed to check file size: %1$s" : "Dateigröße konnte nicht überprüft werden: %1$s",
    "Could not open file: %1$s (%2$d), file does seem to exist" : "Datei konnte nicht geöffnet werden: %1$s (%2$d), Datei scheint aber zu existieren",
    "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Datei konnte nicht geöffnet werden: %1$s (%2$d), Datei scheint nicht zu existieren",
-    "Failed to get size for : %1$s" : "Größe konnte nicht ermittelt werden für: %1$s",
    "Encryption not ready: %1$s" : "Verschlüsselung nicht bereit: %1$s",
    "Failed to open file: %1$s" : "Datei konnte nicht geöffnet werden: %1$s",
    "Failed to unlink: %1$s" : "Fehler beim Aufheben der Verknüpfung: %1$s",
@@ -236,7 +236,6 @@ OC.L10N.register(
    "Failed to check file size: %1$s" : "Dateigröße konnte nicht überprüft werden: %1$s",
    "Could not open file: %1$s (%2$d), file does seem to exist" : "Datei konnte nicht geöffnet werden: %1$s (%2$d), Datei scheint aber zu existieren",
    "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Datei konnte nicht geöffnet werden: %1$s (%2$d), Datei scheint nicht zu existieren",
-    "Failed to get size for : %1$s" : "Größe konnte nicht ermittelt werden für: %1$s",
    "Encryption not ready: %1$s" : "Verschlüsselung nicht bereit: %1$s",
    "Failed to open file: %1$s" : "Datei konnte nicht geöffnet werden: %1$s",
    "Failed to unlink: %1$s" : "Fehler beim Aufheben der Verknüpfung: %1$s",
@@ -234,7 +234,6 @@
    "Failed to check file size: %1$s" : "Dateigröße konnte nicht überprüft werden: %1$s",
    "Could not open file: %1$s (%2$d), file does seem to exist" : "Datei konnte nicht geöffnet werden: %1$s (%2$d), Datei scheint aber zu existieren",
    "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Datei konnte nicht geöffnet werden: %1$s (%2$d), Datei scheint nicht zu existieren",
-    "Failed to get size for : %1$s" : "Größe konnte nicht ermittelt werden für: %1$s",
    "Encryption not ready: %1$s" : "Verschlüsselung nicht bereit: %1$s",
    "Failed to open file: %1$s" : "Datei konnte nicht geöffnet werden: %1$s",
    "Failed to unlink: %1$s" : "Fehler beim Aufheben der Verknüpfung: %1$s",
@@ -236,7 +236,6 @@ OC.L10N.register(
    "Failed to check file size: %1$s" : "Failed to check file size: %1$s",
    "Could not open file: %1$s (%2$d), file does seem to exist" : "Could not open file: %1$s (%2$d), file does seem to exist",
    "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Could not open file: %1$s (%2$d), file doesn't seem to exist",
-    "Failed to get size for : %1$s" : "Failed to get size for : %1$s",
    "Encryption not ready: %1$s" : "Encryption not ready: %1$s",
    "Failed to open file: %1$s" : "Failed to open file: %1$s",
    "Failed to unlink: %1$s" : "Failed to unlink: %1$s",
@@ -234,7 +234,6 @@
    "Failed to check file size: %1$s" : "Failed to check file size: %1$s",
    "Could not open file: %1$s (%2$d), file does seem to exist" : "Could not open file: %1$s (%2$d), file does seem to exist",
    "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Could not open file: %1$s (%2$d), file doesn't seem to exist",
-    "Failed to get size for : %1$s" : "Failed to get size for : %1$s",
    "Encryption not ready: %1$s" : "Encryption not ready: %1$s",
    "Failed to open file: %1$s" : "Failed to open file: %1$s",
    "Failed to unlink: %1$s" : "Failed to unlink: %1$s",
@@ -254,16 +254,16 @@ OC.L10N.register(
    "Due on %s" : "Tähtaeg: %s",
    "Welcome to Nextcloud Calendar!\n\nThis is a sample event - explore the flexibility of planning with Nextcloud Calendar by making any edits you want!\n\nWith Nextcloud Calendar, you can:\n- Create, edit, and manage events effortlessly.\n- Create multiple calendars and share them with teammates, friends, or family.\n- Check availability and display your busy times to others.\n- Seamlessly integrate with apps and devices via CalDAV.\n- Customize your experience: schedule recurring events, adjust notifications and other settings." : "Tere tulemast Nextcloudi Kalendrisse!\n\nSee näidissündmus võimaldab sul tutvuda Nextcloudi Kalendri paindlikkusega oma aja plaanimisel - proovi teha igasuguseid muudatusi!\n\nNextcloudi Kalendriga saad sa:\n- vaevata luua, muuta ja hallata sündmusi,\n- koostada mitmeid kalendreid ning neid jagada tiimikaaslaste, sõprade ja perega,\n- kontrollida teiste vabu aega ja enda omi näidata teistele,\n- kasutada sujuvat CalDAV-i põhist lõimingut teiste rakenduste ja seadmetega,\n- kohendada kõike oma vajadustele: ajastades korduvaid sündmusi ning sättida teavitusi ja muid seadistusi.",
    "Example event - open me!" : "Näidissündmus - klõpsi mind!",
-    "System Address Book" : "Süsteemiülene aadressiraamat",
-    "The system address book contains contact information for all users in your instance." : "Süsteemiüleses aadressiraamatus leiduvad kõikide selle serveri kasutajate kontaktandmed.",
-    "Enable System Address Book" : "Kasuta süsteemiülest aadressiraamatut",
-    "DAV system address book" : "DAV-i süsteemiülene aadressiraamat",
-    "No outstanding DAV system address book sync." : "DAV-i süsteemiülese aadressiraamatu sünkroonimist pole ootel või toimunud.",
-    "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "Kuna selles serveris on üle 1000 kasutaja, siis DAV-i süsteemiülese aadressiraamatu sünkroonimist pole veel toimunud. Aga võis ka juhtuda viga. Palun käivita ta käsurealt ise käsuga „occ dav:sync-system-addressbook“.",
-    "DAV system address book size" : "DAV-i süsteemiülese aadressiraamatu suurus",
-    "The system address book is disabled" : "Süsteemiülene aadressiraamat pole kasutusel",
-    "The system address book is enabled, but contains more than the configured limit of %d contacts" : "Süsteemiülene aadressiraamat on kasutusel, kuid seal on andmeid rohkem, kui seadistatud %d kontakti ülempiir lubab",
-    "The system address book is enabled and contains less than the configured limit of %d contacts" : "Süsteemiülene aadressiraamat on kasutusel ning seal on andmeid vähem, kui seadistatud %d kontakti ülempiir lubab",
+    "System Address Book" : "Süsteemne aadressiraamat",
+    "The system address book contains contact information for all users in your instance." : "Süsteemses aadressiraamatus leiduvad kõikde selle serveri kasutajate kontaktteave.",
+    "Enable System Address Book" : "Kasuta süsteemset aadressiraamatut",
+    "DAV system address book" : "DAV-i süsteemne aadressiraamat",
+    "No outstanding DAV system address book sync." : "Pole DAV-i süsteemse aadressiraamatu sünkroniseerimist.",
+    "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "Kuna selles serveris on üle 1000 kasutaja, siis DAV-i süsteemse aadressiraamatu sünkroonomist  poel veel toimunud. Aga võis ka juhtuda viga. Palun käivita ta käsurealt ise käsuga „occ dav:sync-system-addressbook“.",
+    "DAV system address book size" : "DAV-i süsteemse aadressiraamatu suurus",
+    "The system address book is disabled" : "Süsteemne aadressiraamat pole kasutusel",
+    "The system address book is enabled, but contains more than the configured limit of %d contacts" : "Süsteemne aadressiraamat on kasutusel, kuid seal on andmeid rohkem, kui seadistatud %d kontakti ülempiir lubab",
+    "The system address book is enabled and contains less than the configured limit of %d contacts" : "Süsteemne aadressiraamat on kasutusel ning seal on andmeid vähem, kui seadistatud %d kontakti ülempiir lubab",
    "WebDAV endpoint" : "WebDAV-i teenuse otspunkt",
    "Could not check that your web server is properly set up to allow file synchronization over WebDAV. Please check manually." : "Ei õnnestunud kontrollida, kas sinu veebiserver on korrektselt seadistatud ja võimaldab kasutada failide sünkroniseerimist WebDAV-i vahendusel. Palun kontrolli seda käsitsi.",
    "Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "Sinu veebiserver pole veel failide sünkroniseerimiseks vajalikult seadistatud, kuna WebDAV liides paistab olevat katki.",
@@ -252,16 +252,16 @@
    "Due on %s" : "Tähtaeg: %s",
    "Welcome to Nextcloud Calendar!\n\nThis is a sample event - explore the flexibility of planning with Nextcloud Calendar by making any edits you want!\n\nWith Nextcloud Calendar, you can:\n- Create, edit, and manage events effortlessly.\n- Create multiple calendars and share them with teammates, friends, or family.\n- Check availability and display your busy times to others.\n- Seamlessly integrate with apps and devices via CalDAV.\n- Customize your experience: schedule recurring events, adjust notifications and other settings." : "Tere tulemast Nextcloudi Kalendrisse!\n\nSee näidissündmus võimaldab sul tutvuda Nextcloudi Kalendri paindlikkusega oma aja plaanimisel - proovi teha igasuguseid muudatusi!\n\nNextcloudi Kalendriga saad sa:\n- vaevata luua, muuta ja hallata sündmusi,\n- koostada mitmeid kalendreid ning neid jagada tiimikaaslaste, sõprade ja perega,\n- kontrollida teiste vabu aega ja enda omi näidata teistele,\n- kasutada sujuvat CalDAV-i põhist lõimingut teiste rakenduste ja seadmetega,\n- kohendada kõike oma vajadustele: ajastades korduvaid sündmusi ning sättida teavitusi ja muid seadistusi.",
    "Example event - open me!" : "Näidissündmus - klõpsi mind!",
-    "System Address Book" : "Süsteemiülene aadressiraamat",
-    "The system address book contains contact information for all users in your instance." : "Süsteemiüleses aadressiraamatus leiduvad kõikide selle serveri kasutajate kontaktandmed.",
-    "Enable System Address Book" : "Kasuta süsteemiülest aadressiraamatut",
-    "DAV system address book" : "DAV-i süsteemiülene aadressiraamat",
-    "No outstanding DAV system address book sync." : "DAV-i süsteemiülese aadressiraamatu sünkroonimist pole ootel või toimunud.",
-    "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "Kuna selles serveris on üle 1000 kasutaja, siis DAV-i süsteemiülese aadressiraamatu sünkroonimist pole veel toimunud. Aga võis ka juhtuda viga. Palun käivita ta käsurealt ise käsuga „occ dav:sync-system-addressbook“.",
-    "DAV system address book size" : "DAV-i süsteemiülese aadressiraamatu suurus",
-    "The system address book is disabled" : "Süsteemiülene aadressiraamat pole kasutusel",
-    "The system address book is enabled, but contains more than the configured limit of %d contacts" : "Süsteemiülene aadressiraamat on kasutusel, kuid seal on andmeid rohkem, kui seadistatud %d kontakti ülempiir lubab",
-    "The system address book is enabled and contains less than the configured limit of %d contacts" : "Süsteemiülene aadressiraamat on kasutusel ning seal on andmeid vähem, kui seadistatud %d kontakti ülempiir lubab",
+    "System Address Book" : "Süsteemne aadressiraamat",
+    "The system address book contains contact information for all users in your instance." : "Süsteemses aadressiraamatus leiduvad kõikde selle serveri kasutajate kontaktteave.",
+    "Enable System Address Book" : "Kasuta süsteemset aadressiraamatut",
+    "DAV system address book" : "DAV-i süsteemne aadressiraamat",
+    "No outstanding DAV system address book sync." : "Pole DAV-i süsteemse aadressiraamatu sünkroniseerimist.",
+    "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "Kuna selles serveris on üle 1000 kasutaja, siis DAV-i süsteemse aadressiraamatu sünkroonomist  poel veel toimunud. Aga võis ka juhtuda viga. Palun käivita ta käsurealt ise käsuga „occ dav:sync-system-addressbook“.",
+    "DAV system address book size" : "DAV-i süsteemse aadressiraamatu suurus",
+    "The system address book is disabled" : "Süsteemne aadressiraamat pole kasutusel",
+    "The system address book is enabled, but contains more than the configured limit of %d contacts" : "Süsteemne aadressiraamat on kasutusel, kuid seal on andmeid rohkem, kui seadistatud %d kontakti ülempiir lubab",
+    "The system address book is enabled and contains less than the configured limit of %d contacts" : "Süsteemne aadressiraamat on kasutusel ning seal on andmeid vähem, kui seadistatud %d kontakti ülempiir lubab",
    "WebDAV endpoint" : "WebDAV-i teenuse otspunkt",
    "Could not check that your web server is properly set up to allow file synchronization over WebDAV. Please check manually." : "Ei õnnestunud kontrollida, kas sinu veebiserver on korrektselt seadistatud ja võimaldab kasutada failide sünkroniseerimist WebDAV-i vahendusel. Palun kontrolli seda käsitsi.",
    "Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "Sinu veebiserver pole veel failide sünkroniseerimiseks vajalikult seadistatud, kuna WebDAV liides paistab olevat katki.",
@@ -236,7 +236,6 @@ OC.L10N.register(
    "Failed to check file size: %1$s" : "Níorbh fhéidir méid an chomhaid a sheiceáil: %1$s",
    "Could not open file: %1$s (%2$d), file does seem to exist" : "Níorbh fhéidir an comhad a oscailt: %1$s (%2$d), is cosúil go bhfuil an comhad ann",
    "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Níorbh fhéidir an comhad a oscailt: %1$s (%2$d), is cosúil nach bhfuil an comhad ann.",
-    "Failed to get size for : %1$s" : "Theip ar mhéid a fháil le haghaidh: %1$s",
    "Encryption not ready: %1$s" : "Níl an criptiúchán réidh: %1$s",
    "Failed to open file: %1$s" : "Níorbh fhéidir an comhad a oscailt: %1$s",
    "Failed to unlink: %1$s" : "Theip ar dhínascadh: %1$s",
@@ -234,7 +234,6 @@
    "Failed to check file size: %1$s" : "Níorbh fhéidir méid an chomhaid a sheiceáil: %1$s",
    "Could not open file: %1$s (%2$d), file does seem to exist" : "Níorbh fhéidir an comhad a oscailt: %1$s (%2$d), is cosúil go bhfuil an comhad ann",
    "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Níorbh fhéidir an comhad a oscailt: %1$s (%2$d), is cosúil nach bhfuil an comhad ann.",
-    "Failed to get size for : %1$s" : "Theip ar mhéid a fháil le haghaidh: %1$s",
    "Encryption not ready: %1$s" : "Níl an criptiúchán réidh: %1$s",
    "Failed to open file: %1$s" : "Níorbh fhéidir an comhad a oscailt: %1$s",
    "Failed to unlink: %1$s" : "Theip ar dhínascadh: %1$s",
@@ -236,7 +236,6 @@ OC.L10N.register(
    "Failed to check file size: %1$s" : "Produciuse un erro ao comprobar o tamaño do ficheiro: %1$s",
    "Could not open file: %1$s (%2$d), file does seem to exist" : "Non foi posíbel abrir o ficheiro: %1$s (%2$d), semella o ficheiro existe",
    "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Non foi posíbel abrir o ficheiro: %1$s (%2$d), semella o ficheiro non existe",
-    "Failed to get size for : %1$s" : "Produciuse un fallo ao obter o tamaño de: %1$s",
    "Encryption not ready: %1$s" : "A cifraxe non está preparada: %1$s",
    "Failed to open file: %1$s" : "Produciuse un erro ao abrir o ficheiro: %1$s",
    "Failed to unlink: %1$s" : "Produciuse un erro ao desligar: %1$s",
@@ -234,7 +234,6 @@
    "Failed to check file size: %1$s" : "Produciuse un erro ao comprobar o tamaño do ficheiro: %1$s",
    "Could not open file: %1$s (%2$d), file does seem to exist" : "Non foi posíbel abrir o ficheiro: %1$s (%2$d), semella o ficheiro existe",
    "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Non foi posíbel abrir o ficheiro: %1$s (%2$d), semella o ficheiro non existe",
-    "Failed to get size for : %1$s" : "Produciuse un fallo ao obter o tamaño de: %1$s",
    "Encryption not ready: %1$s" : "A cifraxe non está preparada: %1$s",
    "Failed to open file: %1$s" : "Produciuse un erro ao abrir o ficheiro: %1$s",
    "Failed to unlink: %1$s" : "Produciuse un erro ao desligar: %1$s",
@@ -236,7 +236,6 @@ OC.L10N.register(
    "Failed to check file size: %1$s" : "Kon bestandsomvang niet controleren: %1$s",
    "Could not open file: %1$s (%2$d), file does seem to exist" : "Kon bestand niet openen: %1$s (%2$d), bestand lijkt wel te bestaan",
    "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Kon bestand niet openen: %1$s (%2$d), bestand lijkt niet te bestaan",
-    "Failed to get size for : %1$s" : "Niet gelukt om grootte te krijgen voor :  %1$s",
    "Encryption not ready: %1$s" : "Versleuteling niet gereed: %1$s",
    "Failed to open file: %1$s" : "Kon het bestand %1$s niet openen",
    "Failed to unlink: %1$s" : "Kon link niet verwijderen: %1$s",
@@ -234,7 +234,6 @@
    "Failed to check file size: %1$s" : "Kon bestandsomvang niet controleren: %1$s",
    "Could not open file: %1$s (%2$d), file does seem to exist" : "Kon bestand niet openen: %1$s (%2$d), bestand lijkt wel te bestaan",
    "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Kon bestand niet openen: %1$s (%2$d), bestand lijkt niet te bestaan",
-    "Failed to get size for : %1$s" : "Niet gelukt om grootte te krijgen voor :  %1$s",
    "Encryption not ready: %1$s" : "Versleuteling niet gereed: %1$s",
    "Failed to open file: %1$s" : "Kon het bestand %1$s niet openen",
    "Failed to unlink: %1$s" : "Kon link niet verwijderen: %1$s",
@@ -236,7 +236,6 @@ OC.L10N.register(
    "Failed to check file size: %1$s" : "Falha ao verificar o tamanho do arquivo: %1$s",
    "Could not open file: %1$s (%2$d), file does seem to exist" : "Não foi possível abrir o arquivo: %1$s (%2$d), o arquivo parece existir",
    "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Não foi possível abrir o arquivo: %1$s (%2$d), o arquivo parece não existir",
-    "Failed to get size for : %1$s" : "Falha ao obter o tamanho para: %1$s",
    "Encryption not ready: %1$s" : "A criptografia não está pronta: %1$s",
    "Failed to open file: %1$s" : "Falha ao abrir arquivo: %1$s",
    "Failed to unlink: %1$s" : "Falha ao desvincular: %1$s",
@@ -234,7 +234,6 @@
    "Failed to check file size: %1$s" : "Falha ao verificar o tamanho do arquivo: %1$s",
    "Could not open file: %1$s (%2$d), file does seem to exist" : "Não foi possível abrir o arquivo: %1$s (%2$d), o arquivo parece existir",
    "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Não foi possível abrir o arquivo: %1$s (%2$d), o arquivo parece não existir",
-    "Failed to get size for : %1$s" : "Falha ao obter o tamanho para: %1$s",
    "Encryption not ready: %1$s" : "A criptografia não está pronta: %1$s",
    "Failed to open file: %1$s" : "Falha ao abrir arquivo: %1$s",
    "Failed to unlink: %1$s" : "Falha ao desvincular: %1$s",
@@ -236,7 +236,6 @@ OC.L10N.register(
    "Failed to check file size: %1$s" : "Dosya boyutu denetlenemedi: %1$s",
    "Could not open file: %1$s (%2$d), file does seem to exist" : "Dosya açılamadı: %1$s (%2$d), dosya var gibi görünüyor",
    "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Dosya açılamadı: %1$s (%2$d), dosya var gibi görünmüyor",
-    "Failed to get size for : %1$s" : "Dosya boyutu alınamadı: %1$s",
    "Encryption not ready: %1$s" : "Şifreleme hazır değil: %1$s",
    "Failed to open file: %1$s" : "Dosya açılamadı: %1$s",
    "Failed to unlink: %1$s" : "Bağlantı kaldırılamadı: %1$s",
@@ -234,7 +234,6 @@
    "Failed to check file size: %1$s" : "Dosya boyutu denetlenemedi: %1$s",
    "Could not open file: %1$s (%2$d), file does seem to exist" : "Dosya açılamadı: %1$s (%2$d), dosya var gibi görünüyor",
    "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Dosya açılamadı: %1$s (%2$d), dosya var gibi görünmüyor",
-    "Failed to get size for : %1$s" : "Dosya boyutu alınamadı: %1$s",
    "Encryption not ready: %1$s" : "Şifreleme hazır değil: %1$s",
    "Failed to open file: %1$s" : "Dosya açılamadı: %1$s",
    "Failed to unlink: %1$s" : "Bağlantı kaldırılamadı: %1$s",
@@ -191,7 +191,6 @@ OC.L10N.register(
    "{actor} updated contact {card} in address book {addressbook}" : "{actor} оновив(-ла) контакт {card} в адресній книзі {addressbook}",
    "You updated contact {card} in address book {addressbook}" : "Ви оновили контакт {card} в адресній книзі {addressbook}",
    "A <strong>contact</strong> or <strong>address book</strong> was modified" : "<strong>Контактну</strong> або <strong>адресну книгу</strong> було змінено",
-    "System address book disabled" : "Системну адресну книгу вимкнено",
    "Accounts" : "Облікові записи",
    "System address book which holds all accounts" : "Системна адресна книга, в якій містяться всі облікові записи",
    "File is not updatable: %1$s" : "Файл не оновлюється: %1$s",
@@ -204,8 +203,6 @@ OC.L10N.register(
    "Could not rename part file to final file, canceled by hook" : "Не вдалося перейменувати файл частини на остаточний файл, скасовано підхопленням",
    "Could not rename part file to final file" : "Не вдалося перейменувати файл частини на остаточний файл",
    "Failed to check file size: %1$s" : "Не вдалося перевірити розмір файлу: %1$s",
-    "Could not open file: %1$s (%2$d), file does seem to exist" : "Не вдалося відкрити файл: %1$s (%2$d), хоча схоже, що файл наявний",
-    "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Не вдалося відкрити файл: %1$s (%2$d), схоже, що файл відсутній",
    "Encryption not ready: %1$s" : "Шифрування не готове: %1$s",
    "Failed to open file: %1$s" : "Не вдалося відкрити файл: %1$s",
    "Failed to unlink: %1$s" : "Не вдалося від’єднати: %1$s",
@@ -230,10 +227,6 @@ OC.L10N.register(
    "DAV system address book" : "Системна адресна книга DAV",
    "No outstanding DAV system address book sync." : "Немає незавершеної синхронізації системної адресної книги DAV.",
    "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "Синхронізація системної адресної книги DAV ще не запускалася, оскільки, або ваша система вже має понад 1000 користувачів, або сталася помилка. Будь ласка, запустіть синхронізацію вручну за допомогою команди \"occ dav:sync-system-addressbook\".",
-    "DAV system address book size" : "Розмір системної адресної книги DAV ",
-    "The system address book is disabled" : "Системну адресну книгу вимкнено",
-    "The system address book is enabled, but contains more than the configured limit of %d contacts" : "Системну адресну книгу увімкнено, проте вона містить більше, ніж визначено максимальну кількість у %d контактів.",
-    "The system address book is enabled and contains less than the configured limit of %d contacts" : "Системну адресну книгу увімкнено, проте вона містить менше, ніж визначено максимальну кількість у %d контактів.",
    "WebDAV endpoint" : "Точка доступу WebDAV",
    "Could not check that your web server is properly set up to allow file synchronization over WebDAV. Please check manually." : "Неможливо перевірити, чи на вашому вебсервері правильно налаштовано доступ для синхронізації файлів через протокол WebDAV. Перевірте це вручну.",
    "Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "Ваш вебсервер не налаштований як треба для синхронізації файлів, схоже інтерфейс WebDAV поламаний.",
@@ -189,7 +189,6 @@
    "{actor} updated contact {card} in address book {addressbook}" : "{actor} оновив(-ла) контакт {card} в адресній книзі {addressbook}",
    "You updated contact {card} in address book {addressbook}" : "Ви оновили контакт {card} в адресній книзі {addressbook}",
    "A <strong>contact</strong> or <strong>address book</strong> was modified" : "<strong>Контактну</strong> або <strong>адресну книгу</strong> було змінено",
-    "System address book disabled" : "Системну адресну книгу вимкнено",
    "Accounts" : "Облікові записи",
    "System address book which holds all accounts" : "Системна адресна книга, в якій містяться всі облікові записи",
    "File is not updatable: %1$s" : "Файл не оновлюється: %1$s",
@@ -202,8 +201,6 @@
    "Could not rename part file to final file, canceled by hook" : "Не вдалося перейменувати файл частини на остаточний файл, скасовано підхопленням",
    "Could not rename part file to final file" : "Не вдалося перейменувати файл частини на остаточний файл",
    "Failed to check file size: %1$s" : "Не вдалося перевірити розмір файлу: %1$s",
-    "Could not open file: %1$s (%2$d), file does seem to exist" : "Не вдалося відкрити файл: %1$s (%2$d), хоча схоже, що файл наявний",
-    "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "Не вдалося відкрити файл: %1$s (%2$d), схоже, що файл відсутній",
    "Encryption not ready: %1$s" : "Шифрування не готове: %1$s",
    "Failed to open file: %1$s" : "Не вдалося відкрити файл: %1$s",
    "Failed to unlink: %1$s" : "Не вдалося від’єднати: %1$s",
@@ -228,10 +225,6 @@
    "DAV system address book" : "Системна адресна книга DAV",
    "No outstanding DAV system address book sync." : "Немає незавершеної синхронізації системної адресної книги DAV.",
    "The DAV system address book sync has not run yet as your instance has more than 1000 users or because an error occurred. Please run it manually by calling \"occ dav:sync-system-addressbook\"." : "Синхронізація системної адресної книги DAV ще не запускалася, оскільки, або ваша система вже має понад 1000 користувачів, або сталася помилка. Будь ласка, запустіть синхронізацію вручну за допомогою команди \"occ dav:sync-system-addressbook\".",
-    "DAV system address book size" : "Розмір системної адресної книги DAV ",
-    "The system address book is disabled" : "Системну адресну книгу вимкнено",
-    "The system address book is enabled, but contains more than the configured limit of %d contacts" : "Системну адресну книгу увімкнено, проте вона містить більше, ніж визначено максимальну кількість у %d контактів.",
-    "The system address book is enabled and contains less than the configured limit of %d contacts" : "Системну адресну книгу увімкнено, проте вона містить менше, ніж визначено максимальну кількість у %d контактів.",
    "WebDAV endpoint" : "Точка доступу WebDAV",
    "Could not check that your web server is properly set up to allow file synchronization over WebDAV. Please check manually." : "Неможливо перевірити, чи на вашому вебсервері правильно налаштовано доступ для синхронізації файлів через протокол WebDAV. Перевірте це вручну.",
    "Your web server is not yet properly set up to allow file synchronization, because the WebDAV interface seems to be broken." : "Ваш вебсервер не налаштований як треба для синхронізації файлів, схоже інтерфейс WebDAV поламаний.",
@@ -236,7 +236,6 @@ OC.L10N.register(
    "Failed to check file size: %1$s" : "檢查檔案大小失敗：%1$s",
    "Could not open file: %1$s (%2$d), file does seem to exist" : "無法開啟檔案：%1$s（%2$d），檔案似乎存在",
    "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "無法開啟檔案：%1$s（%2$d），檔案似乎不存在",
-    "Failed to get size for : %1$s" : "無法取得以下項目的大小：%1$s",
    "Encryption not ready: %1$s" : "尚未準備好加密：%1$s",
    "Failed to open file: %1$s" : "開啟檔案失敗：%1$s",
    "Failed to unlink: %1$s" : "解除連結失敗：%1$s",
@@ -234,7 +234,6 @@
    "Failed to check file size: %1$s" : "檢查檔案大小失敗：%1$s",
    "Could not open file: %1$s (%2$d), file does seem to exist" : "無法開啟檔案：%1$s（%2$d），檔案似乎存在",
    "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "無法開啟檔案：%1$s（%2$d），檔案似乎不存在",
-    "Failed to get size for : %1$s" : "無法取得以下項目的大小：%1$s",
    "Encryption not ready: %1$s" : "尚未準備好加密：%1$s",
    "Failed to open file: %1$s" : "開啟檔案失敗：%1$s",
    "Failed to unlink: %1$s" : "解除連結失敗：%1$s",
@@ -236,7 +236,6 @@ OC.L10N.register(
    "Failed to check file size: %1$s" : "檢查檔案大小失敗：%1$s",
    "Could not open file: %1$s (%2$d), file does seem to exist" : "無法開啟檔案：%1$s (%2$d)，檔案似乎存在",
    "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "無法開啟檔案：%1$s（%2$d），檔案似乎不存在",
-    "Failed to get size for : %1$s" : "無法取得以下項目的大小：%1$s",
    "Encryption not ready: %1$s" : "尚未準備好加密：%1$s",
    "Failed to open file: %1$s" : "開啟檔案失敗：%1$s",
    "Failed to unlink: %1$s" : "解除連結失敗：%1$s",
@@ -234,7 +234,6 @@
    "Failed to check file size: %1$s" : "檢查檔案大小失敗：%1$s",
    "Could not open file: %1$s (%2$d), file does seem to exist" : "無法開啟檔案：%1$s (%2$d)，檔案似乎存在",
    "Could not open file: %1$s (%2$d), file doesn't seem to exist" : "無法開啟檔案：%1$s（%2$d），檔案似乎不存在",
-    "Failed to get size for : %1$s" : "無法取得以下項目的大小：%1$s",
    "Encryption not ready: %1$s" : "尚未準備好加密：%1$s",
    "Failed to open file: %1$s" : "開啟檔案失敗：%1$s",
    "Failed to unlink: %1$s" : "解除連結失敗：%1$s",
@@ -1570,12 +1570,8 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
 			}

 			if ($forceDeletePermanently || $this->config->getAppValue(Application::APP_ID, RetentionService::RETENTION_CONFIG_KEY) === '0') {
-				$qb = $this->db->getQueryBuilder();
-				$qb->delete('calendarobjects')
-					->where($qb->expr()->eq('calendarid', $qb->createNamedParameter($calendarId)))
-					->andWhere($qb->expr()->eq('uri', $qb->createNamedParameter($objectUri)))
-					->andWhere($qb->expr()->eq('calendartype', $qb->createNamedParameter($calendarType)))
-					->executeStatement();
+				$stmt = $this->db->prepare('DELETE FROM `*PREFIX*calendarobjects` WHERE `calendarid` = ? AND `uri` = ? AND `calendartype` = ?');
+				$stmt->execute([$calendarId, $objectUri, $calendarType]);

 				$this->purgeProperties($calendarId, $data['id']);

@@ -43,9 +43,9 @@ class CalendarProvider implements ICalendarProvider {
 			});
 		}

+		$additionalProperties = $this->getAdditionalPropertiesForCalendars($calendarInfos);
 		$iCalendars = [];

-		$additionalProperties = $this->getAdditionalPropertiesForCalendars($calendarInfos);
 		foreach ($calendarInfos as $calendarInfo) {
 			$user = str_replace('principals/users/', '', $calendarInfo['principaluri']);
 			$path = 'calendars/' . $user . '/' . $calendarInfo['uri'];
@@ -60,7 +60,9 @@ class CalendarProvider implements ICalendarProvider {
 			);
 		}

-		$additionalFederatedProps = $this->getAdditionalPropertiesForCalendars($federatedCalendarInfos);
+		$additionalFederatedProps = $this->getAdditionalPropertiesForCalendars(
+			$federatedCalendarInfos,
+		);
 		foreach ($federatedCalendarInfos as $calendarInfo) {
 			$user = str_replace('principals/users/', '', $calendarInfo['principaluri']);
 			$path = 'calendars/' . $user . '/' . $calendarInfo['uri'];
@@ -104,10 +104,9 @@ class CalendarFederationProvider implements ICloudFederationProvider {
 			);
 		}

-		// convert access to permissions
+		// TODO: implement read-write sharing
 		$permissions = match ($access) {
 			DavSharingBackend::ACCESS_READ => Constants::PERMISSION_READ,
-			DavSharingBackend::ACCESS_READ_WRITE => Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE,
 			default => throw new ProviderCouldNotAddShareException(
 				"Unsupported access value: $access",
 				'',
@@ -123,27 +122,20 @@ class CalendarFederationProvider implements ICloudFederationProvider {
 		$sharedWithPrincipal = 'principals/users/' . $share->getShareWith();

 		// Delete existing incoming federated share first
-		$calendar = $this->federatedCalendarMapper->findByUri($sharedWithPrincipal, $calendarUri);
+		$this->federatedCalendarMapper->deleteByUri($sharedWithPrincipal, $calendarUri);

-		if ($calendar === null) {
-			$calendar = new FederatedCalendarEntity();
-			$calendar->setPrincipaluri($sharedWithPrincipal);
-			$calendar->setUri($calendarUri);
-			$calendar->setRemoteUrl($calendarUrl);
-			$calendar->setDisplayName($displayName);
-			$calendar->setColor($color);
-			$calendar->setToken($share->getShareSecret());
-			$calendar->setSharedBy($share->getSharedBy());
-			$calendar->setSharedByDisplayName($share->getSharedByDisplayName());
-			$calendar->setPermissions($permissions);
-			$calendar->setComponents($components);
-			$calendar = $this->federatedCalendarMapper->insert($calendar);
-		} else {
-			$calendar->setToken($share->getShareSecret());
-			$calendar->setPermissions($permissions);
-			$calendar->setComponents($components);
-			$this->federatedCalendarMapper->update($calendar);
-		}
+		$calendar = new FederatedCalendarEntity();
+		$calendar->setPrincipaluri($sharedWithPrincipal);
+		$calendar->setUri($calendarUri);
+		$calendar->setRemoteUrl($calendarUrl);
+		$calendar->setDisplayName($displayName);
+		$calendar->setColor($color);
+		$calendar->setToken($share->getShareSecret());
+		$calendar->setSharedBy($share->getSharedBy());
+		$calendar->setSharedByDisplayName($share->getSharedByDisplayName());
+		$calendar->setPermissions($permissions);
+		$calendar->setComponents($components);
+		$calendar = $this->federatedCalendarMapper->insert($calendar);

 		$this->jobList->add(FederatedCalendarSyncJob::class, [
 			FederatedCalendarSyncJob::ARGUMENT_ID => $calendar->getId(),
@@ -10,289 +10,29 @@ declare(strict_types=1);
 namespace OCA\DAV\CalDAV\Federation;

 use OCA\DAV\CalDAV\CalDavBackend;
-use OCP\Constants;
-use Sabre\CalDAV\ICalendar;
-use Sabre\CalDAV\Plugin;
-use Sabre\CalDAV\Xml\Property\SupportedCalendarComponentSet;
-use Sabre\DAV\Exception\MethodNotAllowed;
-use Sabre\DAV\Exception\NotFound;
-use Sabre\DAV\IMultiGet;
-use Sabre\DAV\INode;
-use Sabre\DAV\IProperties;
-use Sabre\DAV\PropPatch;
-
-class FederatedCalendar implements ICalendar, IProperties, IMultiGet {
-
-	private const CALENDAR_TYPE = CalDavBackend::CALENDAR_TYPE_FEDERATED;
-	private const DAV_PROPERTY_CALENDAR_LABEL = '{DAV:}displayname';
-	private const DAV_PROPERTY_CALENDAR_COLOR = '{http://apple.com/ns/ical/}calendar-color';
-
-	private string $principalUri;
-	private string $calendarUri;
-	private ?array $calendarACL = null;
-	private FederatedCalendarEntity $federationInfo;
+use OCA\DAV\CalDAV\Calendar;
+use OCP\IConfig;
+use OCP\IL10N;
+use Psr\Log\LoggerInterface;
+use Sabre\CalDAV\Backend;

+class FederatedCalendar extends Calendar {
 	public function __construct(
-		private readonly FederatedCalendarMapper $federatedCalendarMapper,
-		private readonly FederatedCalendarSyncService $federatedCalendarService,
-		private readonly CalDavBackend $caldavBackend,
+		Backend\BackendInterface $caldavBackend,
 		$calendarInfo,
+		IL10N $l10n,
+		IConfig $config,
+		LoggerInterface $logger,
+		private readonly FederatedCalendarMapper $federatedCalendarMapper,
 	) {
-		$this->principalUri = $calendarInfo['principaluri'];
-		$this->calendarUri = $calendarInfo['uri'];
-		$this->federationInfo = $federatedCalendarMapper->findByUri($this->principalUri, $this->calendarUri);
+		parent::__construct($caldavBackend, $calendarInfo, $l10n, $config, $logger);
 	}

-	public function getResourceId(): int {
-		return $this->federationInfo->getId();
-	}
-
-	public function getName(): string {
-		return $this->federationInfo->getUri();
-	}
-
-	/**
-	 * @param string $name Name of the file
-	 */
-	public function setName($name): void {
-		throw new MethodNotAllowed('Renaming federated calendars is not allowed');
-	}
-
-	protected function getCalendarType(): int {
-		return self::CALENDAR_TYPE;
-	}
-
-	public function getPrincipalURI(): string {
-		return $this->federationInfo->getPrincipaluri();
-	}
-
-	public function getOwner(): ?string {
-		return $this->federationInfo->getSharedByPrincipal();
-	}
-
-	public function getGroup(): ?string {
-		return null;
-	}
-
-	/**
-	 * @return array<array-key, mixed>
-	 */
-	public function getACL(): array {
-		if ($this->calendarACL !== null) {
-			return $this->calendarACL;
-		}
-
-		$permissions = $this->federationInfo->getPermissions();
-		// default permission
-		$acl = [
-			// read object permission
-			[
-				'privilege' => '{DAV:}read',
-				'principal' => $this->principalUri,
-				'protected' => true,
-			],
-			// read acl permission
-			[
-				'privilege' => '{DAV:}read-acl',
-				'principal' => $this->principalUri,
-				'protected' => true,
-			],
-			// write properties permission (calendar name, color)
-			[
-				'privilege' => '{DAV:}write-properties',
-				'principal' => $this->principalUri,
-				'protected' => true,
-			],
-		];
-		// create permission
-		if ($permissions & Constants::PERMISSION_CREATE) {
-			$acl[] = [
-				'privilege' => '{DAV:}bind',
-				'principal' => $this->principalUri,
-				'protected' => true,
-			];
-		}
-		// update permission
-		if ($permissions & Constants::PERMISSION_UPDATE) {
-			$acl[] = [
-				'privilege' => '{DAV:}write-content',
-				'principal' => $this->principalUri,
-				'protected' => true,
-			];
-		}
-		// delete permission
-		if ($permissions & Constants::PERMISSION_DELETE) {
-			$acl[] = [
-				'privilege' => '{DAV:}unbind',
-				'principal' => $this->principalUri,
-				'protected' => true,
-			];
-		}
-
-		// cache the calculated ACL for later use
-		$this->calendarACL = $acl;
-
-		return $acl;
-	}
-
-	public function setACL(array $acl): void {
-		throw new MethodNotAllowed('Changing ACLs on federated calendars is not allowed');
-	}
-
-	public function getSupportedPrivilegeSet(): ?array {
-		return null;
-	}
-
-	/**
-	 * @return array<string, mixed> properties array, with property name as key
-	 */
-	public function getProperties($properties): array {
-		return [
-			self::DAV_PROPERTY_CALENDAR_LABEL => $this->federationInfo->getDisplayName(),
-			self::DAV_PROPERTY_CALENDAR_COLOR => $this->federationInfo->getColor(),
-			'{' . Plugin::NS_CALDAV . '}supported-calendar-component-set' => new SupportedCalendarComponentSet(explode(',', $this->federationInfo->getComponents())),
-		];
-	}
-
-	public function propPatch(PropPatch $propPatch): void {
-		$mutations = $propPatch->getMutations();
-		if (count($mutations) > 0) {
-			// evaluate if name was changed
-			if (isset($mutations[self::DAV_PROPERTY_CALENDAR_LABEL])) {
-				$this->federationInfo->setDisplayName($mutations[self::DAV_PROPERTY_CALENDAR_LABEL]);
-				$propPatch->setResultCode(self::DAV_PROPERTY_CALENDAR_LABEL, 200);
-			}
-			// evaluate if color was changed
-			if (isset($mutations[self::DAV_PROPERTY_CALENDAR_COLOR])) {
-				$this->federationInfo->setColor($mutations[self::DAV_PROPERTY_CALENDAR_COLOR]);
-				$propPatch->setResultCode(self::DAV_PROPERTY_CALENDAR_COLOR, 200);
-			}
-			$this->federatedCalendarMapper->update($this->federationInfo);
-		}
-	}
-
-
-	public function getChildACL(): array {
-		return $this->getACL();
-	}
-
-	public function getLastModified(): ?int {
-		return $this->federationInfo->getLastSync();
-	}
-
-	public function delete(): void {
+	public function delete() {
 		$this->federatedCalendarMapper->deleteById($this->getResourceId());
 	}

-	/**
-	 * @param string $name Name of the file
-	 */
-	public function createDirectory($name): void {
-		throw new MethodNotAllowed('Creating nested collection is not allowed');
+	protected function getCalendarType(): int {
+		return CalDavBackend::CALENDAR_TYPE_FEDERATED;
 	}
-
-	public function calendarQuery(array $filters): array {
-		$uris = $this->caldavBackend->calendarQuery($this->federationInfo->getId(), $filters, $this->getCalendarType());
-		return $uris;
-	}
-
-	/**
-	 * @param string $name Name of the file
-	 */
-	public function getChild($name): INode {
-		$obj = $this->caldavBackend->getCalendarObject($this->federationInfo->getId(), $name, $this->getCalendarType());
-
-		if ($obj === null) {
-			throw new NotFound('Calendar object not found');
-		}
-
-		return new FederatedCalendarObject($this, $obj);
-	}
-
-	/**
-	 * @return array<INode>
-	 */
-	public function getChildren(): array {
-		$objs = $this->caldavBackend->getCalendarObjects($this->federationInfo->getId(), $this->getCalendarType());
-
-		$children = [];
-		foreach ($objs as $obj) {
-			$children[] = new FederatedCalendarObject($this, $obj);
-		}
-
-		return $children;
-	}
-
-	/**
-	 * @param array<string> $paths Names of the files
-	 *
-	 * @return array<INode>
-	 */
-	public function getMultipleChildren(array $paths): array {
-		$objs = $this->caldavBackend->getMultipleCalendarObjects($this->federationInfo->getId(), $paths, $this->getCalendarType());
-
-		$children = [];
-		foreach ($objs as $obj) {
-			$children[] = new FederatedCalendarObject($this, $obj);
-		}
-
-		return $children;
-	}
-
-	/**
-	 * @param string $name Name of the file
-	 */
-	public function childExists($name): bool {
-		$obj = $this->caldavBackend->getCalendarObject($this->federationInfo->getId(), $name, $this->getCalendarType());
-		return $obj !== null;
-	}
-
-	/**
-	 * @param string $name Name of the file
-	 * @param resource|string $data Initial payload
-	 */
-	public function createFile($name, $data = null): string {
-		if (is_resource($data)) {
-			$data = stream_get_contents($data);
-		}
-
-		// Create on remote server first
-		$etag = $this->federatedCalendarService->createCalendarObject($this->federationInfo, $name, $data);
-
-		if (empty($etag)) {
-			throw new \Exception('Failed to create calendar object on remote server');
-		}
-
-		// Then store locally
-		return $this->caldavBackend->createCalendarObject($this->federationInfo->getId(), $name, $data, $this->getCalendarType());
-	}
-
-	/**
-	 * @param string $name Name of the file
-	 * @param resource|string $data Initial payload
-	 */
-	public function updateFile($name, $data): string {
-		if (is_resource($data)) {
-			$data = stream_get_contents($data);
-		}
-
-		// Update remote calendar first
-		$etag = $this->federatedCalendarService->updateCalendarObject($this->federationInfo, $name, $data);
-
-		if (empty($etag)) {
-			throw new \Exception('Failed to update calendar object on remote server');
-		}
-
-		// Then update locally
-		return $this->caldavBackend->updateCalendarObject($this->federationInfo->getId(), $name, $data, $this->getCalendarType());
-	}
-
-	public function deleteFile(string $name): void {
-		// Delete from remote server first
-		$this->federatedCalendarService->deleteCalendarObject($this->federationInfo, $name);
-
-		// Then delete locally
-		$this->caldavBackend->deleteCalendarObject($this->federationInfo->getId(), $name, $this->getCalendarType());
-	}
-
 }
@@ -11,7 +11,6 @@ namespace OCA\DAV\CalDAV\Federation;

 use OCA\DAV\DAV\RemoteUserPrincipalBackend;
 use OCP\AppFramework\Db\Entity;
-use OCP\Constants;
 use OCP\DB\Types;
 use Sabre\CalDAV\Xml\Property\SupportedCalendarComponentSet;

@@ -95,8 +94,8 @@ class FederatedCalendarEntity extends Entity {
 			'{' . \Sabre\CalDAV\Plugin::NS_CALENDARSERVER . '}getctag' => $this->getSyncTokenForSabre(),
 			'{' . \Sabre\CalDAV\Plugin::NS_CALDAV . '}supported-calendar-component-set' => $this->getSupportedCalendarComponentSet(),
 			'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}owner-principal' => $this->getSharedByPrincipal(),
-			'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only' => ($this->getPermissions() & Constants::PERMISSION_UPDATE) === 0 ? 1 : 0,
-			'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}permissions' => $this->getPermissions(),
+			// TODO: implement read-write sharing
+			'{' . \OCA\DAV\DAV\Sharing\Plugin::NS_OWNCLOUD . '}read-only' => 1
 		];
 	}
 }
@@ -9,23 +9,34 @@ declare(strict_types=1);

 namespace OCA\DAV\CalDAV\Federation;

+use OCA\DAV\AppInfo\Application;
 use OCA\DAV\CalDAV\CalDavBackend;
+use OCP\IConfig;
+use OCP\IL10N;
+use OCP\L10N\IFactory as IL10NFactory;
+use Psr\Log\LoggerInterface;

 class FederatedCalendarFactory {
+	private readonly IL10N $l10n;

 	public function __construct(
-		private readonly FederatedCalendarMapper $federatedCalendarMapper,
-		private readonly FederatedCalendarSyncService $federatedCalendarService,
 		private readonly CalDavBackend $caldavBackend,
+		private readonly IConfig $config,
+		private readonly LoggerInterface $logger,
+		private readonly FederatedCalendarMapper $federatedCalendarMapper,
+		IL10NFactory $l10nFactory,
 	) {
+		$this->l10n = $l10nFactory->get(Application::APP_ID);
 	}

 	public function createFederatedCalendar(array $calendarInfo): FederatedCalendar {
 		return new FederatedCalendar(
-			$this->federatedCalendarMapper,
-			$this->federatedCalendarService,
 			$this->caldavBackend,
 			$calendarInfo,
+			$this->l10n,
+			$this->config,
+			$this->logger,
+			$this->federatedCalendarMapper,
 		);
 	}
 }
@@ -51,7 +51,8 @@ class FederatedCalendarImpl implements ICalendar, ICalendarIsShared, ICalendarIs
 	}

 	public function getPermissions(): int {
-		return $this->calendarInfo['{http://owncloud.org/ns}permissions'] ?? Constants::PERMISSION_READ;
+		// TODO: implement read-write sharing
+		return Constants::PERMISSION_READ;
 	}

 	public function isDeleted(): bool {
@@ -63,8 +64,7 @@ class FederatedCalendarImpl implements ICalendar, ICalendarIsShared, ICalendarIs
 	}

 	public function isWritable(): bool {
-		$permissions = $this->getPermissions();
-		return ($permissions & Constants::PERMISSION_UPDATE) !== 0;
+		return false;
 	}

 	public function isEnabled(): bool {
@@ -1,107 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-namespace OCA\DAV\CalDAV\Federation;
-
-use Sabre\CalDAV\ICalendarObject;
-use Sabre\DAV\Exception\MethodNotAllowed;
-use Sabre\DAVACL\IACL;
-
-class FederatedCalendarObject implements ICalendarObject, IACL {
-
-	public function __construct(
-		protected FederatedCalendar $calendarObject,
-		protected $objectData,
-	) {
-	}
-
-	public function getName(): string {
-		return $this->objectData['uri'];
-	}
-
-	/**
-	 * @param string $name Name of the file
-	 */
-	public function setName($name) {
-		throw new \Exception('Not implemented');
-	}
-
-	public function get(): string {
-		return $this->objectData['calendardata'];
-	}
-
-	/**
-	 * @param resource|string $data contents of the file
-	 */
-	public function put($data): string {
-
-		$etag = $this->calendarObject->updateFile($this->objectData['uri'], $data);
-		$this->objectData['calendardata'] = $data;
-		$this->objectData['etag'] = $etag;
-
-		return $etag;
-	}
-
-	public function delete(): void {
-		$this->calendarObject->deleteFile($this->objectData['uri']);
-	}
-
-	public function getContentType(): ?string {
-		$mime = 'text/calendar; charset=utf-8';
-		if (isset($this->objectData['component']) && $this->objectData['component']) {
-			$mime .= '; component=' . $this->objectData['component'];
-		}
-
-		return $mime;
-	}
-
-	public function getETag(): string {
-		if (isset($this->objectData['etag'])) {
-			return $this->objectData['etag'];
-		} else {
-			return '"' . md5($this->get()) . '"';
-		}
-	}
-
-	public function getLastModified(): int {
-		return $this->objectData['lastmodified'];
-	}
-
-	public function getSize(): int {
-		if (isset($this->objectData['size'])) {
-			return $this->objectData['size'];
-		} else {
-			return strlen($this->get());
-		}
-	}
-
-	public function getOwner(): ?string {
-		return $this->calendarObject->getPrincipalURI();
-	}
-
-	public function getGroup(): ?string {
-		return null;
-	}
-
-	/**
-	 * @return array<array-key, mixed>
-	 */
-	public function getACL(): array {
-		return $this->calendarObject->getACL();
-	}
-
-	public function setACL(array $acl): void {
-		throw new MethodNotAllowed('Changing ACLs on federated events is not allowed');
-	}
-
-	public function getSupportedPrivilegeSet(): ?array {
-		return null;
-	}
-
-}
@@ -9,52 +9,20 @@ declare(strict_types=1);

 namespace OCA\DAV\CalDAV\Federation;

-use OCA\DAV\CalDAV\CalDavBackend;
-use OCA\DAV\Service\ASyncService;
-use OCP\AppFramework\Db\TTransactional;
-use OCP\AppFramework\Http;
+use OCA\DAV\CalDAV\SyncService as CalDavSyncService;
 use OCP\Federation\ICloudIdManager;
-use OCP\Http\Client\IClientService;
-use OCP\IConfig;
-use OCP\IDBConnection;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Log\LoggerInterface;

-class FederatedCalendarSyncService extends ASyncService {
-	use TTransactional;
-
+class FederatedCalendarSyncService {
 	private const SYNC_TOKEN_PREFIX = 'http://sabre.io/ns/sync/';

 	public function __construct(
-		IClientService $clientService,
-		IConfig $config,
 		private readonly FederatedCalendarMapper $federatedCalendarMapper,
 		private readonly LoggerInterface $logger,
-		private readonly CalDavBackend $backend,
-		private readonly IDBConnection $dbConnection,
+		private readonly CalDavSyncService $syncService,
 		private readonly ICloudIdManager $cloudIdManager,
 	) {
-		parent::__construct($clientService, $config);
-	}
-
-	/**
-	 * Extract and encode credentials from a federated calendar entity.
-	 *
-	 * @return array{username: string, remoteUrl: string, token: string}
-	 */
-	private function getCredentials(FederatedCalendarEntity $calendar): array {
-		[,, $sharedWith] = explode('/', $calendar->getPrincipaluri());
-		$calDavUser = $this->cloudIdManager->getCloudId($sharedWith, null)->getId();
-
-		// Need to encode the cloud id as it might contain a colon which is not allowed in basic
-		// auth according to RFC 7617
-		$calDavUser = base64_encode($calDavUser);
-
-		return [
-			'username' => $calDavUser,
-			'remoteUrl' => $calendar->getRemoteUrl(),
-			'token' => $calendar->getToken(),
-		];
 	}

 	/**
@@ -63,77 +31,29 @@ class FederatedCalendarSyncService extends ASyncService {
 	 * @throws ClientExceptionInterface If syncing the calendar fails.
 	 */
 	public function syncOne(FederatedCalendarEntity $calendar): int {
-		$credentials = $this->getCredentials($calendar);
+		[,, $sharedWith] = explode('/', $calendar->getPrincipaluri());
+		$calDavUser = $this->cloudIdManager->getCloudId($sharedWith, null)->getId();
+		$remoteUrl = $calendar->getRemoteUrl();
 		$syncToken = $calendar->getSyncTokenForSabre();

-		try {
-			$response = $this->requestSyncReport(
-				$credentials['remoteUrl'],
-				$credentials['username'],
-				$credentials['token'],
-				$syncToken,
-			);
-		} catch (ClientExceptionInterface $ex) {
-			if ($ex->getCode() === Http::STATUS_UNAUTHORIZED) {
-				// Remote server revoked access to the calendar => remove it
-				$this->federatedCalendarMapper->delete($calendar);
-				$this->logger->warning("Authorization failed, remove federated calendar: {$credentials['remoteUrl']}", [
-					'app' => 'dav',
-				]);
-				return 0;
-			}
-			$this->logger->error('Client exception:', ['app' => 'dav', 'exception' => $ex]);
-			throw $ex;
-		}
+		// Need to encode the cloud id as it might contain a colon which is not allowed in basic
+		// auth according to RFC 7617
+		$calDavUser = base64_encode($calDavUser);

-		// Process changes from remote
-		$downloadedEvents = 0;
-		foreach ($response['response'] as $resource => $status) {
-			$objectUri = basename($resource);
-			if (isset($status[200])) {
-				// Object created or updated
-				$absoluteUrl = $this->prepareUri($credentials['remoteUrl'], $resource);
-				$calendarData = $this->download($absoluteUrl, $credentials['username'], $credentials['token']);
-				$this->atomic(function () use ($calendar, $objectUri, $calendarData): void {
-					$existingObject = $this->backend->getCalendarObject(
-						$calendar->getId(),
-						$objectUri,
-						CalDavBackend::CALENDAR_TYPE_FEDERATED
-					);
-					if (!$existingObject) {
-						$this->backend->createCalendarObject(
-							$calendar->getId(),
-							$objectUri,
-							$calendarData,
-							CalDavBackend::CALENDAR_TYPE_FEDERATED
-						);
-					} else {
-						$this->backend->updateCalendarObject(
-							$calendar->getId(),
-							$objectUri,
-							$calendarData,
-							CalDavBackend::CALENDAR_TYPE_FEDERATED
-						);
-					}
-				}, $this->dbConnection);
-				$downloadedEvents++;
-			} else {
-				// Object deleted
-				$this->backend->deleteCalendarObject(
-					$calendar->getId(),
-					$objectUri,
-					CalDavBackend::CALENDAR_TYPE_FEDERATED,
-					true
-				);
-			}
-		}
+		$syncResponse = $this->syncService->syncRemoteCalendar(
+			$remoteUrl,
+			$calDavUser,
+			$calendar->getToken(),
+			$syncToken,
+			$calendar,
+		);

-		$newSyncToken = $response['token'];
+		$newSyncToken = $syncResponse->getSyncToken();

 		// Check sync token format and extract the actual sync token integer
 		$matches = [];
 		if (!preg_match('/^http:\/\/sabre\.io\/ns\/sync\/([0-9]+)$/', $newSyncToken, $matches)) {
-			$this->logger->error("Failed to sync federated calendar at {$credentials['remoteUrl']}: New sync token has unexpected format: $newSyncToken", [
+			$this->logger->error("Failed to sync federated calendar at $remoteUrl: New sync token has unexpected format: $newSyncToken", [
 				'calendar' => $calendar->toCalendarInfo(),
 				'newSyncToken' => $newSyncToken,
 			]);
@@ -147,58 +67,10 @@ class FederatedCalendarSyncService extends ASyncService {
 				$newSyncToken,
 			);
 		} else {
-			$this->logger->debug("Sync Token for {$credentials['remoteUrl']} unchanged from previous sync");
+			$this->logger->debug("Sync Token for $remoteUrl unchanged from previous sync");
 			$this->federatedCalendarMapper->updateSyncTime($calendar->getId());
 		}

-		return $downloadedEvents;
-	}
-
-	/**
-	 * Create a calendar object on the remote server.
-	 *
-	 * @throws ClientExceptionInterface If the remote request fails.
-	 */
-	public function createCalendarObject(FederatedCalendarEntity $calendar, string $name, string $data): string {
-		$credentials = $this->getCredentials($calendar);
-		$objectUrl = $this->prepareUri($credentials['remoteUrl'], $name);
-
-		return $this->requestPut(
-			$objectUrl,
-			$credentials['username'],
-			$credentials['token'],
-			$data,
-			'text/calendar; charset=utf-8'
-		);
-	}
-
-	/**
-	 * Update a calendar object on the remote server.
-	 *
-	 * @throws ClientExceptionInterface If the remote request fails.
-	 */
-	public function updateCalendarObject(FederatedCalendarEntity $calendar, string $name, string $data): string {
-		$credentials = $this->getCredentials($calendar);
-		$objectUrl = $this->prepareUri($credentials['remoteUrl'], $name);
-
-		return $this->requestPut(
-			$objectUrl,
-			$credentials['username'],
-			$credentials['token'],
-			$data,
-			'text/calendar; charset=utf-8'
-		);
-	}
-
-	/**
-	 * Delete a calendar object on the remote server.
-	 *
-	 * @throws ClientExceptionInterface If the remote request fails.
-	 */
-	public function deleteCalendarObject(FederatedCalendarEntity $calendar, string $name): void {
-		$credentials = $this->getCredentials($calendar);
-		$objectUrl = $this->prepareUri($credentials['remoteUrl'], $name);
-
-		$this->requestDelete($objectUrl, $credentials['username'], $credentials['token']);
+		return $syncResponse->getDownloadedEvents();
 	}
 }
@@ -12,7 +12,6 @@ use OCA\DAV\CalDAV\Calendar;
 use OCA\DAV\CalDAV\CalendarHome;
 use OCA\DAV\CalDAV\CalendarObject;
 use OCA\DAV\CalDAV\DefaultCalendarValidator;
-use OCA\DAV\CalDAV\Federation\FederatedCalendar;
 use OCA\DAV\CalDAV\TipBroker;
 use OCP\IConfig;
 use Psr\Log\LoggerInterface;
@@ -174,15 +173,8 @@ class Plugin extends \Sabre\CalDAV\Schedule\Plugin {
 				return;
 			}

-			/** @var Calendar&ICalendar $calendarNode */
+			/** @var Calendar $calendarNode */
 			$calendarNode = $this->server->tree->getNodeForPath($calendarPath);
-
-			// abort if calendar is federated
-			if ($calendarNode instanceof FederatedCalendar) {
-				$this->logger->debug('Not processing scheduling for federated calendar at path: ' . $calendarPath);
-				return;
-			}
-
 			// extract addresses for owner
 			$addresses = $this->getAddressesForPrincipal($calendarNode->getOwner());
 			// determine if request is from a sharee
@@ -20,15 +20,13 @@ class Capabilities implements ICapability {
 	}

 	/**
-	 * @return array{dav: array{chunking: string, public_shares_chunking: bool, search_supports_creation_time: bool, search_supports_upload_time: bool, bulkupload?: string, absence-supported?: bool, absence-replacement?: bool}}
+	 * @return array{dav: array{chunking: string, public_shares_chunking: bool, bulkupload?: string, absence-supported?: bool, absence-replacement?: bool}}
 	 */
 	public function getCapabilities() {
 		$capabilities = [
 			'dav' => [
 				'chunking' => '1.0',
 				'public_shares_chunking' => true,
-				'search_supports_creation_time' => true,
-				'search_supports_upload_time' => true,
 			]
 		];
 		if ($this->config->getSystemValueBool('bulkupload.enabled', true)) {
@@ -8,6 +8,7 @@ declare(strict_types=1);
 */
 namespace OCA\DAV\CardDAV\Notification;

+use InvalidArgumentException;
 use OCA\DAV\AppInfo\Application;
 use OCP\IL10N;
 use OCP\L10N\IFactory;
@@ -41,7 +42,7 @@ class Notifier implements INotifier {
 	 */
 	public function prepare(INotification $notification, string $languageCode): INotification {
 		if ($notification->getApp() !== Application::APP_ID) {
-			throw new UnknownNotificationException();
+			throw new InvalidArgumentException();
 		}

 		$l = $this->l10nFactory->get(Application::APP_ID, $languageCode);
@@ -22,7 +22,6 @@ use OCP\IDBConnection;
 use OCP\IGroupManager;
 use OCP\IUserManager;
 use OCP\IUserSession;
-use OCP\L10N\IFactory;
 use OCP\Security\ISecureRandom;
 use OCP\Server;
 use Psr\Log\LoggerInterface;
@@ -67,7 +66,7 @@ class CreateCalendar extends Command {
 			Server::get(ProxyMapper::class),
 			Server::get(KnownUserService::class),
 			Server::get(IConfig::class),
-			Server::get(IFactory::class),
+			\OC::$server->getL10NFactory(),
 		);
 		$random = Server::get(ISecureRandom::class);
 		$logger = Server::get(LoggerInterface::class);
@@ -532,7 +532,7 @@ class Directory extends Node implements
 		}

 		if ($info->getMimeType() === FileInfo::MIMETYPE_FOLDER) {
-			$node = new Directory($this->fileView, $info, $this->tree, $this->shareManager);
+			$node = new \OCA\DAV\Connector\Sabre\Directory($this->fileView, $info, $this->tree, $this->shareManager);
 		} else {
 			// In case reading a directory was allowed but it turns out the node was a not a directory, reject it now.
 			if (!$this->info->isReadable()) {
@@ -480,15 +480,11 @@ class File extends Node implements IFile {
 				}
 			}

-			$logger = Server::get(LoggerInterface::class);
 			// comparing current file size with the one in DB
 			// if different, fix DB and refresh cache.
-			//
 			$fsSize = $this->fileView->filesize($this->getPath());
-			if ($fsSize === false) {
-				$logger->warning('file not found on storage after successfully opening it');
-				throw new ServiceUnavailable($this->l10n->t('Failed to get size for : %1$s', [$this->getPath()]));
-			} elseif ($this->getSize() !== $fsSize) {
+			if ($this->getSize() !== $fsSize) {
+				$logger = Server::get(LoggerInterface::class);
 				$logger->warning('fixing cached size of file id=' . $this->getId() . ', cached size was ' . $this->getSize() . ', but the filesystem reported a size of ' . $fsSize);

 				$this->getFileInfo()->getStorage()->getUpdater()->update($this->getFileInfo()->getInternalPath());
@@ -86,7 +86,6 @@ class FileSearchBackend implements ISearchBackend {
 			new SearchPropertyDefinition('{DAV:}displayname', true, true, true),
 			new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true),
 			new SearchPropertyDefinition('{DAV:}getlastmodified', true, true, true, SearchPropertyDefinition::DATATYPE_DATETIME),
-			new SearchPropertyDefinition('{DAV:}creationdate', true, true, true, SearchPropertyDefinition::DATATYPE_DATETIME),
 			new SearchPropertyDefinition('{http://nextcloud.org/ns}upload_time', true, true, true, SearchPropertyDefinition::DATATYPE_DATETIME),
 			new SearchPropertyDefinition(FilesPlugin::SIZE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
 			new SearchPropertyDefinition(TagsPlugin::FAVORITE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_BOOLEAN),
@@ -300,8 +299,6 @@ class FileSearchBackend implements ISearchBackend {
 				return $node->getName();
 			case '{DAV:}getlastmodified':
 				return $node->getLastModified();
-			case '{DAV:}creationdate':
-				return $node->getNode()->getCreationTime();
 			case '{http://nextcloud.org/ns}upload_time':
 				return $node->getNode()->getUploadTime();
 			case FilesPlugin::SIZE_PROPERTYNAME:
@@ -464,8 +461,6 @@ class FileSearchBackend implements ISearchBackend {
 				return 'mimetype';
 			case '{DAV:}getlastmodified':
 				return 'mtime';
-			case '{DAV:}creationdate':
-				return 'creation_time';
 			case '{http://nextcloud.org/ns}upload_time':
 				return 'upload_time';
 			case FilesPlugin::SIZE_PROPERTYNAME:
@@ -8,7 +8,6 @@
 namespace OCA\DAV\Files;

 use OCP\Files\FileInfo;
-use OCP\Files\IRootFolder;
 use OCP\IUserSession;
 use OCP\Server;
 use Sabre\DAV\INode;
@@ -36,7 +35,7 @@ class RootCollection extends AbstractPrincipalCollection {
 			// in the future this could be considered to be used for accessing shared files
 			return new SimpleCollection($name);
 		}
-		$userFolder = Server::get(IRootFolder::class)->getUserFolder($user->getUID());
+		$userFolder = \OC::$server->getUserFolder();
 		if (!($userFolder instanceof FileInfo)) {
 			throw new \Exception('Home does not exist');
 		}
@@ -42,7 +42,6 @@ use OCP\IDBConnection;
 use OCP\IGroupManager;
 use OCP\IUserManager;
 use OCP\IUserSession;
-use OCP\L10N\IFactory;
 use OCP\Security\ISecureRandom;
 use OCP\Server;
 use OCP\SystemTag\ISystemTagManager;
@@ -76,7 +75,7 @@ class RootCollection extends SimpleCollection {
 			$proxyMapper,
 			Server::get(KnownUserService::class),
 			Server::get(IConfig::class),
-			Server::get(IFactory::class)
+			\OC::$server->getL10NFactory()
 		);

 		$groupPrincipalBackend = new GroupPrincipalBackend($groupManager, $userSession, $shareManager, $config);
@@ -150,13 +150,13 @@ class EventsSearchProvider extends ACalendarSearchProvider implements IFiltering
 		$formattedResults = \array_map(function (array $eventRow) use ($calendarsById, $subscriptionsById): SearchResultEntry {
 			$component = $this->getPrimaryComponent($eventRow['calendardata'], self::$componentType);
 			$title = (string)($component->SUMMARY ?? $this->l10n->t('Untitled event'));
+			$subline = $this->generateSubline($component);

 			if ($eventRow['calendartype'] === CalDavBackend::CALENDAR_TYPE_CALENDAR) {
 				$calendar = $calendarsById[$eventRow['calendarid']];
 			} else {
 				$calendar = $subscriptionsById[$eventRow['calendarid']];
 			}
-			$subline = $this->generateSubline($component, $calendar);
 			$resourceUrl = $this->getDeepLinkToCalendarApp($calendar['principaluri'], $calendar['uri'], $eventRow['uri']);
 			$result = new SearchResultEntry('', $title, $subline, $resourceUrl, 'icon-calendar-dark', false);

@@ -204,7 +204,7 @@ class EventsSearchProvider extends ACalendarSearchProvider implements IFiltering
 			. $calendarObjectUri;
 	}

-	protected function generateSubline(Component $eventComponent, array $calendarInfo): string {
+	protected function generateSubline(Component $eventComponent): string {
 		$dtStart = $eventComponent->DTSTART;
 		$dtEnd = $this->getDTEndForEvent($eventComponent);
 		$isAllDayEvent = $dtStart instanceof Property\ICalendar\Date;
@@ -214,31 +214,24 @@ class EventsSearchProvider extends ACalendarSearchProvider implements IFiltering
 		if ($isAllDayEvent) {
 			$endDateTime->modify('-1 day');
 			if ($this->isDayEqual($startDateTime, $endDateTime)) {
-				$formattedSubline = $this->l10n->l('date', $startDateTime, ['width' => 'medium']);
-			} else {
-				$formattedStart = $this->l10n->l('date', $startDateTime, ['width' => 'medium']);
-				$formattedEnd = $this->l10n->l('date', $endDateTime, ['width' => 'medium']);
-				$formattedSubline = "$formattedStart - $formattedEnd";
+				return $this->l10n->l('date', $startDateTime, ['width' => 'medium']);
 			}
-		} else {
-			$formattedStartDate = $this->l10n->l('date', $startDateTime, ['width' => 'medium']);
-			$formattedEndDate = $this->l10n->l('date', $endDateTime, ['width' => 'medium']);
-			$formattedStartTime = $this->l10n->l('time', $startDateTime, ['width' => 'short']);
-			$formattedEndTime = $this->l10n->l('time', $endDateTime, ['width' => 'short']);

-			if ($this->isDayEqual($startDateTime, $endDateTime)) {
-				$formattedSubline = "$formattedStartDate $formattedStartTime - $formattedEndTime";
-			} else {
-				$formattedSubline = "$formattedStartDate $formattedStartTime - $formattedEndDate $formattedEndTime";
-			}
+			$formattedStart = $this->l10n->l('date', $startDateTime, ['width' => 'medium']);
+			$formattedEnd = $this->l10n->l('date', $endDateTime, ['width' => 'medium']);
+			return "$formattedStart - $formattedEnd";
 		}

-		if (isset($calendarInfo['{DAV:}displayname']) && !empty($calendarInfo['{DAV:}displayname'])) {
-			$formattedSubline = $formattedSubline . " ({$calendarInfo['{DAV:}displayname']})";
+		$formattedStartDate = $this->l10n->l('date', $startDateTime, ['width' => 'medium']);
+		$formattedEndDate = $this->l10n->l('date', $endDateTime, ['width' => 'medium']);
+		$formattedStartTime = $this->l10n->l('time', $startDateTime, ['width' => 'short']);
+		$formattedEndTime = $this->l10n->l('time', $endDateTime, ['width' => 'short']);
+
+		if ($this->isDayEqual($startDateTime, $endDateTime)) {
+			return "$formattedStartDate $formattedStartTime - $formattedEndTime";
 		}

-		// string cast is just to make psalm happy
-		return (string)$formattedSubline;
+		return "$formattedStartDate $formattedStartTime - $formattedEndDate $formattedEndTime";
 	}

 	protected function getDTEndForEvent(Component $eventComponent):Property {
@@ -96,13 +96,13 @@ class TasksSearchProvider extends ACalendarSearchProvider {
 		$formattedResults = \array_map(function (array $taskRow) use ($calendarsById, $subscriptionsById):SearchResultEntry {
 			$component = $this->getPrimaryComponent($taskRow['calendardata'], self::$componentType);
 			$title = (string)($component->SUMMARY ?? $this->l10n->t('Untitled task'));
+			$subline = $this->generateSubline($component);

 			if ($taskRow['calendartype'] === CalDavBackend::CALENDAR_TYPE_CALENDAR) {
 				$calendar = $calendarsById[$taskRow['calendarid']];
 			} else {
 				$calendar = $subscriptionsById[$taskRow['calendarid']];
 			}
-			$subline = $this->generateSubline($component, $calendar);
 			$resourceUrl = $this->getDeepLinkToTasksApp($calendar['uri'], $taskRow['uri']);

 			return new SearchResultEntry('', $title, $subline, $resourceUrl, 'icon-checkmark', false);
@@ -128,29 +128,25 @@ class TasksSearchProvider extends ACalendarSearchProvider {
 		);
 	}

-	protected function generateSubline(Component $taskComponent, array $calendarInfo): string {
+	protected function generateSubline(Component $taskComponent): string {
 		if ($taskComponent->COMPLETED) {
 			$completedDateTime = new \DateTime($taskComponent->COMPLETED->getDateTime()->format(\DateTimeInterface::ATOM));
 			$formattedDate = $this->l10n->l('date', $completedDateTime, ['width' => 'medium']);
-			$formattedSubline = $this->l10n->t('Completed on %s', [$formattedDate]);
-		} elseif ($taskComponent->DUE) {
+			return $this->l10n->t('Completed on %s', [$formattedDate]);
+		}
+
+		if ($taskComponent->DUE) {
 			$dueDateTime = new \DateTime($taskComponent->DUE->getDateTime()->format(\DateTimeInterface::ATOM));
 			$formattedDate = $this->l10n->l('date', $dueDateTime, ['width' => 'medium']);

 			if ($taskComponent->DUE->hasTime()) {
 				$formattedTime = $this->l10n->l('time', $dueDateTime, ['width' => 'short']);
-				$formattedSubline = $this->l10n->t('Due on %s by %s', [$formattedDate, $formattedTime]);
-			} else {
-				$formattedSubline = $this->l10n->t('Due on %s', [$formattedDate]);
+				return $this->l10n->t('Due on %s by %s', [$formattedDate, $formattedTime]);
 			}
-		} else {
-			$formattedSubline = '';
+
+			return $this->l10n->t('Due on %s', [$formattedDate]);
 		}

-		if (isset($calendarInfo['{DAV:}displayname']) && !empty($calendarInfo['{DAV:}displayname'])) {
-			$formattedSubline = $formattedSubline . (!empty($formattedSubline) ? ' ' : '') . "({$calendarInfo['{DAV:}displayname']})";
-		}
-
-		return $formattedSubline;
+		return '';
 	}
 }
@@ -191,70 +191,4 @@ abstract class ASyncService {
 			rtrim($responseUri, '/'),
 		);
 	}
-
-	/**
-	 * Push data to the remote server via HTTP PUT.
-	 * Used for creating or updating CalDAV/CardDAV objects.
-	 *
-	 * @param string $url The absolute URL to PUT to
-	 * @param string $username The username for authentication
-	 * @param string $token The authentication token/password
-	 * @param string $data The data to upload
-	 * @param string $contentType The Content-Type header (e.g., 'text/calendar' or 'text/vcard')
-	 *
-	 * @return string The ETag returned by the server
-	 */
-	protected function requestPut(
-		string $url,
-		string $username,
-		string $token,
-		string $data,
-		string $contentType = 'text/calendar; charset=utf-8',
-	): string {
-		$client = $this->getClient();
-
-		$options = [
-			'auth' => [$username, $token],
-			'body' => $data,
-			'headers' => [
-				'Content-Type' => $contentType,
-			],
-			'verify' => !$this->config->getSystemValue(
-				'sharing.federation.allowSelfSignedCertificates',
-				false,
-			),
-		];
-
-		$response = $client->put($url, $options);
-
-		// Extract and return the ETag from the response
-		$etag = $response->getHeader('ETag');
-		return $etag;
-	}
-
-	/**
-	 * Delete a resource from the remote server via HTTP DELETE.
-	 * Used for deleting CalDAV/CardDAV objects.
-	 *
-	 * @param string $url The absolute URL to DELETE
-	 * @param string $username The username for authentication
-	 * @param string $token The authentication token/password
-	 */
-	protected function requestDelete(
-		string $url,
-		string $username,
-		string $token,
-	): void {
-		$client = $this->getClient();
-
-		$options = [
-			'auth' => [$username, $token],
-			'verify' => !$this->config->getSystemValue(
-				'sharing.federation.allowSelfSignedCertificates',
-				false,
-			),
-		];
-
-		$client->delete($url, $options);
-	}
 }
@@ -15,7 +15,6 @@ use OCP\AppFramework\Services\IAppConfig;
 use OCP\Files\AppData\IAppDataFactory;
 use OCP\Files\IAppData;
 use OCP\Files\NotFoundException;
-use OCP\IL10N;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Uid\Uuid;

@@ -27,7 +26,6 @@ class ExampleContactService {
 		private readonly IAppConfig $appConfig,
 		private readonly LoggerInterface $logger,
 		private readonly CardDavBackend $cardDav,
-		private readonly IL10N $l,
 	) {
 		$this->appData = $appDataFactory->get(Application::APP_ID);
 	}
@@ -133,9 +131,6 @@ class ExampleContactService {
 		} else {
 			$vcard->add('REV', $newRev);
 		}
-		if (!$vcard->Note) {
-			$vcard->add('note', $this->l->t('This is an example contact'));
-		}

 		// Level 3 means that the document is invalid
 		// https://sabre.io/vobject/vcard/#validating-vcard
@@ -30,9 +30,7 @@
                        "type": "object",
                        "required": [
                            "chunking",
-                            "public_shares_chunking",
-                            "search_supports_creation_time",
-                            "search_supports_upload_time"
+                            "public_shares_chunking"
                        ],
                        "properties": {
                            "chunking": {
@@ -41,12 +39,6 @@
                            "public_shares_chunking": {
                                "type": "boolean"
                            },
-                            "search_supports_creation_time": {
-                                "type": "boolean"
-                            },
-                            "search_supports_upload_time": {
-                                "type": "boolean"
-                            },
                            "bulkupload": {
                                "type": "string"
                            },
@@ -92,12 +92,11 @@ class CalendarFederationProviderTest extends TestCase {
 			->willReturn(true);

 		$this->federatedCalendarMapper->expects(self::once())
-			->method('findByUri')
+			->method('deleteByUri')
 			->with(
 				'principals/users/sharee1',
 				'ae4b8ab904076fff2b955ea21b1a0d92',
-			)
-			->willReturn(null);
+			);

 		$this->federatedCalendarMapper->expects(self::once())
 			->method('insert')
@@ -124,68 +123,6 @@ class CalendarFederationProviderTest extends TestCase {
 		$this->assertEquals(10, $this->calendarFederationProvider->shareReceived($share));
 	}

-	public function testShareReceivedWithExistingCalendar(): void {
-		$share = $this->createMock(ICloudFederationShare::class);
-		$share->method('getShareType')
-			->willReturn('user');
-		$share->method('getProtocol')
-			->willReturn([
-				'version' => 'v1',
-				'url' => 'https://nextcloud.remote/remote.php/dav/remote-calendars/abcdef123/cal1_shared_by_user1',
-				'displayName' => 'Calendar 1',
-				'color' => '#ff0000',
-				'access' => 3,
-				'components' => 'VEVENT,VTODO',
-			]);
-		$share->method('getShareWith')
-			->willReturn('sharee1');
-		$share->method('getShareSecret')
-			->willReturn('new-token');
-		$share->method('getSharedBy')
-			->willReturn('user1@nextcloud.remote');
-		$share->method('getSharedByDisplayName')
-			->willReturn('User 1');
-
-		$this->calendarFederationConfig->expects(self::once())
-			->method('isFederationEnabled')
-			->willReturn(true);
-
-		$existingCalendar = new FederatedCalendarEntity();
-		$existingCalendar->setId(10);
-		$existingCalendar->setPrincipaluri('principals/users/sharee1');
-		$existingCalendar->setUri('ae4b8ab904076fff2b955ea21b1a0d92');
-		$existingCalendar->setRemoteUrl('https://nextcloud.remote/remote.php/dav/remote-calendars/abcdef123/cal1_shared_by_user1');
-		$existingCalendar->setToken('old-token');
-		$existingCalendar->setPermissions(1);
-		$existingCalendar->setComponents('VEVENT');
-
-		$this->federatedCalendarMapper->expects(self::once())
-			->method('findByUri')
-			->with(
-				'principals/users/sharee1',
-				'ae4b8ab904076fff2b955ea21b1a0d92',
-			)
-			->willReturn($existingCalendar);
-
-		$this->federatedCalendarMapper->expects(self::never())
-			->method('insert');
-
-		$this->federatedCalendarMapper->expects(self::once())
-			->method('update')
-			->willReturnCallback(function (FederatedCalendarEntity $calendar) {
-				$this->assertEquals('new-token', $calendar->getToken());
-				$this->assertEquals(1, $calendar->getPermissions());
-				$this->assertEquals('VEVENT,VTODO', $calendar->getComponents());
-				return $calendar;
-			});
-
-		$this->jobList->expects(self::once())
-			->method('add')
-			->with(FederatedCalendarSyncJob::class, ['id' => 10]);
-
-		$this->assertEquals(10, $this->calendarFederationProvider->shareReceived($share));
-	}
-
 	public function testShareReceivedWithInvalidProtocolVersion(): void {
 		$share = $this->createMock(ICloudFederationShare::class);
 		$share->method('getShareType')
@@ -333,65 +270,6 @@ class CalendarFederationProviderTest extends TestCase {
 		$this->calendarFederationProvider->shareReceived($share);
 	}

-	public function testShareReceivedWithReadWriteAccess(): void {
-		$share = $this->createMock(ICloudFederationShare::class);
-		$share->method('getShareType')
-			->willReturn('user');
-		$share->method('getProtocol')
-			->willReturn([
-				'version' => 'v1',
-				'url' => 'https://nextcloud.remote/remote.php/dav/remote-calendars/abcdef123/cal1_shared_by_user1',
-				'displayName' => 'Calendar 1',
-				'color' => '#ff0000',
-				'access' => 2, // Backend::ACCESS_READ_WRITE
-				'components' => 'VEVENT,VTODO',
-			]);
-		$share->method('getShareWith')
-			->willReturn('sharee1');
-		$share->method('getShareSecret')
-			->willReturn('token');
-		$share->method('getSharedBy')
-			->willReturn('user1@nextcloud.remote');
-		$share->method('getSharedByDisplayName')
-			->willReturn('User 1');
-
-		$this->calendarFederationConfig->expects(self::once())
-			->method('isFederationEnabled')
-			->willReturn(true);
-
-		$this->federatedCalendarMapper->expects(self::once())
-			->method('findByUri')
-			->with(
-				'principals/users/sharee1',
-				'ae4b8ab904076fff2b955ea21b1a0d92',
-			)
-			->willReturn(null);
-
-		$this->federatedCalendarMapper->expects(self::once())
-			->method('insert')
-			->willReturnCallback(function (FederatedCalendarEntity $calendar) {
-				$this->assertEquals('principals/users/sharee1', $calendar->getPrincipaluri());
-				$this->assertEquals('ae4b8ab904076fff2b955ea21b1a0d92', $calendar->getUri());
-				$this->assertEquals('https://nextcloud.remote/remote.php/dav/remote-calendars/abcdef123/cal1_shared_by_user1', $calendar->getRemoteUrl());
-				$this->assertEquals('Calendar 1', $calendar->getDisplayName());
-				$this->assertEquals('#ff0000', $calendar->getColor());
-				$this->assertEquals('token', $calendar->getToken());
-				$this->assertEquals('user1@nextcloud.remote', $calendar->getSharedBy());
-				$this->assertEquals('User 1', $calendar->getSharedByDisplayName());
-				$this->assertEquals(15, $calendar->getPermissions()); // READ | CREATE | UPDATE | DELETE
-				$this->assertEquals('VEVENT,VTODO', $calendar->getComponents());
-
-				$calendar->setId(10);
-				return $calendar;
-			});
-
-		$this->jobList->expects(self::once())
-			->method('add')
-			->with(FederatedCalendarSyncJob::class, ['id' => 10]);
-
-		$this->assertEquals(10, $this->calendarFederationProvider->shareReceived($share));
-	}
-
 	public function testShareReceivedWithUnsupportedAccess(): void {
 		$share = $this->createMock(ICloudFederationShare::class);
 		$share->method('getShareType')
@@ -402,7 +280,7 @@ class CalendarFederationProviderTest extends TestCase {
 				'url' => 'https://nextcloud.remote/remote.php/dav/remote-calendars/abcdef123/cal1_shared_by_user1',
 				'displayName' => 'Calendar 1',
 				'color' => '#ff0000',
-				'access' => 999, // Invalid access value
+				'access' => 2, // Backend::ACCESS_READ_WRITE
 				'components' => 'VEVENT,VTODO',
 			]);
 		$share->method('getShareWith')
@@ -9,17 +9,13 @@ declare(strict_types=1);

 namespace OCA\DAV\Tests\unit\CalDAV\Federation;

-use OCA\DAV\CalDAV\CalDavBackend;
 use OCA\DAV\CalDAV\Federation\FederatedCalendarEntity;
 use OCA\DAV\CalDAV\Federation\FederatedCalendarMapper;
 use OCA\DAV\CalDAV\Federation\FederatedCalendarSyncService;
+use OCA\DAV\CalDAV\SyncService as CalDavSyncService;
+use OCA\DAV\CalDAV\SyncServiceResult;
 use OCP\Federation\ICloudId;
 use OCP\Federation\ICloudIdManager;
-use OCP\Http\Client\IClient;
-use OCP\Http\Client\IClientService;
-use OCP\Http\Client\IResponse;
-use OCP\IConfig;
-use OCP\IDBConnection;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
@@ -30,30 +26,21 @@ class FederatedCalendarSyncServiceTest extends TestCase {

 	private FederatedCalendarMapper&MockObject $federatedCalendarMapper;
 	private LoggerInterface&MockObject $logger;
-	private CalDavBackend&MockObject $backend;
-	private IDBConnection&MockObject $dbConnection;
+	private CalDavSyncService&MockObject $calDavSyncService;
 	private ICloudIdManager&MockObject $cloudIdManager;
-	private IClientService&MockObject $clientService;
-	private IConfig&MockObject $config;

 	protected function setUp(): void {
 		parent::setUp();

 		$this->federatedCalendarMapper = $this->createMock(FederatedCalendarMapper::class);
 		$this->logger = $this->createMock(LoggerInterface::class);
-		$this->backend = $this->createMock(CalDavBackend::class);
-		$this->dbConnection = $this->createMock(IDBConnection::class);
+		$this->calDavSyncService = $this->createMock(CalDavSyncService::class);
 		$this->cloudIdManager = $this->createMock(ICloudIdManager::class);
-		$this->clientService = $this->createMock(IClientService::class);
-		$this->config = $this->createMock(IConfig::class);

 		$this->federatedCalendarSyncService = new FederatedCalendarSyncService(
-			$this->clientService,
-			$this->config,
 			$this->federatedCalendarMapper,
 			$this->logger,
-			$this->backend,
-			$this->dbConnection,
+			$this->calDavSyncService,
 			$this->cloudIdManager,
 		);
 	}
@@ -74,24 +61,16 @@ class FederatedCalendarSyncServiceTest extends TestCase {
 			->with('user1')
 			->willReturn($cloudId);

-		// Mock HTTP client for sync report
-		$client = $this->createMock(IClient::class);
-		$response = $this->createMock(IResponse::class);
-		$response->method('getBody')
-			->willReturn('<?xml version="1.0"?><d:multistatus xmlns:d="DAV:"><d:sync-token>http://sabre.io/ns/sync/101</d:sync-token></d:multistatus>');
-
-		$client->expects(self::once())
-			->method('request')
-			->with('REPORT', 'https://remote.tld/remote.php/dav/remote-calendars/abcdef123/cal1_shared_by_user2', self::anything())
-			->willReturn($response);
-
-		$this->clientService->method('newClient')
-			->willReturn($client);
-
-		$this->config->method('getSystemValueInt')
-			->willReturn(30);
-		$this->config->method('getSystemValue')
-			->willReturn(false);
+		$this->calDavSyncService->expects(self::once())
+			->method('syncRemoteCalendar')
+			->with(
+				'https://remote.tld/remote.php/dav/remote-calendars/abcdef123/cal1_shared_by_user2',
+				'dXNlcjFAbmV4dGNsb3VkLnRlc3Rpbmc=',
+				'token',
+				'http://sabre.io/ns/sync/100',
+				$calendar,
+			)
+			->willReturn(new SyncServiceResult('http://sabre.io/ns/sync/101', 10));

 		$this->federatedCalendarMapper->expects(self::once())
 			->method('updateSyncTokenAndTime')
@@ -99,7 +78,7 @@ class FederatedCalendarSyncServiceTest extends TestCase {
 		$this->federatedCalendarMapper->expects(self::never())
 			->method('updateSyncTime');

-		$this->assertEquals(0, $this->federatedCalendarSyncService->syncOne($calendar));
+		$this->assertEquals(10, $this->federatedCalendarSyncService->syncOne($calendar));
 	}

 	public function testSyncOneUnchanged(): void {
@@ -118,24 +97,16 @@ class FederatedCalendarSyncServiceTest extends TestCase {
 			->with('user1')
 			->willReturn($cloudId);

-		// Mock HTTP client for sync report
-		$client = $this->createMock(IClient::class);
-		$response = $this->createMock(IResponse::class);
-		$response->method('getBody')
-			->willReturn('<?xml version="1.0"?><d:multistatus xmlns:d="DAV:"><d:sync-token>http://sabre.io/ns/sync/100</d:sync-token></d:multistatus>');
-
-		$client->expects(self::once())
-			->method('request')
-			->with('REPORT', 'https://remote.tld/remote.php/dav/remote-calendars/abcdef123/cal1_shared_by_user2', self::anything())
-			->willReturn($response);
-
-		$this->clientService->method('newClient')
-			->willReturn($client);
-
-		$this->config->method('getSystemValueInt')
-			->willReturn(30);
-		$this->config->method('getSystemValue')
-			->willReturn(false);
+		$this->calDavSyncService->expects(self::once())
+			->method('syncRemoteCalendar')
+			->with(
+				'https://remote.tld/remote.php/dav/remote-calendars/abcdef123/cal1_shared_by_user2',
+				'dXNlcjFAbmV4dGNsb3VkLnRlc3Rpbmc=',
+				'token',
+				'http://sabre.io/ns/sync/100',
+				$calendar,
+			)
+			->willReturn(new SyncServiceResult('http://sabre.io/ns/sync/100', 0));

 		$this->federatedCalendarMapper->expects(self::never())
 			->method('updateSyncTokenAndTime');
@@ -172,24 +143,16 @@ class FederatedCalendarSyncServiceTest extends TestCase {
 			->with('user1')
 			->willReturn($cloudId);

-		// Mock HTTP client for sync report with unexpected token format
-		$client = $this->createMock(IClient::class);
-		$response = $this->createMock(IResponse::class);
-		$response->method('getBody')
-			->willReturn('<?xml version="1.0"?><d:multistatus xmlns:d="DAV:"><d:sync-token>' . $syncToken . '</d:sync-token></d:multistatus>');
-
-		$client->expects(self::once())
-			->method('request')
-			->with('REPORT', 'https://remote.tld/remote.php/dav/remote-calendars/abcdef123/cal1_shared_by_user2', self::anything())
-			->willReturn($response);
-
-		$this->clientService->method('newClient')
-			->willReturn($client);
-
-		$this->config->method('getSystemValueInt')
-			->willReturn(30);
-		$this->config->method('getSystemValue')
-			->willReturn(false);
+		$this->calDavSyncService->expects(self::once())
+			->method('syncRemoteCalendar')
+			->with(
+				'https://remote.tld/remote.php/dav/remote-calendars/abcdef123/cal1_shared_by_user2',
+				'dXNlcjFAbmV4dGNsb3VkLnRlc3Rpbmc=',
+				'token',
+				'http://sabre.io/ns/sync/100',
+				$calendar,
+			)
+			->willReturn(new SyncServiceResult($syncToken, 10));

 		$this->federatedCalendarMapper->expects(self::never())
 			->method('updateSyncTokenAndTime');
@@ -1,404 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/**
- * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-namespace OCA\DAV\Tests\unit\CalDAV\Federation;
-
-use OCA\DAV\CalDAV\CalDavBackend;
-use OCA\DAV\CalDAV\Federation\FederatedCalendar;
-use OCA\DAV\CalDAV\Federation\FederatedCalendarEntity;
-use OCA\DAV\CalDAV\Federation\FederatedCalendarMapper;
-use OCA\DAV\CalDAV\Federation\FederatedCalendarObject;
-use OCA\DAV\CalDAV\Federation\FederatedCalendarSyncService;
-use OCP\Constants;
-use PHPUnit\Framework\MockObject\MockObject;
-use Sabre\DAV\Exception\MethodNotAllowed;
-use Sabre\DAV\Exception\NotFound;
-use Sabre\DAV\PropPatch;
-use Test\TestCase;
-
-class FederatedCalendarTest extends TestCase {
-	private FederatedCalendar $federatedCalendar;
-
-	private FederatedCalendarMapper&MockObject $federatedCalendarMapper;
-	private FederatedCalendarSyncService&MockObject $federatedCalendarService;
-	private CalDavBackend&MockObject $caldavBackend;
-	private FederatedCalendarEntity $federationInfo;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->federatedCalendarMapper = $this->createMock(FederatedCalendarMapper::class);
-		$this->federatedCalendarService = $this->createMock(FederatedCalendarSyncService::class);
-		$this->caldavBackend = $this->createMock(CalDavBackend::class);
-
-		$this->federationInfo = new FederatedCalendarEntity();
-		$this->federationInfo->setId(10);
-		$this->federationInfo->setPrincipaluri('principals/users/user1');
-		$this->federationInfo->setUri('calendar-uri');
-		$this->federationInfo->setDisplayName('Federated Calendar');
-		$this->federationInfo->setColor('#ff0000');
-		$this->federationInfo->setSharedBy('user2@nextcloud.remote');
-		$this->federationInfo->setSharedByDisplayName('User 2');
-		$this->federationInfo->setPermissions(Constants::PERMISSION_READ);
-		$this->federationInfo->setLastSync(1234567890);
-
-		$this->federatedCalendarMapper->method('findByUri')
-			->with('principals/users/user1', 'calendar-uri')
-			->willReturn($this->federationInfo);
-
-		$calendarInfo = [
-			'principaluri' => 'principals/users/user1',
-			'id' => 10,
-			'uri' => 'calendar-uri',
-		];
-
-		$this->federatedCalendar = new FederatedCalendar(
-			$this->federatedCalendarMapper,
-			$this->federatedCalendarService,
-			$this->caldavBackend,
-			$calendarInfo,
-		);
-	}
-
-	public function testGetResourceId(): void {
-		$this->assertEquals(10, $this->federatedCalendar->getResourceId());
-	}
-
-	public function testGetName(): void {
-		$this->assertEquals('calendar-uri', $this->federatedCalendar->getName());
-	}
-
-	public function testSetName(): void {
-		$this->expectException(MethodNotAllowed::class);
-		$this->expectExceptionMessage('Renaming federated calendars is not allowed');
-		$this->federatedCalendar->setName('new-name');
-	}
-
-	public function testGetPrincipalURI(): void {
-		$this->assertEquals('principals/users/user1', $this->federatedCalendar->getPrincipalURI());
-	}
-
-	public function testGetOwner(): void {
-		$expected = 'principals/remote-users/' . base64_encode('user2@nextcloud.remote');
-		$this->assertEquals($expected, $this->federatedCalendar->getOwner());
-	}
-
-	public function testGetGroup(): void {
-		$this->assertNull($this->federatedCalendar->getGroup());
-	}
-
-	public function testGetACLWithReadOnlyPermissions(): void {
-		$this->federationInfo->setPermissions(Constants::PERMISSION_READ);
-
-		$acl = $this->federatedCalendar->getACL();
-
-		$this->assertCount(3, $acl);
-		// Check basic read permissions
-		$this->assertEquals('{DAV:}read', $acl[0]['privilege']);
-		$this->assertTrue($acl[0]['protected']);
-		$this->assertEquals('{DAV:}read-acl', $acl[1]['privilege']);
-		$this->assertTrue($acl[1]['protected']);
-		$this->assertEquals('{DAV:}write-properties', $acl[2]['privilege']);
-		$this->assertTrue($acl[2]['protected']);
-	}
-
-	public function testGetACLWithCreatePermission(): void {
-		$this->federationInfo->setPermissions(Constants::PERMISSION_READ | Constants::PERMISSION_CREATE);
-
-		$acl = $this->federatedCalendar->getACL();
-
-		$this->assertCount(4, $acl);
-		// Check that create permission is added
-		$privileges = array_column($acl, 'privilege');
-		$this->assertContains('{DAV:}bind', $privileges);
-	}
-
-	public function testGetACLWithUpdatePermission(): void {
-		$this->federationInfo->setPermissions(Constants::PERMISSION_READ | Constants::PERMISSION_UPDATE);
-
-		$acl = $this->federatedCalendar->getACL();
-
-		$this->assertCount(4, $acl);
-		// Check that update permission is added (write-content, not write-properties which is already in base ACL)
-		$privileges = array_column($acl, 'privilege');
-		$this->assertContains('{DAV:}write-content', $privileges);
-	}
-
-	public function testGetACLWithDeletePermission(): void {
-		$this->federationInfo->setPermissions(Constants::PERMISSION_READ | Constants::PERMISSION_DELETE);
-
-		$acl = $this->federatedCalendar->getACL();
-
-		$this->assertCount(4, $acl);
-		// Check that delete permission is added
-		$privileges = array_column($acl, 'privilege');
-		$this->assertContains('{DAV:}unbind', $privileges);
-	}
-
-	public function testGetACLWithAllPermissions(): void {
-		$this->federationInfo->setPermissions(
-			Constants::PERMISSION_READ
-			| Constants::PERMISSION_CREATE
-			| Constants::PERMISSION_UPDATE
-			| Constants::PERMISSION_DELETE
-		);
-
-		$acl = $this->federatedCalendar->getACL();
-
-		$this->assertCount(6, $acl);
-		$privileges = array_column($acl, 'privilege');
-		$this->assertContains('{DAV:}read', $privileges);
-		$this->assertContains('{DAV:}bind', $privileges);
-		$this->assertContains('{DAV:}write-content', $privileges);
-		$this->assertContains('{DAV:}write-properties', $privileges);
-		$this->assertContains('{DAV:}unbind', $privileges);
-	}
-
-	public function testSetACL(): void {
-		$this->expectException(MethodNotAllowed::class);
-		$this->expectExceptionMessage('Changing ACLs on federated calendars is not allowed');
-		$this->federatedCalendar->setACL([]);
-	}
-
-	public function testGetSupportedPrivilegeSet(): void {
-		$this->assertNull($this->federatedCalendar->getSupportedPrivilegeSet());
-	}
-
-	public function testGetProperties(): void {
-		$properties = $this->federatedCalendar->getProperties([
-			'{DAV:}displayname',
-			'{http://apple.com/ns/ical/}calendar-color',
-		]);
-
-		$this->assertEquals('Federated Calendar', $properties['{DAV:}displayname']);
-		$this->assertEquals('#ff0000', $properties['{http://apple.com/ns/ical/}calendar-color']);
-	}
-
-	public function testPropPatchWithDisplayName(): void {
-		$propPatch = $this->createMock(PropPatch::class);
-		$propPatch->method('getMutations')
-			->willReturn([
-				'{DAV:}displayname' => 'New Calendar Name',
-			]);
-
-		$this->federatedCalendarMapper->expects(self::once())
-			->method('update')
-			->willReturnCallback(function (FederatedCalendarEntity $entity) {
-				$this->assertEquals('New Calendar Name', $entity->getDisplayName());
-				return $entity;
-			});
-
-		$propPatch->expects(self::once())
-			->method('setResultCode')
-			->with('{DAV:}displayname', 200);
-
-		$this->federatedCalendar->propPatch($propPatch);
-	}
-
-	public function testPropPatchWithColor(): void {
-		$propPatch = $this->createMock(PropPatch::class);
-		$propPatch->method('getMutations')
-			->willReturn([
-				'{http://apple.com/ns/ical/}calendar-color' => '#00ff00',
-			]);
-
-		$this->federatedCalendarMapper->expects(self::once())
-			->method('update')
-			->willReturnCallback(function (FederatedCalendarEntity $entity) {
-				$this->assertEquals('#00ff00', $entity->getColor());
-				return $entity;
-			});
-
-		$propPatch->expects(self::once())
-			->method('setResultCode')
-			->with('{http://apple.com/ns/ical/}calendar-color', 200);
-
-		$this->federatedCalendar->propPatch($propPatch);
-	}
-
-	public function testPropPatchWithNoMutations(): void {
-		$propPatch = $this->createMock(PropPatch::class);
-		$propPatch->method('getMutations')
-			->willReturn([]);
-
-		$this->federatedCalendarMapper->expects(self::never())
-			->method('update');
-
-		$propPatch->expects(self::never())
-			->method('handle');
-
-		$this->federatedCalendar->propPatch($propPatch);
-	}
-
-	public function testGetChildACL(): void {
-		$this->assertEquals($this->federatedCalendar->getACL(), $this->federatedCalendar->getChildACL());
-	}
-
-	public function testGetLastModified(): void {
-		$this->assertEquals(1234567890, $this->federatedCalendar->getLastModified());
-	}
-
-	public function testDelete(): void {
-		$this->federatedCalendarMapper->expects(self::once())
-			->method('deleteById')
-			->with(10);
-
-		$this->federatedCalendar->delete();
-	}
-
-	public function testCreateDirectory(): void {
-		$this->expectException(MethodNotAllowed::class);
-		$this->expectExceptionMessage('Creating nested collection is not allowed');
-		$this->federatedCalendar->createDirectory('test');
-	}
-
-	public function testCalendarQuery(): void {
-		$filters = ['comp-filter' => ['name' => 'VEVENT']];
-		$expectedUris = ['event1.ics', 'event2.ics'];
-
-		$this->caldavBackend->expects(self::once())
-			->method('calendarQuery')
-			->with(10, $filters, 2) // 2 is CALENDAR_TYPE_FEDERATED
-			->willReturn($expectedUris);
-
-		$result = $this->federatedCalendar->calendarQuery($filters);
-		$this->assertEquals($expectedUris, $result);
-	}
-
-	public function testGetChild(): void {
-		$objectData = [
-			'id' => 1,
-			'uri' => 'event1.ics',
-			'calendardata' => 'BEGIN:VCALENDAR...',
-		];
-
-		$this->caldavBackend->expects(self::once())
-			->method('getCalendarObject')
-			->with(10, 'event1.ics', 2) // 2 is CALENDAR_TYPE_FEDERATED
-			->willReturn($objectData);
-
-		$child = $this->federatedCalendar->getChild('event1.ics');
-		$this->assertInstanceOf(FederatedCalendarObject::class, $child);
-	}
-
-	public function testGetChildNotFound(): void {
-		$this->caldavBackend->expects(self::once())
-			->method('getCalendarObject')
-			->with(10, 'nonexistent.ics', 2)
-			->willReturn(null);
-
-		$this->expectException(NotFound::class);
-		$this->federatedCalendar->getChild('nonexistent.ics');
-	}
-
-	public function testGetChildren(): void {
-		$objects = [
-			['id' => 1, 'uri' => 'event1.ics', 'calendardata' => 'BEGIN:VCALENDAR...'],
-			['id' => 2, 'uri' => 'event2.ics', 'calendardata' => 'BEGIN:VCALENDAR...'],
-		];
-
-		$this->caldavBackend->expects(self::once())
-			->method('getCalendarObjects')
-			->with(10, 2) // 2 is CALENDAR_TYPE_FEDERATED
-			->willReturn($objects);
-
-		$children = $this->federatedCalendar->getChildren();
-		$this->assertCount(2, $children);
-		$this->assertInstanceOf(FederatedCalendarObject::class, $children[0]);
-		$this->assertInstanceOf(FederatedCalendarObject::class, $children[1]);
-	}
-
-	public function testGetMultipleChildren(): void {
-		$paths = ['event1.ics', 'event2.ics'];
-		$objects = [
-			['id' => 1, 'uri' => 'event1.ics', 'calendardata' => 'BEGIN:VCALENDAR...'],
-			['id' => 2, 'uri' => 'event2.ics', 'calendardata' => 'BEGIN:VCALENDAR...'],
-		];
-
-		$this->caldavBackend->expects(self::once())
-			->method('getMultipleCalendarObjects')
-			->with(10, $paths, 2) // 2 is CALENDAR_TYPE_FEDERATED
-			->willReturn($objects);
-
-		$children = $this->federatedCalendar->getMultipleChildren($paths);
-		$this->assertCount(2, $children);
-		$this->assertInstanceOf(FederatedCalendarObject::class, $children[0]);
-		$this->assertInstanceOf(FederatedCalendarObject::class, $children[1]);
-	}
-
-	public function testChildExists(): void {
-		$this->caldavBackend->expects(self::once())
-			->method('getCalendarObject')
-			->with(10, 'event1.ics', 2)
-			->willReturn(['id' => 1, 'uri' => 'event1.ics']);
-
-		$result = $this->federatedCalendar->childExists('event1.ics');
-		$this->assertTrue($result);
-	}
-
-	public function testChildNotExists(): void {
-		$this->caldavBackend->expects(self::once())
-			->method('getCalendarObject')
-			->with(10, 'nonexistent.ics', 2)
-			->willReturn(null);
-
-		$result = $this->federatedCalendar->childExists('nonexistent.ics');
-		$this->assertFalse($result);
-	}
-
-	public function testCreateFile(): void {
-		$calendarData = 'BEGIN:VCALENDAR...END:VCALENDAR';
-		$remoteEtag = '"remote-etag-123"';
-		$localEtag = '"local-etag-456"';
-
-		$this->federatedCalendarService->expects(self::once())
-			->method('createCalendarObject')
-			->with($this->federationInfo, 'event1.ics', $calendarData)
-			->willReturn($remoteEtag);
-
-		$this->caldavBackend->expects(self::once())
-			->method('createCalendarObject')
-			->with(10, 'event1.ics', $calendarData, 2)
-			->willReturn($localEtag);
-
-		$result = $this->federatedCalendar->createFile('event1.ics', $calendarData);
-		$this->assertEquals($localEtag, $result);
-	}
-
-	public function testUpdateFile(): void {
-		$calendarData = 'BEGIN:VCALENDAR...UPDATED...END:VCALENDAR';
-		$remoteEtag = '"remote-etag-updated"';
-		$localEtag = '"local-etag-updated"';
-
-		$this->federatedCalendarService->expects(self::once())
-			->method('updateCalendarObject')
-			->with($this->federationInfo, 'event1.ics', $calendarData)
-			->willReturn($remoteEtag);
-
-		$this->caldavBackend->expects(self::once())
-			->method('updateCalendarObject')
-			->with(10, 'event1.ics', $calendarData, 2)
-			->willReturn($localEtag);
-
-		$result = $this->federatedCalendar->updateFile('event1.ics', $calendarData);
-		$this->assertEquals($localEtag, $result);
-	}
-
-	public function testDeleteFile(): void {
-		$this->federatedCalendarService->expects(self::once())
-			->method('deleteCalendarObject')
-			->with($this->federationInfo, 'event1.ics');
-
-		$this->caldavBackend->expects(self::once())
-			->method('deleteCalendarObject')
-			->with(10, 'event1.ics', 2);
-
-		$this->federatedCalendar->deleteFile('event1.ics');
-	}
-}
@@ -17,7 +17,6 @@ use OCP\Config\IUserConfig;
 use OCP\IAppConfig;
 use OCP\IDBConnection;
 use OCP\IL10N;
-use OCP\IUser;
 use OCP\IUserManager;
 use OCP\L10N\IFactory;
 use OCP\Security\ISecureRandom;
@@ -164,7 +163,7 @@ class IMipServiceTest extends TestCase {

 	public function testIsSystemUserWhenUserExists(): void {
 		$email = 'user@example.com';
-		$user = $this->createMock(IUser::class);
+		$user = $this->createMock(\OCP\IUser::class);

 		$this->userManager->expects(self::once())
 			->method('getByEmail')
@@ -31,8 +31,6 @@ class CapabilitiesTest extends TestCase {
 			'dav' => [
 				'chunking' => '1.0',
 				'public_shares_chunking' => true,
-				'search_supports_creation_time' => true,
-				'search_supports_upload_time' => true,
 			],
 		];
 		$this->assertSame($expected, $capabilities->getCapabilities());
@@ -53,8 +51,6 @@ class CapabilitiesTest extends TestCase {
 			'dav' => [
 				'chunking' => '1.0',
 				'public_shares_chunking' => true,
-				'search_supports_creation_time' => true,
-				'search_supports_upload_time' => true,
 				'bulkupload' => '1.0',
 			],
 		];
@@ -76,8 +72,6 @@ class CapabilitiesTest extends TestCase {
 			'dav' => [
 				'chunking' => '1.0',
 				'public_shares_chunking' => true,
-				'search_supports_creation_time' => true,
-				'search_supports_upload_time' => true,
 				'absence-supported' => true,
 				'absence-replacement' => true,
 			],
@@ -436,7 +436,7 @@ class EventsSearchProviderTest extends TestCase {
 	}

 	#[\PHPUnit\Framework\Attributes\DataProvider(methodName: 'generateSublineDataProvider')]
-	public function testGenerateSubline(string $ics, string $expectedSubline, array $calendarInfo = []): void {
+	public function testGenerateSubline(string $ics, string $expectedSubline): void {
 		$vCalendar = Reader::read($ics, Reader::OPTION_FORGIVING);
 		$eventComponent = $vCalendar->VEVENT;

@@ -449,23 +449,19 @@ class EventsSearchProviderTest extends TestCase {
 				return $date->format('m-d');
 			});

-		$actual = self::invokePrivate($this->provider, 'generateSubline', [$eventComponent, $calendarInfo]);
+		$actual = self::invokePrivate($this->provider, 'generateSubline', [$eventComponent]);
 		$this->assertEquals($expectedSubline, $actual);
 	}

 	public static function generateSublineDataProvider(): array {
 		return [
-			[self::$vEvent1, '08-16 09:00 - 10:00', []],
-			[self::$vEvent2, '08-16 09:00 - 08-17 10:00', []],
-			[self::$vEvent3, '10-05', []],
-			[self::$vEvent4, '10-05 - 10-07', []],
-			[self::$vEvent5, '10-05 - 10-09', []],
-			[self::$vEvent6, '10-05', []],
-			[self::$vEvent7, '08-16 09:00 - 09:00', []],
-			[self::$vEvent1, '08-16 09:00 - 10:00 (My Calendar)', ['{DAV:}displayname' => 'My Calendar']],
-			[self::$vEvent3, '10-05 (My Calendar)', ['{DAV:}displayname' => 'My Calendar']],
-			[self::$vEvent2, '08-16 09:00 - 08-17 10:00 (My Calendar)', ['{DAV:}displayname' => 'My Calendar']],
-			[self::$vEvent1, '08-16 09:00 - 10:00', ['{DAV:}displayname' => '']],
+			[self::$vEvent1, '08-16 09:00 - 10:00'],
+			[self::$vEvent2, '08-16 09:00 - 08-17 10:00'],
+			[self::$vEvent3, '10-05'],
+			[self::$vEvent4, '10-05 - 10-07'],
+			[self::$vEvent5, '10-05 - 10-09'],
+			[self::$vEvent6, '10-05'],
+			[self::$vEvent7, '08-16 09:00 - 09:00'],
 		];
 	}
 }
@@ -290,29 +290,24 @@ class TasksSearchProviderTest extends TestCase {
 	}

 	#[\PHPUnit\Framework\Attributes\DataProvider(methodName: 'generateSublineDataProvider')]
-	public function testGenerateSubline(string $ics, string $expectedSubline, array $calendarInfo = []): void {
+	public function testGenerateSubline(string $ics, string $expectedSubline): void {
 		$vCalendar = Reader::read($ics, Reader::OPTION_FORGIVING);
 		$taskComponent = $vCalendar->VTODO;

 		$this->l10n->method('t')->willReturnArgument(0);
 		$this->l10n->method('l')->willReturnArgument(0);

-		$actual = self::invokePrivate($this->provider, 'generateSubline', [$taskComponent, $calendarInfo]);
+		$actual = self::invokePrivate($this->provider, 'generateSubline', [$taskComponent]);
 		$this->assertEquals($expectedSubline, $actual);
 	}

 	public static function generateSublineDataProvider(): array {
 		return [
-			[self::$vTodo0, '', []],
-			[self::$vTodo1, 'Completed on %s', []],
-			[self::$vTodo2, 'Completed on %s', []],
-			[self::$vTodo3, 'Due on %s', []],
-			[self::$vTodo4, 'Due on %s by %s', []],
-			[self::$vTodo0, '(My Tasks)', ['{DAV:}displayname' => 'My Tasks']],
-			[self::$vTodo1, 'Completed on %s (My Tasks)', ['{DAV:}displayname' => 'My Tasks']],
-			[self::$vTodo3, 'Due on %s (My Tasks)', ['{DAV:}displayname' => 'My Tasks']],
-			[self::$vTodo4, 'Due on %s by %s (My Tasks)', ['{DAV:}displayname' => 'My Tasks']],
-			[self::$vTodo1, 'Completed on %s', ['{DAV:}displayname' => '']],
+			[self::$vTodo0, ''],
+			[self::$vTodo1, 'Completed on %s'],
+			[self::$vTodo2, 'Completed on %s'],
+			[self::$vTodo3, 'Due on %s'],
+			[self::$vTodo4, 'Due on %s by %s'],
 		];
 	}
 }
@@ -18,7 +18,6 @@ use OCP\Files\IAppData;
 use OCP\Files\NotFoundException;
 use OCP\Files\SimpleFS\ISimpleFile;
 use OCP\Files\SimpleFS\ISimpleFolder;
-use OCP\IL10N;
 use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Uid\Uuid;
@@ -32,7 +31,6 @@ class ExampleContactServiceTest extends TestCase {
 	protected LoggerInterface&MockObject $logger;
 	protected IAppConfig&MockObject $appConfig;
 	protected IAppData&MockObject $appData;
-	protected IL10N&MockObject $l;

 	protected function setUp(): void {
 		parent::setUp();
@@ -41,7 +39,6 @@ class ExampleContactServiceTest extends TestCase {
 		$this->appDataFactory = $this->createMock(IAppDataFactory::class);
 		$this->logger = $this->createMock(LoggerInterface::class);
 		$this->appConfig = $this->createMock(IAppConfig::class);
-		$this->l = $this->createMock((IL10N::class));

 		$this->appData = $this->createMock(IAppData::class);
 		$this->appDataFactory->method('get')
@@ -53,7 +50,6 @@ class ExampleContactServiceTest extends TestCase {
 			$this->appConfig,
 			$this->logger,
 			$this->cardDav,
-			$this->l,
 		);
 	}

@@ -33,31 +33,21 @@ OC.L10N.register(
    "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Por favor ingrese en la interfaz web, vaya a la sección \"Seguridad\" de sus ajustes personales y actualice su contraseña de cifrado ingresando esta contraseña en el campo \"Contraseña de inicio de sesión antigua\" y su contraseña actual.",
    "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede descifrar este archivo, probablemente se trate de un archivo compartido. Por favor, pida al propietario del archivo que vuelva a compartirlo con usted.",
    "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede leer este archivo, probablemente se trate de un archivo compartido. Por favor, pida al propietario del archivo que vuelva a compartirlo con usted.",
-    "Default Encryption Module" : "Módulo de cifrado predeterminado",
-    "Default encryption module for Nextcloud Server-side Encryption (SSE)" : "Módulo de cifrado predeterminado para el cifrado del lado del servidor (SSE) de Nextcloud",
    "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Al activar esta opción se encriptarán todos los archivos almacenados en la memoria principal, de lo contrario, serán cifrados sólo los archivos de almacenamiento externo",
    "Encrypt the home storage" : "Encriptar el almacenamiento personal",
    "Disable recovery key" : "Desactiva la clave de recuperación",
    "Enable recovery key" : "Activa la clave de recuperación",
    "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "La llave de recuperación es una llave de cifrado adicional utilizada para cifrar archivos. Es utilizada para recuperar los archivos de una cuenta si la contraseña fuese olvidada.",
    "Recovery key password" : "Contraseña de clave de recuperación",
-    "Passwords fields do not match" : "Las contraseñas no coinciden",
    "Repeat recovery key password" : "Repita la contraseña de recuperación",
-    "An error occurred while updating the recovery key settings. Please try again." : "Se produjo un error al actualizar la configuración de la clave de recuperación. Por favor, inténtelo de nuevo.",
-    "Change recovery key password" : "Cambiar la contraseña de la clave de recuperación",
    "Old recovery key password" : "Antigua contraseña de recuperación",
    "New recovery key password" : "Nueva contraseña de recuperación",
    "Repeat new recovery key password" : "Repita la nueva contraseña de recuperación",
-    "An error occurred while changing the recovery key password. Please try again." : "Se produjo un error al cambiar la contraseña de la clave de recuperación. Por favor, inténtelo de nuevo.",
-    "Update private key password" : "Actualizar la contraseña de la clave privada",
-    "Your private key password no longer matches your log-in password. Set your old private key password to your current log-in password." : "Tu contraseña de clave privada ya no coincide con tu contraseña de inicio de sesión. Cambia tu contraseña de clave privada anterior a tu contraseña de inicio de sesión actual.",
    "If you do not remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña, puede pedir a su administrador que recupere sus archivos.",
    "Old log-in password" : "Contraseña de acceso antigua",
    "Current log-in password" : "Contraseña de acceso actual",
    "Update" : "Actualizar",
-    "Updating recovery keys. This can take some time…" : "Actualizando las claves de recuperación. Esto puede tardar algún tiempo …",
    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción le permitirá volver a tener acceso a sus archivos cifrados en caso de pérdida de contraseña",
-    "Enable password recovery" : "Habilitar la contraseña de recuperación",
    "Default encryption module" : "Módulo de cifrado por defecto",
    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La app de cifrado está habilitada pero sus claves no se han inicializado, por favor, cierre la sesión y vuelva a iniciarla de nuevo.",
    "Basic encryption module" : "Módulo de cifrado básico",
@@ -31,31 +31,21 @@
    "Please login to the web interface, go to the \"Security\" section of your personal settings and update your encryption password by entering this password into the \"Old login password\" field and your current login password." : "Por favor ingrese en la interfaz web, vaya a la sección \"Seguridad\" de sus ajustes personales y actualice su contraseña de cifrado ingresando esta contraseña en el campo \"Contraseña de inicio de sesión antigua\" y su contraseña actual.",
    "Cannot decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede descifrar este archivo, probablemente se trate de un archivo compartido. Por favor, pida al propietario del archivo que vuelva a compartirlo con usted.",
    "Cannot read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "No se puede leer este archivo, probablemente se trate de un archivo compartido. Por favor, pida al propietario del archivo que vuelva a compartirlo con usted.",
-    "Default Encryption Module" : "Módulo de cifrado predeterminado",
-    "Default encryption module for Nextcloud Server-side Encryption (SSE)" : "Módulo de cifrado predeterminado para el cifrado del lado del servidor (SSE) de Nextcloud",
    "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Al activar esta opción se encriptarán todos los archivos almacenados en la memoria principal, de lo contrario, serán cifrados sólo los archivos de almacenamiento externo",
    "Encrypt the home storage" : "Encriptar el almacenamiento personal",
    "Disable recovery key" : "Desactiva la clave de recuperación",
    "Enable recovery key" : "Activa la clave de recuperación",
    "The recovery key is an additional encryption key used to encrypt files. It is used to recover files from an account if the password is forgotten." : "La llave de recuperación es una llave de cifrado adicional utilizada para cifrar archivos. Es utilizada para recuperar los archivos de una cuenta si la contraseña fuese olvidada.",
    "Recovery key password" : "Contraseña de clave de recuperación",
-    "Passwords fields do not match" : "Las contraseñas no coinciden",
    "Repeat recovery key password" : "Repita la contraseña de recuperación",
-    "An error occurred while updating the recovery key settings. Please try again." : "Se produjo un error al actualizar la configuración de la clave de recuperación. Por favor, inténtelo de nuevo.",
-    "Change recovery key password" : "Cambiar la contraseña de la clave de recuperación",
    "Old recovery key password" : "Antigua contraseña de recuperación",
    "New recovery key password" : "Nueva contraseña de recuperación",
    "Repeat new recovery key password" : "Repita la nueva contraseña de recuperación",
-    "An error occurred while changing the recovery key password. Please try again." : "Se produjo un error al cambiar la contraseña de la clave de recuperación. Por favor, inténtelo de nuevo.",
-    "Update private key password" : "Actualizar la contraseña de la clave privada",
-    "Your private key password no longer matches your log-in password. Set your old private key password to your current log-in password." : "Tu contraseña de clave privada ya no coincide con tu contraseña de inicio de sesión. Cambia tu contraseña de clave privada anterior a tu contraseña de inicio de sesión actual.",
    "If you do not remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña, puede pedir a su administrador que recupere sus archivos.",
    "Old log-in password" : "Contraseña de acceso antigua",
    "Current log-in password" : "Contraseña de acceso actual",
    "Update" : "Actualizar",
-    "Updating recovery keys. This can take some time…" : "Actualizando las claves de recuperación. Esto puede tardar algún tiempo …",
    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción le permitirá volver a tener acceso a sus archivos cifrados en caso de pérdida de contraseña",
-    "Enable password recovery" : "Habilitar la contraseña de recuperación",
    "Default encryption module" : "Módulo de cifrado por defecto",
    "Encryption app is enabled but your keys are not initialized, please log-out and log-in again" : "La app de cifrado está habilitada pero sus claves no se han inicializado, por favor, cierre la sesión y vuelva a iniciarla de nuevo.",
    "Basic encryption module" : "Módulo de cifrado básico",
@@ -545,7 +545,7 @@ class Crypt {
 			$options,
 			$iv);

-		if ($plainContent !== false) {
+		if ($plainContent) {
 			return $plainContent;
 		} else {
 			throw new DecryptionFailedException('Encryption library: Decryption (symmetric) of content failed: ' . openssl_error_string());
@@ -22,20 +22,16 @@ OC.L10N.register(
    "Sharing" : "Delen",
    "Federated file sharing" : "Gefedereerd delen",
    "Provide federated file sharing across servers" : "Voorzien in gefedereerd delen van bestanden over verschillende servers",
-    "Enable data upload" : "Schakel data upload in",
-    "Disable upload" : "Schakel upload uit",
    "This is used to retrieve the federated cloud ID to make federated sharing easier." : "Dit wordt gebruikt om de federatieve cloud-ID op te halen om federatief delen gemakkelijker te maken.",
    "Share with me through my #Nextcloud Federated Cloud ID, see {url}" : "Deel met mij via mijn #Nextcloud Federated Cloud-ID, zie {url}",
    "Share with me through my #Nextcloud Federated Cloud ID" : "Deel met mij via mijn #Nextcloud gefedereerde Cloud-ID",
    "Share with me via Nextcloud" : "Deel met mij via Nextcloud",
-    "Cloud ID copied" : "Cloud ID gekopieerd",
    "Copy" : "Kopiëren",
    "Clipboard not available. Please copy the cloud ID manually." : "Klembord niet beschikbaar. Kopieer de cloud-ID handmatig.",
    "Copied!" : "Gekopieerd!",
    "Federated Cloud" : "Gefedereerde Cloud",
    "Your Federated Cloud ID" : "Jouw Federated Cloud-ID",
    "Share it so your friends can share files with you:" : "Deel het, zodat anderen bestanden met jou kunnen delen:",
-    "Bluesky" : "Bluesky",
    "Facebook" : "Facebook",
    "Mastodon" : "Mastodon",
    "Add to your website" : "Toevoegen aan je website",
@@ -20,20 +20,16 @@
    "Sharing" : "Delen",
    "Federated file sharing" : "Gefedereerd delen",
    "Provide federated file sharing across servers" : "Voorzien in gefedereerd delen van bestanden over verschillende servers",
-    "Enable data upload" : "Schakel data upload in",
-    "Disable upload" : "Schakel upload uit",
    "This is used to retrieve the federated cloud ID to make federated sharing easier." : "Dit wordt gebruikt om de federatieve cloud-ID op te halen om federatief delen gemakkelijker te maken.",
    "Share with me through my #Nextcloud Federated Cloud ID, see {url}" : "Deel met mij via mijn #Nextcloud Federated Cloud-ID, zie {url}",
    "Share with me through my #Nextcloud Federated Cloud ID" : "Deel met mij via mijn #Nextcloud gefedereerde Cloud-ID",
    "Share with me via Nextcloud" : "Deel met mij via Nextcloud",
-    "Cloud ID copied" : "Cloud ID gekopieerd",
    "Copy" : "Kopiëren",
    "Clipboard not available. Please copy the cloud ID manually." : "Klembord niet beschikbaar. Kopieer de cloud-ID handmatig.",
    "Copied!" : "Gekopieerd!",
    "Federated Cloud" : "Gefedereerde Cloud",
    "Your Federated Cloud ID" : "Jouw Federated Cloud-ID",
    "Share it so your friends can share files with you:" : "Deel het, zodat anderen bestanden met jou kunnen delen:",
-    "Bluesky" : "Bluesky",
    "Facebook" : "Facebook",
    "Mastodon" : "Mastodon",
    "Add to your website" : "Toevoegen aan je website",
@@ -42,8 +42,8 @@ OC.L10N.register(
    "The lookup server is only available for global scale." : "Сервер пошуку доступний тільки для глобального масштабу.",
    "Search global and public address book for people" : "Шукати користувачів у глобальній та публічній адресних книгах",
    "Allow people to publish their data to a global and public address book" : "Дозволити користувачам розміщувати власні дані у глобальній публічній адресній книзі",
-    "Trusted federation" : "Довірені об'єднані хмари",
-    "Automatically accept shares from trusted federated accounts and groups by default" : "Стандартно автоматично приймати пропозиції спільного доступу від надійних облікових записів та груп об'єднаних хмар",
+    "Trusted federation" : "Довірена федерація",
+    "Automatically accept shares from trusted federated accounts and groups by default" : "Типово автоматично приймати пропозиції спільного доступу від надійних облікових записів та груп об'єднаних хмар",
    "Share with me through my #Nextcloud Federated Cloud ID, see {url}" : "Поділітися зі мною через мій #Nextcloud Federated Cloud ID, див. {url}",
    "Share with me through my #Nextcloud Federated Cloud ID" : "Поділітися зі мною через мій #Nextcloud Federated Cloud ID",
    "Share with me via Nextcloud" : "Поділіться зі мною у Nextcloud",
@@ -40,8 +40,8 @@
    "The lookup server is only available for global scale." : "Сервер пошуку доступний тільки для глобального масштабу.",
    "Search global and public address book for people" : "Шукати користувачів у глобальній та публічній адресних книгах",
    "Allow people to publish their data to a global and public address book" : "Дозволити користувачам розміщувати власні дані у глобальній публічній адресній книзі",
-    "Trusted federation" : "Довірені об'єднані хмари",
-    "Automatically accept shares from trusted federated accounts and groups by default" : "Стандартно автоматично приймати пропозиції спільного доступу від надійних облікових записів та груп об'єднаних хмар",
+    "Trusted federation" : "Довірена федерація",
+    "Automatically accept shares from trusted federated accounts and groups by default" : "Типово автоматично приймати пропозиції спільного доступу від надійних облікових записів та груп об'єднаних хмар",
    "Share with me through my #Nextcloud Federated Cloud ID, see {url}" : "Поділітися зі мною через мій #Nextcloud Federated Cloud ID, див. {url}",
    "Share with me through my #Nextcloud Federated Cloud ID" : "Поділітися зі мною через мій #Nextcloud Federated Cloud ID",
    "Share with me via Nextcloud" : "Поділіться зі мною у Nextcloud",
@@ -17,7 +17,6 @@ use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\Federation\ICloudFederationProviderManager;
-use OCP\Server;

 class Application extends App implements IBootstrap {

@@ -42,7 +41,7 @@ class Application extends App implements IBootstrap {
 			$manager->addCloudFederationProvider($type,
 				'Federated Files Sharing',
 				function (): CloudFederationProviderFiles {
-					return Server::get(CloudFederationProviderFiles::class);
+					return \OCP\Server::get(CloudFederationProviderFiles::class);
 				});
 		}
 	}
@@ -329,29 +329,14 @@ class FederatedShareProvider implements IShareProvider, IShareProviderSupportsAl
 			->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATETIME_MUTABLE))
 			->executeStatement();

-		/*
-		 * If the share owner and share initiator are on the same instance,
-		 * then we're done here as the share was just updated above.
-		 *
-		 * However, if the share owner/sharee is on a remote instance (and thus we're dealing with a federated share),
-		 * then we are supposed to let the share owner/ sharee on the remote instance know.
-		 */
-		if ($this->shouldNotifyRemote($share)) {
+		// send the updated permission to the owner/initiator, if they are not the same
+		if ($share->getShareOwner() !== $share->getSharedBy()) {
 			$this->sendPermissionUpdate($share);
 		}

 		return $share;
 	}

-	/**
-	 * Notify owner/sharee if they are not the same and ANY of them is a remote user.
-	 */
-	protected function shouldNotifyRemote(IShare $share): bool {
-		$ownerOrSharerIsRemoteUser = !$this->userManager->userExists($share->getShareOwner())
-			|| !$this->userManager->userExists($share->getSharedBy());
-		return $ownerOrSharerIsRemoteUser && $share->getShareOwner() !== $share->getSharedBy();
-	}
-
 	/**
 	 * Send the updated permission to the owner/initiator, if they are not the same.
 	 *
@@ -481,8 +466,13 @@ class FederatedShareProvider implements IShareProvider, IShareProviderSupportsAl
 	 * @throws HintException
 	 */
 	protected function revokeShare($share, $isOwner) {
+		if ($this->userManager->userExists($share->getShareOwner()) && $this->userManager->userExists($share->getSharedBy())) {
+			// If both the owner and the initiator of the share are local users we don't have to notify anybody else
+			return;
+		}
+
 		// also send a unShare request to the initiator, if this is a different user than the owner
-		if ($this->shouldNotifyRemote($share)) {
+		if ($share->getShareOwner() !== $share->getSharedBy()) {
 			if ($isOwner) {
 				[, $remote] = $this->addressHandler->splitUserRemote($share->getSharedBy());
 			} else {
@@ -14,7 +14,6 @@ use OCP\GlobalScale\IConfig;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\Settings\IDelegatedSettings;
-use OCP\Util;

 class Admin implements IDelegatedSettings {
 	/**
@@ -45,8 +44,8 @@ class Admin implements IDelegatedSettings {
 		$this->initialState->provideInitialState('lookupServerUploadEnabled', $this->fedShareProvider->isLookupServerUploadEnabled());
 		$this->initialState->provideInitialState('federatedTrustedShareAutoAccept', $this->fedShareProvider->isFederatedTrustedShareAutoAccept());

-		Util::addStyle(Application::APP_ID, 'settings-admin');
-		Util::addScript(Application::APP_ID, 'settings-admin');
+		\OCP\Util::addStyle(Application::APP_ID, 'settings-admin');
+		\OCP\Util::addScript(Application::APP_ID, 'settings-admin');
 		return new TemplateResponse(Application::APP_ID, 'settings-admin', renderAs: '');
 	}

@@ -16,7 +16,6 @@ use OCP\Defaults;
 use OCP\IURLGenerator;
 use OCP\IUserSession;
 use OCP\Settings\ISettings;
-use OCP\Util;

 class Personal implements ISettings {
 	public function __construct(
@@ -43,8 +42,8 @@ class Personal implements ISettings {
 		$this->initialState->provideInitialState('cloudId', $cloudID);
 		$this->initialState->provideInitialState('docUrlFederated', $this->urlGenerator->linkToDocs('user-sharing-federated'));

-		Util::addStyle(Application::APP_ID, 'settings-personal');
-		Util::addScript(Application::APP_ID, 'settings-personal');
+		\OCP\Util::addStyle(Application::APP_ID, 'settings-personal');
+		\OCP\Util::addScript(Application::APP_ID, 'settings-personal');
 		return new TemplateResponse(Application::APP_ID, 'settings-personal', renderAs: TemplateResponse::RENDER_AS_BLANK);
 	}

@@ -1,417 +0,0 @@
-<?php
-
-declare(strict_types=1);
-/**
- * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-namespace OCA\FederatedFileSharing\Tests;
-
-use LogicException;
-use OC\Federation\CloudId;
-use OC\Share20\Share;
-use OCA\FederatedFileSharing\AddressHandler;
-use OCA\FederatedFileSharing\FederatedShareProvider;
-use OCA\FederatedFileSharing\Notifications;
-use OCA\FederatedFileSharing\TokenHandler;
-use OCP\Constants;
-use OCP\DB\IResult;
-use OCP\DB\QueryBuilder\IExpressionBuilder;
-use OCP\DB\QueryBuilder\IQueryBuilder;
-use OCP\Federation\ICloudFederationProviderManager;
-use OCP\Federation\ICloudIdManager;
-use OCP\Files\Folder;
-use OCP\Files\IRootFolder;
-use OCP\GlobalScale\IConfig as GlobalScaleConfig;
-use OCP\IConfig;
-use OCP\IDBConnection;
-use OCP\IL10N;
-use OCP\IUserManager;
-use OCP\Share\IShare;
-use PHPUnit\Framework\MockObject\MockObject;
-use Psr\Log\LoggerInterface;
-use Psr\Log\NullLogger;
-
-class FederatedShareProviderReshareRemoteTest extends \Test\TestCase {
-	private IDBConnection&MockObject $connection;
-	private AddressHandler&MockObject $addressHandler;
-	private Notifications&MockObject $notifications;
-	private TokenHandler&MockObject $tokenHandler;
-	private IL10N&MockObject $l10n;
-	private IRootFolder&MockObject $rootFolder;
-	private IConfig&MockObject $config;
-
-	private IUserManager&MockObject $userManager;
-	private ICloudIdManager&MockObject $cloudIdManager;
-	private GlobalScaleConfig&MockObject $gsConfig;
-	private ICloudFederationProviderManager&MockObject $cloudFederationProviderManager;
-	private LoggerInterface $logger;
-	private FederatedShareProvider $shareProvider;
-
-
-	protected function setUp(): void {
-		$this->connection = $this->createMock(IDBConnection::class);
-		$this->addressHandler = $this->createMock(AddressHandler::class);
-		$this->notifications = $this->createMock(Notifications::class);
-		$this->tokenHandler = $this->createMock(TokenHandler::class);
-		$this->l10n = $this->createMock(IL10N::class);
-		$this->rootFolder = $this->createMock(IRootFolder::class);
-		$this->config = $this->createMock(IConfig::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-		$this->cloudIdManager = $this->createMock(ICloudIdManager::class);
-		$this->gsConfig = $this->createMock(GlobalScaleConfig::class);
-		$this->cloudFederationProviderManager = $this->createMock(ICloudFederationProviderManager::class);
-		$this->logger = new NullLogger();
-
-		$this->shareProvider = new FederatedShareProvider(
-			$this->connection,
-			$this->addressHandler,
-			$this->notifications,
-			$this->tokenHandler,
-			$this->l10n,
-			$this->rootFolder,
-			$this->config,
-			$this->userManager,
-			$this->cloudIdManager,
-			$this->gsConfig,
-			$this->cloudFederationProviderManager,
-			$this->logger,
-		);
-	}
-
-	/**
-	 * This test case validates that requestReShare is called when creating a federated share.
-	 *
-	 * We have three actors:
-	 *
-	 * jane@https://origin.test
-	 * alice@https://local.test
-	 * bob@https://destination.test
-	 *
-	 * Jane shared the folder with Alice which re-shares the folder with Bob.
-	 *
-	 * The expected outcome is, that Alice sends a request to Jane to share the folder with Bob.
-	 */
-	public function testCreateRemoteOwner(): void {
-		$permissions = Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE;
-
-		$node = $this->createMock(Folder::class);
-		$node->method('getId')->willReturn(1000);
-		$node->method('getName')->willReturn('Share 1');
-
-		/*
-		 * Mocks getSharedWith ($alreadyShared and $alreadySharedGroup).
-		 * The share we are going to create does not already exist.
-		 */
-		$expr1 = $this->createMock(IExpressionBuilder::class);
-		$expr1->method('in')->willReturn('');
-		$expr1->method('eq')->willReturn('');
-
-		$result1 = $this->createMock(IResult::class);
-		$result1->method('fetchAssociative')->willReturn(false);
-
-		$qb1 = $this->createMock(IQueryBuilder::class);
-		$qb1->method('select')->willReturnSelf();
-		$qb1->method('from')->willReturnSelf();
-		$qb1->method('where')->willReturnSelf();
-		$qb1->method('expr')->willReturn($expr1);
-		$qb1->method('createNamedParameter')->willReturn('');
-		$qb1->method('executeQuery')->willReturn($result1);
-
-		/*
-		 * Mocks for getShareFromExternalShareTable.
-		 * The share we are going to create is an external share.
-		 */
-		$expr2 = $this->createMock(IExpressionBuilder::class);
-		$expr2->method('eq')->willReturn('');
-
-		$result2 = $this->createMock(IResult::class);
-		$result2->method('fetchAllAssociative')->willReturn([
-			[
-				'id' => 100000,
-				'parent' => -1,
-				'share_type' => 0,
-				'remote' => 'https://origin.test/',
-				'remote_id' => '10',
-				'share_token' => 'share_token1',
-				'password' => '',
-				'name' => '/Share1',
-				'owner' => 'jane', // owner in share_external is the user on the remote instance
-				'user' => 'alice', // user in share_external is the receiver on the current instance
-				'mountpoint' => '/Share1',
-				'mountpoint_hash' => '94ee935396a30e27953838d0f65d1e17', // md5(mountpoint)
-				'accepted' => 1,
-			],
-		]);
-
-		$qb2 = $this->createMock(IQueryBuilder::class);
-		$qb2->method('select')->willReturnSelf();
-		$qb2->method('from')->willReturnSelf();
-		$qb2->method('where')->willReturnSelf();
-		$qb2->method('expr')->willReturn($expr2);
-		$qb2->method('createNamedParameter')->willReturn('');
-		$qb2->method('executeQuery')->willReturn($result2);
-
-		/*
-		 * Mocks for addShareToDB.
-		 * The record on the local instance for the outgoing share.
-		 */
-		$expr3 = $this->createMock(IExpressionBuilder::class);
-		$expr3->method('eq')->willReturn('');
-
-		$result3 = $this->createMock(IResult::class);
-		$result3->method('fetchAllAssociative')->willReturn([
-			[
-				'id' => 100000,
-				'parent' => -1,
-				'share_type' => 0,
-				'remote' => 'https://origin.test/',
-				'remote_id' => '10',
-				'share_token' => 'share_token2',
-				'password' => '',
-				'name' => '/Share1',
-				'owner' => 'jane', // owner in share_external is the user on the remote instance
-				'user' => 'alice', // user in share_external is the receiver on the current instance
-				'mountpoint' => '/Share1',
-				'mountpoint_hash' => '94ee935396a30e27953838d0f65d1e17', // md5(mountpoint)
-				'accepted' => 1,
-			],
-		]);
-
-		$qb3 = $this->createMock(IQueryBuilder::class);
-		$qb3->method('insert')->willReturnSelf();
-		$qb3->method('setValue')->willReturnSelf();
-		$qb3->method('getLastInsertId')->willReturn(2000);
-
-		/*
-		 * Mocks for updateSuccessfulReShare
-		 */
-		$expr4 = $this->createMock(IExpressionBuilder::class);
-		$expr4->method('eq')->willReturn('');
-
-		$qb4 = $this->createMock(IQueryBuilder::class);
-		$qb4->method('update')->willReturnSelf();
-		$qb4->method('where')->willReturnSelf();
-		$qb4->method('expr')->willReturn($expr4);
-		$qb4->method('set')->willReturnSelf();
-		$qb4->method('createNamedParameter')->willReturn('');
-
-		/*
-		 * Mocks for storeRemoteId.
-		 */
-		$qb5 = $this->createMock(IQueryBuilder::class);
-		$qb5->method('insert')->willReturnSelf();
-		$qb5->method('values')->willReturnSelf();
-
-		/*
-		 * Mocks for getRawShare.
-		 */
-		$expr6 = $this->createMock(IExpressionBuilder::class);
-		$expr6->method('eq')->willReturn('');
-
-		$result6 = $this->createMock(IResult::class);
-		$result6->method('fetchAssociative')->willReturn([
-			'id' => 20000,
-			'share_type' => IShare::TYPE_REMOTE,
-			'share_with' => 'bob@https://destination.test',
-			'password' => null,
-			'uid_owner' => 'jane@origin.test',
-			'uid_initiator' => 'alice',
-			'parent' => null,
-			'item_type' => 'folder',
-			'item_source' => (string)$node->getId(),
-			'item_target' => null,
-			'file_source' => $node->getId(),
-			'file_target' => '',
-			'permissions' => $permissions,
-			'stime' => 0,
-			'accepted' => 0,
-			'expiration' => null,
-			'token' => 'share_token3',
-			'mail_send' => 0,
-			'share_name' => null,
-			'password_by_talk' => 0,
-			'note' => null,
-			'hide_download' => 0,
-			'label' => null,
-			'attributes' => null,
-			'password_expiration_time' => null,
-			'reminder_sent' => 0,
-		]);
-
-		$qb6 = $this->createMock(IQueryBuilder::class);
-		$qb6->method('select')->willReturnSelf();
-		$qb6->method('from')->willReturnSelf();
-		$qb6->method('where')->willReturnSelf();
-		$qb6->method('expr')->willReturn($expr6);
-		$qb6->method('createNamedParameter')->willReturn('');
-		$qb6->method('executeQuery')->willReturn($result6);
-
-
-		$queryBuilderMatcher = $this->exactly(8);
-		$this->connection
-			->expects($queryBuilderMatcher)
-			->method('getQueryBuilder')
-			->willReturnCallback(function () use ($queryBuilderMatcher, $qb1, $qb2, $qb3, $qb4, $qb5, $qb6) {
-				return match ($queryBuilderMatcher->numberOfInvocations()) {
-					1, 2 => $qb1,
-					3, 5 => $qb2,
-					4 => $qb3,
-					6 => $qb4,
-					7 => $qb5,
-					8 => $qb6,
-					default => throw new LogicException('Unexpected number of invocations for getQueryBuilder')
-				};
-			});
-
-		// the cloud id for the recipient
-		$this->cloudIdManager->method('resolveCloudId')
-			->with('bob@https://destination.test')
-			->willReturn(new CloudId(
-				'bob@https://destination.test',
-				'bob',
-				'https://destination.test',
-				'Bob', // is usually null in prod, setting it here to avoid additional mocking
-			));
-
-		$this->addressHandler->method('generateRemoteURL')
-			->willReturn('https://local.test');
-		$this->addressHandler->method('compareAddresses')
-			->willReturn(false);
-
-		// the cloud id of the actual owner
-		$this->cloudIdManager->method('getCloudId')
-			->willReturn(new CloudId(
-				'jane@https://origin.test',
-				'jane',
-				'https://origin.test',
-				'Jane', // is usually null in prod, setting it here to avoid additional mocking
-			));
-
-		$this->notifications->expects($this->once())
-			->method('requestReShare')
-			->with(
-				$this->equalTo('share_token1'),
-				$this->equalTo('10'),
-				$this->equalTo('2000'),
-				$this->equalTo('https://origin.test/'),
-				$this->equalTo('bob@https://destination.test'),
-				$this->equalTo($permissions),
-				$this->equalTo('Share 1'),
-				$this->equalTo(IShare::TYPE_REMOTE),
-			)
-			->willReturn(['share_token2', '20']);
-
-		$share = new Share($this->rootFolder, $this->userManager);
-		$share
-			->setSharedWith('bob@https://destination.test')
-			->setShareOwner('alice')
-			->setSharedBy('alice')
-			->setPermissions($permissions)
-			->setShareType(IShare::TYPE_REMOTE)
-			->setNode($node)
-			->setTarget('/Share1');
-
-		$this->shareProvider->create($share);
-	}
-
-	/**
-	 * This test case validates that sendPermission is called when updating a federated share.
-	 *
-	 * We have three actors:
-	 *
-	 * jane@https://origin.test
-	 * alice@https://local.test
-	 * bob@https://destination.test
-	 *
-	 * Jane shared the folder with Alice which re-shared the folder with Bob.
-	 * Alice is now changing the permissions for the share.
-	 *
-	 * The expected outcome is, that Alice sends a request to Jane to change the share.
-	 */
-	public function testUpdateRemoteOwner(): void {
-		$permissions = Constants::PERMISSION_READ;
-
-		$node = $this->createMock(Folder::class);
-		$node->method('getId')->willReturn(1000);
-		$node->method('getName')->willReturn('Share 1');
-
-		/*
-		 * Mocks update share.
-		 */
-		$expr1 = $this->createMock(IExpressionBuilder::class);
-		$expr1->method('eq')->willReturn('');
-
-		$qb1 = $this->createMock(IQueryBuilder::class);
-		$qb1->method('update')->willReturnSelf();
-		$qb1->method('where')->willReturnSelf();
-		$qb1->method('expr')->willReturn($expr1);
-		$qb1->method('createNamedParameter')->willReturn('');
-		$qb1->method('set')->willReturnSelf();
-
-		/*
-		 * Mocks getRemoteId.
-		 */
-		$expr2 = $this->createMock(IExpressionBuilder::class);
-		$expr2->method('eq')->willReturn('');
-
-		$result2 = $this->createMock(IResult::class);
-		$result2->method('fetchAssociative')->willReturn([
-			'share_id' => 3000,
-			'remote_id' => '10',
-		]);
-
-		$qb2 = $this->createMock(IQueryBuilder::class);
-		$qb2->method('select')->willReturnSelf();
-		$qb2->method('from')->willReturnSelf();
-		$qb2->method('where')->willReturnSelf();
-		$qb2->method('expr')->willReturn($expr2);
-		$qb2->method('createNamedParameter')->willReturn('');
-		$qb2->method('executeQuery')->willReturn($result2);
-
-		$queryBuilderMatcher = $this->exactly(2);
-		$this->connection
-			->expects($queryBuilderMatcher)
-			->method('getQueryBuilder')
-			->willReturnCallback(function () use ($queryBuilderMatcher, $qb1, $qb2) {
-				return match ($queryBuilderMatcher->numberOfInvocations()) {
-					1 => $qb1,
-					2 => $qb2,
-					default => throw new LogicException('Unexpected number of invocations for getQueryBuilder')
-				};
-			});
-
-		$this->userManager->method('userExists')
-			->willReturnMap([
-				['jane@https://origin.test', false],
-				['alice', true],
-			]);
-
-		$this->addressHandler->method('splitUserRemote')
-			->willReturn(['jane', 'https://origin.test']);
-
-		$this->notifications->expects($this->once())
-			->method('sendPermissionChange')
-			->with(
-				$this->equalTo('https://origin.test'),
-				$this->equalTo('10'),
-				$this->equalTo('share_token3'),
-				$this->equalTo($permissions),
-			);
-
-		$share = new Share($this->rootFolder, $this->userManager);
-		$share
-			->setId('3000')
-			->setToken('share_token3')
-			->setSharedWith('bob@https://destination.test')
-			->setShareOwner('jane@https://origin.test')
-			->setSharedBy('alice')
-			->setPermissions($permissions)
-			->setShareType(IShare::TYPE_REMOTE)
-			->setNode($node)
-			->setTarget('/Share1');
-
-		$this->shareProvider->update($share);
-	}
-}
@@ -450,7 +450,11 @@ class FederatedShareProviderTest extends \Test\TestCase {
 				$sharedBy . '@http://localhost'
 			)->willReturn(true);

-		$this->provider->expects($this->never())->method('sendPermissionUpdate');
+		if ($owner === $sharedBy) {
+			$this->provider->expects($this->never())->method('sendPermissionUpdate');
+		} else {
+			$this->provider->expects($this->once())->method('sendPermissionUpdate');
+		}

 		$this->rootFolder->expects($this->never())->method($this->anything());

@@ -11,18 +11,7 @@ OC.L10N.register(
    "Federation" : "Об'єднання",
    "Federation allows you to connect with other trusted servers to exchange the account directory." : "Об'єднання хмар дозволяє з'єднуватися з іншими довіреними серверами й обмінюватися обліковими даними користувачів.",
    "Federation allows you to connect with other trusted servers to exchange the account directory. For example this will be used to auto-complete external accounts for federated sharing." : "Об'єднання хмар дозволяє з'єднуватися з іншими довіреними серверами й обмінюватися обліковими даними користувачів. Так, це може бути корисно для автоматичної підстановки зовнішніх користувачів під час надання у спільний доступ ресурсів об'єднаних хмар.",
-    "Could not add trusted server. Please try again later." : "Не вдалося додати довірений сервер. Спробуйте ще раз пізніше.",
-    "Add trusted server" : "Додати довірений сервер",
-    "Server url" : " Посилання на сервер",
    "Add" : "Додати",
-    "Server ok" : "Сервер ОК",
-    "User list was exchanged at least once successfully with the remote server." : "Принаймні один раз відбувся обмін списком користувачів з віддаленим сервером.",
-    "Server pending" : "Очікування сервера",
-    "Waiting for shared secret or initial user list exchange." : "Очікування парольної фрази спільного доступу або початкового обміну списком користувачів",
-    "Server access revoked" : "Відкликано доступ для сервера",
-    "Server failure" : "Помилка на стороні сервера",
-    "Connection to the remote server failed or the remote server is misconfigured." : "Не вдалося встановити з'єднання з віддаленим сервером, або віддалений сервер має помилки з налаштуванням",
-    "Failed to delete trusted server. Please try again later." : "Не вдалося вилучити довірений сервер. Спробуйте ще раз пізніше.",
    "Delete" : "Видалити",
    "Federation allows you to connect with other trusted servers to exchange the account directory. For example this will be used to auto-complete external accounts for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Об'єднання хмар дозволяє з'єднуватися з іншими довіреними серверами й обмінюватися обліковими даними користувачів. Так, це може бути корисно для автоматичної підстановки зовнішніх користувачів під час надання у спільний доступ ресурсів об'єднаних хмар. Необов'язково додавати сервер яко довірений для створення спільного ресурсу між об'єднаними хмарами.",
    "Each server must validate the other. This process may require a few cron cycles." : "Кожен сервер має підтвердити один одного. Цей процес може вимагати кількох циклів виконання cron.",
@@ -9,18 +9,7 @@
    "Federation" : "Об'єднання",
    "Federation allows you to connect with other trusted servers to exchange the account directory." : "Об'єднання хмар дозволяє з'єднуватися з іншими довіреними серверами й обмінюватися обліковими даними користувачів.",
    "Federation allows you to connect with other trusted servers to exchange the account directory. For example this will be used to auto-complete external accounts for federated sharing." : "Об'єднання хмар дозволяє з'єднуватися з іншими довіреними серверами й обмінюватися обліковими даними користувачів. Так, це може бути корисно для автоматичної підстановки зовнішніх користувачів під час надання у спільний доступ ресурсів об'єднаних хмар.",
-    "Could not add trusted server. Please try again later." : "Не вдалося додати довірений сервер. Спробуйте ще раз пізніше.",
-    "Add trusted server" : "Додати довірений сервер",
-    "Server url" : " Посилання на сервер",
    "Add" : "Додати",
-    "Server ok" : "Сервер ОК",
-    "User list was exchanged at least once successfully with the remote server." : "Принаймні один раз відбувся обмін списком користувачів з віддаленим сервером.",
-    "Server pending" : "Очікування сервера",
-    "Waiting for shared secret or initial user list exchange." : "Очікування парольної фрази спільного доступу або початкового обміну списком користувачів",
-    "Server access revoked" : "Відкликано доступ для сервера",
-    "Server failure" : "Помилка на стороні сервера",
-    "Connection to the remote server failed or the remote server is misconfigured." : "Не вдалося встановити з'єднання з віддаленим сервером, або віддалений сервер має помилки з налаштуванням",
-    "Failed to delete trusted server. Please try again later." : "Не вдалося вилучити довірений сервер. Спробуйте ще раз пізніше.",
    "Delete" : "Видалити",
    "Federation allows you to connect with other trusted servers to exchange the account directory. For example this will be used to auto-complete external accounts for federated sharing. It is not necessary to add a server as trusted server in order to create a federated share." : "Об'єднання хмар дозволяє з'єднуватися з іншими довіреними серверами й обмінюватися обліковими даними користувачів. Так, це може бути корисно для автоматичної підстановки зовнішніх користувачів під час надання у спільний доступ ресурсів об'єднаних хмар. Необов'язково додавати сервер яко довірений для створення спільного ресурсу між об'єднаними хмарами.",
    "Each server must validate the other. This process may require a few cron cycles." : "Кожен сервер має підтвердити один одного. Цей процес може вимагати кількох циклів виконання cron.",
@@ -328,6 +328,10 @@ OC.L10N.register(
    "Tags" : "الوسوم",
    "Save as …" : "حفظ باسم ...",
    "Converting files …" : "تحويل الملفات ...",
-    "Converting file …" : "تحويل الملف ..."
+    "Converting file …" : "تحويل الملف ...",
+    "Moving \"{source}\" to \"{destination}\" …" : "نقل \"{source}\" إلى \"{destination}\" …",
+    "Copying \"{source}\" to \"{destination}\" …" : "نسخ \"{source}\" إلى \"{destination}\" …",
+    "(copy)" : "(نسخ)",
+    "(copy %n)" : "(نسخ %n)"
 },
 "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
@@ -326,6 +326,10 @@
    "Tags" : "الوسوم",
    "Save as …" : "حفظ باسم ...",
    "Converting files …" : "تحويل الملفات ...",
-    "Converting file …" : "تحويل الملف ..."
+    "Converting file …" : "تحويل الملف ...",
+    "Moving \"{source}\" to \"{destination}\" …" : "نقل \"{source}\" إلى \"{destination}\" …",
+    "Copying \"{source}\" to \"{destination}\" …" : "نسخ \"{source}\" إلى \"{destination}\" …",
+    "(copy)" : "(نسخ)",
+    "(copy %n)" : "(نسخ %n)"
 },"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
 }
@@ -245,6 +245,8 @@ OC.L10N.register(
    "You" : "Tu",
    "Shared multiple times with different people" : "Compartióse múltiples vegaes con otres persones",
    "Error while loading the file data" : "Hebo un error mentanto de cargaben los datos de los ficheros",
-    "Tags" : "Etiquetes"
+    "Tags" : "Etiquetes",
+    "(copy)" : "(copia)",
+    "(copy %n)" : "(copia %n)"
 },
 "nplurals=2; plural=(n != 1);");
@@ -243,6 +243,8 @@
    "You" : "Tu",
    "Shared multiple times with different people" : "Compartióse múltiples vegaes con otres persones",
    "Error while loading the file data" : "Hebo un error mentanto de cargaben los datos de los ficheros",
-    "Tags" : "Etiquetes"
+    "Tags" : "Etiquetes",
+    "(copy)" : "(copia)",
+    "(copy %n)" : "(copia %n)"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -390,6 +390,10 @@ OC.L10N.register(
    "Tags" : "Тэгі",
    "Save as …" : "Захаваць як …",
    "Converting files …" : "Канвертацыя файлаў …",
-    "Converting file …" : "Канвертацыя файла …"
+    "Converting file …" : "Канвертацыя файла …",
+    "Moving \"{source}\" to \"{destination}\" …" : "Перамяшчэнне \"{source}\" у \"{destination}\" …",
+    "Copying \"{source}\" to \"{destination}\" …" : "Капіяванне \"{source}\" у \"{destination}\" …",
+    "(copy)" : "(копія)",
+    "(copy %n)" : "(копія %n)"
 },
 "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
@@ -388,6 +388,10 @@
    "Tags" : "Тэгі",
    "Save as …" : "Захаваць як …",
    "Converting files …" : "Канвертацыя файлаў …",
-    "Converting file …" : "Канвертацыя файла …"
+    "Converting file …" : "Канвертацыя файла …",
+    "Moving \"{source}\" to \"{destination}\" …" : "Перамяшчэнне \"{source}\" у \"{destination}\" …",
+    "Copying \"{source}\" to \"{destination}\" …" : "Капіяванне \"{source}\" у \"{destination}\" …",
+    "(copy)" : "(копія)",
+    "(copy %n)" : "(копія %n)"
 },"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
 }
@@ -397,6 +397,10 @@ OC.L10N.register(
    "Tags" : "Етикети",
    "Save as …" : "Запази като...",
    "Converting files …" : "Конвертиране на файлове...",
-    "Converting file …" : "Файлът се преобразува..."
+    "Converting file …" : "Файлът се преобразува...",
+    "Moving \"{source}\" to \"{destination}\" …" : "Преместване на \"{source}\" към \"{destination}\" …",
+    "Copying \"{source}\" to \"{destination}\" …" : "Копиране на \"{source}\" в \"{destination}\" …",
+    "(copy)" : "(копие)",
+    "(copy %n)" : "(копирай %n)"
 },
 "nplurals=2; plural=(n != 1);");
@@ -395,6 +395,10 @@
    "Tags" : "Етикети",
    "Save as …" : "Запази като...",
    "Converting files …" : "Конвертиране на файлове...",
-    "Converting file …" : "Файлът се преобразува..."
+    "Converting file …" : "Файлът се преобразува...",
+    "Moving \"{source}\" to \"{destination}\" …" : "Преместване на \"{source}\" към \"{destination}\" …",
+    "Copying \"{source}\" to \"{destination}\" …" : "Копиране на \"{source}\" в \"{destination}\" …",
+    "(copy)" : "(копие)",
+    "(copy %n)" : "(копирай %n)"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -326,6 +326,10 @@ OC.L10N.register(
    "Tags" : "Etiquetes",
    "Save as …" : "Anomena i desa …",
    "Converting files …" : "Convertint fitxers …",
-    "Converting file …" : "S'està convertint el fitxer …"
+    "Converting file …" : "S'està convertint el fitxer …",
+    "Moving \"{source}\" to \"{destination}\" …" : "S'està movent \"{source}\" a \"{destination}”…",
+    "Copying \"{source}\" to \"{destination}\" …" : "S'està copiant \"{source}\" a \"{destination}” …",
+    "(copy)" : "(còpia)",
+    "(copy %n)" : "(còpia %n)"
 },
 "nplurals=2; plural=(n != 1);");
@@ -324,6 +324,10 @@
    "Tags" : "Etiquetes",
    "Save as …" : "Anomena i desa …",
    "Converting files …" : "Convertint fitxers …",
-    "Converting file …" : "S'està convertint el fitxer …"
+    "Converting file …" : "S'està convertint el fitxer …",
+    "Moving \"{source}\" to \"{destination}\" …" : "S'està movent \"{source}\" a \"{destination}”…",
+    "Copying \"{source}\" to \"{destination}\" …" : "S'està copiant \"{source}\" a \"{destination}” …",
+    "(copy)" : "(còpia)",
+    "(copy %n)" : "(còpia %n)"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
@@ -411,6 +411,10 @@ OC.L10N.register(
    "Tags" : "Štítky",
    "Save as …" : "Uložit jako …",
    "Converting files …" : "Převádění souborů …",
-    "Converting file …" : "Převádění souboru …"
+    "Converting file …" : "Převádění souboru …",
+    "Moving \"{source}\" to \"{destination}\" …" : "Přesouvání „{source}“ do „{destination}“ …",
+    "Copying \"{source}\" to \"{destination}\" …" : "Kopírování „{source}“ do „{destination}“ …",
+    "(copy)" : "(zkopírovat)",
+    "(copy %n)" : "(zkopírovat %n)"
 },
 "nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");
@@ -409,6 +409,10 @@
    "Tags" : "Štítky",
    "Save as …" : "Uložit jako …",
    "Converting files …" : "Převádění souborů …",
-    "Converting file …" : "Převádění souboru …"
+    "Converting file …" : "Převádění souboru …",
+    "Moving \"{source}\" to \"{destination}\" …" : "Přesouvání „{source}“ do „{destination}“ …",
+    "Copying \"{source}\" to \"{destination}\" …" : "Kopírování „{source}“ do „{destination}“ …",
+    "(copy)" : "(zkopírovat)",
+    "(copy %n)" : "(zkopírovat %n)"
 },"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
 }
@@ -395,6 +395,10 @@ OC.L10N.register(
    "Tags" : "Tags",
    "Save as …" : "Gem som ...",
    "Converting files …" : "Konverterer filer ...",
-    "Converting file …" : "Konverterer fil ..."
+    "Converting file …" : "Konverterer fil ...",
+    "Moving \"{source}\" to \"{destination}\" …" : "Flytter \"{source}\" til \"{destination}\" …",
+    "Copying \"{source}\" to \"{destination}\" …" : "Kopierer \"{source}\" til \"{destination}\" …",
+    "(copy)" : "(kopier)",
+    "(copy %n)" : "(kopier %n)"
 },
 "nplurals=2; plural=(n != 1);");
@@ -393,6 +393,10 @@
    "Tags" : "Tags",
    "Save as …" : "Gem som ...",
    "Converting files …" : "Konverterer filer ...",
-    "Converting file …" : "Konverterer fil ..."
+    "Converting file …" : "Konverterer fil ...",
+    "Moving \"{source}\" to \"{destination}\" …" : "Flytter \"{source}\" til \"{destination}\" …",
+    "Copying \"{source}\" to \"{destination}\" …" : "Kopierer \"{source}\" til \"{destination}\" …",
+    "(copy)" : "(kopier)",
+    "(copy %n)" : "(kopier %n)"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
--- a/Show More
+++ b/Show More