Merge branch 'master' into getTitle

amirh · amirh · commit c257198b65b8 · 2019-08-15T14:51:01.000-07:00
diff --git a/AUTHORS b/AUTHORS
@@ -41,4 +41,5 @@ Jose Sanchez <josesm82@gmail.com>
 Debkanchan Samadder <debu.samadder@gmail.com>
 Audrius Karosevicius <audrius.karosevicius@gmail.com>
 Lukasz Piliszczuk <lukasz@intheloup.io>
-SoundReply Solutions GmbH <ch@soundreply.com>
+SoundReply Solutions GmbH <ch@soundreply.com>
+Rafal Wachol <rwachol@gmail.com>
diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 * Added a getTitle getter to WebViewController.
 
+## 0.3.11+6
+
+* Calling destroy on Android webview when flutter webview is getting disposed.
+>>>>>>> master
+
 ## 0.3.11+5
 
 * Reduce compiler warnings regarding iOS9 compatibility by moving a single
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
@@ -285,5 +285,6 @@ private void registerJavaScriptChannelNames(List<String> channelNames) {
   public void dispose() {
     methodChannel.setMethodCallHandler(null);
     webView.dispose();
+    webView.destroy();
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -285,5 +285,6 @@ private void registerJavaScriptChannelNames(List<String> channelNames) {`
`285`	`285`	`public void dispose() {`
`286`	`286`	`methodChannel.setMethodCallHandler(null);`
`287`	`287`	`webView.dispose();`
	`288`	`+ webView.destroy();`
`288`	`289`	`}`
`289`	`290`	`}`