Merge pull request #10606 from nextcloud/backport/10599/stable-34.0

[stable-34.0] fix(macOS): compare FinderSync broker application versions

Author: Rello

shell_integration/MacOSX/NextcloudIntegration/FinderSyncBroker/main.swift

@@ -51,7 +51,7 @@ private func readBundleIdentity() -> BundleIdentity? {
     return BundleIdentity(serviceName: serviceName,
                           teamIdentifier: team,
                           applicationRevDomain: revDomain,
-                          version: info["CFBundleVersion"] as? String ?? "0")
+                          version: info["CFBundleShortVersionString"] as? String ?? "")
 }
 
 /// Prove the listener is actually reachable, rather than assuming it is.

shell_integration/MacOSX/NextcloudIntegration/FinderSyncExt/Services/FinderSyncBrokerProtocol.h

@@ -80,7 +80,7 @@ NS_ASSUME_NONNULL_BEGIN
  * unregister completion handler before re-registering, because registering too early
  * fails with SMAppServiceErrorDomain code 1.
  *
- * @param reply Invoked with the broker's CFBundleVersion.
+ * @param reply Invoked with the broker's CFBundleShortVersionString.
  */
 - (void)brokerVersionWithReply:(void(^)(NSString *version))reply;
 

src/gui/macOS/findersyncxpc_mac.mm

@@ -4,6 +4,7 @@
  */
 
 #include "findersyncxpc.h"
+#include "version.h"
 
 #import <Foundation/Foundation.h>
 #import "../../../shell_integration/MacOSX/NextcloudIntegration/FinderSyncExt/Services/FinderSyncProtocol.h"
@@ -332,11 +333,7 @@ - (BOOL)listener:(NSXPCListener *)listener shouldAcceptNewConnection:(NSXPCConne
     // and we would go on talking to last version's broker indefinitely.
     [broker brokerVersionWithReply:^(NSString *version) {
         const auto brokerVersion = QString::fromNSString(version);
-        // Deliberately the literal key rather than kCFBundleVersionKey: that constant would add
-        // a CoreFoundation data symbol to this translation unit for no benefit, and the other
-        // Info.plist reads here use literals too.
-        const auto ourVersion = QString::fromNSString(
-            [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]);
+        const auto ourVersion = QString::fromLatin1(MIRALL_STRINGIFY(MIRALL_VERSION));
 
         if (brokerVersion == ourVersion) {
             qCDebug(lcFinderSyncXPC) << "Broker version matches ours:" << brokerVersion;