From 79c554fcc72a9202539f633180214f606014bd5e Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Sun, 5 May 2013 13:14:23 -0700
Subject: [PATCH] Fixed group in-thread notifications

---
 src/org/thoughtcrime/securesms/database/MmsDatabase.java | 6 +++---
 src/org/thoughtcrime/securesms/database/SmsDatabase.java | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/database/MmsDatabase.java b/src/org/thoughtcrime/securesms/database/MmsDatabase.java
index 3aa2924307..9614ccae6d 100644
--- a/src/org/thoughtcrime/securesms/database/MmsDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/MmsDatabase.java
@@ -352,12 +352,12 @@ public class MmsDatabase extends Database implements MmsSmsColumns {
 
     long messageId = insertMediaMessage(masterSecret, retrieved, contentValues);
 
-    notifyConversationListeners(threadId);
-    DatabaseFactory.getThreadDatabase(context).update(threadId);
     DatabaseFactory.getThreadDatabase(context).setUnread(threadId);
+    DatabaseFactory.getThreadDatabase(context).update(threadId);
+    notifyConversationListeners(threadId);
     Trimmer.trimThread(context, threadId);
 
-    return new Pair<Long, Long>(threadId, messageId);
+    return new Pair<Long, Long>(messageId, threadId);
   }
 
   public Pair<Long, Long> insertMessageInbox(MasterSecret masterSecret, RetrieveConf retrieved,
diff --git a/src/org/thoughtcrime/securesms/database/SmsDatabase.java b/src/org/thoughtcrime/securesms/database/SmsDatabase.java
index f8903e575f..551cb6a091 100644
--- a/src/org/thoughtcrime/securesms/database/SmsDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/SmsDatabase.java
@@ -211,10 +211,10 @@ public class SmsDatabase extends Database implements MmsSmsColumns {
 
     ContentValues values = new ContentValues(6);
     values.put(ADDRESS, message.getSender());
-    values.put(DATE_RECEIVED, Long.valueOf(System.currentTimeMillis()));
+    values.put(DATE_RECEIVED, System.currentTimeMillis());
     values.put(DATE_SENT, message.getSentTimestampMillis());
     values.put(PROTOCOL, message.getProtocol());
-    values.put(READ, Integer.valueOf(0));
+    values.put(READ, 0);
 
     if (!Util.isEmpty(message.getPseudoSubject()))
       values.put(SUBJECT, message.getPseudoSubject());