[roll] Update third-party dart packages
Updated:
Change-Id: I2d5eba27065cff9534c563532679ec37a10fc579
diff --git a/webview_flutter/BUILD.gn b/webview_flutter/BUILD.gn
index a130370..d4f37f9 100644
--- a/webview_flutter/BUILD.gn
+++ b/webview_flutter/BUILD.gn
@@ -1,4 +1,4 @@
-# This file is generated by importer.py for webview_flutter-0.3.10+2
+# This file is generated by importer.py for webview_flutter-0.3.10+3
import("//build/dart/dart_library.gni")
diff --git a/webview_flutter/CHANGELOG.md b/webview_flutter/CHANGELOG.md
index bb09f98..7904efa 100644
--- a/webview_flutter/CHANGELOG.md
+++ b/webview_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.10+3
+
+* Don't log an unknown setting key error for 'debuggingEnabled' on iOS.
+
## 0.3.10+2
* Fix InputConnection being lost when combined with route transitions.
diff --git a/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/InputAwareWebView.java b/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/InputAwareWebView.java
index da4d81e..93b5c57 100644
--- a/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/InputAwareWebView.java
+++ b/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/InputAwareWebView.java
@@ -83,7 +83,7 @@
// We've never seen this before, so we make the assumption that this is WebView's
// ThreadedInputConnectionProxyView. We are making the assumption that the only view that could
- // possibly be interacting the the IMM here is WebView's ThreadedInputConnectionProxyView.
+ // possibly be interacting with the IMM here is WebView's ThreadedInputConnectionProxyView.
proxyAdapterView =
new ThreadedInputConnectionProxyAdapterView(
/*containerView=*/ containerView,
diff --git a/webview_flutter/ios/Classes/FlutterWebView.m b/webview_flutter/ios/Classes/FlutterWebView.m
index afc2f99..c56d5c7 100644
--- a/webview_flutter/ios/Classes/FlutterWebView.m
+++ b/webview_flutter/ios/Classes/FlutterWebView.m
@@ -74,6 +74,8 @@
}];
NSDictionary<NSString*, id>* settings = args[@"settings"];
[self applySettings:settings];
+ // TODO(amirh): return an error if apply settings failed once it's possible to do so.
+ // https://github.com/flutter/flutter/issues/36228
NSString* initialUrl = args[@"initialUrl"];
if ([initialUrl isKindOfClass:[NSString class]]) {
@@ -118,8 +120,12 @@
}
- (void)onUpdateSettings:(FlutterMethodCall*)call result:(FlutterResult)result {
- [self applySettings:[call arguments]];
- result(nil);
+ NSString* error = [self applySettings:[call arguments]];
+ if (error == nil) {
+ result(nil);
+ return;
+ }
+ result([FlutterError errorWithCode:@"updateSettings_failed" message:error details:nil]);
}
- (void)onLoadUrl:(FlutterMethodCall*)call result:(FlutterResult)result {
@@ -228,7 +234,9 @@
}
}
-- (void)applySettings:(NSDictionary<NSString*, id>*)settings {
+// Returns nil when successful, or an error message when one or more keys are unknown.
+- (NSString*)applySettings:(NSDictionary<NSString*, id>*)settings {
+ NSMutableArray<NSString*>* unknownKeys = [[NSMutableArray alloc] init];
for (NSString* key in settings) {
if ([key isEqualToString:@"jsMode"]) {
NSNumber* mode = settings[key];
@@ -236,10 +244,17 @@
} else if ([key isEqualToString:@"hasNavigationDelegate"]) {
NSNumber* hasDartNavigationDelegate = settings[key];
_navigationDelegate.hasDartNavigationDelegate = [hasDartNavigationDelegate boolValue];
+ } else if ([key isEqualToString:@"debuggingEnabled"]) {
+ // no-op debugging is always enabled on iOS.
} else {
- NSLog(@"webview_flutter: unknown setting key: %@", key);
+ [unknownKeys addObject:key];
}
}
+ if ([unknownKeys count] == 0) {
+ return nil;
+ }
+ return [NSString stringWithFormat:@"webview_flutter: unknown setting keys: {%@}",
+ [unknownKeys componentsJoinedByString:@", "]];
}
- (void)updateJsMode:(NSNumber*)mode {
diff --git a/webview_flutter/pubspec.yaml b/webview_flutter/pubspec.yaml
index b1aa092..4d230df 100644
--- a/webview_flutter/pubspec.yaml
+++ b/webview_flutter/pubspec.yaml
@@ -1,6 +1,6 @@
name: webview_flutter
description: A Flutter plugin that provides a WebView widget on Android and iOS.
-version: 0.3.10+2
+version: 0.3.10+3
author: Flutter Team <flutter-dev@googlegroups.com>
homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
