[webview_flutter] Fix double tap on resize issue (#1965)

WebView is incorrectly dropping some input events as unhandled.
Previously we were restarting the input connection to try and work
around this, but that causes a long tail of bugs in various SDK and
WebView versions. Stop the events from bubbling instead since they still
appear to be correctly handled despite being marked wrong.

Long term we should figure out why this is happening in WebView and
figure out a deeper fix for this issue, but this workaround solves the
linked bugs in the immediate short term.

Author: Michael Klimushyn

packages/webview_flutter/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.11+2
+
+* Add fix for input connection being dropped after a screen resize on certain
+  Android devices.
+
 ## 0.3.11+1
 
 * Work around a bug in old Android WebView versions that was causing a crash

packages/webview_flutter/README.md

@@ -22,12 +22,10 @@ Keyboard support within webviews is also experimental. The above tags also
 surface known issues with keyboard input. Some currently known keyboard issues,
 as of `webview_flutter` version `0.3.10+4`:
 
-* [Input needs to be tapped twice to be registered on Samsung
-  devices](https://github.com/flutter/flutter/issues/35867)
-* [Keyboard behavior is buggy after a
-  resize](https://github.com/flutter/flutter/issues/36978)
 * [Keyboard persists after tapping outside text
   field](https://github.com/flutter/flutter/issues/36478)
+* [WebView's text selection dialog is not responding to touch
+  events](https://github.com/flutter/flutter/issues/24585)
 
 ## Setup
 

packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebViewClient.java

@@ -7,6 +7,7 @@
 import android.annotation.TargetApi;
 import android.os.Build;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.webkit.WebResourceRequest;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
@@ -110,6 +111,13 @@ public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request
       public void onPageFinished(WebView view, String url) {
         FlutterWebViewClient.this.onPageFinished(view, url);
       }
+
+      @Override
+      public void onUnhandledKeyEvent(WebView view, KeyEvent event) {
+        // Deliberately empty. Occasionally the webview will mark events as having failed to be
+        // handled even though they were handled. We don't want to propagate those as they're not
+        // truly lost.
+      }
     };
   }
 
@@ -130,6 +138,13 @@ public boolean shouldOverrideUrlLoading(WebView view, String url) {
       public void onPageFinished(WebView view, String url) {
         FlutterWebViewClient.this.onPageFinished(view, url);
       }
+
+      @Override
+      public void onUnhandledKeyEvent(WebView view, KeyEvent event) {
+        // Deliberately empty. Occasionally the webview will mark events as having failed to be
+        // handled even though they were handled. We don't want to propagate those as they're not
+        // truly lost.
+      }
     };
   }
 

packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/InputAwareWebView.java

@@ -43,14 +43,11 @@ void lockInputConnection() {
 
   /** Sets the proxy adapter view back to its default behavior. */
   void unlockInputConnection() {
-    if (proxyAdapterView != null) {
-      proxyAdapterView.setLocked(false);
+    if (proxyAdapterView == null) {
+      return;
     }
 
-    // Restart the input connection to avoid ViewRootImpl assuming an incorrect window state.
-    InputMethodManager imm =
-        (InputMethodManager) containerView.getContext().getSystemService(INPUT_METHOD_SERVICE);
-    imm.restartInput(containerView);
+    proxyAdapterView.setLocked(false);
   }
 
   /** Restore the original InputConnection, if needed. */

packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/WebViewFlutterPlugin.java

@@ -8,7 +8,6 @@
 
 /** WebViewFlutterPlugin */
 public class WebViewFlutterPlugin {
-
   /** Plugin registration. */
   public static void registerWith(Registrar registrar) {
     registrar

packages/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.11+1
+version: 0.3.11+2
 author: Flutter Team <flutter-dev@googlegroups.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter