From 0ba1a689a0af112ed9b38510dd0896147bd058a3 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Thu, 15 Dec 2011 17:11:43 -0800
Subject: [PATCH] Don't show task notes by default

---
 .../com/todoroo/astrid/notes/NotesDecorationExposer.java        | 2 +-
 .../plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java | 2 +-
 astrid/res/xml/preferences.xml                                  | 2 +-
 astrid/src/com/todoroo/astrid/service/UpgradeService.java       | 2 +-
 astrid/src/com/todoroo/astrid/utility/AstridPreferences.java    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/NotesDecorationExposer.java b/astrid/plugin-src/com/todoroo/astrid/notes/NotesDecorationExposer.java
index 2359c6c4f..1c69a60d4 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/NotesDecorationExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/NotesDecorationExposer.java
@@ -24,7 +24,7 @@ public class NotesDecorationExposer implements TaskDecorationExposer {
 
     @Override
     public TaskDecoration expose(Task task) {
-        if(Preferences.getBoolean(R.string.p_showNotes, true))
+        if(Preferences.getBoolean(R.string.p_showNotes, false))
             return null;
         if(task == null || !NotesPlugin.hasNotes(task))
             return null;
diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java
index eeaab2bfc..e216c5713 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java
@@ -51,7 +51,7 @@ public class NotesDetailExposer extends BroadcastReceiver {
 
     @SuppressWarnings("nls")
     public String getTaskDetails(long id) {
-        if(!Preferences.getBoolean(R.string.p_showNotes, true))
+        if(!Preferences.getBoolean(R.string.p_showNotes, false))
             return null;
 
         Task task = PluginServices.getTaskService().fetchById(id, Task.ID, Task.NOTES);
diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml
index ae19119c5..656fc2d26 100644
--- a/astrid/res/xml/preferences.xml
+++ b/astrid/res/xml/preferences.xml
@@ -19,7 +19,7 @@
         <com.todoroo.astrid.ui.MultilineCheckboxPreference
             android:key="@string/p_showNotes"
             android:title="@string/EPr_showNotes_title"
-            android:defaultValue="true" />
+            android:defaultValue="false" />
             
         <com.todoroo.astrid.ui.MultilineListPreference
             android:key="@string/p_theme"
diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
index ecdbec998..4f4515a09 100644
--- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
@@ -131,7 +131,7 @@ public final class UpgradeService {
                     if(from < V3_8_3_1)
                         new TagCaseMigrator().performTagCaseMigration(context);
 
-                    if(from < V3_8_4 && Preferences.getBoolean(R.string.p_showNotes, true))
+                    if(from < V3_8_4 && Preferences.getBoolean(R.string.p_showNotes, false))
                         taskService.clearDetails(Task.NOTES.neq("")); //$NON-NLS-1$
                 } finally {
                     DialogUtilities.dismissDialog((Activity)context, dialog);
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
index f605ff660..d5f8c533b 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
@@ -36,7 +36,7 @@ public class AstridPreferences {
         Preferences.setIfUnset(prefs, editor, r, R.string.p_default_reminders_key, Task.NOTIFY_AT_DEADLINE | Task.NOTIFY_AFTER_DEADLINE);
         Preferences.setIfUnset(prefs, editor, r, R.string.p_rmd_default_random_hours, 0);
         Preferences.setIfUnset(prefs, editor, r, R.string.p_fontSize, 20);
-        Preferences.setIfUnset(prefs, editor, r, R.string.p_showNotes, true);
+        Preferences.setIfUnset(prefs, editor, r, R.string.p_showNotes, false);
 
         editor.commit();
     }