am 6bbfd941: Fix unread notifications

Merge commit '6bbfd941885c588cc5d94e345d2cfc4197134a19' into froyo-plus-aosp

* commit '6bbfd941885c588cc5d94e345d2cfc4197134a19':
  Fix unread notifications

1 files changed, 3 insertions, 3 deletions

diff --git a/src/com/android/mms/data/Conversation.java b/src/com/android/mms/data/Conversation.java
index 968244e9..aa248e0c 100644
--- a/src/com/android/mms/data/Conversation.java
+++ b/src/com/android/mms/data/Conversation.java
@@ -46,7 +46,7 @@ public class Conversation {
         Threads.READ
     };
 
-    private static final String UNREAD_SELECTION = "read=0 OR seen=0";
+    private static final String UNREAD_SELECTION = "(read=0 OR seen=0)";
 
     private static final String[] SEEN_PROJECTION = new String[] {
         "seen"
@@ -616,7 +616,7 @@ public class Conversation {
         }
         // Fill in as much of the conversation as we can before doing the slow stuff of looking
         // up the contacts associated with this conversation.
-        String recipientIds = c.getString(RECIPIENT_IDS);       
+        String recipientIds = c.getString(RECIPIENT_IDS);
         ContactList recipients = ContactList.getByIds(recipientIds, allowQuery);
         synchronized (conv) {
             conv.mRecipients = recipients;
@@ -922,7 +922,7 @@ public class Conversation {
         try {
             if (c.moveToFirst()) {
                 fillFromCursor(mContext, this, c, allowQuery);
-                
+
                 if (threadId != mThreadId) {
                     LogTag.error("loadFromThreadId: fillFromCursor returned differnt thread_id!" +
                             " threadId=" + threadId + ", mThreadId=" + mThreadId);