From 8ea62c0d359699f1a97d0518a39ac221cf4fb747 Mon Sep 17 00:00:00 2001
From: Giom Foret <giom@matrix.org>
Date: Wed, 16 Aug 2017 18:24:07 +0200
Subject: [PATCH] Apply the actual application group: "group.im.vector"

---
 Riot/AppDelegate.m                                 | 5 +++--
 Riot/Riot.entitlements                             | 2 +-
 RiotShareExtension/RiotShareExtension.entitlements | 2 +-
 RiotShareExtension/ShareViewController.m           | 3 +++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Riot/AppDelegate.m b/Riot/AppDelegate.m
index b29c573b3..7d823b5c7 100644
--- a/Riot/AppDelegate.m
+++ b/Riot/AppDelegate.m
@@ -1607,8 +1607,9 @@ NSString *const kAppDelegateNetworkStatusDidChangeNotification = @"kAppDelegateN
         
     }];
     
-    // Observe settings changes
-    [[MXKAppSettings standardAppSettings]  addObserver:self forKeyPath:@"showAllEventsInRoomHistory" options:0 context:nil];
+    // Apply the application group name, and add observer on settings changes.
+    [MXKAppSettings standardAppSettings].applicationGroup = @"group.im.vector";
+    [[MXKAppSettings standardAppSettings] addObserver:self forKeyPath:@"showAllEventsInRoomHistory" options:0 context:nil];
     
     // Prepare account manager
     MXKAccountManager *accountManager = [MXKAccountManager sharedManager];
diff --git a/Riot/Riot.entitlements b/Riot/Riot.entitlements
index fe7295f52..bb2281e16 100644
--- a/Riot/Riot.entitlements
+++ b/Riot/Riot.entitlements
@@ -13,7 +13,7 @@
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.org.matrix</string>
+		<string>group.im.vector</string>
 	</array>
 </dict>
 </plist>
diff --git a/RiotShareExtension/RiotShareExtension.entitlements b/RiotShareExtension/RiotShareExtension.entitlements
index 95ba9ff62..e540aaaec 100644
--- a/RiotShareExtension/RiotShareExtension.entitlements
+++ b/RiotShareExtension/RiotShareExtension.entitlements
@@ -4,7 +4,7 @@
 <dict>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.org.matrix</string>
+		<string>group.im.vector</string>
 	</array>
 </dict>
 </plist>
diff --git a/RiotShareExtension/ShareViewController.m b/RiotShareExtension/ShareViewController.m
index 8c18b34f9..cb5c573ed 100644
--- a/RiotShareExtension/ShareViewController.m
+++ b/RiotShareExtension/ShareViewController.m
@@ -59,6 +59,9 @@
 
 - (void)prepareSession
 {
+    // Apply the application group
+    [MXKAppSettings standardAppSettings].applicationGroup = @"group.im.vector";
+    
     // Prepare account manager
     MXKAccountManager *accountManager = [MXKAccountManager sharedManager];