From b3f4b689584804437a2569f2572887115c88bac4 Mon Sep 17 00:00:00 2001 From: Rafal Wachol Date: Sat, 20 Jul 2019 20:00:44 +0100 Subject: [PATCH 1/5] Calling destroy on webview when flutter part is getting disposed --- packages/webview_flutter/CHANGELOG.md | 4 ++++ .../io/flutter/plugins/webviewflutter/FlutterWebView.java | 1 + packages/webview_flutter/pubspec.yaml | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md index bb09f98f4697..7bd6f0c984c4 100644 --- a/packages/webview_flutter/CHANGELOG.md +++ b/packages/webview_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.10+3 + +* Fix disposing Android webview properly. + ## 0.3.10+2 * Fix InputConnection being lost when combined with route transitions. diff --git a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java index 838987714d31..5d66127940ac 100644 --- a/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java +++ b/packages/webview_flutter/android/src/main/java/io/flutter/plugins/webviewflutter/FlutterWebView.java @@ -262,5 +262,6 @@ private void registerJavaScriptChannelNames(List channelNames) { public void dispose() { methodChannel.setMethodCallHandler(null); webView.dispose(); + webView.destroy(); } } diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml index b1aa0925c42c..4d230dfbc4af 100644 --- a/packages/webview_flutter/pubspec.yaml +++ b/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.10+2 +version: 0.3.10+3 author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter From 83aad911ce774c66b49d220e779b04c409943afb Mon Sep 17 00:00:00 2001 From: Rafal Wachol Date: Sun, 21 Jul 2019 02:41:19 +0100 Subject: [PATCH 2/5] upgraded changelog and pubspec version --- packages/webview_flutter/CHANGELOG.md | 6 +++++- packages/webview_flutter/pubspec.yaml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md index 7904efa1998a..a4a7db8cc2e6 100644 --- a/packages/webview_flutter/CHANGELOG.md +++ b/packages/webview_flutter/CHANGELOG.md @@ -1,7 +1,11 @@ -## 0.3.10+3 +## 0.3.10+4 * Don't log an unknown setting key error for 'debuggingEnabled' on iOS. +## 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/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml index 4d230dfbc4af..38033b73f142 100644 --- a/packages/webview_flutter/pubspec.yaml +++ b/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.10+3 +version: 0.3.10+4 author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter From 0e89f45c096a9bf2298def4d153247e03640dd8b Mon Sep 17 00:00:00 2001 From: Rafal Wachol Date: Mon, 22 Jul 2019 00:24:38 +0100 Subject: [PATCH 3/5] fixed changelog --- packages/webview_flutter/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md index a4a7db8cc2e6..e5a74af6dc64 100644 --- a/packages/webview_flutter/CHANGELOG.md +++ b/packages/webview_flutter/CHANGELOG.md @@ -1,6 +1,6 @@ ## 0.3.10+4 -* Don't log an unknown setting key error for 'debuggingEnabled' on iOS. +* Calling destroy on Android webview when flutter webview is getting disposed. ## 0.3.10+3 From f9cd164eefc1ebe3714477af75d5eb83b28d7531 Mon Sep 17 00:00:00 2001 From: Rafal Wachol Date: Tue, 23 Jul 2019 21:50:42 +0100 Subject: [PATCH 4/5] fixed changelog --- packages/webview_flutter/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md index e5a74af6dc64..5940cf839ca0 100644 --- a/packages/webview_flutter/CHANGELOG.md +++ b/packages/webview_flutter/CHANGELOG.md @@ -4,7 +4,7 @@ ## 0.3.10+3 -Don't log an unknown setting key error for 'debuggingEnabled' on iOS. +* Don't log an unknown setting key error for 'debuggingEnabled' on iOS. ## 0.3.10+2 From 8a65fac67c4fe4aaef1486265163cfa52e3ae6b9 Mon Sep 17 00:00:00 2001 From: Amir Hardon Date: Thu, 15 Aug 2019 14:06:21 -0700 Subject: [PATCH 5/5] fix changelog --- packages/webview_flutter/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md index cff1db9bfbdf..8600d04b3ffb 100644 --- a/packages/webview_flutter/CHANGELOG.md +++ b/packages/webview_flutter/CHANGELOG.md @@ -1,6 +1,6 @@ ## 0.3.11+6 -* Calling destroy on Android webview when flutter webview is getting disposed.Calling destroy on Android webview when flutter webview is getting disposed. +* Calling destroy on Android webview when flutter webview is getting disposed. ## 0.3.11+5