wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1199859 - Use local switchboard. r=mfinkle

Browse Source
This commit is contained in:
Chenxia Liu 2015-09-16 09:43:38 -07:00
parent 8722fc159d
commit 5f9d002d7d
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mobile/android/base/BrowserApp.java
View File

@ -741,17 +741,12 @@ public class BrowserApp extends GeckoApp
// Looks at the server if there are changes in the server URL that should be used in the future
Log.d(LOGTAG, "update server urls from remote");
SwitchBoard.updateConfigServerUrl(this);
new AsyncConfigLoader(this, AsyncConfigLoader.UPDATE_SERVER).execute();
// Loads the actual config. This can be done on app start or on app onResume() depending
// how often you want to update the config.
Log.d(LOGTAG, "update app config");
// TODO: Make this NON-SYNCHRONOUS
SwitchBoard.loadConfig(this);
final AsyncConfigLoader loader = new AsyncConfigLoader(this, AsyncConfigLoader.CONFIG_SERVER);
loader.execute();
new AsyncConfigLoader(this, AsyncConfigLoader.CONFIG_SERVER).execute();
}
mBrowserChrome = (ViewGroup) findViewById(R.id.browser_chrome);

17
mobile/android/base/firstrun/FirstrunPagerConfig.java
View File

@ -20,9 +20,9 @@ public class FirstrunPagerConfig {
public static List<FirstrunPanelConfig> getDefault(Context context) {
final List<FirstrunPanelConfig> panels = new LinkedList<>();
if (isBucket(ONBOARDING_A, context)) {
if (isInExperimentLocal(context, ONBOARDING_A)) {
panels.add(new FirstrunPanelConfig(WelcomePanel.class.getName(), WelcomePanel.TITLE_RES));
} else if (isBucket(ONBOARDING_B, context)) {
} else if (isInExperimentLocal(context, ONBOARDING_B)) {
// Strings used for first run, pulled from existing strings.
panels.add(new FirstrunPanelConfig(ImportPanel.class.getName(), ImportPanel.TITLE_RES));
panels.add(new FirstrunPanelConfig(SyncPanel.class.getName(), SyncPanel.TITLE_RES));
@ -35,14 +35,15 @@ public class FirstrunPagerConfig {
}
/*
* Wrapper method for determining what Firstrun version to use.
* Wrapper method for using local bucketing rather than server-side.
* This needs to match the server-side bucketing used on mozilla-switchboard.herokuapp.com.
*/
private static boolean isBucket(String name, Context context) {
private static boolean isInExperimentLocal(Context context, String name) {
if (AppConstants.MOZ_SWITCHBOARD) {
if (ONBOARDING_A.equals(name)) {
return SwitchBoard.isInExperiment(context, name);
} else if (ONBOARDING_B.equals(name)) {
return SwitchBoard.isInExperiment(context, name);
if (SwitchBoard.isInBucket(context, 0, 50)) {
return ONBOARDING_A.equals(name);
} else if (SwitchBoard.isInBucket(context, 50, 100)) {
return ONBOARDING_B.equals(name);
}
}
return false;