From 7b6671d2844fb43f9b9a047c220fd3174c943547 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Thu, 22 Aug 2013 16:54:54 -0500
Subject: [PATCH] Remove social encouragement menu item

---
 .../com/todoroo/astrid/reminders/ReminderDialog.java      | 6 ------
 .../com/todoroo/astrid/reminders/ReminderPreferences.java | 8 --------
 astrid/res/values/keys.xml                                | 3 ---
 astrid/res/xml/preferences_reminders.xml                  | 5 -----
 .../astrid/utility/AstridDefaultPreferenceSpec.java       | 1 -
 .../todoroo/astrid/utility/AstridLitePreferenceSpec.java  | 1 -
 6 files changed, 24 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDialog.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDialog.java
index a40eb9612..ad10a76fa 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDialog.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDialog.java
@@ -162,12 +162,6 @@ public class ReminderDialog extends Dialog {
     private void setupSpeechBubble(Activity activity, long taskId) {
         ((TextView) findViewById(R.id.reminder_message)).setText(
                 Notifications.getRandomReminder(activity.getResources().getStringArray(R.array.reminder_responses)));
-
-        if (Preferences.getBoolean(R.string.p_rmd_social, true)) {
-            Task task = new Task();
-            task.setId(taskId);
-            addFacesToReminder(activity, task);
-        }
     }
 
     private void addFacesToReminder(Activity activity, Task task) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java
index 691a2cf12..02a528831 100644
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java
@@ -107,14 +107,6 @@ public class ReminderPreferences extends TodorooPreferenceActivity {
             } else {
                 preference.setSummary(R.string.rmd_EPr_enabled_desc_false);
             }
-        } else if (r.getString(R.string.p_rmd_social).equals(preference.getKey())) {
-            if ((Boolean)value) {
-                preference.setSummary(R.string.rmd_EPr_social_summary_enabled);
-            } else {
-                preference.setSummary(R.string.rmd_EPr_social_summary_disabled);
-            }
         }
-
     }
-
 }
diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index 5e32fc7f3..7a075d635 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -48,9 +48,6 @@
   <!-- default random reminder setting (in hours) -->
   <string name="p_rmd_default_random_hours">notif_default_reminder</string>
 
-  <!-- show faces in reminders (aka social reminders) -->
-  <string name="p_rmd_social">p_rmd_social</string>
-
   <!-- field missed calls preference -->
   <string name="p_field_missed_calls">field_missed_calls</string>
   
diff --git a/astrid/res/xml/preferences_reminders.xml b/astrid/res/xml/preferences_reminders.xml
index 4f024a70f..302c9e805 100644
--- a/astrid/res/xml/preferences_reminders.xml
+++ b/astrid/res/xml/preferences_reminders.xml
@@ -23,11 +23,6 @@
         android:entries="@array/EPr_rmd_time"
         android:entryValues="@array/EPr_rmd_time_values"
         android:title="@string/rmd_EPr_rmd_time_title"/>
-    <com.todoroo.astrid.ui.MultilineCheckboxPreference
-        android:key="@string/p_rmd_social"
-        android:title="@string/rmd_EPr_social_title"
-        android:summary="@string/rmd_EPr_social_summary_enabled"
-        android:defaultValue="true"/>
     <com.todoroo.astrid.ui.MultilineCheckboxPreference
         android:key="@string/p_rmd_persistent"
         android:title="@string/rmd_EPr_persistent_title"/>
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
index 33dc4e8b9..f3c674154 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
@@ -115,7 +115,6 @@ public class AstridDefaultPreferenceSpec extends AstridPreferenceSpec {
         setPreference(prefs, editor, r, R.string.p_use_filters, false, ifUnset);
 
         setPreference(prefs, editor, r, R.string.p_show_list_members, true, ifUnset);
-        setPreference(prefs, editor, r, R.string.p_rmd_social, true, ifUnset);
 
         setPreference(prefs, editor, r, R.string.p_theme, ThemeService.THEME_WHITE, ifUnset);
 
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
index 88db5f91e..52d4998c8 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
@@ -92,7 +92,6 @@ public class AstridLitePreferenceSpec extends AstridPreferenceSpec {
         setPreference(prefs, editor, r, R.string.p_use_filters, false, ifUnset);
 
         setPreference(prefs, editor, r, R.string.p_show_list_members, false, ifUnset);
-        setPreference(prefs, editor, r, R.string.p_rmd_social, true, ifUnset);
 
         setPreference(prefs, editor, r, R.string.p_theme, ThemeService.THEME_WHITE_ALT, ifUnset);