jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/374433 )
Change subject: Don't destroy WebView explicitly.
......................................................................
Don't destroy WebView explicitly.
Explicitly calling destroy() on the WebView seems to be having adverse
effects on the most recent version of the System WebView, whereby all
subsequent instances of the WebView can enter a bad state.
We started calling destroy() to resolve memory leaks that were found
previously, but basic functionality of the WebView obviously takes
priority. We'll need to re-audit memory leaks and fix any ones related to
the WebView in a different way (if they still exist).
Bug: T174401
Change-Id: I13e9967ceb6b76af978542c9482732b0b9bb351b
---
M app/src/main/java/org/wikipedia/page/PageFragment.java
M app/src/main/java/org/wikipedia/views/ObservableWebView.java
2 files changed, 3 insertions(+), 10 deletions(-)
Approvals:
jenkins-bot: Verified
Mholloway: Looks good to me, approved
diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index 462cf51..7bb1465 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -333,7 +333,9 @@
bridge.cleanup();
tabsProvider.setTabsProviderListener(null);
toolbarHideHandler.setScrollView(null);
- webView.destroy();
+ webView.clearAllListeners();
+ ((ViewGroup) webView.getParent()).removeView(webView);
+ webView = null;
super.onDestroyView();
}
diff --git a/app/src/main/java/org/wikipedia/views/ObservableWebView.java
b/app/src/main/java/org/wikipedia/views/ObservableWebView.java
index 9996e0d..e786804 100755
--- a/app/src/main/java/org/wikipedia/views/ObservableWebView.java
+++ b/app/src/main/java/org/wikipedia/views/ObservableWebView.java
@@ -7,7 +7,6 @@
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.ViewConfiguration;
-import android.view.ViewGroup;
import android.webkit.WebView;
import org.wikipedia.WikipediaApp;
@@ -133,14 +132,6 @@
public ObservableWebView(Context context, AttributeSet attrs, int
defStyle) {
super(context, attrs, defStyle);
init();
- }
-
- @Override public void destroy() {
- clearAllListeners();
- if (getParent() != null) {
- ((ViewGroup) getParent()).removeView(this);
- }
- super.destroy();
}
private void init() {
--
To view, visit https://gerrit.wikimedia.org/r/374433
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I13e9967ceb6b76af978542c9482732b0b9bb351b
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Cooltey <cf...@wikimedia.org>
Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: Sharvaniharan <sha...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
