Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[webview_flutter_wkwebview] Fixes internal enum type and adds unknown enum values #3812

Merged
merged 6 commits into from
May 2, 2023
Merged

[webview_flutter_wkwebview] Fixes internal enum type and adds unknown enum values #3812

merged 6 commits into from
May 2, 2023

Conversation

bparrishMines
Copy link
Contributor

@bparrishMines bparrishMines commented Apr 24, 2023 •
edited
Loading

Followup from #3543 (comment)

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the relevant style guides and ran the auto-formatter. (Unlike the flutter/flutter repo, the flutter/packages repo does use dart format.)
  • I signed the CLA.
  • The title of the PR starts with the name of the package surrounded by square brackets, e.g. [shared_preferences]
  • I listed at least one issue that this PR fixes in the description above.
  • I updated pubspec.yaml with an appropriate new version according to the pub versioning philosophy, or this PR is exempt from version changes.
  • I updated CHANGELOG.md to add a description of the change, following repository CHANGELOG style.
  • I updated/added relevant documentation (doc comments with ///).
  • I added new tests to check the change I am making, or this PR is test-exempt.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

bparrishMines
bparrishMines commented Apr 28, 2023
View reviewed changes
packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFUIDelegateHostApi.m
@@ -61,7 +61,7 @@ - (void)requestMediaCapturePermissionForDelegateWithIdentifier:(FWFUIDelegate *)
webView:(WKWebView *)webView
origin:(WKSecurityOrigin *)origin
frame:(WKFrameInfo *)frame
type:(FWFWKMediaCaptureType)type
type:(WKMediaCaptureType)type
Copy link
Contributor Author

@bparrishMines bparrishMines Apr 28, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was not causing an crash since all enums are represented by an NSInteger and the correct WKMediaCaptureType was still being passed. But this was causing the lint error:

error: implicit conversion from enumeration type 'FWFWKMediaCaptureType' (aka 'enum FWFWKMediaCaptureType') to different enumeration type 'WKMediaCaptureType' (aka 'enum WKMediaCaptureType') [-Werror,-Wenum-conversion]

@bparrishMines bparrishMines changed the title Set correct enum type [webview_flutter_wkwebview] Fixes internal enum type and adds unknown enum values Apr 28, 2023
@bparrishMines bparrishMines marked this pull request as ready for review April 28, 2023 18:14
@bparrishMines bparrishMines requested a review from cyanglaz as a code owner April 28, 2023 18:14
@bparrishMines bparrishMines requested review from stuartmorgan and removed request for cyanglaz April 28, 2023 18:14
stuartmorgan
stuartmorgan approved these changes Apr 28, 2023
View reviewed changes
Copy link
Contributor

@stuartmorgan stuartmorgan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with nit. Thanks!

packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFDataConverters.m
@@ -210,6 +210,8 @@ WKNavigationActionPolicy FWFNativeWKNavigationActionPolicyFromEnumData(
makeWithValue:FWFNSKeyValueChangeKeyEnumNotificationIsPrior];
} else if ([key isEqualToString:NSKeyValueChangeOldKey]) {
return [FWFNSKeyValueChangeKeyEnumData makeWithValue:FWFNSKeyValueChangeKeyEnumOldValue];
} else {
return [FWFNSKeyValueChangeKeyEnumData makeWithValue:FWFNSKeyValueChangeKeyEnumUnknown];
}

return nil;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is dead code now.

@bparrishMines bparrishMines added the autosubmit Merge PR when tree becomes green via auto submit App label May 2, 2023
@auto-submit auto-submit bot merged commit 0a12f2c into flutter:main May 2, 2023
@bparrishMines bparrishMines deleted the wkwebview_enum_type branch May 2, 2023 16:40
joshpetit pushed a commit to joshpetit/packages that referenced this pull request May 2, 2023
@bparrishMines @joshpetit
[webview_flutter_wkwebview] Fixes internal enum type and adds unknown…
0ca20b7 
… enum values (flutter#3812)

Followup from flutter#3543 (comment)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request May 3, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 3, 2023
@engine-flutter-autoroll
0a12f2c [webview_flutter_wkwebview] Fixes internal enum type and adds…
9bdc1af 
… unknown enum values (flutter/packages#3812)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request May 3, 2023
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 3, 2023
@engine-flutter-autoroll
0a12f2c [webview_flutter_wkwebview] Fixes internal enum type and adds…
bed5472 
… unknown enum values (flutter/packages#3812)
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request May 3, 2023
@engine-flutter-autoroll
Roll Packages from f163786 to 407b7da (13 revisions) (#125988)
fd7efc6 
flutter/packages@f163786...407b7da

2023-05-03 [email protected] Update Cirrus to Xcode 14.3 (flutter/packages#3890)
2023-05-03 [email protected] [file_selector] Deprecates `macUTIs` (flutter/packages#3888)
2023-05-03 [email protected] [pigeon]enable treat warning as errors for swift code in unit test (flutter/packages#3889)
2023-05-02 [email protected] Update xcode to 14e222b (flutter/packages#3868)
2023-05-02 [email protected] [pigeon]fix "as Any" workaround due to nested optional (flutter/packages#3658)
2023-05-02 [email protected] [webview_flutter_android] Adds support to accept third party cookies (flutter/packages#3834)
2023-05-02 [email protected] [webview_flutter_wkwebview] Fixes an exception caused by the `onUrlChange` callback returning a null url (flutter/packages#3848)
2023-05-02 [email protected] [google_maps_flutter] [Docs] Note regarding usage within a bounded & an unbound widget  (flutter/packages#3691)
2023-05-02 [email protected] [local_auth_android] Fix Android lint warnings (flutter/packages#3764)
2023-05-02 [email protected] [go_router_builder] Support go_router v7 (flutter/packages#3858)
2023-05-02 [email protected] [webview_flutter_wkwebview] Fixes internal enum type and adds unknown enum values (flutter/packages#3812)
2023-05-02 [email protected] [file_selector] Add MIME type support on macOS (flutter/packages#3862)
2023-05-02 [email protected] Roll Flutter from 828a040 to db6074a (12 revisions) (flutter/packages#3881)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages-flutter-autoroll
Please CC [email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
@reidbaker reidbaker mentioned this pull request May 12, 2023
Merged
11 tasks
@bparrishMines bparrishMines mentioned this pull request May 19, 2023
Closed
11 tasks
@reidbaker reidbaker mentioned this pull request Jul 7, 2023
Merged
11 tasks
This was referenced Jul 12, 2023
Closed
Merged
nploi pushed a commit to nploi/packages that referenced this pull request Jul 16, 2023
@bparrishMines @nploi
[webview_flutter_wkwebview] Fixes internal enum type and adds unknown…
c50afca 
… enum values (flutter#3812)

Followup from flutter#3543 (comment)
@reidbaker reidbaker mentioned this pull request Jul 26, 2023
Merged
11 tasks
@reidbaker reidbaker mentioned this pull request Aug 4, 2023
Merged
11 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stuartmorgan stuartmorgan stuartmorgan approved these changes

Assignees
No one assigned
Labels
autosubmit Merge PR when tree becomes green via auto submit App p: webview_flutter platform-ios
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@bparrishMines @stuartmorgan