Browse Source

Fixed memory leak, removed useless log statement

master
Anthony Restaino 9 years ago
parent
commit
7486ebe3c4
  1. 11
      app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java
  2. 1
      app/src/main/java/acr/browser/lightning/activity/TabsManager.java

11
app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java

@ -560,7 +560,8 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
} }
mToolbarLayout.setTranslationY(0); mToolbarLayout.setTranslationY(0);
mBrowserFrame.setLayoutTransition(new LayoutTransition()); // TODO layout transition causing memory leak
// mBrowserFrame.setLayoutTransition(new LayoutTransition());
initializeTabHeight(); initializeTabHeight();
mBrowserFrame.setTranslationY(0); mBrowserFrame.setTranslationY(0);
setFullscreen(mPreferences.getHideStatusBarEnabled(), false); setFullscreen(mPreferences.getHideStatusBarEnabled(), false);
@ -1023,7 +1024,7 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
mToolbar.setMinimumHeight(toolbarSize); mToolbar.setMinimumHeight(toolbarSize);
mToolbar.requestLayout(); mToolbar.requestLayout();
if (mCurrentView != null && mFullScreen) { if (mFullScreen) {
showActionBar(); showActionBar();
mBrowserFrame.setTranslationY(0); mBrowserFrame.setTranslationY(0);
mToolbarLayout.setTranslationY(0); mToolbarLayout.setTranslationY(0);
@ -1033,11 +1034,9 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
public void closeBrowser() { public void closeBrowser() {
mBrowserFrame.setBackgroundColor(mBackgroundColor); mBrowserFrame.setBackgroundColor(mBackgroundColor);
performExitCleanUp(); performExitCleanUp();
LightningView currentTab = mTabsManager.getCurrentTab(); mBrowserFrame.removeAllViews();
if (currentTab != null && currentTab.getWebView() != null) {
mBrowserFrame.removeView(currentTab.getWebView());
}
mTabsManager.shutdown(); mTabsManager.shutdown();
mCurrentView = null;
mEventBus.post(new BrowserEvents.TabsChanged()); mEventBus.post(new BrowserEvents.TabsChanged());
finish(); finish();
} }

1
app/src/main/java/acr/browser/lightning/activity/TabsManager.java

@ -273,7 +273,6 @@ public class TabsManager {
mCurrentTab = null; mCurrentTab = null;
} }
tab.onDestroy(); tab.onDestroy();
Log.d(Constants.TAG, tab.toString());
} }
/** /**

Loading…
Cancel
Save