empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix delivery receipts in group messages.

Browse source 
Fixes #2056
Fixes #2067
Fixes #2087
This commit is contained in:
Moxie Marlinspike 2014-11-12 12:28:11 -08:00
parent 71fdaac1b2
commit baaa3514d4
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java
View file

@ -55,7 +55,7 @@ public class MediaMmsMessageRecord extends MessageRecord {
int partCount, long mailbox) int partCount, long mailbox)
{ {
super(context, id, body, recipients, individualRecipient, recipientDeviceId, 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.context = context.getApplicationContext();
this.partCount = partCount; this.partCount = partCount;

4
src/org/thoughtcrime/securesms/sms/MessageSender.java
View file

@ -255,6 +255,10 @@ public class MessageSender {
return false; return false;
} }
if (recipients.isGroupRecipient()) {
return false;
}
String e164number = Util.canonicalizeNumber(context, recipients.getPrimaryRecipient().getNumber()); String e164number = Util.canonicalizeNumber(context, recipients.getPrimaryRecipient().getNumber());
return TextSecurePreferences.getLocalNumber(context).equals(e164number); return TextSecurePreferences.getLocalNumber(context).equals(e164number);
} catch (InvalidNumberException e) { } catch (InvalidNumberException e) {