APPLICATION_REV_DOMAIN changed from eu.opencloud.desktop to eu.opencloud.OpenCloudDesktop (complies with Flathub app ID requirements).

Author: bryce-hoehn

.github/workflows/build-flatpak.yml

@@ -31,8 +31,8 @@ jobs:
           git checkout
       - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:
-          bundle: eu.opencloud.Desktop.flatpak
-          manifest-path: eu.opencloud.Desktop.yml
+          bundle: eu.opencloud.OpenCloudDesktop.flatpak
+          manifest-path: eu.opencloud.OpenCloudDesktop.yml
           cache-key: flatpak-builder-${{ github.sha }}
           arch: ${{ matrix.variant.arch }}
           verbose: true

.github/workflows/update-flathub.yml

@@ -4,9 +4,9 @@ name: Update Flathub
 # or metainfo file are updated on the default branch.
 #
 # Prerequisites (see https://docs.flathub.org/docs/for-app-authors/updates):
-#   1. App must be published on Flathub (repo: flathub/eu.opencloud.Desktop)
+#   1. App must be published on Flathub (repo: flathub/eu.opencloud.OpenCloudDesktop)
 #   2. Add a FLATHUB_TOKEN repository secret – a GitHub PAT with repo scope
-#      that has write access to the flathub/eu.opencloud.Desktop repo
+#      that has write access to the flathub/eu.opencloud.OpenCloudDesktop repo
 #   3. Disable the global x-checker action on the Flathub repo (if enabled)
 #      to avoid duplicate update PRs
 #
@@ -17,8 +17,8 @@ on:
   push:
     branches: [main]
     paths:
-      - eu.opencloud.Desktop.metainfo.xml
-      - eu.opencloud.Desktop.yml
+      - eu.opencloud.OpenCloudDesktop.metainfo.xml
+      - eu.opencloud.OpenCloudDesktop.yml
 
 jobs:
   update-flathub:
@@ -30,20 +30,20 @@ jobs:
       - name: Get version from metainfo
         id: version
         run: |
-          VERSION=$(grep -oP '<release version="\K[^"]+' eu.opencloud.Desktop.metainfo.xml)
+          VERSION=$(grep -oP '<release version="\K[^"]+' eu.opencloud.OpenCloudDesktop.metainfo.xml)
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
 
       - name: Checkout Flathub repo
         uses: actions/checkout@v6
         with:
-          repository: flathub/eu.opencloud.Desktop
+          repository: flathub/eu.opencloud.OpenCloudDesktop
           token: ${{ secrets.FLATHUB_TOKEN }}
           path: flathub
 
       - name: Copy updated files
         run: |
-          cp eu.opencloud.Desktop.metainfo.xml flathub/
-          cp eu.opencloud.Desktop.yml flathub/
+          cp eu.opencloud.OpenCloudDesktop.metainfo.xml flathub/
+          cp eu.opencloud.OpenCloudDesktop.yml flathub/
 
       - name: Create Pull Request to Flathub
         uses: peter-evans/create-pull-request@v7

.github/workflows/update-flatpak.yml

@@ -46,21 +46,21 @@ jobs:
         run: |
           sed -i \
             -e 's|<release version="[^"]*" date="[^"]*">|<release version="${{ steps.release.outputs.version }}" date="${{ steps.release.outputs.date }}">|' \
-            eu.opencloud.Desktop.metainfo.xml
+            eu.opencloud.OpenCloudDesktop.metainfo.xml
 
-          echo "Updated eu.opencloud.Desktop.metainfo.xml:"
-          grep '<release version=' eu.opencloud.Desktop.metainfo.xml
+          echo "Updated eu.opencloud.OpenCloudDesktop.metainfo.xml:"
+          grep '<release version=' eu.opencloud.OpenCloudDesktop.metainfo.xml
 
       - name: Update Desktop.yml
         run: |
           # Update the tag and commit for the opencloud-desktop module source
           sed -i \
             -e '/name: opencloud-desktop/,/^  - name:/{ s|tag: v.*|tag: ${{ steps.release.outputs.tag }}|; s|commit: [a-f0-9]\{40\}|commit: ${{ steps.release.outputs.commit }}|; }' \
-            eu.opencloud.Desktop.yml
+            eu.opencloud.OpenCloudDesktop.yml
 
-          echo "Updated eu.opencloud.Desktop.yml:"
-          grep -A2 'name: opencloud-desktop' eu.opencloud.Desktop.yml | head -1
-          grep -E '^\s+tag:|^\s+commit:' eu.opencloud.Desktop.yml | tail -2
+          echo "Updated eu.opencloud.OpenCloudDesktop.yml:"
+          grep -A2 'name: opencloud-desktop' eu.opencloud.OpenCloudDesktop.yml | head(1)
+          grep -E '^\s+tag:|^\s+commit:' eu.opencloud.OpenCloudDesktop.yml | tail -2
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v7
@@ -70,8 +70,8 @@ jobs:
             Automated update to [${{ steps.release.outputs.tag }}](https://github.com/opencloud-eu/desktop/releases/tag/${{ steps.release.outputs.tag }}).
 
             Changes:
-            - Updated `eu.opencloud.Desktop.metainfo.xml` release version to `${{ steps.release.outputs.version }}` (date: `${{ steps.release.outputs.date }}`)
-            - Updated `eu.opencloud.Desktop.yml` source tag to `${{ steps.release.outputs.tag }}` and commit to `${{ steps.release.outputs.commit }}`
+            - Updated `eu.opencloud.OpenCloudDesktop.metainfo.xml` release version to `${{ steps.release.outputs.version }}` (date: `${{ steps.release.outputs.date }}`)
+            - Updated `eu.opencloud.OpenCloudDesktop.yml` source tag to `${{ steps.release.outputs.tag }}` and commit to `${{ steps.release.outputs.commit }}`
           branch: update-flatpak-${{ steps.release.outputs.version }}
           commit-message: "chore: update flatpak to ${{ steps.release.outputs.version }}"
           delete-branch: true

OPENCLOUD.cmake

@@ -3,7 +3,7 @@ set( APPLICATION_SHORTNAME  "OpenCloud" )
 set( APPLICATION_EXECUTABLE "opencloud" )
 set( APPLICATION_VENDOR     "OpenCloud" )
 set( APPLICATION_ICON_NAME  "opencloud" )
-set( APPLICATION_REV_DOMAIN "eu.opencloud.desktop" )
+set( APPLICATION_REV_DOMAIN "eu.opencloud.OpenCloudDesktop" )
 
 if(BETA_CHANNEL_BUILD)
     set( APPLICATION_NAME       "${APPLICATION_NAME} Beta")

…ny_autoupdate_eu.opencloud.desktop.plist …date_eu.opencloud.OpenCloudDesktop.plistadmin/osx/deny_autoupdate_eu.opencloud.desktop.plist renamed to admin/osx/deny_autoupdate_eu.opencloud.OpenCloudDesktop.plist admin/osx/deny_autoupdate_eu.opencloud.desktop.plist renamed to admin/osx/deny_autoupdate_eu.opencloud.OpenCloudDesktop.plist

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-  <id>eu.opencloud.Desktop</id>
+  <id>eu.opencloud.OpenCloudDesktop</id>
   <name>Opencloud Desktop Client</name>
   <project_license>GPL-2.0+</project_license>
   <summary>Sync and collaborate on your desktop or laptop</summary>
@@ -12,12 +12,12 @@
     <p>The OpenCloud desktop client keeps photos and documents always up to date, enabling you to work like you always did.
 Any file you add, modify or delete in the synced folders on your desktop or laptop will show up, change or disappear on the server and all other connected devices.</p>
   </description>
-  <icon type="stock">opencloud</icon>
+  <icon type="stock">eu.opencloud.OpenCloudDesktop</icon>
   <categories>
     <category>Network</category>
     <category>Utility</category>
   </categories>
-  <launchable type="desktop-id">eu.opencloud.Desktop</launchable>
+  <launchable type="desktop-id">eu.opencloud.OpenCloudDesktop</launchable>
   <screenshots>
     <screenshot type="default">
       <caption>The options dialog</caption>
@@ -38,4 +38,4 @@ Any file you add, modify or delete in the synced folders on your desktop or lapt
     </release>
   </releases>
   <content_rating type="oars-1.1"/>
-</component>
+</component>

eu.opencloud.Desktop.metainfo.xml ….opencloud.OpenCloudDesktop.metainfo.xmleu.opencloud.Desktop.metainfo.xml renamed to eu.opencloud.OpenCloudDesktop.metainfo.xml eu.opencloud.Desktop.metainfo.xml renamed to eu.opencloud.OpenCloudDesktop.metainfo.xml

@@ -1,4 +1,4 @@
-app-id: eu.opencloud.Desktop
+app-id: eu.opencloud.OpenCloudDesktop
 
 runtime: org.kde.Platform
 runtime-version: "6.9"
@@ -20,7 +20,7 @@ finish-args:
   - --talk-name=org.freedesktop.Notifications
   - --talk-name=org.freedesktop.secrets
   - --talk-name=org.kde.StatusNotifierWatcher
-  - --own-name=eu.opencloud.Desktop
+  - --own-name=eu.opencloud.OpenCloudDesktop
   - --talk-name=org.kde.kwalletd5
   - --talk-name=org.kde.kwalletd6
   - --env=TMPDIR=/var/tmp
@@ -99,15 +99,6 @@ modules:
         tag: v1.2.0
         commit: 3186a158f8e6565e89f5983b4028c892737844ff
 
-  - name: desktop-file
-    buildsystem: simple
-    build-commands:
-      - sed -e 's|@APPLICATION_EXECUTABLE@|opencloud|g' -e 's|@APPLICATION_NAME@|OpenCloud|g' -e 's|@APPLICATION_ICON_NAME@|eu.opencloud.Desktop|g' opencloud.desktop.in > eu.opencloud.Desktop.desktop
-      - install -Dm644 eu.opencloud.Desktop.desktop /app/share/applications/eu.opencloud.Desktop.desktop
-    sources:
-      - type: file
-        path: opencloud.desktop.in
-        
   - name: opencloud-desktop
     buildsystem: cmake-ninja
     config-opts:
@@ -123,7 +114,7 @@ modules:
     cleanup:
       - /include
     post-install:
-      - install -Dm644 -t /app/share/metainfo eu.opencloud.Desktop.metainfo.xml
+      - install -Dm644 -t /app/share/metainfo eu.opencloud.OpenCloudDesktop.metainfo.xml
     sources:
       - type: git
         url: https://github.com/opencloud-eu/desktop
@@ -136,4 +127,4 @@ modules:
           version-query: $tag | sub("^[vV]"; "")
           timestamp-query: .published_at
       - type: file
-        path: eu.opencloud.Desktop.metainfo.xml
+        path: eu.opencloud.OpenCloudDesktop.metainfo.xml

eu.opencloud.Desktop.yml eu.opencloud.OpenCloudDesktop.ymleu.opencloud.Desktop.yml renamed to eu.opencloud.OpenCloudDesktop.yml

@@ -48,7 +48,7 @@ - (instancetype)init
     // - Be prefixed with the code signing Team ID
     // - Then infixed with the sandbox App Group
     // - The App Group itself must be a prefix of (or equal to) the application bundle identifier
-    // We end up in the official signed client with: 9B5WD74GWJ.eu.opencloud.desktop.socketApi
+    // We end up in the official signed client with: 9B5WD74GWJ.eu.opencloud.OpenCloudDesktop.socketApi
     // With ad-hoc signing (the '-' signing identity) we must drop the Team ID.
     // When the code isn't sandboxed (e.g. the OC client or the legacy overlay icon extension)
     // the OS doesn't seem to put any restriction on the port name, so we just follow what

shell_integration/MacOSX/OpenCloudFinderExtension/FinderSyncExt/FinderSync.m

@@ -438,7 +438,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				OC_APPLICATION_NAME = OpenCloud;
-				OC_APPLICATION_REV_DOMAIN = eu.opencloud.desktop;
+				OC_APPLICATION_REV_DOMAIN = eu.opencloud.OpenCloudDesktop;
 				OC_OEM_SHARE_ICNS = "";
 				OC_SOCKETAPI_TEAM_IDENTIFIER_PREFIX = "";
 				ONLY_ACTIVE_ARCH = YES;
@@ -486,8 +486,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @executable_path/../../../../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MTL_ENABLE_DEBUG_INFO = NO;
-				OC_APPLICATION_NAME = OpenClud;
-				OC_APPLICATION_REV_DOMAIN = eu.opencloud.desktop;
+				OC_APPLICATION_NAME = OpenCloud;
+				OC_APPLICATION_REV_DOMAIN = eu.opencloud.OpenCloudDesktop;
 				OC_OEM_SHARE_ICNS = "";
 				OC_SOCKETAPI_TEAM_IDENTIFIER_PREFIX = "";
 				PRODUCT_NAME = "$(TARGET_NAME)";

shell_integration/MacOSX/OpenCloudFinderExtension/OpenCloudFinderExtension.xcodeproj/project.pbxproj

@@ -16,6 +16,9 @@ else()
 endif()
 
 if(UNIX AND NOT APPLE)
-    configure_file(${CMAKE_SOURCE_DIR}/opencloud.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_EXECUTABLE}cmd.desktop)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_EXECUTABLE}cmd.desktop DESTINATION ${KDE_INSTALL_DATADIR}/applications)
+    set(_saved_icon_name "${APPLICATION_ICON_NAME}")
+    set(APPLICATION_ICON_NAME "${APPLICATION_REV_DOMAIN}")
+    configure_file(${CMAKE_SOURCE_DIR}/opencloud.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_REV_DOMAIN}-cmd.desktop)
+    set(APPLICATION_ICON_NAME "${_saved_icon_name}")
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_REV_DOMAIN}-cmd.desktop DESTINATION ${KDE_INSTALL_DATADIR}/applications)
 endif()