Fix delivery receipts in group messages.

Fixes #2056 Fixes #2067 Fixes #2087
signalapp · Nov 12, 2014 · baaa351 · baaa351
1 parent 71fdaac
commit baaa351
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java b/src/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java
@@ -55,7 +55,7 @@ public MediaMmsMessageRecord(Context context, long id, Recipients recipients,
                                int partCount, long mailbox)
   {
     super(context, id, body, recipients, individualRecipient, recipientDeviceId,
-          dateSent, dateReceived, threadId, deliveredCount, DELIVERY_STATUS_NONE, mailbox);
+          dateSent, dateReceived, threadId, DELIVERY_STATUS_NONE, deliveredCount, mailbox);
 
     this.context             = context.getApplicationContext();
     this.partCount           = partCount;

diff --git a/src/org/thoughtcrime/securesms/sms/MessageSender.java b/src/org/thoughtcrime/securesms/sms/MessageSender.java
@@ -255,6 +255,10 @@ private static boolean isSelfSend(Context context, Recipients recipients) {
         return false;
       }
 
+      if (recipients.isGroupRecipient()) {
+        return false;
+      }
+
       String e164number = Util.canonicalizeNumber(context, recipients.getPrimaryRecipient().getNumber());
       return TextSecurePreferences.getLocalNumber(context).equals(e164number);
     } catch (InvalidNumberException e) {