Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,9 @@ - (BOOL)followURLWithContinueUserActivity:(NSURL *)url {
FIRLogDebug(kFIRLoggerInAppMessaging, @"I-IAM240004",
@"App delegate responds to application:continueUserActivity:restorationHandler:."
"Simulating action url opening from a web browser.");
NSUserActivity *userActivity =
[[NSUserActivity alloc] initWithActivityType:NSUserActivityTypeBrowsingWeb];
// Use string literal to ensure compatibility with Xcode 26 and iOS 18
NSString *browsingWebType = @"NSUserActivityTypeBrowsingWeb";
NSUserActivity *userActivity = [[NSUserActivity alloc] initWithActivityType:browsingWebType];
userActivity.webpageURL = url;
BOOL handled = [self.appDelegate application:self.mainApplication
continueUserActivity:userActivity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,9 @@ - (void)testUniversalLinkHandlingReturnYES {
continueUserActivity:[OCMArg checkWithBlock:^BOOL(id userActivity) {
// verifying the type and url field for the userActivity object
NSUserActivity *activity = (NSUserActivity *)userActivity;
return [activity.activityType
isEqualToString:NSUserActivityTypeBrowsingWeb] &&
// Use string literal to ensure compatibility with Xcode 26 and iOS 18
NSString *browsingWebType = @"NSUserActivityTypeBrowsingWeb";
return [activity.activityType isEqualToString:browsingWebType] &&
[activity.webpageURL isEqual:url];
}]
restorationHandler:[OCMArg any]])
Expand Down
5 changes: 5 additions & 0 deletions FirebaseMessaging/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 12.1.0
- [fixed] Fix Xcode 26 crash from missing `NSUserActivityTypeBrowsingWeb`
symbol. Note that this fix isn't in the 12.1.0 zip and Carthage
distributions, but will be included from 12.2.0 onwards. (#15159)

# 11.14.0
- [fixed] Fix a potential SQL injection issue. (#14846).

Expand Down
5 changes: 3 additions & 2 deletions FirebaseMessaging/Sources/FIRMessaging.m
Original file line number Diff line number Diff line change
Expand Up @@ -400,8 +400,9 @@ - (void)handleIncomingLinkIfNeededFromMessage:(NSDictionary *)message {
// if they haven't implemented it.
if ([NSUserActivity class] != nil &&
[appDelegate respondsToSelector:continueUserActivitySelector]) {
NSUserActivity *userActivity =
[[NSUserActivity alloc] initWithActivityType:NSUserActivityTypeBrowsingWeb];
// Use string literal to ensure compatibility with Xcode 26 and iOS 18
NSString *browsingWebType = @"NSUserActivityTypeBrowsingWeb";
NSUserActivity *userActivity = [[NSUserActivity alloc] initWithActivityType:browsingWebType];
userActivity.webpageURL = url;
[appDelegate application:application
continueUserActivity:userActivity
Expand Down
Loading