From a353753ccf2b09bed8dad2275b681dd923167f77 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Thu, 22 Aug 2013 17:29:32 -0500
Subject: [PATCH] Remove social filters, people menu item

---
 .../astrid/actfm/sync/messages/MakeChanges.java      |  1 -
 .../com/todoroo/astrid/core/CoreFilterExposer.java   |  6 ------
 .../com/todoroo/astrid/core/CustomFilterExposer.java |  4 ----
 astrid/res/values/keys.xml                           |  6 ------
 astrid/res/xml/preferences.xml                       | 12 ------------
 .../com/todoroo/astrid/activity/EditPreferences.java |  3 +--
 .../src/com/todoroo/astrid/ui/MainMenuPopover.java   |  6 ------
 .../astrid/utility/AstridDefaultPreferenceSpec.java  |  3 ---
 .../astrid/utility/AstridLitePreferenceSpec.java     |  3 ---
 .../todoroo/astrid/utility/AstridPreferences.java    |  1 -
 10 files changed, 1 insertion(+), 44 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java
index 6c662520a..819308042 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java
@@ -448,7 +448,6 @@ public class MakeChanges<TYPE extends RemoteModel> extends ServerToClientMessage
 
         @Override
         public void performChanges() {
-            Preferences.setBoolean(R.string.p_show_friends_view, true);
         }
     }
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java
index 20d62fff4..c02dd9bdd 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/CoreFilterExposer.java
@@ -68,12 +68,6 @@ public final class CoreFilterExposer extends BroadcastReceiver implements Astrid
             filters.add(getTodayFilter(r));
         }
 
-        if (Preferences.getBoolean(R.string.p_show_waiting_on_me_filter, true) &&
-                PluginServices.getWaitingOnMeDao().count(Query.select(WaitingOnMe.ID).where(Criterion.and(WaitingOnMe.DELETED_AT.eq(0),
-                        Criterion.or(WaitingOnMe.ACKNOWLEDGED.isNull(), WaitingOnMe.ACKNOWLEDGED.neq(1))))) > 0) {
-            filters.add(getWaitingOnMeFilter(r));
-        }
-
         // transmit filter list
         return filters.toArray(new FilterListItem[filters.size()]);
     }
diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java
index 9a632d341..dcd4df910 100644
--- a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterExposer.java
@@ -100,10 +100,6 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr
                 list.add(recent);
             }
 
-            if (Preferences.getBoolean(R.string.p_show_ive_assigned_filter, true)) {
-                list.add(getAssignedByMeFilter(r));
-            }
-
             if (useCustomFilters && cursor != null) {
                 StoreObject savedFilter = new StoreObject();
                 for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index a69759996..02fb22c2e 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -53,9 +53,6 @@
   
   <!-- calendar reminders preference -->
   <string name="p_calendar_reminders">p_calendar_reminder</string>
-  
-  <!-- show friends view preference -->
-  <string name="p_show_friends_view">show_friends_view</string>
 
   <!-- force tablets to use phone layout -->
   <string name="p_force_phone_layout">force_phone_layout</string>
@@ -67,9 +64,7 @@
   <string name="p_filters_to_show">p_filters_to_show</string>
   <string name="p_show_my_tasks_filter">p_show_my_tasks_f</string>
   <string name="p_show_today_filter">p_show_today_f</string>
-  <string name="p_show_waiting_on_me_filter">p_show_waiting_on_me_f</string>
   <string name="p_show_recently_modified_filter">p_show_recently_modified_f</string>
-  <string name="p_show_ive_assigned_filter">p_show_assigned_f</string>
   <string name="p_show_not_in_list_filter">p_show_no_list_f</string>
   
   <!-- show quickadd controls -->
@@ -84,7 +79,6 @@
   <!-- menu items to show -->
   <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_menu_sync">p_show_menu_sync</string>
   <string name="p_show_menu_sort">p_show_menu_sort</string>
   
diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml
index 884591bd4..d9f6af5b6 100644
--- a/astrid/res/xml/preferences.xml
+++ b/astrid/res/xml/preferences.xml
@@ -89,10 +89,6 @@
 	                android:key="@string/p_show_menu_search"
 	                android:title="@string/TLA_menu_search"
 	                android:defaultValue="true" />
-	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	                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_menu_sync"
 	                android:title="@string/TLA_menu_sync"
@@ -118,18 +114,10 @@
 	                android:key="@string/p_show_today_filter"
 	                android:title="@string/today"
 	                android:defaultValue="true"/>
-	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	                android:key="@string/p_show_waiting_on_me_filter"
-	                android:title="@string/BFE_waiting_on_me"
-	                android:defaultValue="true"/>
 	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
 	                android:key="@string/p_show_recently_modified_filter"
 	                android:title="@string/BFE_Recent"
 	                android:defaultValue="true"/>
-	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
-	                android:key="@string/p_show_ive_assigned_filter"
-	                android:title="@string/BFE_Assigned"
-	                android:defaultValue="true"/>
 	            <com.todoroo.astrid.ui.MultilineCheckboxPreference
 	                android:key="@string/p_show_not_in_list_filter"
 	                android:title="@string/tag_FEx_untagged"
diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
index f2c85a18d..5119ea0d3 100644
--- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
@@ -504,8 +504,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_menu_sync, R.string.p_show_menu_sort,
+        int[] menuPrefs = { R.string.p_show_menu_search, R.string.p_show_menu_sync, R.string.p_show_menu_sort,
         };
         for (int key : menuPrefs) {
             findPreference(getString(key)).setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_CODE_PERFORMANCE_PREF_CHANGED));
diff --git a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
index 991f49dc8..57eb55de8 100644
--- a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
+++ b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
@@ -119,12 +119,6 @@ public class MainMenuPopover extends FragmentPopover implements InterceptTouchLi
                 ThemeService.getDrawable(R.drawable.icn_menu_lists, themeFlags),
                 MAIN_MENU_ITEM_LISTS, null, topFixed); // Lists item
 
-        if (Preferences.getBoolean(R.string.p_show_friends_view, false) && Preferences.getBoolean(R.string.p_show_menu_friends, true)) {
-            addMenuItem(R.string.TLA_menu_friends,
-                    ThemeService.getDrawable(R.drawable.icn_menu_friends, themeFlags),
-                    MAIN_MENU_ITEM_FRIENDS, 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 94a552281..4e5707338 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
@@ -99,13 +99,10 @@ public class AstridDefaultPreferenceSpec extends AstridPreferenceSpec {
         setPreference(prefs, editor, r, R.string.p_rmd_persistent, true, ifUnset);
 
         setPreference(prefs, editor, r, R.string.p_show_today_filter, true, ifUnset);
-        setPreference(prefs, editor, r, R.string.p_show_waiting_on_me_filter, true, ifUnset);
         setPreference(prefs, editor, r, R.string.p_show_recently_modified_filter, true, ifUnset);
-        setPreference(prefs, editor, r, R.string.p_show_ive_assigned_filter, true, ifUnset);
         setPreference(prefs, editor, r, R.string.p_show_not_in_list_filter, true, ifUnset);
 
         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_menu_sync, true, ifUnset);
         setPreference(prefs, editor, r, R.string.p_show_menu_sort, true, ifUnset);
 
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
index ccd895a03..83f8bb709 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
@@ -95,13 +95,10 @@ public class AstridLitePreferenceSpec extends AstridPreferenceSpec {
         setPreference(prefs, editor, r, R.string.p_force_phone_layout, true, ifUnset);
 
         setPreference(prefs, editor, r, R.string.p_show_today_filter, true, ifUnset);
-        setPreference(prefs, editor, r, R.string.p_show_waiting_on_me_filter, false, ifUnset);
         setPreference(prefs, editor, r, R.string.p_show_recently_modified_filter, false, ifUnset);
-        setPreference(prefs, editor, r, R.string.p_show_ive_assigned_filter, false, ifUnset);
         setPreference(prefs, editor, r, R.string.p_show_not_in_list_filter, false, ifUnset);
 
         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_menu_sync, false, ifUnset);
         setPreference(prefs, editor, r, R.string.p_show_menu_sort, true, ifUnset);
 
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
index 8da29b855..ad49fb19d 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
@@ -89,7 +89,6 @@ public class AstridPreferences {
         } finally {
             users.close();
         }
-        Preferences.setBoolean(R.string.p_show_friends_view, showFriends);
     }
 
     private static void setShowFeaturedLists() {