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

Fixed close tab behavior, fixed UI corner case bug

Browse Source
This commit is contained in:
Anthony Restaino 2015-11-22 22:06:15 -05:00
parent 8da11b4f08
commit de2d0b2ca4
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/main/java/acr/browser/lightning/activity/BrowserActivity.java
View File

@ -106,7 +106,9 @@ import acr.browser.lightning.fragment.BookmarksFragment;
import acr.browser.lightning.fragment.TabsFragment; import acr.browser.lightning.fragment.TabsFragment;
import acr.browser.lightning.object.SearchAdapter; import acr.browser.lightning.object.SearchAdapter;
import acr.browser.lightning.receiver.NetworkReceiver; import acr.browser.lightning.receiver.NetworkReceiver;
import com.anthonycr.grant.PermissionsManager; import com.anthonycr.grant.PermissionsManager;
import acr.browser.lightning.utils.ProxyUtils; import acr.browser.lightning.utils.ProxyUtils;
import acr.browser.lightning.utils.ThemeUtils; import acr.browser.lightning.utils.ThemeUtils;
import acr.browser.lightning.utils.UrlUtils; import acr.browser.lightning.utils.UrlUtils;
@ -846,7 +848,6 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
// This is commodity to breack the flow between regular tab management and the CLIQZ's search // This is commodity to breack the flow between regular tab management and the CLIQZ's search
// interface. // interface.
private void switchTabs(final LightningView currentView, final LightningView newView) { private void switchTabs(final LightningView currentView, final LightningView newView) {
final WebView currentWebView = currentView != null ? currentView.getWebView() : null;
final WebView newWebView = newView != null ? newView.getWebView() : null; final WebView newWebView = newView != null ? newView.getWebView() : null;
if (newView == null || newWebView == null) { if (newView == null || newWebView == null) {
return; return;
@ -866,13 +867,8 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
currentView.onPause(); currentView.onPause();
} }
newView.setForegroundTab(true); newView.setForegroundTab(true);
if (currentWebView != null) { updateUrl(newView.getUrl(), true);
updateUrl(newView.getUrl(), true); updateProgress(newView.getProgress());
updateProgress(newView.getProgress());
} else {
updateUrl("", true);
updateProgress(0);
}
removeViewFromParent(newWebView); removeViewFromParent(newWebView);
mBrowserFrame.addView(newWebView, MATCH_PARENT); mBrowserFrame.addView(newWebView, MATCH_PARENT);
@ -1043,19 +1039,23 @@ public abstract class BrowserActivity extends ThemableBrowserActivity implements
mBrowserFrame.setBackgroundColor(mBackgroundColor); mBrowserFrame.setBackgroundColor(mBackgroundColor);
} }
final LightningView currentTab = mTabsManager.getCurrentTab(); final LightningView currentTab = mTabsManager.getCurrentTab();
mTabsManager.deleteTab(position); if (mTabsManager.size() == 1 && currentTab != null &&
(UrlUtils.isSpecialUrl(currentTab.getUrl()) ||
currentTab.getUrl().equals(mPreferences.getHomepage()))) {
closeActivity();
return;
} else {
mTabsManager.deleteTab(position);
}
final LightningView afterTab = mTabsManager.getCurrentTab(); final LightningView afterTab = mTabsManager.getCurrentTab();
if (afterTab == null) { if (afterTab == null) {
// if (currentTab != null && (UrlUtils.isSpecialUrl(currentTab.getUrl()) closeBrowser();
// || currentTab.getUrl().equals(mPreferenceManager.getHomepage()))) { return;
// closeActivity();
// } else {
performExitCleanUp();
finish();
// }
} else if (afterTab != currentTab) { } else if (afterTab != currentTab) {
switchTabs(currentTab, afterTab); switchTabs(currentTab, afterTab);
currentTab.pauseTimers(); if (currentTab != null) {
currentTab.pauseTimers();
}
} }
mEventBus.post(new BrowserEvents.TabsChanged()); mEventBus.post(new BrowserEvents.TabsChanged());