Merge pull request #19780 from wordpress-mobile/fix/use-appgroup-constant

Jetpack Migration: Use app group constant instead of hardcoded value

Author: dvdchr

WordPress/Classes/System/Constants.m

@@ -22,18 +22,18 @@
 
 /// Keychain Constants
 ///
-#ifdef INTERNAL_BUILD
-NSString *const WPAppGroupName                                      = @"group.org.wordpress.internal";
-NSString *const WPAppKeychainAccessGroup                            = @"99KV9Z6BKV.org.wordpress.internal";
-#else
-#if ALPHA_BUILD
+/// Note: Multiple compiler flags are set for some builds, so conditional ordering matters.
+///
+#if defined(ALPHA_BUILD)
 NSString *const WPAppGroupName                                      = @"group.org.wordpress.alpha";
 NSString *const WPAppKeychainAccessGroup                            = @"99KV9Z6BKV.org.wordpress.alpha";
+#elif defined(INTERNAL_BUILD)
+NSString *const WPAppGroupName                                      = @"group.org.wordpress.internal";
+NSString *const WPAppKeychainAccessGroup                            = @"99KV9Z6BKV.org.wordpress.internal";
 #else
 NSString *const WPAppGroupName                                      = @"group.org.wordpress";
 NSString *const WPAppKeychainAccessGroup                            = @"3TMU3BH3NK.org.wordpress";
 #endif
-#endif
 
 /// Notification Content Extension Constants
 ///

WordPress/Classes/Utility/Blogging Reminders/BloggingRemindersScheduler.swift

@@ -142,7 +142,7 @@ class BloggingRemindersScheduler {
     }
 
     private static func sharedDataFileURL() -> URL? {
-        let sharedDirectory = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: "group.org.wordpress")
+        let sharedDirectory = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: WPAppGroupName)
         return sharedDirectory?.appendingPathComponent(defaultDataFileName)
     }
 

WordPress/Jetpack/Classes/Utility/DataMigrator.swift

@@ -35,7 +35,7 @@ final class DataMigrator {
     private let sharedDefaults: UserPersistentRepository?
 
     init(coreDataStack: CoreDataStack = ContextManager.sharedInstance(),
-         backupLocation: URL? = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: "group.org.wordpress")?.appendingPathComponent("WordPress.sqlite"),
+         backupLocation: URL? = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: WPAppGroupName)?.appendingPathComponent("WordPress.sqlite"),
          keychainUtils: KeychainUtils = KeychainUtils(),
          localDefaults: UserPersistentRepository = UserDefaults.standard,
          sharedDefaults: UserPersistentRepository? = UserDefaults(suiteName: WPAppGroupName)) {