From 696bf298db5ea7c36c61e42303e46a8ca1f07ccf Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Mon, 22 Oct 2012 16:36:20 -0700
Subject: [PATCH] Refactored featured list preference code to be easier to
 read, introduce an ab test for the presence of featured lists

---
 .../com/todoroo/astrid/actfm/sync/ActFmSyncService.java    | 3 ++-
 .../com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java | 2 +-
 .../astrid/tags/reusable/FeaturedListFilterExposer.java    | 2 ++
 astrid/res/values/keys.xml                                 | 5 +----
 astrid/res/xml/preferences.xml                             | 2 +-
 .../src/com/todoroo/astrid/activity/DefaultFilterMode.java | 2 +-
 .../src/com/todoroo/astrid/activity/EditPreferences.java   | 2 +-
 .../src/com/todoroo/astrid/service/abtesting/ABTests.java  | 7 ++++++-
 astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java      | 3 ++-
 .../src/com/todoroo/astrid/utility/AstridPreferences.java  | 6 +++++-
 10 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
index 4890aadcd..eb5d63b33 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java
@@ -77,6 +77,7 @@ import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.service.abtesting.ABTestEventReportingService;
 import com.todoroo.astrid.sync.SyncV2Provider.SyncExceptionHandler;
 import com.todoroo.astrid.tags.TagService;
+import com.todoroo.astrid.tags.reusable.FeaturedListFilterExposer;
 import com.todoroo.astrid.utility.Flags;
 
 /**
@@ -859,7 +860,7 @@ public final class ActFmSyncService {
                 "token", token, "modified_after", serverTime);
         JSONArray featuredLists = result.getJSONArray("list");
         if (featuredLists.length() > 0)
-            Preferences.setBoolean(R.string.p_show_featured_lists, true);
+            Preferences.setBoolean(FeaturedListFilterExposer.PREF_SHOULD_SHOW_FEATURED_LISTS, true);
 
         for (int i = 0; i < featuredLists.length(); i++) {
             JSONObject featObject = featuredLists.getJSONObject(i);
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
index 97404f99d..6fa1d3265 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
@@ -295,7 +295,7 @@ public class ActFmSyncV2Provider extends SyncV2Provider {
             public void run() {
                 int time = Preferences.getInt(LAST_FEATURED_TAG_FETCH_TIME, 0);
                 try {
-                    if (Preferences.getBoolean(R.string.p_show_featured_lists_labs, false)) {
+                    if (Preferences.getBoolean(R.string.p_show_featured_lists, false)) {
                         time = actFmSyncService.fetchFeaturedLists(time);
                         Preferences.setInt(LAST_FEATURED_TAG_FETCH_TIME, time);
                     }
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterExposer.java
index bedd759bc..a3f5b8160 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/reusable/FeaturedListFilterExposer.java
@@ -31,6 +31,8 @@ import com.todoroo.astrid.tags.TagService.Tag;
 
 public class FeaturedListFilterExposer extends TagFilterExposer {
 
+    public static final String PREF_SHOULD_SHOW_FEATURED_LISTS = "show_featured_lists"; //$NON-NLS-1$
+
     @Override
     public void onReceive(Context context, Intent intent) {
         addUntaggedFilter = false;
diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index 33896e9e6..052077d29 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -54,9 +54,6 @@
   
   <!-- show friends view preference -->
   <string name="p_show_friends_view">show_friends_view</string>
-  
-  <!-- show featured lists preference -->
-  <string name="p_show_featured_lists">show_featured_lists</string>
 
   <!-- enable third party addons preference -->
   <string name="p_third_party_addons">third_party_addons</string>
@@ -68,7 +65,7 @@
   <string name="p_force_phone_layout">force_phone_layout</string>
   
   <!-- show featured lists -->
-  <string name="p_show_featured_lists_labs">show_featured_lists_labs</string>
+  <string name="p_show_featured_lists">show_featured_lists_labs</string>
   
   <!-- account status section key -->
   <string name="p_account">account</string>
diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml
index c29c03aaf..deef94323 100644
--- a/astrid/res/xml/preferences.xml
+++ b/astrid/res/xml/preferences.xml
@@ -90,7 +90,7 @@
         
         <CheckBoxPreference
 	        android:title="@string/EPr_show_featured_lists"
-	        android:key="@string/p_show_featured_lists_labs"
+	        android:key="@string/p_show_featured_lists"
 	        android:defaultValue="false"/>
         
         <CheckBoxPreference
diff --git a/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java b/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java
index 05d9b3812..83f9a3341 100644
--- a/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java
+++ b/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java
@@ -13,7 +13,7 @@ public class DefaultFilterMode implements FilterModeSpec {
 
     @Override
     public int[] getForbiddenMenuItems() {
-        if (Preferences.getBoolean(R.string.p_show_featured_lists_labs, false))
+        if (Preferences.getBoolean(R.string.p_show_featured_lists, false))
             return new int[0];
         else
             return new int[] { MainMenuPopover.MAIN_MENU_ITEM_FEATURED_LISTS };
diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
index 0a55b6185..735e50249 100644
--- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
@@ -574,7 +574,7 @@ public class EditPreferences extends TodorooPreferenceActivity {
                     return super.onPreferenceChange(p, newValue);
                 }
              });
-        } else if (r.getString(R.string.p_show_featured_lists_labs).equals(preference.getKey())) {
+        } else if (r.getString(R.string.p_show_featured_lists).equals(preference.getKey())) {
             preference.setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(SyncProviderPreferences.RESULT_CODE_SYNCHRONIZE) {
                 @Override
                 public boolean onPreferenceChange(Preference p, Object newValue) {
diff --git a/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java b/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java
index 2a1aa3272..9b2a3c559 100644
--- a/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java
+++ b/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java
@@ -123,10 +123,15 @@ public class ABTests {
 
     public static final String AB_CALENDAR_REMINDERS = "android_cal_reminders";  //$NON-NLS-1$
 
+    public static final String AB_FEATURED_LISTS = "android_featured_lists"; //$NON-NLS-1$
+
     private void initialize() {
 
+        addTest(AB_FEATURED_LISTS, new int[] { 1, 1 },
+                new int[] { 1, 1 }, new String[] { "featured-lists-disabled", "featured-lists-enabled" }); //$NON-NLS-1$ //$NON-NLS-2$
+
         addTest(AB_SIMPLE_TASK_ROW, new int[] { 1, 1 },
-                new int[] { 1, 0 }, new String[] { "original-row-style", "simple-row-style" });//$NON-NLS-1$ //$NON-NLS-2$
+                new int[] { 1, 0 }, new String[] { "original-row-style", "simple-row-style" }); //$NON-NLS-1$ //$NON-NLS-2$
 
         addTest(AB_CALENDAR_REMINDERS, new int[] { 0, 1 },
                 new int[] { 0, 1 }, new String[] { "no-cal-reminders", "show-cal-reminders" }); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
index 091a645f5..a91579e95 100644
--- a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
+++ b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
@@ -22,6 +22,7 @@ import android.widget.TextView;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.service.ThemeService;
+import com.todoroo.astrid.tags.reusable.FeaturedListFilterExposer;
 import com.todoroo.astrid.ui.TouchInterceptingFrameLayout.InterceptTouchListener;
 import com.todoroo.astrid.utility.AstridPreferences;
 
@@ -120,7 +121,7 @@ public class MainMenuPopover extends FragmentPopover implements InterceptTouchLi
                     ThemeService.getDrawable(R.drawable.icn_menu_friends, themeFlags),
                     MAIN_MENU_ITEM_FRIENDS, null, topFixed);
 
-        if (Preferences.getBoolean(R.string.p_show_featured_lists, false))
+        if (Preferences.getBoolean(FeaturedListFilterExposer.PREF_SHOULD_SHOW_FEATURED_LISTS, false))
             addMenuItem(R.string.TLA_menu_featured_lists,
                     ThemeService.getDrawable(R.drawable.icn_featured_lists, themeFlags),
                     MAIN_MENU_ITEM_FEATURED_LISTS, null, topFixed);
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
index 65b6e8c4b..032111ecf 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
@@ -25,6 +25,7 @@ import com.todoroo.astrid.data.User;
 import com.todoroo.astrid.service.ThemeService;
 import com.todoroo.astrid.service.abtesting.ABChooser;
 import com.todoroo.astrid.service.abtesting.ABTests;
+import com.todoroo.astrid.tags.reusable.FeaturedListFilterExposer;
 
 public class AstridPreferences {
 
@@ -71,6 +72,9 @@ public class AstridPreferences {
 
         Preferences.setIfUnset(prefs, editor, r, R.string.p_ideas_tab_enabled, true);
 
+        Preferences.setIfUnset(prefs, editor, r, R.string.p_show_featured_lists,
+                ABChooser.readChoiceForTest(ABTests.AB_FEATURED_LISTS) != 0);
+
         Preferences.setIfUnset(prefs, editor, r, R.string.p_taskRowStyle,
                 ABChooser.readChoiceForTest(ABTests.AB_SIMPLE_TASK_ROW) != 0);
 
@@ -114,7 +118,7 @@ public class AstridPreferences {
         } finally {
             featLists.close();
         }
-        Preferences.setBoolean(R.string.p_show_featured_lists, showFeaturedLists);
+        Preferences.setBoolean(FeaturedListFilterExposer.PREF_SHOULD_SHOW_FEATURED_LISTS, showFeaturedLists);
     }
 
     /* ======================================================================