This repository was archived by the owner on Feb 25, 2025. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 6k
[CP] Fix crash on choosing share in selection controls on ipad #48427
Merged
auto-submit
merged 4 commits into
flutter-team-archive:flutter-3.16-candidate.0
from
LouiseHsu:louisehsu/ipad-share-crash-fix-cp
Nov 30, 2023
Merged
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -161,6 +161,44 @@ - (void)testShareScreenInvoked { | |||||
| [self waitForExpectationsWithTimeout:1 handler:nil]; | ||||||
| } | ||||||
|
|
||||||
| - (void)testShareScreenInvokedOnIPad { | ||||||
| FlutterEngine* engine = [[FlutterEngine alloc] initWithName:@"test" project:nil]; | ||||||
| [engine runWithEntrypoint:nil]; | ||||||
| std::unique_ptr<fml::WeakNSObjectFactory<FlutterEngine>> _weakFactory = | ||||||
| std::make_unique<fml::WeakNSObjectFactory<FlutterEngine>>(engine); | ||||||
|
|
||||||
| XCTestExpectation* presentExpectation = | ||||||
| [self expectationWithDescription:@"Share view controller presented on iPad"]; | ||||||
|
|
||||||
| FlutterViewController* engineViewController = [[FlutterViewController alloc] initWithEngine:engine | ||||||
| nibName:nil | ||||||
| bundle:nil]; | ||||||
| FlutterViewController* mockEngineViewController = OCMPartialMock(engineViewController); | ||||||
| OCMStub([mockEngineViewController | ||||||
| presentViewController:[OCMArg isKindOfClass:[UIActivityViewController class]] | ||||||
| animated:YES | ||||||
| completion:nil]); | ||||||
|
|
||||||
| id mockTraitCollection = OCMClassMock([UITraitCollection class]); | ||||||
| OCMStub([mockTraitCollection userInterfaceIdiom]).andReturn(UIUserInterfaceIdiomPad); | ||||||
|
|
||||||
| FlutterPlatformPlugin* plugin = | ||||||
| [[FlutterPlatformPlugin alloc] initWithEngine:_weakFactory->GetWeakNSObject()]; | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Here too. |
||||||
| FlutterPlatformPlugin* mockPlugin = OCMPartialMock(plugin); | ||||||
|
|
||||||
| FlutterMethodCall* methodCall = [FlutterMethodCall methodCallWithMethodName:@"Share.invoke" | ||||||
| arguments:@"Test"]; | ||||||
| FlutterResult result = ^(id result) { | ||||||
| OCMVerify([mockEngineViewController | ||||||
| presentViewController:[OCMArg isKindOfClass:[UIActivityViewController class]] | ||||||
| animated:YES | ||||||
| completion:nil]); | ||||||
| [presentExpectation fulfill]; | ||||||
| }; | ||||||
| [mockPlugin handleMethodCall:methodCall result:result]; | ||||||
| [self waitForExpectationsWithTimeout:1 handler:nil]; | ||||||
| } | ||||||
|
|
||||||
| - (void)testClipboardHasCorrectStrings { | ||||||
| [UIPasteboard generalPasteboard].string = nil; | ||||||
| FlutterEngine* engine = [[[FlutterEngine alloc] initWithName:@"test" project:nil] autorelease]; | ||||||
|
|
||||||
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We need to temporarily change back to the old type to pass checks.