From 74203d1c2ce450a5954ef2a35554c729aa636914 Mon Sep 17 00:00:00 2001
From: Arne Jans <arne.jans@gmail.com>
Date: Wed, 11 May 2011 16:02:59 +0200
Subject: [PATCH] Fix for 13186759, note-ordering and pref-setting show all
 notes. couldnt reproduce disappearing notes.

---
 .../com/todoroo/astrid/notes/NoteViewingActivity.java        | 3 ++-
 .../com/todoroo/astrid/notes/NotesDetailExposer.java         | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/NoteViewingActivity.java b/astrid/plugin-src/com/todoroo/astrid/notes/NoteViewingActivity.java
index 0607b7880..81ac29b3d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/NoteViewingActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/NoteViewingActivity.java
@@ -15,6 +15,7 @@ import android.widget.TextView;
 
 import com.timsu.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
+import com.todoroo.andlib.sql.Order;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.astrid.core.PluginServices;
 import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria;
@@ -56,7 +57,7 @@ public class NoteViewingActivity extends Activity {
         TodorooCursor<Metadata> cursor = PluginServices.getMetadataService().query(
                 Query.select(Metadata.PROPERTIES).where(
                         MetadataCriteria.byTaskAndwithKey(task.getId(),
-                                NoteMetadata.METADATA_KEY)));
+                                NoteMetadata.METADATA_KEY)).orderBy(Order.desc(Metadata.CREATION_DATE)));
         Metadata metadata = new Metadata();
         try {
             for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java
index c339f3162..f16fd6efb 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java
@@ -11,6 +11,7 @@ import android.text.TextUtils;
 
 import com.timsu.astrid.R;
 import com.todoroo.andlib.data.TodorooCursor;
+import com.todoroo.andlib.sql.Order;
 import com.todoroo.andlib.sql.Query;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.api.AstridApiConstants;
@@ -51,7 +52,7 @@ public class NotesDetailExposer extends BroadcastReceiver {
         if(!Preferences.getBoolean(R.string.p_showNotes, false))
             return null;
 
-        Task task = PluginServices.getTaskService().fetchById(id, Task.NOTES);
+        Task task = PluginServices.getTaskService().fetchById(id, Task.ID, Task.NOTES);
         if(task == null)
             return null;
 
@@ -64,7 +65,7 @@ public class NotesDetailExposer extends BroadcastReceiver {
         TodorooCursor<Metadata> cursor = PluginServices.getMetadataService().query(
                 Query.select(Metadata.PROPERTIES).where(
                         MetadataCriteria.byTaskAndwithKey(task.getId(),
-                                NoteMetadata.METADATA_KEY)));
+                                NoteMetadata.METADATA_KEY)).orderBy(Order.asc(Metadata.CREATION_DATE)));
         Metadata metadata = new Metadata();
         try {
             for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {