Bug 1359531 - Part 4 - Import Tab intent extra key definitions. r?sebastian,walkingice
MozReview-Commit-ID: DXZGscSpRtd
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
@@ -114,16 +114,18 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
+import static org.mozilla.gecko.Tabs.INTENT_EXTRA_SESSION_UUID;
+import static org.mozilla.gecko.Tabs.INTENT_EXTRA_TAB_ID;
import static org.mozilla.gecko.Tabs.INVALID_TAB_ID;
public abstract class GeckoApp extends GeckoActivity
implements AnchoredPopup.OnVisibilityChangeListener,
BundleEventListener,
ContextGetter,
GeckoAppShell.GeckoInterface,
GeckoMenu.Callback,
@@ -2204,28 +2206,28 @@ public abstract class GeckoApp extends G
/**
* Check whether an intent with tab switch extras refers to a tab that
* is actually existing at the moment.
*
* @param intent The intent to be checked.
* @return True if the tab specified in the intent is existing in our Tabs list.
*/
protected boolean hasGeckoTab(SafeIntent intent) {
- final int tabId = intent.getIntExtra(Tabs.INTENT_EXTRA_TAB_ID, INVALID_TAB_ID);
- final String intentSessionUUID = intent.getStringExtra(Tabs.INTENT_EXTRA_SESSION_UUID);
+ final int tabId = intent.getIntExtra(INTENT_EXTRA_TAB_ID, INVALID_TAB_ID);
+ final String intentSessionUUID = intent.getStringExtra(INTENT_EXTRA_SESSION_UUID);
final Tab tabToCheck = Tabs.getInstance().getTab(tabId);
// We only care about comparing session UUIDs if one was specified in the intent.
// Otherwise, we just try matching the tab ID with one of our open tabs.
- return tabToCheck != null && (!intent.hasExtra(Tabs.INTENT_EXTRA_SESSION_UUID) ||
+ return tabToCheck != null && (!intent.hasExtra(INTENT_EXTRA_SESSION_UUID) ||
GeckoApplication.getSessionUUID().equals(intentSessionUUID));
}
protected void handleSelectTabIntent(SafeIntent intent) {
- final int tabId = intent.getIntExtra(Tabs.INTENT_EXTRA_TAB_ID, INVALID_TAB_ID);
+ final int tabId = intent.getIntExtra(INTENT_EXTRA_TAB_ID, INVALID_TAB_ID);
final Tab selectedTab = Tabs.getInstance().selectTab(tabId);
// If the tab selection has been redirected to a different activity,
// the selectedTab within Tabs will not have been updated yet.
if (selectedTab == Tabs.getInstance().getSelectedTab()) {
onTabSelectFromIntent(selectedTab);
}
}