From 8603e56e01c91089e79780de114cc5fc43c25bd9 Mon Sep 17 00:00:00 2001
From: Sebastian Livoni <29739749+sebastianlivoni@users.noreply.github.com>
Date: Tue, 28 Jan 2025 18:01:01 +0100
Subject: [PATCH] Add MacOS App Group used by Safari Web Extension

---
 share/macosx/keepassxc.entitlements | 4 ----
 src/browser/BrowserShared.cpp       | 5 +++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/share/macosx/keepassxc.entitlements b/share/macosx/keepassxc.entitlements
index 1a33c68a3..1247a526d 100644
--- a/share/macosx/keepassxc.entitlements
+++ b/share/macosx/keepassxc.entitlements
@@ -4,10 +4,6 @@
 <dict>
 	<key>com.apple.application-identifier</key>
 	<string>G2S7P7J672.org.keepassxc.keepassxc</string>
-	<key>keychain-access-groups</key>
-	<array>
-		<string>G2S7P7J672.org.keepassxc.keepassxc</string>
-	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>G2S7P7J672.org.keepassxc.keepassxc</string>
diff --git a/src/browser/BrowserShared.cpp b/src/browser/BrowserShared.cpp
index eac634183..d3a507360 100644
--- a/src/browser/BrowserShared.cpp
+++ b/src/browser/BrowserShared.cpp
@@ -56,12 +56,13 @@ namespace BrowserShared
 #elif defined(Q_OS_MACOS)
         // Get the home directory and append the desired subdirectory
         QString homePath = QDir::homePath();
-        QString subPath = homePath + "/Library/Group Containers/org.keepassxc.KeePassXC";
+        QString subPath = homePath + "/Library/Group Containers/G2S7P7J672.org.keepassxc.KeePassXC";
 
         // Make sure the directory exists
         QDir().mkpath(subPath);
 
-        QString socketPath = subPath + serverName;
+        // The path will become too long therefore we must cut off serverName
+        QString socketPath = subPath + "KeePassXC.BrowserServer";
 
         return socketPath;
 #else // others