Merge 68563b8 into 27c7302

Author: aashishpatil-g

FirebaseMessaging/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 10.1.0
+- [fixed] App bundle identifier gets incorrectly shortened for watchOS apps created on Xcode 14 (#10147)
+
 # 8.12.0
 - [changed] Improved reporting for SQLite errors when failing to open a local database (#8699).
 

FirebaseMessaging/Sources/FIRMessagingUtilities.h

@@ -30,6 +30,7 @@ FOUNDATION_EXPORT int64_t FIRMessagingCurrentTimestampInMilliseconds(void);
 FOUNDATION_EXPORT NSString *FIRMessagingCurrentAppVersion(void);
 FOUNDATION_EXPORT NSString *FIRMessagingAppIdentifier(void);
 FOUNDATION_EXPORT NSString *FIRMessagingFirebaseAppID(void);
+FOUNDATION_EXPORT BOOL FIRMessagingIsWatchKitExtension(void);
 
 #pragma mark - Others
 

FirebaseMessaging/Sources/FIRMessagingUtilities.m

@@ -27,6 +27,8 @@
 static NSString *const kFIRMessagingAPNSSandboxPrefix = @"s_";
 static NSString *const kFIRMessagingAPNSProdPrefix = @"p_";
 
+static NSString *const kFIRMessagingWatchKitExtensionPoint = @"com.apple.watchkit";
+
 #if TARGET_OS_IOS || TARGET_OS_TV || TARGET_OS_WATCH
 static NSString *const kEntitlementsAPSEnvironmentKey = @"Entitlements.aps-environment";
 #else
@@ -76,10 +78,14 @@ int64_t FIRMessagingCurrentTimestampInMilliseconds(void) {
 NSString *FIRMessagingAppIdentifier(void) {
   NSString *bundleID = [[NSBundle mainBundle] bundleIdentifier];
 #if TARGET_OS_WATCH
-  // The code is running in watchKit extension target but the actually bundleID is in the watchKit
-  // target. So we need to remove the last part of the bundle ID in watchKit extension to match
-  // the one in watchKit target.
-  return FIRMessagingBundleIDByRemovingLastPartFrom(bundleID);
+  if (FIRMessagingIsWatchKitExtension()) {
+    // The code is running in watchKit extension target but the actually bundleID is in the watchKit
+    // target. So we need to remove the last part of the bundle ID in watchKit extension to match
+    // the one in watchKit target.
+    return FIRMessagingBundleIDByRemovingLastPartFrom(bundleID);
+  } else {
+    return bundleID;
+  }
 #else
   return bundleID;
 #endif
@@ -89,6 +95,25 @@ int64_t FIRMessagingCurrentTimestampInMilliseconds(void) {
   return [FIROptions defaultOptions].googleAppID;
 }
 
+BOOL FIRMessagingIsWatchKitExtension(void) {
+#if TARGET_OS_WATCH
+  NSDictionary<NSString *, id> *infoDict = [[NSBundle mainBundle] infoDictionary];
+  NSDictionary<NSString *, id> *extensionAttrDict = infoDict[@"NSExtension"];
+  if (!extensionAttrDict) {
+    return NO;
+  }
+
+  NSString *extensionPointId = extensionAttrDict[@"NSExtensionPointIdentifier"];
+  if (extensionPointId) {
+    return [extensionPointId isEqualToString:kFIRMessagingWatchKitExtensionPoint];
+  } else {
+    return NO;
+  }
+#else
+  return NO;
+#endif
+}
+
 uint64_t FIRMessagingGetFreeDiskSpaceInMB(void) {
   NSError *error;
   NSArray *paths =

FirebaseMessaging/Tests/UnitTests/FIRMessagingUtilitiesTest.m

@@ -69,6 +69,9 @@ - (void)testAppVersionReturnsEmptyStringWhenNotFound {
 
 - (void)testAppIdentifierReturnsExpectedValue {
 #if TARGET_OS_WATCH
+  NSDictionary *fakeInfoDictionary =
+      @{@"NSExtension" : @{@"NSExtensionPointIdentifier" : @"com.apple.watchkit"}};
+  [[[_mainBundleMock stub] andReturn:fakeInfoDictionary] infoDictionary];
   NSString *bundleIdentifier = @"com.me.myapp.watchkit.watchkitextensions";
   NSString *expectedIdentifier = @"com.me.myapp.watchkit";
 #else