Fix delivery receipts in group messages.

moxie0 · moxie0 · commit baaa3514d494 · 2014-11-12T15:42:43.000-08:00
Fixes signalapp#2056 Fixes signalapp#2067 Fixes signalapp#2087
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) {

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public MediaMmsMessageRecord(Context context, long id, Recipients recipients,`
`55`	`55`	`int partCount, long mailbox)`
`56`	`56`	`{`
`57`	`57`	`super(context, id, body, recipients, individualRecipient, recipientDeviceId,`
`58`		`- dateSent, dateReceived, threadId, deliveredCount, DELIVERY_STATUS_NONE, mailbox);`
	`58`	`+ dateSent, dateReceived, threadId, DELIVERY_STATUS_NONE, deliveredCount, mailbox);`
`59`	`59`
`60`	`60`	`this.context = context.getApplicationContext();`
`61`	`61`	`this.partCount = partCount;`