This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Support route on ios engine#31555
Merged
fluttergithubbot merged 14 commits intoflutter:mainfrom Mar 2, 2022
Merged
Conversation
8 tasks
jmagman
reviewed
Mar 1, 2022
Member
jmagman
left a comment
jmagman
left a comment
There was a problem hiding this comment.
Also add a test for the FlutterEngine logic change. This test passed on your PR, you can put it right after
- (void)testInitialRouteSettingsSendsNavigationMessage {
id mockBinaryMessenger = OCMClassMock([FlutterBinaryMessengerRelay class]);
auto settings = FLTDefaultSettingsForBundle();
settings.route = "test";
FlutterDartProject* project = [[FlutterDartProject alloc] initWithSettings:settings];
FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"foobar" project:project];
[engine setBinaryMessenger:mockBinaryMessenger];
[engine run];
// Now check that an encoded method call has been made on the binary messenger to set the
// initial route to "test".
FlutterMethodCall* setInitialRouteMethodCall =
[FlutterMethodCall methodCallWithMethodName:@"setInitialRoute" arguments:@"test"];
NSData* encodedSetInitialRouteMethod =
[[FlutterJSONMethodCodec sharedInstance] encodeMethodCall:setInitialRouteMethodCall];
OCMVerify([mockBinaryMessenger sendOnChannel:@"flutter/navigation"
message:encodedSetInitialRouteMethod]);
}
Comment on lines
695
to
+701
| self.initialRoute = initialRoute; | ||
|
|
||
| auto settings = [_dartProject.get() settings]; | ||
| if (settings.route.empty() == false) { | ||
| self.initialRoute = [NSString stringWithCString:settings.route.c_str() | ||
| encoding:[NSString defaultCStringEncoding]]; | ||
| } |
Member
There was a problem hiding this comment.
I think defaultCStringEncoding usage is discouraged, let's just accept utf8 here.
Also, don't set the initialRoute twice.
Suggested change
| self.initialRoute = initialRoute; | |
| auto settings = [_dartProject.get() settings]; | |
| if (settings.route.empty() == false) { | |
| self.initialRoute = [NSString stringWithCString:settings.route.c_str() | |
| encoding:[NSString defaultCStringEncoding]]; | |
| } | |
| auto settings = [_dartProject.get() settings]; | |
| if (initialRoute != nil) { | |
| self.initialRoute = initialRoute; | |
| } else if (settings.route.empty() == false) { | |
| self.initialRoute = [NSString stringWithCString:settings.route.c_str() | |
| encoding:NSUTF8StringEncoding]; | |
| } |
jmagman
approved these changes
Mar 2, 2022
Member
jmagman
left a comment
jmagman
left a comment
There was a problem hiding this comment.
LGTM, thanks for tracking this down I know it was trickier than it looks!
Jasguerrero
added
the
waiting for tree to go green
Contributor
Author
Thank you for all your help! |
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/flutter
that referenced
this pull request
Mar 3, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Issue: flutter/flutter#4703
Framework PR: flutter/flutter#99078
Pre-launch Checklist
writing and running engine tests.
///).