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

flutter · Jan 21, 2021 · 7f66714 · 7f66714
1 parent 87960d8
commit 7f66714
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm b/shell/platform/darwin/ios/framework/Source/FlutterAppDelegate.mm
@@ -159,8 +159,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;

diff --git a/shell/platform/darwin/ios/framework/Source/FlutterAppDelegateTest.mm b/shell/platform/darwin/ios/framework/Source/FlutterAppDelegateTest.mm
@@ -30,7 +30,7 @@ - (void)skip_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
@@ -39,7 +39,7 @@ - (void)skip_testLaunchUrl {
                            return @{@"FlutterDeepLinkingEnabled" : @(YES)};
                          }];
   XCTAssertTrue(result);
-  OCMVerify([navigationChannel invokeMethod:@"pushRoute" arguments:url.path]);
+  OCMVerify([navigationChannel invokeMethod:@"pushRoute" arguments:@"/custom/route?query=test"]);
 }
 
 @end