From 3aac9f082bfa15864abb8d4e9f2b997a1adaf5b6 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 6 Mar 2013 16:31:03 -0800
Subject: [PATCH] Kill featured lists

---
 .../actfm/sync/ActFmSyncV2Provider.java       | 32 -------------------
 .../actfm/sync/AstridNewSyncMigrator.java     | 10 ++++++
 astrid/res/values/keys.xml                    |  3 --
 astrid/res/xml/preferences.xml                |  4 ---
 .../astrid/activity/DefaultFilterMode.java    |  6 +---
 .../astrid/activity/EditPreferences.java      | 10 +-----
 .../todoroo/astrid/ui/MainMenuPopover.java    |  7 ----
 .../utility/AstridDefaultPreferenceSpec.java  |  1 -
 .../utility/AstridLitePreferenceSpec.java     |  1 -
 .../astrid/utility/AstridPreferences.java     | 13 +-------
 10 files changed, 13 insertions(+), 74 deletions(-)

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 b2658609d..8f38be6ac 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
@@ -6,9 +6,7 @@
 package com.todoroo.astrid.actfm.sync;
 
 import java.io.IOException;
-import java.util.concurrent.atomic.AtomicInteger;
 
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import com.timsu.astrid.GCMIntentService;
@@ -73,8 +71,6 @@ public class ActFmSyncV2Provider extends SyncV2Provider {
         return actFmPreferenceService.isLoggedIn();
     }
 
-    private static final String LAST_FEATURED_TAG_FETCH_TIME = "actfm_last_featuredTag"; //$NON-NLS-1$
-
     // --- synchronize active tasks
 
     @Override
@@ -84,13 +80,9 @@ public class ActFmSyncV2Provider extends SyncV2Provider {
         new Thread(new Runnable() {
             public void run() {
 
-                final AtomicInteger finisher = new AtomicInteger(1);
-
                 updateUserStatus();
 
                 ActFmSyncThread.getInstance().setTimeForBackgroundSync(true);
-
-                startFeaturedListFetcher(finisher);
             }
         }).start();
     }
@@ -129,30 +121,6 @@ public class ActFmSyncV2Provider extends SyncV2Provider {
         }
     }
 
-    /** fetch changes to tags */
-    private void startFeaturedListFetcher(final AtomicInteger finisher) {
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                int time = Preferences.getInt(LAST_FEATURED_TAG_FETCH_TIME, 0);
-                try {
-                    if (Preferences.getBoolean(R.string.p_show_featured_lists, false)) {
-                        time = actFmSyncService.fetchFeaturedLists(time);
-                        Preferences.setInt(LAST_FEATURED_TAG_FETCH_TIME, time);
-                    }
-                } catch (JSONException e) {
-                    handler.handleException("actfm-sync", e, e.toString()); //$NON-NLS-1$
-                } catch (IOException e) {
-                    handler.handleException("actfm-sync", e, e.toString()); //$NON-NLS-1$
-                } finally {
-                    if(finisher.decrementAndGet() == 0) {
-                        finishSync(null);
-                    }
-                }
-            }
-        }).start();
-    }
-
     // --- synchronize list
     @Override
     public void synchronizeList(Object list, final boolean manual,
diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/AstridNewSyncMigrator.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/AstridNewSyncMigrator.java
index 5f42d48d1..8fe916556 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/AstridNewSyncMigrator.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/AstridNewSyncMigrator.java
@@ -402,6 +402,16 @@ public class AstridNewSyncMigrator {
             Log.e(LOG_TAG, "Error validating task to tag metadata", e);
         }
 
+        // --------------
+        // Delete all featured list data
+        // --------------
+        try {
+            tagDataDao.deleteWhere(Functions.bitwiseAnd(TagData.FLAGS, TagData.FLAG_FEATURED).gt(0));
+        } catch (Exception e) {
+            Log.e(LOG_TAG, "Error deleting featured list data", e);
+        }
+
+
         // --------------
         // Finally, create oustanding entries for tags on unsynced tasks
         // --------------
diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index 164f6e133..b426a2a19 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -64,8 +64,6 @@
   <!-- force tablets to use phone layout -->
   <string name="p_force_phone_layout">force_phone_layout</string>
   
-  <!-- show featured lists -->
-  
   <!-- account status section key -->
   <string name="p_account">account</string>
 
@@ -90,7 +88,6 @@
   <string name="p_menu_items">p_menu_items</string>
   <string name="p_show_menu_search">p_show_menu_search</string>
   <string name="p_show_menu_friends">p_show_menu_friends</string>
-  <string name="p_show_featured_lists">p_show_featured_lists_labs</string>
   <string name="p_show_menu_sync">p_show_menu_sync</string>
   <string name="p_show_menu_sort">p_show_menu_sort</string>
   <string name="p_show_menu_addons">p_show_menu_addons</string>
diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml
index 5a2007cd3..79f11accb 100644
--- a/astrid/res/xml/preferences.xml
+++ b/astrid/res/xml/preferences.xml
@@ -104,10 +104,6 @@
 	                android:key="@string/p_show_menu_friends"
 	                android:title="@string/TLA_menu_friends"
 	                android:defaultValue="true"/>
-	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	                android:key="@string/p_show_featured_lists"
-	                android:title="@string/EPr_show_featured_lists"
-	                android:defaultValue="true"/>
 	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
 	                android:key="@string/p_show_menu_sync"
 	                android:title="@string/TLA_menu_sync"
diff --git a/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java b/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java
index 83f9a3341..d0588cd0e 100644
--- a/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java
+++ b/astrid/src/com/todoroo/astrid/activity/DefaultFilterMode.java
@@ -3,7 +3,6 @@ package com.todoroo.astrid.activity;
 import android.content.Context;
 
 import com.timsu.astrid.R;
-import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.api.Filter;
 import com.todoroo.astrid.api.FilterListItem;
 import com.todoroo.astrid.core.CoreFilterExposer;
@@ -13,10 +12,7 @@ public class DefaultFilterMode implements FilterModeSpec {
 
     @Override
     public int[] getForbiddenMenuItems() {
-        if (Preferences.getBoolean(R.string.p_show_featured_lists, false))
-            return new int[0];
-        else
-            return new int[] { MainMenuPopover.MAIN_MENU_ITEM_FEATURED_LISTS };
+        return new int[] { MainMenuPopover.MAIN_MENU_ITEM_FEATURED_LISTS };
     }
 
     @Override
diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
index 2d86e1861..8d645e1df 100644
--- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
@@ -600,14 +600,6 @@ public class EditPreferences extends TodorooPreferenceActivity {
                     return super.onPreferenceChange(p, newValue);
                 }
              });
-        } 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) {
-                    StatisticsService.reportEvent(StatisticsConstants.PREF_SHOW_FEATURED_LISTS, "enabled", newValue.toString()); //$NON-NLS-1$
-                    return super.onPreferenceChange(p, newValue);
-                }
-            });
         }
         else if (r.getString(R.string.p_voiceInputEnabled).equals(preference.getKey())) {
             if (value != null && !(Boolean)value)
@@ -673,7 +665,7 @@ public class EditPreferences extends TodorooPreferenceActivity {
         findPreference(getString(R.string.p_config_lite)).setOnPreferenceClickListener(
                 new SetDefaultsClickListener(new AstridLitePreferenceSpec(), R.string.EPr_config_lite, StatisticsConstants.PREFS_RESET_LITE));
 
-        int[] menuPrefs = { R.string.p_show_menu_search, R.string.p_show_menu_friends, R.string.p_show_featured_lists,
+        int[] menuPrefs = { R.string.p_show_menu_search, R.string.p_show_menu_friends,
                 R.string.p_show_menu_sync, R.string.p_show_menu_sort, R.string.p_show_menu_addons
         };
         for (int key : menuPrefs) {
diff --git a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
index 148d89dab..3407400cd 100644
--- a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
+++ b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
@@ -22,7 +22,6 @@ 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;
 
@@ -122,12 +121,6 @@ public class MainMenuPopover extends FragmentPopover implements InterceptTouchLi
                     ThemeService.getDrawable(R.drawable.icn_menu_friends, themeFlags),
                     MAIN_MENU_ITEM_FRIENDS, null, topFixed);
 
-        if (Preferences.getBoolean(FeaturedListFilterExposer.PREF_SHOULD_SHOW_FEATURED_LISTS, false)
-                && Preferences.getBoolean(R.string.p_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);
-
         addMenuItem(R.string.TLA_menu_settings,
                 ThemeService.getDrawable(R.drawable.icn_menu_settings, themeFlags),
                 MAIN_MENU_ITEM_SETTINGS, null, bottomFixed); // Settings item
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
index 91f13f18e..c9ce57005 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
@@ -109,7 +109,6 @@ public class AstridDefaultPreferenceSpec extends AstridPreferenceSpec {
 
         setPreference(prefs, editor, r, R.string.p_show_menu_search, true, ifUnset);
         setPreference(prefs, editor, r, R.string.p_show_menu_friends, true, ifUnset);
-        setPreference(prefs, editor, r, R.string.p_show_featured_lists, true, ifUnset);
         setPreference(prefs, editor, r, R.string.p_show_menu_sync, true, ifUnset);
         setPreference(prefs, editor, r, R.string.p_show_menu_sort, true, ifUnset);
         setPreference(prefs, editor, r, R.string.p_show_menu_addons, true, ifUnset);
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
index ab2e5edda..b01b7a376 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
@@ -108,7 +108,6 @@ public class AstridLitePreferenceSpec extends AstridPreferenceSpec {
 
         setPreference(prefs, editor, r, R.string.p_show_menu_search, false, ifUnset);
         setPreference(prefs, editor, r, R.string.p_show_menu_friends, false, ifUnset);
-        setPreference(prefs, editor, r, R.string.p_show_featured_lists, false, ifUnset);
         setPreference(prefs, editor, r, R.string.p_show_menu_sync, false, ifUnset);
         setPreference(prefs, editor, r, R.string.p_show_menu_sort, true, ifUnset);
         setPreference(prefs, editor, r, R.string.p_show_menu_addons, false, ifUnset);
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
index 99402c1df..c8a33541c 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
@@ -12,13 +12,11 @@ import android.content.SharedPreferences;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.ContextManager;
-import com.todoroo.andlib.sql.Functions;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.core.PluginServices;
-import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.data.User;
 import com.todoroo.astrid.service.UpgradeService;
 import com.todoroo.astrid.tags.reusable.FeaturedListFilterExposer;
@@ -93,16 +91,7 @@ public class AstridPreferences {
     }
 
     private static void setShowFeaturedLists() {
-        // Show featured lists if necessary
-        boolean showFeaturedLists = false;
-        TodorooCursor<TagData> featLists = PluginServices.getTagDataService().query(Query.select(TagData.ID)
-                .where(Functions.bitwiseAnd(TagData.FLAGS, TagData.FLAG_FEATURED).gt(0)).limit(1));
-        try {
-            showFeaturedLists = featLists.getCount() > 0;
-        } finally {
-            featLists.close();
-        }
-        Preferences.setBoolean(FeaturedListFilterExposer.PREF_SHOULD_SHOW_FEATURED_LISTS, showFeaturedLists);
+        Preferences.setBoolean(FeaturedListFilterExposer.PREF_SHOULD_SHOW_FEATURED_LISTS, false);
     }
 
     /* ======================================================================