From b8dd6d37542a0f8353137225d3415795814ee799 Mon Sep 17 00:00:00 2001
From: Bryce Hoehn <bryce.hoehn@icloud.com>
Date: Fri, 1 May 2026 15:05:30 -0400
Subject: [PATCH 01/30] basic flatpak support

---
 .github/workflows/flatpak.yml             |  33 ++++++
 flatpak/eu.opencloud.Desktop.metainfo.xml |  41 +++++++
 flatpak/eu.opencloud.Desktop.yml          | 130 ++++++++++++++++++++++
 3 files changed, 204 insertions(+)
 create mode 100644 .github/workflows/flatpak.yml
 create mode 100644 flatpak/eu.opencloud.Desktop.metainfo.xml
 create mode 100644 flatpak/eu.opencloud.Desktop.yml

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
new file mode 100644
index 000000000..7a7a40f3b
--- /dev/null
+++ b/.github/workflows/flatpak.yml
@@ -0,0 +1,33 @@
+name: CI
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+  workflow_dispatch: 
+
+jobs:
+  flatpak:
+    name: "Flatpak"
+    container:
+      image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-48
+      options: --privileged
+    strategy:
+      matrix:
+        variant:
+          - arch: x86_64
+            runner: ubuntu-24.04
+          - arch: aarch64
+            runner: ubuntu-24.04-arm
+    runs-on: ${{ matrix.variant.runner }}
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          submodules: "true"
+      - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+        with:
+          bundle: eu.opencloud.Desktop.flatpak
+          manifest-path: flatpak/eu.opencloud.Desktop.yml
+          cache-key: flatpak-builder-${{ github.sha }}
+          arch: ${{ matrix.variant.arch }}
+          verbose: true
\ No newline at end of file
diff --git a/flatpak/eu.opencloud.Desktop.metainfo.xml b/flatpak/eu.opencloud.Desktop.metainfo.xml
new file mode 100644
index 000000000..ad3685963
--- /dev/null
+++ b/flatpak/eu.opencloud.Desktop.metainfo.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>eu.opencloud.Desktop</id>
+  <name>Opencloud Desktop Client</name>
+  <project_license>GPL-2.0+</project_license>
+  <summary>Sync and collaborate on your desktop or laptop</summary>
+  <metadata_license>CC0-1.0</metadata_license>
+  <developer id="eu.opencloud">
+    <name>Heinlein Group</name>
+  </developer>
+  <description>
+    <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>
+  <categories>
+    <category>Network</category>
+    <category>Utility</category>
+  </categories>
+  <launchable type="desktop-id">eu.opencloud.Desktop</launchable>
+  <screenshots>
+    <screenshot type="default">
+      <caption>The options dialog</caption>
+      <image>https://opencloud.eu/sites/default/files/styles/416x233/public/2025-01/OpenCloud_Filesharing_Desktop_mobil_Hauptscreen.webp</image>
+    </screenshot>
+  </screenshots>
+  <branding>
+    <color type="primary" scheme_preference="light">#0082c9</color>
+    <color type="primary" scheme_preference="dark">#0082c9</color>
+  </branding>
+  <url type="homepage">https://opencloud.eu</url>
+  <url type="bugtracker">https://github.com/opencloud-eu/desktop/issues</url>
+  <url type="faq">https://docs.opencloud.eu/docs/user/intro/</url>
+  <url type="vcs-browser">https://github.com/opencloud-eu/desktop</url>
+  <releases>
+    <release version="3.0.0-rc.1" date="2025-11-10">
+      <description></description>
+    </release>
+  </releases>
+  <content_rating type="oars-1.1"/>
+</component>
\ No newline at end of file
diff --git a/flatpak/eu.opencloud.Desktop.yml b/flatpak/eu.opencloud.Desktop.yml
new file mode 100644
index 000000000..47f16b625
--- /dev/null
+++ b/flatpak/eu.opencloud.Desktop.yml
@@ -0,0 +1,130 @@
+app-id: eu.opencloud.Desktop
+
+runtime: org.kde.Platform
+runtime-version: "6.9"
+sdk: org.kde.Sdk
+
+base: io.qt.qtwebengine.BaseApp
+base-version: "6.9"
+
+command: opencloud
+
+finish-args:
+  - --device=dri
+  - --socket=wayland
+  - --socket=fallback-x11
+  - --share=network
+  - --share=ipc
+  - --filesystem=home:rw
+  - --filesystem=xdg-run/opencloud:create
+  - --talk-name=org.freedesktop.Notifications
+  - --talk-name=org.freedesktop.secrets
+  - --talk-name=org.kde.StatusNotifierWatcher
+  - --own-name=eu.opencloud.Desktop
+  - --talk-name=org.kde.kwalletd5
+  - --talk-name=org.kde.kwalletd6
+  - --env=TMPDIR=/var/tmp
+
+cleanup:
+  - /lib/*.a
+  - /lib/*.la
+  - /lib/x86_64-linux-gnu/pkgconfig
+  - /share/doc
+  - /share/icons/hicolor/1024x1024
+cleanup-commands:
+  - /app/cleanup-BaseApp.sh
+
+modules:
+  - shared-modules/libsecret/libsecret.json
+
+  - name: qtkeychain
+    buildsystem: cmake-ninja
+    config-opts:
+      - -DCMAKE_INSTALL_LIBDIR=lib
+      - -DBUILD_TRANSLATIONS=NO
+      - -DBUILD_WITH_QT6=1
+    cleanup:
+      - /include
+      - /mkspecs
+      - /lib/cmake
+    sources:
+      - type: archive
+        url: https://github.com/frankosterfeld/qtkeychain/archive/0.15.0.tar.gz
+        sha256: f4254dc8f0933b06d90672d683eab08ef770acd8336e44dfa030ce041dc2ca22
+        x-checker-data:
+          type: anitya
+          url-template: https://github.com/frankosterfeld/qtkeychain/archive/$version.tar.gz
+          stable-only: true
+          project-id: 4138
+
+  - name: rsvg-convert-shim
+    buildsystem: simple
+    build-commands:
+      - ln -s /usr/bin/rsvg-convert /app/bin/inkscape
+    cleanup:
+      - "*"
+
+  - name: libp11
+    config-opts:
+      - --with-enginesdir=${FLATPAK_DEST}/lib/engines-3/
+      - --with-modulesdir=${FLATPAK_DEST}/lib/ossl-modules/
+    cleanup:
+      - /include
+    sources:
+      - type: archive
+        url: https://github.com/OpenSC/libp11/releases/download/libp11-0.4.16/libp11-0.4.16.tar.gz
+        sha256: 97777640492fa9e5831497e5892e291dfbf39a7b119d9cb6abb3ec8c56d17553
+
+  - name: libre-graph-api
+    buildsystem: cmake
+    subdir: client
+    config-opts:
+      - -DCMAKE_INSTALL_LIBDIR=lib
+      - -DBUILD_SHARED_LIBS=ON
+    sources:
+      - type: git
+        url: https://github.com/opencloud-eu/libre-graph-api-cpp-qt-client.git
+        tag: v1.0.7
+        commit: 72b89ddd9a5dab2a837d1ab078d6088fa0727695
+
+  - name: kdsingleapplication
+    buildsystem: cmake
+    config-opts:
+      - -DCMAKE_INSTALL_LIBDIR=lib
+      - -DBUILD_TRANSLATIONS=NO
+      - -DBUILD_WITH_QT6=1
+    sources:
+      - type: git
+        url: https://github.com/KDAB/KDSingleApplication.git
+        tag: v1.2.0
+        commit: 3186a158f8e6565e89f5983b4028c892737844ff
+
+  - name: opencloud-desktop
+    buildsystem: cmake-ninja
+    config-opts:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DCMAKE_INSTALL_LIBDIR=lib
+      - -DNO_SHIBBOLETH=1
+      - -DBUILD_SHELL_INTEGRATION_DOLPHIN=0
+      - -DBUILD_SHELL_INTEGRATION_NAUTILUS=0
+      - -DBUILD_UPDATER=OFF
+      - -DPLUGIN_INSTALL_DIR=/app/lib/plugins
+      - -DPLUGINDIR=/app/lib/plugins
+      - -DQT_MAJOR_VERSION=6
+    cleanup:
+      - /include
+    post-install:
+      - install -Dm644 -t /app/share/metainfo eu.opencloud.Desktop.metainfo.xml
+    sources:
+      - type: git
+        url: https://github.com/opencloud-eu/desktop
+        tag: v3.0.0-rc.1
+        commit: 65249647dd131585fd4e13f760a24190255a008a
+        x-checker-data:
+          type: json
+          url: https://api.github.com/repos/opencloud/desktop/releases/latest
+          tag-query: .tag_name
+          version-query: $tag | sub("^[vV]"; "")
+          timestamp-query: .published_at
+      - type: file
+        path: eu.opencloud.Desktop.metainfo.xml
\ No newline at end of file

From e804ede45d1b88773ac1d870566329c9bf30dc59 Mon Sep 17 00:00:00 2001
From: Bryce Hoehn <bryce.hoehn@icloud.com>
Date: Fri, 1 May 2026 15:27:55 -0400
Subject: [PATCH 02/30] only run on release publish, not every commit

---
 .github/workflows/flatpak.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 7a7a40f3b..1aaedad9a 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -1,9 +1,8 @@
 name: CI
 
 on:
-  push:
-    branches: [main]
-  pull_request:
+  release:
+    types: [published]
   workflow_dispatch: 
 
 jobs:

From 142bac2ff5029f7f9ed872e07c8f9ca342825c36 Mon Sep 17 00:00:00 2001
From: Bryce Hoehn <bryce.hoehn@icloud.com>
Date: Fri, 1 May 2026 15:39:12 -0400
Subject: [PATCH 03/30] example deploy stage

---
 .github/workflows/flatpak.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 1aaedad9a..6e730c47d 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -1,4 +1,4 @@
-name: CI
+name: Flatpak Builder
 
 on:
   release:
@@ -6,6 +6,7 @@ on:
   workflow_dispatch: 
 
 jobs:
+  # from https://github.com/flatpak/flatpak-github-actions
   flatpak:
     name: "Flatpak"
     container:
@@ -21,12 +22,16 @@ jobs:
     runs-on: ${{ matrix.variant.runner }}
     steps:
       - uses: actions/checkout@v6
-        with:
-          submodules: "true"
       - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:
           bundle: eu.opencloud.Desktop.flatpak
           manifest-path: flatpak/eu.opencloud.Desktop.yml
           cache-key: flatpak-builder-${{ github.sha }}
           arch: ${{ matrix.variant.arch }}
-          verbose: true
\ No newline at end of file
+          verbose: true
+      - uses: flatpak/flatpak-github-actions/flat-manager@v6
+        name: "Deploy"
+        with:
+          repository: opencloud # The repository to push the build into
+          flat-manager-url: https://flatpak-api.elementary.io # The flat-manager remote URL
+          token: some_very_hidden_token # A flat-manager token
\ No newline at end of file

From 9083192f39ba03173f0cd957bbc0e54e678067fc Mon Sep 17 00:00:00 2001
From: Bryce Hoehn <bryce.hoehn@icloud.com>
Date: Fri, 1 May 2026 15:40:02 -0400
Subject: [PATCH 04/30] switch to kde-6.9 to match flatpak manifest

---
 .github/workflows/flatpak.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 6e730c47d..0084f25cc 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -10,7 +10,7 @@ jobs:
   flatpak:
     name: "Flatpak"
     container:
-      image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-48
+      image: ghcr.io/flathub-infra/flatpak-github-actions:kde-6.9
       options: --privileged
     strategy:
       matrix:

From 8e677dbb6445ef1389e66d1c01454a5033a78968 Mon Sep 17 00:00:00 2001
From: Bryce Hoehn <bryce.hoehn@icloud.com>
Date: Fri, 1 May 2026 15:44:20 -0400
Subject: [PATCH 05/30] bump opencloud version & fixed paths

---
 flatpak/eu.opencloud.Desktop.metainfo.xml | 2 +-
 flatpak/eu.opencloud.Desktop.yml          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/flatpak/eu.opencloud.Desktop.metainfo.xml b/flatpak/eu.opencloud.Desktop.metainfo.xml
index ad3685963..9c82a334a 100644
--- a/flatpak/eu.opencloud.Desktop.metainfo.xml
+++ b/flatpak/eu.opencloud.Desktop.metainfo.xml
@@ -33,7 +33,7 @@ Any file you add, modify or delete in the synced folders on your desktop or lapt
   <url type="faq">https://docs.opencloud.eu/docs/user/intro/</url>
   <url type="vcs-browser">https://github.com/opencloud-eu/desktop</url>
   <releases>
-    <release version="3.0.0-rc.1" date="2025-11-10">
+    <release version="3.0.3" date="2025-12-08">
       <description></description>
     </release>
   </releases>
diff --git a/flatpak/eu.opencloud.Desktop.yml b/flatpak/eu.opencloud.Desktop.yml
index 47f16b625..0b9c86469 100644
--- a/flatpak/eu.opencloud.Desktop.yml
+++ b/flatpak/eu.opencloud.Desktop.yml
@@ -114,12 +114,12 @@ modules:
     cleanup:
       - /include
     post-install:
-      - install -Dm644 -t /app/share/metainfo eu.opencloud.Desktop.metainfo.xml
+      - install -Dm644 -t /app/share/metainfo flatpak/eu.opencloud.Desktop.metainfo.xml
     sources:
       - type: git
         url: https://github.com/opencloud-eu/desktop
-        tag: v3.0.0-rc.1
-        commit: 65249647dd131585fd4e13f760a24190255a008a
+        tag: v3.0.3
+        commit: 72fe8fb78e3e8b7dc9d2e54dfb497660e729cec3
         x-checker-data:
           type: json
           url: https://api.github.com/repos/opencloud/desktop/releases/latest
@@ -127,4 +127,4 @@ modules:
           version-query: $tag | sub("^[vV]"; "")
           timestamp-query: .published_at
       - type: file
-        path: eu.opencloud.Desktop.metainfo.xml
\ No newline at end of file
+        path: flatpak/eu.opencloud.Desktop.metainfo.xml
\ No newline at end of file

From 43d1ecdeffa8f5c5130e6c9e6c70ac04f1fb27d4 Mon Sep 17 00:00:00 2001
From: Bryce Hoehn <bryce.hoehn@icloud.com>
Date: Fri, 1 May 2026 19:21:36 -0400
Subject: [PATCH 06/30] Download libsecret dependency during buildtime

---
 .github/workflows/flatpak.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 0084f25cc..85e2f1390 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -22,6 +22,12 @@ jobs:
     runs-on: ${{ matrix.variant.runner }}
     steps:
       - uses: actions/checkout@v6
+      - name: Download libsecret only
+        run: |
+          git clone --filter=blob:none --no-checkout --depth 1 https://github.com/flathub/shared-modules flatpak/shared-modules
+          cd flatpak/shared-modules
+          git sparse-checkout set libsecret
+          git checkout
       - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:
           bundle: eu.opencloud.Desktop.flatpak
@@ -34,4 +40,4 @@ jobs:
         with:
           repository: opencloud # The repository to push the build into
           flat-manager-url: https://flatpak-api.elementary.io # The flat-manager remote URL
-          token: some_very_hidden_token # A flat-manager token
\ No newline at end of file
+          token: some_very_hidden_token # A flat-manager token

From 1432407f22902756391f1c4cce301bf2cf0188ad Mon Sep 17 00:00:00 2001
From: Bryce Hoehn <bryce.hoehn@icloud.com>
Date: Fri, 1 May 2026 19:26:21 -0400
Subject: [PATCH 07/30] fixed path

---
 flatpak/eu.opencloud.Desktop.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/flatpak/eu.opencloud.Desktop.yml b/flatpak/eu.opencloud.Desktop.yml
index 0b9c86469..f61026119 100644
--- a/flatpak/eu.opencloud.Desktop.yml
+++ b/flatpak/eu.opencloud.Desktop.yml
@@ -114,7 +114,7 @@ modules:
     cleanup:
       - /include
     post-install:
-      - install -Dm644 -t /app/share/metainfo flatpak/eu.opencloud.Desktop.metainfo.xml
+      - install -Dm644 -t /app/share/metainfo eu.opencloud.Desktop.metainfo.xml
     sources:
       - type: git
         url: https://github.com/opencloud-eu/desktop
@@ -127,4 +127,4 @@ modules:
           version-query: $tag | sub("^[vV]"; "")
           timestamp-query: .published_at
       - type: file
-        path: flatpak/eu.opencloud.Desktop.metainfo.xml
\ No newline at end of file
+        path: eu.opencloud.Desktop.metainfo.xml

From 65f4b0fd662414e56d5d0b4ca188b46f824b50b0 Mon Sep 17 00:00:00 2001
From: Bryce Hoehn <bryce.hoehn@icloud.com>
Date: Fri, 1 May 2026 19:41:32 -0400
Subject: [PATCH 08/30] removed flat-manager step

---
 .github/workflows/flatpak.yml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index 85e2f1390..fb92c8121 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -1,12 +1,13 @@
 name: Flatpak Builder
 
 on:
-  release:
-    types: [published]
   workflow_dispatch: 
 
 jobs:
   # from https://github.com/flatpak/flatpak-github-actions
+  # this builds the flatpak for testing purposes
+  # flathub builds from source once submitted: https://docs.flathub.org/docs/for-app-authors/requirements
+  # alternatively, flatpak/flatpak-github-actions/flat-manager@v6 can be used for deploying to custom flatpak repo
   flatpak:
     name: "Flatpak"
     container:
@@ -35,9 +36,3 @@ jobs:
           cache-key: flatpak-builder-${{ github.sha }}
           arch: ${{ matrix.variant.arch }}
           verbose: true
-      - uses: flatpak/flatpak-github-actions/flat-manager@v6
-        name: "Deploy"
-        with:
-          repository: opencloud # The repository to push the build into
-          flat-manager-url: https://flatpak-api.elementary.io # The flat-manager remote URL
-          token: some_very_hidden_token # A flat-manager token

From 571bc837f73aa03234efa75142985309d434a7dd Mon Sep 17 00:00:00 2001
From: bryce <bryce.hoehn@icloud.com>
Date: Fri, 1 May 2026 19:52:14 -0400
Subject: [PATCH 09/30] moved manifest to root directory per flathub
 requirements: https://docs.flathub.org/docs/for-app-authors/requirements

---
 .github/workflows/flatpak.yml                               | 6 +++---
 ...esktop.metainfo.xml => eu.opencloud.Desktop.metainfo.xml | 0
 .../eu.opencloud.Desktop.yml => eu.opencloud.Desktop.yml    | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename flatpak/eu.opencloud.Desktop.metainfo.xml => eu.opencloud.Desktop.metainfo.xml (100%)
 rename flatpak/eu.opencloud.Desktop.yml => eu.opencloud.Desktop.yml (100%)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index fb92c8121..cd98a0b51 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -25,14 +25,14 @@ jobs:
       - uses: actions/checkout@v6
       - name: Download libsecret only
         run: |
-          git clone --filter=blob:none --no-checkout --depth 1 https://github.com/flathub/shared-modules flatpak/shared-modules
-          cd flatpak/shared-modules
+          git clone --filter=blob:none --no-checkout --depth 1 https://github.com/flathub/shared-modules
+          cd shared-modules
           git sparse-checkout set libsecret
           git checkout
       - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:
           bundle: eu.opencloud.Desktop.flatpak
-          manifest-path: flatpak/eu.opencloud.Desktop.yml
+          manifest-path: eu.opencloud.Desktop.yml
           cache-key: flatpak-builder-${{ github.sha }}
           arch: ${{ matrix.variant.arch }}
           verbose: true
diff --git a/flatpak/eu.opencloud.Desktop.metainfo.xml b/eu.opencloud.Desktop.metainfo.xml
similarity index 100%
rename from flatpak/eu.opencloud.Desktop.metainfo.xml
rename to eu.opencloud.Desktop.metainfo.xml
diff --git a/flatpak/eu.opencloud.Desktop.yml b/eu.opencloud.Desktop.yml
similarity index 100%
rename from flatpak/eu.opencloud.Desktop.yml
rename to eu.opencloud.Desktop.yml

From 1b397509ffa691fd33a79f074d503f01751534d9 Mon Sep 17 00:00:00 2001
From: bryce <bryce.hoehn@icloud.com>
Date: Fri, 1 May 2026 20:12:29 -0400
Subject: [PATCH 10/30] auto-update flatpak manifest

---
 .../{flatpak.yml => build-flatpak.yml}        |  5 ++
 .github/workflows/update-flatpak.yml          | 77 +++++++++++++++++++
 .gitignore                                    |  1 +
 3 files changed, 83 insertions(+)
 rename .github/workflows/{flatpak.yml => build-flatpak.yml} (99%)
 create mode 100644 .github/workflows/update-flatpak.yml

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/build-flatpak.yml
similarity index 99%
rename from .github/workflows/flatpak.yml
rename to .github/workflows/build-flatpak.yml
index cd98a0b51..234fc6216 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/build-flatpak.yml
@@ -36,3 +36,8 @@ jobs:
           cache-key: flatpak-builder-${{ github.sha }}
           arch: ${{ matrix.variant.arch }}
           verbose: true
+
+
+
+
+
diff --git a/.github/workflows/update-flatpak.yml b/.github/workflows/update-flatpak.yml
new file mode 100644
index 000000000..6e8eb9774
--- /dev/null
+++ b/.github/workflows/update-flatpak.yml
@@ -0,0 +1,77 @@
+name: Update Flatpak
+
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  update:
+    name: "Update Flatpak files"
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Get latest release info
+        id: release
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          # Get the latest release from GitHub API
+          RELEASE=$(gh api repos/opencloud-eu/desktop/releases/latest)
+
+          TAG=$(echo "$RELEASE" | jq -r '.tag_name')
+          DATE=$(echo "$RELEASE" | jq -r '.published_at' | cut -dT -f1)
+          VERSION="${TAG#v}"
+
+          # Get the commit SHA for the tag
+          COMMIT=$(gh api "repos/opencloud-eu/desktop/commits/$TAG" --jq '.sha')
+
+          echo "tag=$TAG" >> "$GITHUB_OUTPUT"
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+          echo "date=$DATE" >> "$GITHUB_OUTPUT"
+          echo "commit=$COMMIT" >> "$GITHUB_OUTPUT"
+
+          echo "## Release info" >> "$GITHUB_STEP_SUMMARY"
+          echo "Tag: \`$TAG\`" >> "$GITHUB_STEP_SUMMARY"
+          echo "Version: \`$VERSION\`" >> "$GITHUB_STEP_SUMMARY"
+          echo "Date: \`$DATE\`" >> "$GITHUB_STEP_SUMMARY"
+          echo "Commit: \`$COMMIT\`" >> "$GITHUB_STEP_SUMMARY"
+
+      - name: Update metainfo.xml
+        run: |
+          sed -i \
+            -e 's|<release version="[^"]*" date="[^"]*">|<release version="${{ steps.release.outputs.version }}" date="${{ steps.release.outputs.date }}">|' \
+            eu.opencloud.Desktop.metainfo.xml
+
+          echo "Updated eu.opencloud.Desktop.metainfo.xml:"
+          grep '<release version=' eu.opencloud.Desktop.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
+
+          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
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v7
+        with:
+          title: "Update flatpak to ${{ steps.release.outputs.version }}"
+          body: |
+            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 }}`
+          branch: update-flatpak-${{ steps.release.outputs.version }}
+          commit-message: "chore: update flatpak to ${{ steps.release.outputs.version }}"
+          delete-branch: true
diff --git a/.gitignore b/.gitignore
index 69b7d6701..953fd5059 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ admin/win/nsi/l10n/pofiles/*.po
 *.swp
 *~$
 build*
+!build-flatpak.yml
 cscope.*
 tags
 t1.cfg

From bde04570de34d219b90c7dad62bfe4ecd02b710a Mon Sep 17 00:00:00 2001
From: bryce <bryce.hoehn@icloud.com>
Date: Fri, 1 May 2026 20:12:54 -0400
Subject: [PATCH 11/30] publish updated manifest to flathub repo

---
 .github/workflows/update-flathub.yml | 58 ++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 .github/workflows/update-flathub.yml

diff --git a/.github/workflows/update-flathub.yml b/.github/workflows/update-flathub.yml
new file mode 100644
index 000000000..cbc900825
--- /dev/null
+++ b/.github/workflows/update-flathub.yml
@@ -0,0 +1,58 @@
+name: Update Flathub
+
+# Submits an update PR to the Flathub repository when the flatpak manifest
+# 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)
+#   2. Add a FLATHUB_TOKEN repository secret – a GitHub PAT with repo scope
+#      that has write access to the flathub/eu.opencloud.Desktop repo
+#   3. Disable the global x-checker action on the Flathub repo (if enabled)
+#      to avoid duplicate update PRs
+#
+# Per Flathub policy only `peter-evans/create-pull-request` and Flathub org
+# actions are allowed. This workflow uses only the allowed action.
+
+on:
+  push:
+    branches: [main]
+    paths:
+      - eu.opencloud.Desktop.metainfo.xml
+      - eu.opencloud.Desktop.yml
+
+jobs:
+  update-flathub:
+    name: "Update Flathub"
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Get version from metainfo
+        id: version
+        run: |
+          VERSION=$(grep -oP '<release version="\K[^"]+' eu.opencloud.Desktop.metainfo.xml)
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+
+      - name: Checkout Flathub repo
+        uses: actions/checkout@v6
+        with:
+          repository: flathub/eu.opencloud.Desktop
+          token: ${{ secrets.FLATHUB_TOKEN }}
+          path: flathub
+
+      - name: Copy updated files
+        run: |
+          cp eu.opencloud.Desktop.metainfo.xml flathub/
+          cp eu.opencloud.Desktop.yml flathub/
+
+      - name: Create Pull Request to Flathub
+        uses: peter-evans/create-pull-request@v7
+        with:
+          token: ${{ secrets.FLATHUB_TOKEN }}
+          path: flathub
+          title: "Update to ${{ steps.version.outputs.version }}"
+          body: |
+            Automated update to [v${{ steps.version.outputs.version }}](https://github.com/opencloud-eu/desktop/releases/tag/v${{ steps.version.outputs.version }}).
+          branch: update-${{ steps.version.outputs.version }}
+          commit-message: "Update to ${{ steps.version.outputs.version }}"
+          delete-branch: true

From 07170f6553eb700bac82e7c97f0987d886c74390 Mon Sep 17 00:00:00 2001
From: Bryce Hoehn <bryce.hoehn@icloud.com>
Date: Fri, 1 May 2026 21:47:23 -0400
Subject: [PATCH 12/30] adds .desktop file

---
 eu.opencloud.Desktop.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/eu.opencloud.Desktop.yml b/eu.opencloud.Desktop.yml
index f61026119..4595ba2c1 100644
--- a/eu.opencloud.Desktop.yml
+++ b/eu.opencloud.Desktop.yml
@@ -99,6 +99,19 @@ 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
+        url: https://raw.githubusercontent.com/opencloud-eu/desktop/refs/heads/main/opencloud.desktop.in
+        dest-filename: opencloud.desktop.in
+        
   - name: opencloud-desktop
     buildsystem: cmake-ninja
     config-opts:

From 83f39c9eaa819f08275e3a96f2031bf011c11bc8 Mon Sep 17 00:00:00 2001
From: Bryce Hoehn <bryce.hoehn@icloud.com>
Date: Fri, 1 May 2026 21:54:17 -0400
Subject: [PATCH 13/30] use local .desktop file instead of url

---
 eu.opencloud.Desktop.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eu.opencloud.Desktop.yml b/eu.opencloud.Desktop.yml
index 4595ba2c1..7587e1494 100644
--- a/eu.opencloud.Desktop.yml
+++ b/eu.opencloud.Desktop.yml
@@ -109,8 +109,7 @@ modules:
       - install -Dm644 eu.opencloud.Desktop.desktop /app/share/applications/eu.opencloud.Desktop.desktop
     sources:
       - type: file
-        url: https://raw.githubusercontent.com/opencloud-eu/desktop/refs/heads/main/opencloud.desktop.in
-        dest-filename: opencloud.desktop.in
+        path: opencloud.desktop.in
         
   - name: opencloud-desktop
     buildsystem: cmake-ninja

From aedc177323575161a36a06358afb49004ff514bc Mon Sep 17 00:00:00 2001
From: Bryce Hoehn <bryce.hoehn@icloud.com>
Date: Fri, 1 May 2026 22:02:54 -0400
Subject: [PATCH 14/30] fixed line breaks

---
 eu.opencloud.Desktop.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/eu.opencloud.Desktop.yml b/eu.opencloud.Desktop.yml
index 7587e1494..ac5e3b4f6 100644
--- a/eu.opencloud.Desktop.yml
+++ b/eu.opencloud.Desktop.yml
@@ -102,9 +102,10 @@ modules:
   - 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' \
+      - >
+        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:

From 152f32cec3669c1923940bd26e8e7e34ba7c7842 Mon Sep 17 00:00:00 2001
From: Bryce Hoehn <bryce.hoehn@icloud.com>
Date: Fri, 1 May 2026 22:10:54 -0400
Subject: [PATCH 15/30] single line sed

---
 eu.opencloud.Desktop.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/eu.opencloud.Desktop.yml b/eu.opencloud.Desktop.yml
index ac5e3b4f6..3e6a5a44b 100644
--- a/eu.opencloud.Desktop.yml
+++ b/eu.opencloud.Desktop.yml
@@ -102,11 +102,7 @@ modules:
   - 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
+      - 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

From 100e360f0bca86aa882ff78d3827d320af46f937 Mon Sep 17 00:00:00 2001
From: bryce <bryce.hoehn@icloud.com>
Date: Fri, 1 May 2026 23:04:25 -0400
Subject: [PATCH 16/30] APPLICATION_REV_DOMAIN changed from
 eu.opencloud.desktop to eu.opencloud.OpenCloudDesktop (complies with Flathub
 app ID requirements).

---
 .github/workflows/build-flatpak.yml           |   4 ++--
 .github/workflows/update-flathub.yml          |  16 ++++++++--------
 .github/workflows/update-flatpak.yml          |  18 +++++++++---------
 OPENCLOUD.cmake                               |   2 +-
 ...pdate_eu.opencloud.OpenCloudDesktop.plist} | Bin
 ...eu.opencloud.OpenCloudDesktop.metainfo.xml |   8 ++++----
 ...p.yml => eu.opencloud.OpenCloudDesktop.yml |  17 ++++-------------
 .../FinderSyncExt/FinderSync.m                |   2 +-
 .../project.pbxproj                           |   6 +++---
 src/cmd/CMakeLists.txt                        |   7 +++++--
 src/gui/CMakeLists.txt                        |   9 ++++++---
 src/gui/guiutility_mac.mm                     |   4 ++--
 src/gui/updater/CMakeLists.txt                |   2 +-
 src/gui/updater/sparkleupdater_mac.mm         |   2 +-
 14 files changed, 47 insertions(+), 50 deletions(-)
 rename admin/osx/{deny_autoupdate_eu.opencloud.desktop.plist => deny_autoupdate_eu.opencloud.OpenCloudDesktop.plist} (100%)
 rename eu.opencloud.Desktop.metainfo.xml => eu.opencloud.OpenCloudDesktop.metainfo.xml (89%)
 rename eu.opencloud.Desktop.yml => eu.opencloud.OpenCloudDesktop.yml (84%)

diff --git a/.github/workflows/build-flatpak.yml b/.github/workflows/build-flatpak.yml
index 234fc6216..5ecd475a7 100644
--- a/.github/workflows/build-flatpak.yml
+++ b/.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
diff --git a/.github/workflows/update-flathub.yml b/.github/workflows/update-flathub.yml
index cbc900825..a4fa4e332 100644
--- a/.github/workflows/update-flathub.yml
+++ b/.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
diff --git a/.github/workflows/update-flatpak.yml b/.github/workflows/update-flatpak.yml
index 6e8eb9774..3265ead0b 100644
--- a/.github/workflows/update-flatpak.yml
+++ b/.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
diff --git a/OPENCLOUD.cmake b/OPENCLOUD.cmake
index 9ecef35b9..b22b0cb7e 100644
--- a/OPENCLOUD.cmake
+++ b/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")
diff --git a/admin/osx/deny_autoupdate_eu.opencloud.desktop.plist b/admin/osx/deny_autoupdate_eu.opencloud.OpenCloudDesktop.plist
similarity index 100%
rename from admin/osx/deny_autoupdate_eu.opencloud.desktop.plist
rename to admin/osx/deny_autoupdate_eu.opencloud.OpenCloudDesktop.plist
diff --git a/eu.opencloud.Desktop.metainfo.xml b/eu.opencloud.OpenCloudDesktop.metainfo.xml
similarity index 89%
rename from eu.opencloud.Desktop.metainfo.xml
rename to eu.opencloud.OpenCloudDesktop.metainfo.xml
index 9c82a334a..4a1d7d14b 100644
--- a/eu.opencloud.Desktop.metainfo.xml
+++ b/eu.opencloud.OpenCloudDesktop.metainfo.xml
@@ -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>
\ No newline at end of file
+</component>
diff --git a/eu.opencloud.Desktop.yml b/eu.opencloud.OpenCloudDesktop.yml
similarity index 84%
rename from eu.opencloud.Desktop.yml
rename to eu.opencloud.OpenCloudDesktop.yml
index 3e6a5a44b..7c0179981 100644
--- a/eu.opencloud.Desktop.yml
+++ b/eu.opencloud.OpenCloudDesktop.yml
@@ -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
diff --git a/shell_integration/MacOSX/OpenCloudFinderExtension/FinderSyncExt/FinderSync.m b/shell_integration/MacOSX/OpenCloudFinderExtension/FinderSyncExt/FinderSync.m
index b76934387..59e877eff 100644
--- a/shell_integration/MacOSX/OpenCloudFinderExtension/FinderSyncExt/FinderSync.m
+++ b/shell_integration/MacOSX/OpenCloudFinderExtension/FinderSyncExt/FinderSync.m
@@ -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
diff --git a/shell_integration/MacOSX/OpenCloudFinderExtension/OpenCloudFinderExtension.xcodeproj/project.pbxproj b/shell_integration/MacOSX/OpenCloudFinderExtension/OpenCloudFinderExtension.xcodeproj/project.pbxproj
index b08d5da3b..cf3b840d2 100644
--- a/shell_integration/MacOSX/OpenCloudFinderExtension/OpenCloudFinderExtension.xcodeproj/project.pbxproj
+++ b/shell_integration/MacOSX/OpenCloudFinderExtension/OpenCloudFinderExtension.xcodeproj/project.pbxproj
@@ -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)";
diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt
index 8f63693ce..57d7602cb 100644
--- a/src/cmd/CMakeLists.txt
+++ b/src/cmd/CMakeLists.txt
@@ -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()
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 6f5325981..f3d6e9206 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -195,7 +195,7 @@ if(NOT APPLE)
         foreach(_file ${_icons})
             string(REPLACE "${OEM_THEME_DIR}/theme/colored/" "" _res ${_file})
             string(REPLACE "-${APPLICATION_ICON_NAME}-icon.png" "" _res ${_res})
-            install(FILES ${_file} RENAME ${APPLICATION_ICON_NAME}.png DESTINATION ${KDE_INSTALL_DATADIR}/icons/hicolor/${_res}x${_res}/apps)
+            install(FILES ${_file} RENAME ${APPLICATION_REV_DOMAIN}.png DESTINATION ${KDE_INSTALL_DATADIR}/icons/hicolor/${_res}x${_res}/apps)
         endforeach(_file)
     endif()
 
@@ -214,7 +214,10 @@ install(TARGETS opencloud OpenCloudGui ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 ecm_finalize_qml_module(OpenCloudGui DESTINATION ${KDE_INSTALL_QMLDIR})
 
 if(UNIX AND NOT APPLE)
+    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_EXECUTABLE}.desktop)
-    install(FILES  ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_EXECUTABLE}.desktop DESTINATION ${KDE_INSTALL_DATADIR}/applications )
+                   ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_REV_DOMAIN}.desktop)
+    set(APPLICATION_ICON_NAME "${_saved_icon_name}")
+    install(FILES  ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_REV_DOMAIN}.desktop DESTINATION ${KDE_INSTALL_DATADIR}/applications )
 endif()
diff --git a/src/gui/guiutility_mac.mm b/src/gui/guiutility_mac.mm
index 3016e4879..a84768c43 100644
--- a/src/gui/guiutility_mac.mm
+++ b/src/gui/guiutility_mac.mm
@@ -53,8 +53,8 @@
 QString Utility::socketApiSocketPath()
 {
     // This must match the code signing Team setting of the extension
-    // Example for developer builds (with ad-hoc signing identity): "" "eu.opencloud.desktop" ".socketApi"
-    // Example for official signed packages: "9B5WD74GWJ." "eu.opencloud.desktop" ".socketApi"
+    // Example for developer builds (with ad-hoc signing identity): "" "eu.opencloud.OpenCloudDesktop" ".socketApi"
+    // Example for official signed packages: "9B5WD74GWJ." "eu.opencloud.OpenCloudDesktop" ".socketApi"
     return QStringLiteral("%1%2.socketApi").arg(QStringLiteral(SOCKETAPI_TEAM_IDENTIFIER_PREFIX), Theme::instance()->orgDomainName());
 }
 
diff --git a/src/gui/updater/CMakeLists.txt b/src/gui/updater/CMakeLists.txt
index 71f9ec9ed..2b2fc7826 100644
--- a/src/gui/updater/CMakeLists.txt
+++ b/src/gui/updater/CMakeLists.txt
@@ -1,7 +1,7 @@
 if(APPLE)
     if (SPARKLE_FOUND)
         list(APPEND OPENCLOUD_BUNDLED_RESOURCES
-            "${PROJECT_SOURCE_DIR}/admin/osx/deny_autoupdate_eu.opencloud.desktop.plist"
+            "${PROJECT_SOURCE_DIR}/admin/osx/deny_autoupdate_eu.opencloud.OpenCloudDesktop.plist"
             "${PROJECT_SOURCE_DIR}/admin/osx/sparkle/dsa_pub.pem")
         set(OPENCLOUD_BUNDLED_RESOURCES ${OPENCLOUD_BUNDLED_RESOURCES} PARENT_SCOPE)
     endif()
diff --git a/src/gui/updater/sparkleupdater_mac.mm b/src/gui/updater/sparkleupdater_mac.mm
index 26d3873b4..89a496554 100644
--- a/src/gui/updater/sparkleupdater_mac.mm
+++ b/src/gui/updater/sparkleupdater_mac.mm
@@ -87,7 +87,7 @@ - (void)updater:(SUUpdater *)updater didFinishLoadingAppcast:(SUAppcast *)appcas
         DelegateObject *delegate;
 };
 
-// Delete ~/Library//Preferences/eu.opencloud.desktop.plist to re-test
+// Delete ~/Library//Preferences/eu.opencloud.OpenCloudDesktop.plist to re-test
 SparkleUpdater::SparkleUpdater(const QUrl& appCastUrl)
     : Updater()
 {

From 8e545b55ca7fb1ed82df5466ea70206144630472 Mon Sep 17 00:00:00 2001
From: Bryce Hoehn <bryce.hoehn@icloud.com>
Date: Fri, 1 May 2026 23:07:55 -0400
Subject: [PATCH 17/30] only trigger on releases

---
 .github/workflows/update-flathub.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/update-flathub.yml b/.github/workflows/update-flathub.yml
index a4fa4e332..1d6156cfd 100644
--- a/.github/workflows/update-flathub.yml
+++ b/.github/workflows/update-flathub.yml
@@ -15,10 +15,8 @@ name: Update Flathub
 
 on:
   push:
-    branches: [main]
-    paths:
-      - eu.opencloud.OpenCloudDesktop.metainfo.xml
-      - eu.opencloud.OpenCloudDesktop.yml
+    tags:
+      - 'v*'
 
 jobs:
   update-flathub:

From 9d38f88174fc37c01f921208e6e04cf2a8567504 Mon Sep 17 00:00:00 2001
From: Bryce Hoehn <bryce.hoehn@icloud.com>
Date: Fri, 1 May 2026 23:11:08 -0400
Subject: [PATCH 18/30] fix release tag

Prevents a possible race condition
---
 .github/workflows/update-flatpak.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-flatpak.yml b/.github/workflows/update-flatpak.yml
index 3265ead0b..3cfda2a40 100644
--- a/.github/workflows/update-flatpak.yml
+++ b/.github/workflows/update-flatpak.yml
@@ -1,8 +1,9 @@
 name: Update Flatpak
 
 on:
-  release:
-    types: [published]
+  push:
+    tags:
+      - 'v*'
   workflow_dispatch:
 
 permissions:

From f3c9e34de9d9093300746b104db6e535a058e2e3 Mon Sep 17 00:00:00 2001
From: Bryce Hoehn <bryce.hoehn@icloud.com>
Date: Fri, 1 May 2026 23:12:58 -0400
Subject: [PATCH 19/30] Delete .github/workflows/update-flathub.yml

---
 .github/workflows/update-flathub.yml | 56 ----------------------------
 1 file changed, 56 deletions(-)
 delete mode 100644 .github/workflows/update-flathub.yml

diff --git a/.github/workflows/update-flathub.yml b/.github/workflows/update-flathub.yml
deleted file mode 100644
index 1d6156cfd..000000000
--- a/.github/workflows/update-flathub.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-name: Update Flathub
-
-# Submits an update PR to the Flathub repository when the flatpak manifest
-# 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.OpenCloudDesktop)
-#   2. Add a FLATHUB_TOKEN repository secret – a GitHub PAT with repo scope
-#      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
-#
-# Per Flathub policy only `peter-evans/create-pull-request` and Flathub org
-# actions are allowed. This workflow uses only the allowed action.
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  update-flathub:
-    name: "Update Flathub"
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Get version from metainfo
-        id: version
-        run: |
-          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.OpenCloudDesktop
-          token: ${{ secrets.FLATHUB_TOKEN }}
-          path: flathub
-
-      - name: Copy updated files
-        run: |
-          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
-        with:
-          token: ${{ secrets.FLATHUB_TOKEN }}
-          path: flathub
-          title: "Update to ${{ steps.version.outputs.version }}"
-          body: |
-            Automated update to [v${{ steps.version.outputs.version }}](https://github.com/opencloud-eu/desktop/releases/tag/v${{ steps.version.outputs.version }}).
-          branch: update-${{ steps.version.outputs.version }}
-          commit-message: "Update to ${{ steps.version.outputs.version }}"
-          delete-branch: true

From cd4f5182b813439e4fe94810a641afa2d6321f2f Mon Sep 17 00:00:00 2001
From: bryce <bryce.hoehn@icloud.com>
Date: Fri, 1 May 2026 23:18:51 -0400
Subject: [PATCH 20/30] ensure that update job completes before publishing to
 flathub

---
 .github/workflows/build-flatpak.yml  | 12 +++---
 .github/workflows/update-flatpak.yml | 58 +++++++++++++++++++++++-----
 2 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build-flatpak.yml b/.github/workflows/build-flatpak.yml
index 5ecd475a7..72068f16d 100644
--- a/.github/workflows/build-flatpak.yml
+++ b/.github/workflows/build-flatpak.yml
@@ -3,6 +3,9 @@ name: Flatpak Builder
 on:
   workflow_dispatch: 
 
+env:
+  FLATPAK_ID: eu.opencloud.OpenCloudDesktop
+
 jobs:
   # from https://github.com/flatpak/flatpak-github-actions
   # this builds the flatpak for testing purposes
@@ -31,13 +34,8 @@ jobs:
           git checkout
       - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:
-          bundle: eu.opencloud.OpenCloudDesktop.flatpak
-          manifest-path: eu.opencloud.OpenCloudDesktop.yml
+          bundle: ${{ env.FLATPAK_ID }}.flatpak
+          manifest-path: ${{ env.FLATPAK_ID }}.yml
           cache-key: flatpak-builder-${{ github.sha }}
           arch: ${{ matrix.variant.arch }}
           verbose: true
-
-
-
-
-
diff --git a/.github/workflows/update-flatpak.yml b/.github/workflows/update-flatpak.yml
index 3cfda2a40..08303edc7 100644
--- a/.github/workflows/update-flatpak.yml
+++ b/.github/workflows/update-flatpak.yml
@@ -10,6 +10,9 @@ permissions:
   contents: write
   pull-requests: write
 
+env:
+  FLATPAK_ID: eu.opencloud.OpenCloudDesktop
+
 jobs:
   update:
     name: "Update Flatpak files"
@@ -47,21 +50,21 @@ jobs:
         run: |
           sed -i \
             -e 's|<release version="[^"]*" date="[^"]*">|<release version="${{ steps.release.outputs.version }}" date="${{ steps.release.outputs.date }}">|' \
-            eu.opencloud.OpenCloudDesktop.metainfo.xml
+            ${{ env.FLATPAK_ID }}.metainfo.xml
 
-          echo "Updated eu.opencloud.OpenCloudDesktop.metainfo.xml:"
-          grep '<release version=' eu.opencloud.OpenCloudDesktop.metainfo.xml
+          echo "Updated ${{ env.FLATPAK_ID }}.metainfo.xml:"
+          grep '<release version=' ${{ env.FLATPAK_ID }}.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.OpenCloudDesktop.yml
+            ${{ env.FLATPAK_ID }}.yml
 
-          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
+          echo "Updated ${{ env.FLATPAK_ID }}.yml:"
+          grep -A2 'name: opencloud-desktop' ${{ env.FLATPAK_ID }}.yml | head -1
+          grep -E '^\s+tag:|^\s+commit:' ${{ env.FLATPAK_ID }}.yml | tail -2
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v7
@@ -71,8 +74,45 @@ jobs:
             Automated update to [${{ steps.release.outputs.tag }}](https://github.com/opencloud-eu/desktop/releases/tag/${{ steps.release.outputs.tag }}).
 
             Changes:
-            - 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 }}`
+            - Updated `${{ env.FLATPAK_ID }}.metainfo.xml` release version to `${{ steps.release.outputs.version }}` (date: `${{ steps.release.outputs.date }}`)
+            - Updated `${{ env.FLATPAK_ID }}.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
+
+  publish:
+    name: "Update Flathub"
+    needs: update
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Get version from metainfo
+        id: version
+        run: |
+          VERSION=$(grep -oP '<release version="\K[^"]+' ${{ env.FLATPAK_ID }}.metainfo.xml)
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+
+      - name: Checkout Flathub repo
+        uses: actions/checkout@v6
+        with:
+          repository: flathub/${{ env.FLATPAK_ID }}
+          token: ${{ secrets.FLATHUB_TOKEN }}
+          path: flathub
+
+      - name: Copy updated files
+        run: |
+          cp ${{ env.FLATPAK_ID }}.metainfo.xml flathub/
+          cp ${{ env.FLATPAK_ID }}.yml flathub/
+
+      - name: Create Pull Request to Flathub
+        uses: peter-evans/create-pull-request@v7
+        with:
+          token: ${{ secrets.FLATHUB_TOKEN }}
+          path: flathub
+          title: "Update to ${{ steps.version.outputs.version }}"
+          body: |
+            Automated update to [v${{ steps.version.outputs.version }}](https://github.com/opencloud-eu/desktop/releases/tag/v${{ steps.version.outputs.version }}).
+          branch: update-${{ steps.version.outputs.version }}
+          commit-message: "Update to ${{ steps.version.outputs.version }}"
+          delete-branch: true

From c2746e53aad9cf9f7c4bfef003524c1eae61ff8e Mon Sep 17 00:00:00 2001
From: bryce <bryce.hoehn@icloud.com>
Date: Sat, 2 May 2026 00:15:28 -0400
Subject: [PATCH 21/30] fix .desktop name

---
 eu.opencloud.OpenCloudDesktop.metainfo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eu.opencloud.OpenCloudDesktop.metainfo.xml b/eu.opencloud.OpenCloudDesktop.metainfo.xml
index 4a1d7d14b..2d5468372 100644
--- a/eu.opencloud.OpenCloudDesktop.metainfo.xml
+++ b/eu.opencloud.OpenCloudDesktop.metainfo.xml
@@ -17,7 +17,7 @@ Any file you add, modify or delete in the synced folders on your desktop or lapt
     <category>Network</category>
     <category>Utility</category>
   </categories>
-  <launchable type="desktop-id">eu.opencloud.OpenCloudDesktop</launchable>
+  <launchable type="desktop-id">eu.opencloud.OpenCloudDesktop.desktop</launchable>
   <screenshots>
     <screenshot type="default">
       <caption>The options dialog</caption>

From 394ba93cfa0c48e310494918cbd1f4249e526d4a Mon Sep 17 00:00:00 2001
From: bryce <bryce.hoehn@icloud.com>
Date: Sat, 2 May 2026 00:19:58 -0400
Subject: [PATCH 22/30] push instead of pr so publish step can run

---
 .github/workflows/update-flatpak.yml | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/update-flatpak.yml b/.github/workflows/update-flatpak.yml
index 08303edc7..de39b52b6 100644
--- a/.github/workflows/update-flatpak.yml
+++ b/.github/workflows/update-flatpak.yml
@@ -8,7 +8,6 @@ on:
 
 permissions:
   contents: write
-  pull-requests: write
 
 env:
   FLATPAK_ID: eu.opencloud.OpenCloudDesktop
@@ -66,19 +65,13 @@ jobs:
           grep -A2 'name: opencloud-desktop' ${{ env.FLATPAK_ID }}.yml | head -1
           grep -E '^\s+tag:|^\s+commit:' ${{ env.FLATPAK_ID }}.yml | tail -2
 
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
-        with:
-          title: "Update flatpak to ${{ steps.release.outputs.version }}"
-          body: |
-            Automated update to [${{ steps.release.outputs.tag }}](https://github.com/opencloud-eu/desktop/releases/tag/${{ steps.release.outputs.tag }}).
-
-            Changes:
-            - Updated `${{ env.FLATPAK_ID }}.metainfo.xml` release version to `${{ steps.release.outputs.version }}` (date: `${{ steps.release.outputs.date }}`)
-            - Updated `${{ env.FLATPAK_ID }}.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
+      - name: Commit and push to main
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add ${{ env.FLATPAK_ID }}.metainfo.xml ${{ env.FLATPAK_ID }}.yml
+          git commit -m "chore: update flatpak to ${{ steps.release.outputs.version }}"
+          git push origin HEAD:main
 
   publish:
     name: "Update Flathub"

From 75b5fe959159ebfa882c993fb38c4fcab3c18f09 Mon Sep 17 00:00:00 2001
From: bryce <bryce.hoehn@icloud.com>
Date: Sat, 2 May 2026 00:24:26 -0400
Subject: [PATCH 23/30] test

---
 .github/workflows/update-flatpak.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-flatpak.yml b/.github/workflows/update-flatpak.yml
index de39b52b6..5ab5bee69 100644
--- a/.github/workflows/update-flatpak.yml
+++ b/.github/workflows/update-flatpak.yml
@@ -25,14 +25,14 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           # Get the latest release from GitHub API
-          RELEASE=$(gh api repos/opencloud-eu/desktop/releases/latest)
+          RELEASE=$(gh api repos/bryce-hoehn/desktop/releases/latest)
 
           TAG=$(echo "$RELEASE" | jq -r '.tag_name')
           DATE=$(echo "$RELEASE" | jq -r '.published_at' | cut -dT -f1)
           VERSION="${TAG#v}"
 
           # Get the commit SHA for the tag
-          COMMIT=$(gh api "repos/opencloud-eu/desktop/commits/$TAG" --jq '.sha')
+          COMMIT=$(gh api "repos/bryce-hoehn/desktop/commits/$TAG" --jq '.sha')
 
           echo "tag=$TAG" >> "$GITHUB_OUTPUT"
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"

From 506c07cc4d0896bcda41479f06df0da35a50180e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 2 May 2026 04:25:08 +0000
Subject: [PATCH 24/30] chore: update flatpak to 3.0.5

---
 eu.opencloud.OpenCloudDesktop.metainfo.xml | 2 +-
 eu.opencloud.OpenCloudDesktop.yml          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eu.opencloud.OpenCloudDesktop.metainfo.xml b/eu.opencloud.OpenCloudDesktop.metainfo.xml
index 2d5468372..11717d9fc 100644
--- a/eu.opencloud.OpenCloudDesktop.metainfo.xml
+++ b/eu.opencloud.OpenCloudDesktop.metainfo.xml
@@ -33,7 +33,7 @@ Any file you add, modify or delete in the synced folders on your desktop or lapt
   <url type="faq">https://docs.opencloud.eu/docs/user/intro/</url>
   <url type="vcs-browser">https://github.com/opencloud-eu/desktop</url>
   <releases>
-    <release version="3.0.3" date="2025-12-08">
+    <release version="3.0.5" date="2026-05-02">
       <description></description>
     </release>
   </releases>
diff --git a/eu.opencloud.OpenCloudDesktop.yml b/eu.opencloud.OpenCloudDesktop.yml
index 7c0179981..78b32f362 100644
--- a/eu.opencloud.OpenCloudDesktop.yml
+++ b/eu.opencloud.OpenCloudDesktop.yml
@@ -118,8 +118,8 @@ modules:
     sources:
       - type: git
         url: https://github.com/opencloud-eu/desktop
-        tag: v3.0.3
-        commit: 72fe8fb78e3e8b7dc9d2e54dfb497660e729cec3
+        tag: v3.0.5
+        commit: 75b5fe959159ebfa882c993fb38c4fcab3c18f09
         x-checker-data:
           type: json
           url: https://api.github.com/repos/opencloud/desktop/releases/latest

From ce73613d2ab0d8bb8f717878bde81974238ecc9f Mon Sep 17 00:00:00 2001
From: Bryce Hoehn <bryce.hoehn@icloud.com>
Date: Sat, 2 May 2026 00:30:05 -0400
Subject: [PATCH 25/30] testing ci

---
 eu.opencloud.OpenCloudDesktop.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eu.opencloud.OpenCloudDesktop.yml b/eu.opencloud.OpenCloudDesktop.yml
index 78b32f362..a43dd2a14 100644
--- a/eu.opencloud.OpenCloudDesktop.yml
+++ b/eu.opencloud.OpenCloudDesktop.yml
@@ -117,12 +117,12 @@ modules:
       - install -Dm644 -t /app/share/metainfo eu.opencloud.OpenCloudDesktop.metainfo.xml
     sources:
       - type: git
-        url: https://github.com/opencloud-eu/desktop
+        url: https://github.com/bryce-hoehn/desktop
         tag: v3.0.5
-        commit: 75b5fe959159ebfa882c993fb38c4fcab3c18f09
+        commit: 506c07cc4d0896bcda41479f06df0da35a50180e
         x-checker-data:
           type: json
-          url: https://api.github.com/repos/opencloud/desktop/releases/latest
+          url: https://api.github.com/repos/bryce-hoehn/desktop/releases/latest
           tag-query: .tag_name
           version-query: $tag | sub("^[vV]"; "")
           timestamp-query: .published_at

From 1ca66406b6df896c24720ba0497bc1ae0f0b1924 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 2 May 2026 04:30:46 +0000
Subject: [PATCH 26/30] chore: update flatpak to 3.0.6

---
 eu.opencloud.OpenCloudDesktop.metainfo.xml | 2 +-
 eu.opencloud.OpenCloudDesktop.yml          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eu.opencloud.OpenCloudDesktop.metainfo.xml b/eu.opencloud.OpenCloudDesktop.metainfo.xml
index 11717d9fc..ebd876425 100644
--- a/eu.opencloud.OpenCloudDesktop.metainfo.xml
+++ b/eu.opencloud.OpenCloudDesktop.metainfo.xml
@@ -33,7 +33,7 @@ Any file you add, modify or delete in the synced folders on your desktop or lapt
   <url type="faq">https://docs.opencloud.eu/docs/user/intro/</url>
   <url type="vcs-browser">https://github.com/opencloud-eu/desktop</url>
   <releases>
-    <release version="3.0.5" date="2026-05-02">
+    <release version="3.0.6" date="2026-05-02">
       <description></description>
     </release>
   </releases>
diff --git a/eu.opencloud.OpenCloudDesktop.yml b/eu.opencloud.OpenCloudDesktop.yml
index a43dd2a14..6c5966c12 100644
--- a/eu.opencloud.OpenCloudDesktop.yml
+++ b/eu.opencloud.OpenCloudDesktop.yml
@@ -118,8 +118,8 @@ modules:
     sources:
       - type: git
         url: https://github.com/bryce-hoehn/desktop
-        tag: v3.0.5
-        commit: 506c07cc4d0896bcda41479f06df0da35a50180e
+        tag: v3.0.6
+        commit: ce73613d2ab0d8bb8f717878bde81974238ecc9f
         x-checker-data:
           type: json
           url: https://api.github.com/repos/bryce-hoehn/desktop/releases/latest

From faea3479eab2f9f2b3a643abc5ebf72eef28ce21 Mon Sep 17 00:00:00 2001
From: bryce <bryce.hoehn@icloud.com>
Date: Sat, 2 May 2026 01:14:51 -0400
Subject: [PATCH 27/30] revert tests

---
 .github/workflows/update-flatpak.yml       | 4 ++--
 eu.opencloud.OpenCloudDesktop.metainfo.xml | 2 +-
 eu.opencloud.OpenCloudDesktop.yml          | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/update-flatpak.yml b/.github/workflows/update-flatpak.yml
index 5ab5bee69..de39b52b6 100644
--- a/.github/workflows/update-flatpak.yml
+++ b/.github/workflows/update-flatpak.yml
@@ -25,14 +25,14 @@ jobs:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           # Get the latest release from GitHub API
-          RELEASE=$(gh api repos/bryce-hoehn/desktop/releases/latest)
+          RELEASE=$(gh api repos/opencloud-eu/desktop/releases/latest)
 
           TAG=$(echo "$RELEASE" | jq -r '.tag_name')
           DATE=$(echo "$RELEASE" | jq -r '.published_at' | cut -dT -f1)
           VERSION="${TAG#v}"
 
           # Get the commit SHA for the tag
-          COMMIT=$(gh api "repos/bryce-hoehn/desktop/commits/$TAG" --jq '.sha')
+          COMMIT=$(gh api "repos/opencloud-eu/desktop/commits/$TAG" --jq '.sha')
 
           echo "tag=$TAG" >> "$GITHUB_OUTPUT"
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
diff --git a/eu.opencloud.OpenCloudDesktop.metainfo.xml b/eu.opencloud.OpenCloudDesktop.metainfo.xml
index ebd876425..2d5468372 100644
--- a/eu.opencloud.OpenCloudDesktop.metainfo.xml
+++ b/eu.opencloud.OpenCloudDesktop.metainfo.xml
@@ -33,7 +33,7 @@ Any file you add, modify or delete in the synced folders on your desktop or lapt
   <url type="faq">https://docs.opencloud.eu/docs/user/intro/</url>
   <url type="vcs-browser">https://github.com/opencloud-eu/desktop</url>
   <releases>
-    <release version="3.0.6" date="2026-05-02">
+    <release version="3.0.3" date="2025-12-08">
       <description></description>
     </release>
   </releases>
diff --git a/eu.opencloud.OpenCloudDesktop.yml b/eu.opencloud.OpenCloudDesktop.yml
index 6c5966c12..70e8ba3af 100644
--- a/eu.opencloud.OpenCloudDesktop.yml
+++ b/eu.opencloud.OpenCloudDesktop.yml
@@ -117,12 +117,12 @@ modules:
       - install -Dm644 -t /app/share/metainfo eu.opencloud.OpenCloudDesktop.metainfo.xml
     sources:
       - type: git
-        url: https://github.com/bryce-hoehn/desktop
-        tag: v3.0.6
-        commit: ce73613d2ab0d8bb8f717878bde81974238ecc9f
+        url: https://github.com/opencloud-eu/desktop
+        tag: v3.0.3
+        commit: 72fe8fb78e3e8b7dc9d2e54dfb497660e729cec3
         x-checker-data:
           type: json
-          url: https://api.github.com/repos/bryce-hoehn/desktop/releases/latest
+          url: https://api.github.com/repos/opencloud-eu/desktop/releases/latest
           tag-query: .tag_name
           version-query: $tag | sub("^[vV]"; "")
           timestamp-query: .published_at

From 1635dd8b287486ea2ea8e59d184dba31456b51c3 Mon Sep 17 00:00:00 2001
From: Bryce Hoehn <bryce.hoehn@icloud.com>
Date: Sat, 2 May 2026 01:24:46 -0400
Subject: [PATCH 28/30] cleaner .desktop name

TODO: apply similar change to translations
---
 opencloud.desktop.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/opencloud.desktop.in b/opencloud.desktop.in
index 8137aa021..d5c4dfb52 100644
--- a/opencloud.desktop.in
+++ b/opencloud.desktop.in
@@ -2,8 +2,8 @@
 Categories=Utility;X-SuSE-SyncUtility;
 Type=Application
 Exec=@APPLICATION_EXECUTABLE@ --showsettings
-Name=@APPLICATION_NAME@ desktop sync client
-Comment=@APPLICATION_NAME@ desktop synchronization client
+Name=@APPLICATION_NAME@
+Comment=Desktop synchronization client
 GenericName=Folder Sync
 Icon=@APPLICATION_ICON_NAME@
 Keywords=@APPLICATION_NAME@;syncing;file;sharing;

From 8fe5c43a0439e0e875271c5c41317f544b4b2d33 Mon Sep 17 00:00:00 2001
From: Bryce Hoehn <bryce.hoehn@icloud.com>
Date: Wed, 20 May 2026 12:54:07 -0400
Subject: [PATCH 29/30] fix: flatpak version auto-derived from VERSION.cmake
 (updated automatically). publish-flathub runs on releases

---
 .github/workflows/publish-flathub.yml | 49 +++++++++++++++++++++
 .github/workflows/update-flatpak.yml  | 62 ++++++---------------------
 2 files changed, 61 insertions(+), 50 deletions(-)
 create mode 100644 .github/workflows/publish-flathub.yml

diff --git a/.github/workflows/publish-flathub.yml b/.github/workflows/publish-flathub.yml
new file mode 100644
index 000000000..2874074c4
--- /dev/null
+++ b/.github/workflows/publish-flathub.yml
@@ -0,0 +1,49 @@
+name: Publish to Flathub
+
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+env:
+  FLATPAK_ID: eu.opencloud.OpenCloudDesktop
+
+jobs:
+  publish:
+    name: "Update Flathub"
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Get version from metainfo
+        id: version
+        run: |
+          VERSION=$(grep -oP '<release version="\K[^"]+' ${{ env.FLATPAK_ID }}.metainfo.xml)
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+
+      - name: Checkout Flathub repo
+        uses: actions/checkout@v6
+        with:
+          repository: flathub/${{ env.FLATPAK_ID }}
+          token: ${{ secrets.FLATHUB_TOKEN }}
+          path: flathub
+
+      - name: Copy updated files
+        run: |
+          cp ${{ env.FLATPAK_ID }}.metainfo.xml flathub/
+          cp ${{ env.FLATPAK_ID }}.yml flathub/
+
+      - name: Create Pull Request to Flathub
+        uses: peter-evans/create-pull-request@v7
+        with:
+          token: ${{ secrets.FLATHUB_TOKEN }}
+          path: flathub
+          title: "Update to ${{ steps.version.outputs.version }}"
+          body: |
+            Automated update to [v${{ steps.version.outputs.version }}](https://github.com/opencloud-eu/desktop/releases/tag/v${{ steps.version.outputs.version }}).
+          branch: update-${{ steps.version.outputs.version }}
+          commit-message: "Update to ${{ steps.version.outputs.version }}"
+          delete-branch: true
diff --git a/.github/workflows/update-flatpak.yml b/.github/workflows/update-flatpak.yml
index de39b52b6..623da7448 100644
--- a/.github/workflows/update-flatpak.yml
+++ b/.github/workflows/update-flatpak.yml
@@ -2,8 +2,10 @@ name: Update Flatpak
 
 on:
   push:
-    tags:
-      - 'v*'
+    branches:
+      - main
+    paths:
+      - VERSION.cmake
   workflow_dispatch:
 
 permissions:
@@ -19,20 +21,17 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
-      - name: Get latest release info
+      - name: Read version from VERSION.cmake
         id: release
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          # Get the latest release from GitHub API
-          RELEASE=$(gh api repos/opencloud-eu/desktop/releases/latest)
+          MAJOR=$(grep 'MIRALL_VERSION_MAJOR' VERSION.cmake | grep -oP '\d+')
+          MINOR=$(grep 'MIRALL_VERSION_MINOR' VERSION.cmake | grep -oP '\d+')
+          PATCH=$(grep 'MIRALL_VERSION_PATCH' VERSION.cmake | grep -oP '\d+')
 
-          TAG=$(echo "$RELEASE" | jq -r '.tag_name')
-          DATE=$(echo "$RELEASE" | jq -r '.published_at' | cut -dT -f1)
-          VERSION="${TAG#v}"
-
-          # Get the commit SHA for the tag
-          COMMIT=$(gh api "repos/opencloud-eu/desktop/commits/$TAG" --jq '.sha')
+          VERSION="${MAJOR}.${MINOR}.${PATCH}"
+          TAG="v${VERSION}"
+          DATE=$(date +%Y-%m-%d)
+          COMMIT="${{ github.sha }}"
 
           echo "tag=$TAG" >> "$GITHUB_OUTPUT"
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
@@ -72,40 +71,3 @@ jobs:
           git add ${{ env.FLATPAK_ID }}.metainfo.xml ${{ env.FLATPAK_ID }}.yml
           git commit -m "chore: update flatpak to ${{ steps.release.outputs.version }}"
           git push origin HEAD:main
-
-  publish:
-    name: "Update Flathub"
-    needs: update
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v6
-
-      - name: Get version from metainfo
-        id: version
-        run: |
-          VERSION=$(grep -oP '<release version="\K[^"]+' ${{ env.FLATPAK_ID }}.metainfo.xml)
-          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
-
-      - name: Checkout Flathub repo
-        uses: actions/checkout@v6
-        with:
-          repository: flathub/${{ env.FLATPAK_ID }}
-          token: ${{ secrets.FLATHUB_TOKEN }}
-          path: flathub
-
-      - name: Copy updated files
-        run: |
-          cp ${{ env.FLATPAK_ID }}.metainfo.xml flathub/
-          cp ${{ env.FLATPAK_ID }}.yml flathub/
-
-      - name: Create Pull Request to Flathub
-        uses: peter-evans/create-pull-request@v7
-        with:
-          token: ${{ secrets.FLATHUB_TOKEN }}
-          path: flathub
-          title: "Update to ${{ steps.version.outputs.version }}"
-          body: |
-            Automated update to [v${{ steps.version.outputs.version }}](https://github.com/opencloud-eu/desktop/releases/tag/v${{ steps.version.outputs.version }}).
-          branch: update-${{ steps.version.outputs.version }}
-          commit-message: "Update to ${{ steps.version.outputs.version }}"
-          delete-branch: true

From 3f7bfeb7b6661a00a985a0ab0ef13333c88a1ccf Mon Sep 17 00:00:00 2001
From: Bryce Hoehn <bryce.hoehn@icloud.com>
Date: Thu, 21 May 2026 18:55:38 -0400
Subject: [PATCH 30/30] fix: fixed broken stock icon tag

Co-authored-by: Benson Muite <bkmgit@users.noreply.github.com>
---
 eu.opencloud.OpenCloudDesktop.metainfo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eu.opencloud.OpenCloudDesktop.metainfo.xml b/eu.opencloud.OpenCloudDesktop.metainfo.xml
index 2d5468372..e4f6baa27 100644
--- a/eu.opencloud.OpenCloudDesktop.metainfo.xml
+++ b/eu.opencloud.OpenCloudDesktop.metainfo.xml
@@ -12,7 +12,7 @@
     <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">eu.opencloud.OpenCloudDesktop</icon>
+  <icon>eu.opencloud.OpenCloudDesktop</icon>
   <categories>
     <category>Network</category>
     <category>Utility</category>