From b79bc4c23449f1bce7e66ca4bc22bbd758fe2ab2 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Sat, 15 Feb 2014 11:44:47 -0800
Subject: [PATCH] Fix for non-group threading issue.

---
 src/org/thoughtcrime/securesms/service/PushReceiver.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/service/PushReceiver.java b/src/org/thoughtcrime/securesms/service/PushReceiver.java
index 58296e2ef1..a6d0a5bbc4 100644
--- a/src/org/thoughtcrime/securesms/service/PushReceiver.java
+++ b/src/org/thoughtcrime/securesms/service/PushReceiver.java
@@ -148,7 +148,6 @@ public class PushReceiver {
                                      boolean secure)
   {
     try {
-      Log.w("PushReceiver", "Processing: " + new String(message.getBody()));
       PushMessageContent messageContent = PushMessageContent.parseFrom(message.getBody());
 
       if (messageContent.hasGroup()) {
@@ -261,7 +260,9 @@ public class PushReceiver {
                                          boolean secure)
   {
     EncryptingSmsDatabase database    = DatabaseFactory.getEncryptingSmsDatabase(context);
-    IncomingTextMessage   textMessage = new IncomingTextMessage(message, "", messageContent.getGroup());
+    IncomingTextMessage   textMessage = new IncomingTextMessage(message, "",
+                                                                messageContent.hasGroup() ?
+                                                                    messageContent.getGroup() : null);
 
     if (secure) {
       textMessage = new IncomingEncryptedMessage(textMessage, "");