From 88461edb9e1aa357f2df6f1f4a35999097907992 Mon Sep 17 00:00:00 2001 From: Aman Verma Date: Wed, 29 Sep 2021 15:31:52 +0530 Subject: [PATCH 1/3] Fixed Todos --- .../webviewflutter/FlutterWebView.java | 28 +++---------------- 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java b/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java index 4651a5f5ae22..556d1fa4028d 100644 --- a/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java +++ b/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java @@ -188,48 +188,28 @@ public View getView() { return webView; } - // @Override - // This is overriding a method that hasn't rolled into stable Flutter yet. Including the - // annotation would cause compile time failures in versions of Flutter too old to include the new - // method. However leaving it raw like this means that the method will be ignored in old versions - // of Flutter but used as an override anyway wherever it's actually defined. - // TODO(mklim): Add the @Override annotation once flutter/engine#9727 rolls to stable. + @Override public void onInputConnectionUnlocked() { if (webView instanceof InputAwareWebView) { ((InputAwareWebView) webView).unlockInputConnection(); } } - // @Override - // This is overriding a method that hasn't rolled into stable Flutter yet. Including the - // annotation would cause compile time failures in versions of Flutter too old to include the new - // method. However leaving it raw like this means that the method will be ignored in old versions - // of Flutter but used as an override anyway wherever it's actually defined. - // TODO(mklim): Add the @Override annotation once flutter/engine#9727 rolls to stable. + @Override public void onInputConnectionLocked() { if (webView instanceof InputAwareWebView) { ((InputAwareWebView) webView).lockInputConnection(); } } - // @Override - // This is overriding a method that hasn't rolled into stable Flutter yet. Including the - // annotation would cause compile time failures in versions of Flutter too old to include the new - // method. However leaving it raw like this means that the method will be ignored in old versions - // of Flutter but used as an override anyway wherever it's actually defined. - // TODO(mklim): Add the @Override annotation once stable passes v1.10.9. + @Override public void onFlutterViewAttached(View flutterView) { if (webView instanceof InputAwareWebView) { ((InputAwareWebView) webView).setContainerView(flutterView); } } - // @Override - // This is overriding a method that hasn't rolled into stable Flutter yet. Including the - // annotation would cause compile time failures in versions of Flutter too old to include the new - // method. However leaving it raw like this means that the method will be ignored in old versions - // of Flutter but used as an override anyway wherever it's actually defined. - // TODO(mklim): Add the @Override annotation once stable passes v1.10.9. + @Override public void onFlutterViewDetached() { if (webView instanceof InputAwareWebView) { ((InputAwareWebView) webView).setContainerView(null); From 28bb1bfa13f9058922c0c830861c121beec38765 Mon Sep 17 00:00:00 2001 From: Aman Verma Date: Wed, 29 Sep 2021 15:42:51 +0530 Subject: [PATCH 2/3] Update Version --- packages/webview_flutter/webview_flutter_android/CHANGELOG.md | 4 ++++ packages/webview_flutter/webview_flutter_android/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/webview_flutter/webview_flutter_android/CHANGELOG.md b/packages/webview_flutter/webview_flutter_android/CHANGELOG.md index 917a3c73acb1..d4827a71e47d 100644 --- a/packages/webview_flutter/webview_flutter_android/CHANGELOG.md +++ b/packages/webview_flutter/webview_flutter_android/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.15 + +* Added Overrides in FlutterWebView.java + ## 2.0.14 * Update example App so navigation menu loads immediatly but only becomes available when `WebViewController` is available (same behavior as example App in webview_flutter package). diff --git a/packages/webview_flutter/webview_flutter_android/pubspec.yaml b/packages/webview_flutter/webview_flutter_android/pubspec.yaml index 4a3d4cb1d942..36f186087c08 100644 --- a/packages/webview_flutter/webview_flutter_android/pubspec.yaml +++ b/packages/webview_flutter/webview_flutter_android/pubspec.yaml @@ -2,7 +2,7 @@ name: webview_flutter_android description: A Flutter plugin that provides a WebView widget on Android. repository: https://github.com/flutter/plugins/tree/master/packages/webview_flutter/webview_flutter_android issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+webview%22 -version: 2.0.14 +version: 2.0.15 environment: sdk: ">=2.14.0 <3.0.0" From af42aa8db16adff287c26c5b1c36d42f64dd0e13 Mon Sep 17 00:00:00 2001 From: Aman Verma Date: Wed, 29 Sep 2021 15:52:54 +0530 Subject: [PATCH 3/3] Formatted with google-java-format --- .../io/flutter/plugins/webviewflutter/FlutterWebView.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java b/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java index 556d1fa4028d..ff573c771960 100644 --- a/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java +++ b/packages/webview_flutter/webview_flutter_android/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java @@ -188,28 +188,28 @@ public View getView() { return webView; } - @Override + @Override public void onInputConnectionUnlocked() { if (webView instanceof InputAwareWebView) { ((InputAwareWebView) webView).unlockInputConnection(); } } - @Override + @Override public void onInputConnectionLocked() { if (webView instanceof InputAwareWebView) { ((InputAwareWebView) webView).lockInputConnection(); } } - @Override + @Override public void onFlutterViewAttached(View flutterView) { if (webView instanceof InputAwareWebView) { ((InputAwareWebView) webView).setContainerView(flutterView); } } - @Override + @Override public void onFlutterViewDetached() { if (webView instanceof InputAwareWebView) { ((InputAwareWebView) webView).setContainerView(null);