Skip to content

Fix FinderSync Extension - #9528

Merged
i2h3 merged 9 commits into
masterfrom
i2h3/fix/findersync
Feb 26, 2026
Merged

Fix FinderSync Extension#9528
i2h3 merged 9 commits into
masterfrom
i2h3/fix/findersync

Conversation

@i2h3

@i2h3 i2h3 commented Feb 26, 2026

Copy link
Copy Markdown
Collaborator

This fixes the correct function of the FinderSync extension on macOS. Several small changes on the way. See commit messages for details.

i2h3 added 7 commits February 26, 2026 14:15
The FinderSync target contained a custom "Run Script" build phase which copied the branded icon assets into the extension bundle. Due to the lack of specification of output files it was run on every build, likely resulting in unnecessary and cacheable results.

Signed-off-by: Iva Horn <[email protected]>
Xcode could no longer resolve the debugging symbols for the main binary. This fixes it.

Signed-off-by: Iva Horn <[email protected]>
Check for a socket file to exist before trying to connect.

Signed-off-by: Iva Horn <[email protected]>
This used to be necessary many years ago but no longer is.

Signed-off-by: Iva Horn <[email protected]>
- Replaced socketApiSocketPath() with socketApiSocketUrl()
- Improved logging
- Fixed socket path

Signed-off-by: Iva Horn <[email protected]>
@i2h3 i2h3 added this to the 33.0.0 milestone Feb 26, 2026
@i2h3 i2h3 self-assigned this Feb 26, 2026
Copilot AI review requested due to automatic review settings February 26, 2026 14:23
@i2h3 i2h3 added the bug label Feb 26, 2026
@i2h3 i2h3 added os: 🍎 macOS Apple macOS, formerly also known as OS X 3. to review labels Feb 26, 2026
@github-project-automation github-project-automation Bot moved this to 🧭 Planning evaluation (don't pick) in 💻 Desktop Clients team Feb 26, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR aims to restore correct behavior of the macOS FinderSync extension by aligning the socket location/handling between the desktop client and the extension, plus a few supporting build/logging adjustments.

Changes:

  • Switch the macOS SocketAPI helper from returning a QString path to returning a QUrl, and use it to derive the local socket path in the desktop client.
  • Update FinderSync extension to use the App Group container root socket (…/s) and improve logging/diagnostics.
  • Adjust macOS integration build steps (Xcode project script phase naming/outputs, mac-crafter dSYM copying) and modernize logging in the socket client.

Reviewed changes

Copilot reviewed 8 out of 8 changed files in this pull request and generated 5 comments.

Show a summary per file
File Description
src/gui/socketapi/socketapi_mac.mm Changes SocketAPI helper to return a QUrl for the App Group socket location.
src/gui/socketapi/socketapi.h Updates macOS SocketAPI declaration and includes QUrl to support by-value return.
src/gui/socketapi/socketapi.cpp Uses the new macOS socket URL helper, adds debug logging around listen/startup.
shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj Renames shell script phase and adds an output path for incremental builds.
shell_integration/MacOSX/NextcloudIntegration/NCDesktopClientSocketKit/LocalSocketClient.m Switches from NSLog to os_log, adds logger creation, minor string fix.
shell_integration/MacOSX/NextcloudIntegration/FinderSyncExt/Info.plist Removes NSPrincipalClass entry for the extension.
shell_integration/MacOSX/NextcloudIntegration/FinderSyncExt/FinderSync.m Updates socket path derivation and logging; adds existence check before starting client.
admin/osx/mac-crafter/Sources/Commands/Build.swift Copies main app dSYM in dev mode and adjusts shell integration dSYM path selection.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread admin/osx/mac-crafter/Sources/Commands/Build.swift
@i2h3

i2h3 commented Feb 26, 2026

Copy link
Copy Markdown
Collaborator Author

/backport to stable-33.0

@Floweb05

Copy link
Copy Markdown

😍🤞

@i2h3
i2h3 requested a review from Copilot February 26, 2026 15:32
@github-actions

Copy link
Copy Markdown
Contributor

Artifact containing the AppImage: nextcloud-appimage-pr-9528.zip

Digest: sha256:e244951a449d5c47a4078a6dae1fd296b6a87888a3da6ced1d3695b4b598d0c6

To test this change/fix you can download the above artifact file, unzip it, and run it.

Please make sure to quit your existing Nextcloud app and backup your data.

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 8 out of 8 changed files in this pull request and generated 2 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread src/gui/socketapi/socketapi_mac.mm Outdated
@i2h3
i2h3 force-pushed the i2h3/fix/findersync branch from ebe7a59 to 289bdbd Compare February 26, 2026 15:47
@i2h3
i2h3 merged commit c165b28 into master Feb 26, 2026
15 of 18 checks passed
@github-project-automation github-project-automation Bot moved this from 🧭 Planning evaluation (don't pick) to ☑️ Done in 💻 Desktop Clients team Feb 26, 2026
@i2h3
i2h3 deleted the i2h3/fix/findersync branch February 26, 2026 15:48
@sonarqubecloud

Copy link
Copy Markdown

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@mgallien mgallien modified the milestones: 33.0.0, 34.0.0 Mar 12, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review bug os: 🍎 macOS Apple macOS, formerly also known as OS X

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants