Undo gobcj++ and move loca server path code for macos into its own Objective-C++ file

.github/workflows/codeql.yml

@@ -36,7 +36,7 @@ jobs:
       name: Install dependencies
       run: |
         sudo apt update
-        sudo apt install build-essential cmake gobjc++
+        sudo apt install build-essential cmake g++
         sudo apt install qtbase5-dev qtbase5-private-dev qttools5-dev qttools5-dev-tools libqt5svg5-dev libargon2-dev libkeyutils-dev libminizip-dev libbotan-2-dev libqrencode-dev zlib1g-dev asciidoctor libreadline-dev libpcsclite-dev libusb-1.0-0-dev libxi-dev libxtst-dev  libqt5x11extras5-dev
 
     # Initializes the CodeQL tools for scanning.

src/browser/BrowserShared.cpp

@@ -26,7 +26,7 @@
 #endif
 
 #if defined(Q_OS_MACOS)
-#include <Foundation/Foundation.h>
+#include "BrowserSharedMac.h"
 #endif
 
 namespace BrowserShared
@@ -58,24 +58,7 @@ namespace BrowserShared
         // Windows uses named pipes
         return serverName + "_" + qgetenv("USERNAME");
 #elif defined(Q_OS_MACOS)
-        NSString *appGroupIdentifier = @"G2S7P7J672.org.keepassxc.KeePassXC";
-
-        // Get the container URL for the app group identifier
-        NSURL *containerURL = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:appGroupIdentifier];
-
-        // Convert the NSURL to a string (path)
-        NSString *containerPath = [containerURL path];
-
-        // Convert NSString to QString
-        QString homePath = QString::fromNSString(containerPath);
-
-        // Make sure the directory exists
-        QDir().mkpath(homePath);
-
-        // The path will become too long therefore we must cut off serverName
-        QString socketPath = homePath + "/KeePassXC.BrowserServer";
-
-        return socketPath;
+        return macOSLocalServerPath();
 #else // others
         return QStandardPaths::writableLocation(QStandardPaths::TempLocation) + serverName;
 #endif

src/browser/BrowserSharedMac.h

@@ -0,0 +1,6 @@
+#include <QString>
+
+namespace BrowserShared
+{
+    QString macOSLocalServerPath();
+}

src/browser/BrowserSharedMac.mm

@@ -0,0 +1,25 @@
+#include <Foundation/Foundation.h>
+#include <QDir>
+#include <QString>
+
+namespace BrowserShared
+{
+    QString macOSLocalServerPath()
+    {
+        NSString *appGroupIdentifier = @"G2S7P7J672.org.keepassxc.KeePassXC";
+
+        // Get the container URL for the app group identifier
+        NSURL *containerURL = [[NSFileManager defaultManager] containerURLForSecurityApplicationGroupIdentifier:appGroupIdentifier];
+
+        NSString *containerPath = [containerURL path];
+
+        QString homePath = QString::fromNSString(containerPath);
+
+        QDir().mkpath(homePath);
+
+        // The path will become too long therefore we must cut off serverName
+        QString socketPath = homePath + "/KeePassXC.BrowserServer";
+
+        return socketPath;
+    }
+}

src/browser/CMakeLists.txt

@@ -27,10 +27,15 @@ if(WITH_XC_BROWSER)
             BrowserSettingsWidget.cpp
             BrowserService.cpp
             BrowserSettings.cpp
-            BrowserShared.mm
+            BrowserShared.cpp
             CustomTableWidget.cpp
             NativeMessageInstaller.cpp)
 
+    if(APPLE)
+        list(APPEND browser_SOURCES
+            BrowserSharedMac.mm)
+    endif()
+
     if(WITH_XC_BROWSER_PASSKEYS)
         list(APPEND browser_SOURCES
                 BrowserCbor.cpp

src/proxy/CMakeLists.txt

@@ -15,10 +15,15 @@
 
 if(WITH_XC_BROWSER)
     set(proxy_SOURCES
-        ../browser/BrowserShared.mm
+        ../browser/BrowserShared.cpp
         keepassxc-proxy.cpp
         NativeMessagingProxy.cpp)
 
+    if(APPLE)
+        list(APPEND proxy_SOURCES
+            ../browser/BrowserSharedMac.mm)
+    endif()
+
     # Alloc must be defined in a static library to prevent clashing with clang ASAN definitions
     add_library(proxy_alloc STATIC ../core/Alloc.cpp)
     target_link_libraries(proxy_alloc PRIVATE Qt5::Core ${BOTAN_LIBRARIES})