r4sas/lightning-i2p
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Fixed memory leak caused by incorrectly destroying the WebView before it was removed from its parent

Browse Source
This commit is contained in:
Anthony Restaino 2016-01-18 21:39:09 -05:00
parent 5368d76218
commit ee52e00c83
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/acr/browser/lightning/view/LightningView.java
View File

@ -25,6 +25,7 @@ import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.View.OnTouchListener; import android.view.View.OnTouchListener;
import android.view.ViewConfiguration; import android.view.ViewConfiguration;
import android.view.ViewGroup;
import android.webkit.CookieManager; import android.webkit.CookieManager;
import android.webkit.WebSettings; import android.webkit.WebSettings;
import android.webkit.WebSettings.LayoutAlgorithm; import android.webkit.WebSettings.LayoutAlgorithm;
@ -453,13 +454,13 @@ public class LightningView {
/** /**
* This method sets the user agent of the current tab. * This method sets the user agent of the current tab.
* There are four options, 1, 2, 3, 4. * There are four options, 1, 2, 3, 4.
* <p> * <p/>
* 1. use the default user agent * 1. use the default user agent
* <p> * <p/>
* 2. use the desktop user agent * 2. use the desktop user agent
* <p> * <p/>
* 3. use the mobile user agent * 3. use the mobile user agent
* <p> * <p/>
* 4. use a custom user agent, or the default user agent * 4. use a custom user agent, or the default user agent
* if none was set. * if none was set.
* *
@ -763,9 +764,17 @@ public class LightningView {
* api. * api.
*/ */
// TODO fix bug where WebView.destroy is being called before the tab // TODO fix bug where WebView.destroy is being called before the tab
// is removed // is removed and would cause a memory leak if the parent check
// was not in place.
public synchronized void onDestroy() { public synchronized void onDestroy() {
if (mWebView != null) { if (mWebView != null) {
// Check to make sure the WebView has been removed
// before calling destroy() so that a memory leak is not created
ViewGroup parent = (ViewGroup) mWebView.getParent();
if (parent != null) {
Log.e(Constants.TAG, "WebView was not detached from window before onDestroy");
parent.removeView(mWebView);
}
mWebView.stopLoading(); mWebView.stopLoading();
mWebView.onPause(); mWebView.onPause();
mWebView.clearHistory(); mWebView.clearHistory();