Bug 1363074 - Part 1 - Clarify meaning of "isExternalURL" variable during session restore. r?walkingice
MozReview-Commit-ID: JnUiPSiqEhd
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
@@ -226,30 +226,34 @@ public abstract class GeckoApp
protected String mLastSessionUUID = null;
protected boolean mSuppressActivitySwitch = false;
private boolean foregrounded = false;
private static final class LastSessionParser extends SessionParser {
private JSONArray tabs;
private JSONObject windowObject;
- private boolean isExternalURL;
+ private boolean loadingExternalURL;
private int selectedTabId = INVALID_TAB_ID;
private boolean selectNextTab;
private boolean tabsWereSkipped;
private boolean tabsWereProcessed;
private SparseIntArray tabIdMap;
- public LastSessionParser(JSONArray tabs, JSONObject windowObject, boolean isExternalURL) {
+ /**
+ * @param loadingExternalURL Pass true if we're going to open an additional tab to load an
+ * URL received through our launch intent.
+ */
+ public LastSessionParser(JSONArray tabs, JSONObject windowObject, boolean loadingExternalURL) {
this.tabs = tabs;
this.windowObject = windowObject;
- this.isExternalURL = isExternalURL;
+ this.loadingExternalURL = loadingExternalURL;
tabIdMap = new SparseIntArray();
}
public boolean allTabsSkipped() {
return tabsWereSkipped && !tabsWereProcessed;
}
@@ -290,17 +294,17 @@ public abstract class GeckoApp
return;
}
tabsWereProcessed = true;
JSONObject tabObject = sessionTab.getTabObject();
int flags = Tabs.LOADURL_NEW_TAB;
- flags |= ((isExternalURL || !sessionTab.isSelected()) ? Tabs.LOADURL_DELAY_LOAD : 0);
+ flags |= ((loadingExternalURL || !sessionTab.isSelected()) ? Tabs.LOADURL_DELAY_LOAD : 0);
flags |= (tabObject.optBoolean("desktopMode") ? Tabs.LOADURL_DESKTOP : 0);
flags |= (tabObject.optBoolean("isPrivate") ? Tabs.LOADURL_PRIVATE : 0);
final Tab tab = Tabs.getInstance().loadUrl(sessionTab.getUrl(), flags);
if (sessionTab.isSelected() || selectNextTab) {
selectedTabId = tab.getId();
}