Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

iOS deeplink sends "path + query" instead of just path #23562

Merged
fluttergithubbot merged 6 commits into from
Jan 21, 2021
Merged

iOS deeplink sends "path + query" instead of just path #23562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c4d1491
set path along with query as initialRoute
sarbagyastha Jan 9, 2021
48587a9
updated launch url test
sarbagyastha Jan 9, 2021
0024430
fixed formatting
sarbagyastha Jan 9, 2021
678d1e4
removed unneccesary check
sarbagyastha Jan 9, 2021
432beae
formatting fix
sarbagyastha Jan 9, 2021
640d5f8
minor formatting fix
sarbagyastha Jan 9, 2021
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
7 changes: 6 additions & 1 deletion shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,13 @@ - (BOOL)application:(UIApplication*)application
FML_LOG(ERROR)
<< "Timeout waiting for the first frame when launching an URL.";
} else {
NSString* pathAndQuery = url.path;
if ([url.query length] != 0) {
pathAndQuery =
[NSString stringWithFormat:@"%@?%@", pathAndQuery, url.query];
}
[flutterViewController.engine.navigationChannel invokeMethod:@"pushRoute"
arguments:url.path];
arguments:pathAndQuery];
}
}];
return YES;
Expand Down
4 changes: 2 additions & 2 deletions shell/platform/darwin/ios/framework/Source/FlutterAppDelegateTest.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ - (void)testLaunchUrl {
appDelegate.rootFlutterViewControllerGetter = ^{
return viewController;
};
NSURL* url = [NSURL URLWithString:@"http://example.com"];
NSURL* url = [NSURL URLWithString:@"http://myApp/custom/route?query=test"];
NSDictionary<UIApplicationOpenURLOptionsKey, id>* options = @{};
BOOL result = [appDelegate application:[UIApplication sharedApplication]
openURL:url
Expand All @@ -38,7 +38,7 @@ - (void)testLaunchUrl {
return @{@"FlutterDeepLinkingEnabled" : @(YES)};
}];
XCTAssertTrue(result);
OCMVerify([navigationChannel invokeMethod:@"pushRoute" arguments:url.path]);
OCMVerify([navigationChannel invokeMethod:@"pushRoute" arguments:@"/custom/route?query=test"]);
}

@end