diff --git a/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java b/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java index a852f137d..d0f2dfba3 100644 --- a/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java +++ b/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java @@ -3,8 +3,6 @@ package com.todoroo.astrid.service.abtesting; import java.util.HashMap; import java.util.Set; -import com.todoroo.astrid.utility.Constants; - /** * Helper class to define options with their probabilities and descriptions * @author Sam Bosley @@ -117,17 +115,6 @@ public class ABTests { } private void initialize() { // Set up - addTest(AB_TEST_PRODUCTEEV_ENABLED, new int[] { 1, 1 }, - new int[] { 1, 0 }, new String[] { "producteev-disabled", "producteev-enabled" }); //$NON-NLS-1$ //$NON-NLS-2$ - - boolean allowIdeasTab = Constants.MARKET_STRATEGY.allowIdeasTab(); - int[] noIdeasTab = new int[] { 1, 0 }; - addTest(AB_TEST_IDEAS_TAB, allowIdeasTab ? new int[] { 1, 1 } : noIdeasTab, - allowIdeasTab ? new int[] { 0, 1 } : noIdeasTab, new String[] { "ideas-tab-diabled", "ideas-tab-enabled" }); //$NON-NLS-1$ //$NON-NLS-2$ } - - public static final String AB_TEST_IDEAS_TAB = "ideasTab"; //$NON-NLS-1$ - public static final String AB_TEST_PRODUCTEEV_ENABLED = "producteev"; //$NON-NLS-1$ - } diff --git a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java index 9835be60a..9add885af 100644 --- a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java +++ b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java @@ -14,10 +14,7 @@ import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.data.User; -import com.todoroo.astrid.producteev.ProducteevUtilities; import com.todoroo.astrid.service.ThemeService; -import com.todoroo.astrid.service.abtesting.ABChooser; -import com.todoroo.astrid.service.abtesting.ABTests; public class AstridPreferences { @@ -58,11 +55,8 @@ public class AstridPreferences { Preferences.setIfUnset(prefs, editor, r, R.string.p_use_contact_picker, true); Preferences.setIfUnset(prefs, editor, r, R.string.p_field_missed_calls, true); - boolean thirdPartyAddons = (ABChooser.readChoiceForTest(ABTests.AB_TEST_PRODUCTEEV_ENABLED) == 1) || ProducteevUtilities.INSTANCE.isLoggedIn(); - Preferences.setIfUnset(prefs, editor, r, R.string.p_third_party_addons, thirdPartyAddons); - - boolean showIdeasTab = (ABChooser.readChoiceForTest(ABTests.AB_TEST_IDEAS_TAB) == 1); - Preferences.setIfUnset(prefs, editor, r, R.string.p_ideas_tab_enabled, showIdeasTab); + Preferences.setIfUnset(prefs, editor, r, R.string.p_third_party_addons, false); + Preferences.setIfUnset(prefs, editor, r, R.string.p_ideas_tab_enabled, true); if ("white-blue".equals(Preferences.getStringValue(R.string.p_theme))) { //$NON-NLS-1$ migrate from when white-blue wasn't the default Preferences.setString(R.string.p_theme, ThemeService.THEME_WHITE);