Skip to content

Commit 59b12f2

Browse files
committed
Fixes feedback
1 parent 6f4a864 commit 59b12f2

File tree

4 files changed

+11
-14
lines changed

4 files changed

+11
-14
lines changed

packages/webview_flutter/webview_flutter_wkwebview/CHANGELOG.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@
2828

2929
## 3.2.0
3030

31-
* Updates minimum Flutter version to 3.3 and iOS 11.
32-
* Aligns Dart and Flutter SDK constraints.
33-
34-
## 3.2.0
35-
3631
* Updates minimum Flutter version to 3.3 and iOS 11.
3732

3833
## 3.1.1

packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFDataConverters.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ extern FWFNSUrlRequestData *FWFNSUrlRequestDataFromNSURLRequest(NSURLRequest *re
110110
*
111111
* @return A FWFWKNavigationResponseData.
112112
*/
113-
extern FWFWKNavigationResponseData *FWFWKNavigationResponseDataFromNavigationResponse(
113+
extern FWFWKNavigationResponseData *FWFWKNavigationResponseDataFromNativeNavigationResponse(
114114
WKNavigationResponse *response);
115115
/**
116116
* Converts a NSURLResponse to an FWFNSHttpUrlResponseData.
@@ -119,7 +119,8 @@ extern FWFWKNavigationResponseData *FWFWKNavigationResponseDataFromNavigationRes
119119
*
120120
* @return A FWFNSHttpUrlResponseData.
121121
*/
122-
extern FWFNSHttpUrlResponseData *FWFNSHttpUrlResponseDataFromNSURLResponse(NSURLResponse *response);
122+
extern FWFNSHttpUrlResponseData *FWFNSHttpUrlResponseDataFromNativeNSURLResponse(
123+
NSURLResponse *response);
123124

124125
/**
125126
* Converts a WKFrameInfo to an FWFWKFrameInfoData.
@@ -147,7 +148,7 @@ extern WKNavigationActionPolicy FWFWKNavigationActionPolicyFromEnumData(
147148
*
148149
* @return A WKNavigationResponsePolicy or -1 if data could not be converted.
149150
*/
150-
extern WKNavigationResponsePolicy FWFWKNavigationResponsePolicyFromEnumData(
151+
extern WKNavigationResponsePolicy FWFNativeWKNavigationResponsePolicyFromEnumData(
151152
FWFWKNavigationResponsePolicyEnumData *data);
152153

153154
/**

packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFDataConverters.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,10 @@ WKAudiovisualMediaTypes FWFWKAudiovisualMediaTypeFromEnumData(
175175
allHttpHeaderFields:request.allHTTPHeaderFields ? request.allHTTPHeaderFields : @{}];
176176
}
177177

178-
FWFWKNavigationResponseData *FWFWKNavigationResponseDataFromNavigationResponse(
178+
FWFWKNavigationResponseData *FWFWKNavigationResponseDataFromNativeNavigationResponse(
179179
WKNavigationResponse *response) {
180180
return [FWFWKNavigationResponseData
181-
makeWithResponse:FWFNSHttpUrlResponseDataFromNSURLResponse(response.response)
181+
makeWithResponse:FWFNSHttpUrlResponseDataFromNativeNSURLResponse(response.response)
182182
forMainFrame:@(response.forMainFrame)];
183183
}
184184

@@ -188,7 +188,7 @@ WKAudiovisualMediaTypes FWFWKAudiovisualMediaTypeFromEnumData(
188188
/// This cast will always succeed because the NSURLResponse object actually is an instance of
189189
/// NSHTTPURLResponse. See:
190190
/// https://developer.apple.com/documentation/foundation/nsurlresponse#overview
191-
FWFNSHttpUrlResponseData *FWFNSHttpUrlResponseDataFromNSURLResponse(NSURLResponse *response) {
191+
FWFNSHttpUrlResponseData *FWFNSHttpUrlResponseDataFromNativeNSURLResponse(NSURLResponse *response) {
192192
NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *)response;
193193
return [FWFNSHttpUrlResponseData makeWithStatusCode:@(httpResponse.statusCode)];
194194
}
@@ -209,7 +209,7 @@ WKNavigationActionPolicy FWFWKNavigationActionPolicyFromEnumData(
209209
return -1;
210210
}
211211

212-
WKNavigationResponsePolicy FWFWKNavigationResponsePolicyFromEnumData(
212+
WKNavigationResponsePolicy FWFNativeWKNavigationResponsePolicyFromEnumData(
213213
FWFWKNavigationResponsePolicyEnumData *data) {
214214
switch (data.value) {
215215
case FWFWKNavigationResponsePolicyEnumAllow:

packages/webview_flutter/webview_flutter_wkwebview/ios/Classes/FWFNavigationDelegateHostApi.m

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ - (void)decidePolicyForNavigationResponseForDelegate:(FWFNavigationDelegate *)in
7979
NSNumber *webViewIdentifier =
8080
@([self.instanceManager identifierWithStrongReferenceForInstance:webView]);
8181
FWFWKNavigationResponseData *navigationResponseData =
82-
FWFWKNavigationResponseDataFromNavigationResponse(navigationResponse);
82+
FWFWKNavigationResponseDataFromNativeNavigationResponse(navigationResponse);
8383
[self decidePolicyForNavigationResponseForDelegateWithIdentifier:
8484
@([self identifierForDelegate:instance])
8585
webViewIdentifier:webViewIdentifier
@@ -181,7 +181,8 @@ - (void)webView:(WKWebView *)webView
181181
FlutterError *error) {
182182
NSAssert(!error, @"%@", error);
183183
decisionHandler(
184-
FWFWKNavigationResponsePolicyFromEnumData(policy));
184+
FWFNativeWKNavigationResponsePolicyFromEnumData(
185+
policy));
185186
}];
186187
}
187188

0 commit comments

Comments
 (0)