From 3027fdaaca0fda5219dd4c6ecd698ff1e9d5d968 Mon Sep 17 00:00:00 2001
From: Pete Schwamb <pete@schwamb.net>
Date: Mon, 12 Dec 2016 16:48:23 -0600
Subject: [PATCH] Change how app group id is constructed to avoid conflict with
 accidentally allocated app group ids

---
 Loop Status Extension/Info.plist                         | 4 ++--
 Loop Status Extension/Loop Status Extension.entitlements | 2 +-
 Loop.xcodeproj/project.pbxproj                           | 6 ++++--
 Loop/Extensions/NSBundle.swift                           | 6 +-----
 Loop/Info.plist                                          | 4 ++--
 Loop/Loop.entitlements                                   | 2 +-
 6 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Loop Status Extension/Info.plist b/Loop Status Extension/Info.plist
index ab9e66d865..66633dc7e3 100644
--- a/Loop Status Extension/Info.plist	
+++ b/Loop Status Extension/Info.plist	
@@ -20,8 +20,8 @@
 	<string>1.2.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>MainAppBundleIdentifier</key>
-	<string>$(MAIN_APP_BUNDLE_IDENTIFIER)</string>
+	<key>AppGroupIdentifier</key>
+	<string>$(APP_GROUP_IDENTIFIER)</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionMainStoryboard</key>
diff --git a/Loop Status Extension/Loop Status Extension.entitlements b/Loop Status Extension/Loop Status Extension.entitlements
index d643ac3f2f..d9849a816d 100644
--- a/Loop Status Extension/Loop Status Extension.entitlements	
+++ b/Loop Status Extension/Loop Status Extension.entitlements	
@@ -4,7 +4,7 @@
 <dict>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.$(MAIN_APP_BUNDLE_IDENTIFIER)</string>
+		<string>$(APP_GROUP_IDENTIFIER)</string>
 	</array>
 </dict>
 </plist>
diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj
index e8525bd86f..63a8d36dcc 100644
--- a/Loop.xcodeproj/project.pbxproj
+++ b/Loop.xcodeproj/project.pbxproj
@@ -1429,6 +1429,7 @@
 			baseConfigurationReference = 437D9BA11D7B5203007245E8 /* Loop.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				APP_GROUP_IDENTIFIER = "group.$(MAIN_APP_BUNDLE_IDENTIFIER)Group";
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -1482,6 +1483,7 @@
 			baseConfigurationReference = 437D9BA11D7B5203007245E8 /* Loop.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				APP_GROUP_IDENTIFIER = "group.$(MAIN_APP_BUNDLE_IDENTIFIER)Group";
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -1719,7 +1721,7 @@
 				);
 				INFOPLIST_FILE = "Loop Status Extension/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER).statusextension";
+				PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER).statuswidget";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
@@ -1743,7 +1745,7 @@
 				);
 				INFOPLIST_FILE = "Loop Status Extension/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER).statusextension";
+				PRODUCT_BUNDLE_IDENTIFIER = "$(MAIN_APP_BUNDLE_IDENTIFIER).statuswidget";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 3.0;
diff --git a/Loop/Extensions/NSBundle.swift b/Loop/Extensions/NSBundle.swift
index 1f458269c4..3cb84759e2 100644
--- a/Loop/Extensions/NSBundle.swift
+++ b/Loop/Extensions/NSBundle.swift
@@ -22,11 +22,7 @@ extension Bundle {
         return String(format: NSLocalizedString("%1$@ v%2$@", comment: "The format string for the app name and version number. (1: bundle name)(2: bundle version)"), bundleDisplayName, shortVersionString)
     }
     
-    private var mainAppBundleIdentifier: String? {
-        return object(forInfoDictionaryKey: "MainAppBundleIdentifier") as? String
-    }
-    
     var appGroupSuiteName: String {
-        return "group.\(mainAppBundleIdentifier!)"
+        return object(forInfoDictionaryKey: "AppGroupIdentifier") as! String
     }
 }
diff --git a/Loop/Info.plist b/Loop/Info.plist
index aa6166da10..9b04e6c5c6 100644
--- a/Loop/Info.plist
+++ b/Loop/Info.plist
@@ -77,7 +77,7 @@ Glucose data retrieved from the CGM is stored securely in HealthKit.</string>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-	<key>MainAppBundleIdentifier</key>
-	<string>$(MAIN_APP_BUNDLE_IDENTIFIER)</string>
+	<key>AppGroupIdentifier</key>
+	<string>$(APP_GROUP_IDENTIFIER)</string>
 </dict>
 </plist>
diff --git a/Loop/Loop.entitlements b/Loop/Loop.entitlements
index d43c131259..8d88cb3139 100644
--- a/Loop/Loop.entitlements
+++ b/Loop/Loop.entitlements
@@ -6,7 +6,7 @@
 	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.$(MAIN_APP_BUNDLE_IDENTIFIER)</string>
+		<string>$(APP_GROUP_IDENTIFIER)</string>
 	</array>
 </dict>
 </plist>