corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changesets 07cc8095956b and f591bbfa5dbf (bug 1159753) for Android debug mochitest crashes.

Browse Source 
CLOSED TREE
This commit is contained in:
Ryan VanderMeulen
2015-05-28 09:20:19 -04:00
parent ea96a46937
commit 073df80139
7 changed files with 14 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mobile/android/base/tabqueue/TabQueueHelper.java
View File

@@ -54,11 +54,12 @@ public class TabQueueHelper {
public static boolean shouldShowTabQueuePrompt(Context context) {
final SharedPreferences prefs = GeckoSharedPrefs.forApp(context);
boolean isTabQueueEnabled = prefs.getBoolean(GeckoPreferences.PREFS_TAB_QUEUE, false);
int numberOfTimesTabQueuePromptSeen = prefs.getInt(PREF_TAB_QUEUE_TIMES_PROMPT_SHOWN, 0);
// Exit early if the feature is already enabled or the user has seen the
// prompt more than MAX_TIMES_TO_SHOW_PROMPT times.
if (isTabQueueEnabled(prefs) || numberOfTimesTabQueuePromptSeen >= MAX_TIMES_TO_SHOW_PROMPT) {
if (isTabQueueEnabled || numberOfTimesTabQueuePromptSeen >= MAX_TIMES_TO_SHOW_PROMPT) {
return false;
}
@@ -183,9 +184,10 @@ public class TabQueueHelper {
// TODO: Use profile shared prefs when bug 1147925 gets fixed.
final SharedPreferences prefs = GeckoSharedPrefs.forApp(context);
boolean tabQueueEnabled = prefs.getBoolean(GeckoPreferences.PREFS_TAB_QUEUE, false);
int tabsQueued = prefs.getInt(PREF_TAB_QUEUE_COUNT, 0);
return isTabQueueEnabled(prefs) && tabsQueued > 0;
return tabQueueEnabled && tabsQueued > 0;
}
public static int getTabQueueLength(final Context context) {
@@ -268,12 +270,4 @@ public class TabQueueHelper {
editor.apply();
}
public static boolean isTabQueueEnabled(Context context) {
return isTabQueueEnabled(GeckoSharedPrefs.forApp(context));
}
public static boolean isTabQueueEnabled(SharedPreferences prefs) {
return prefs.getBoolean(GeckoPreferences.PREFS_TAB_QUEUE, false);
}
}
}