diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-03-19 18:47:33 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-03-19 18:47:33 +0100 |
| commit | 382bcc4cb54e30023a04411754fa5c7f3a559e8a (patch) | |
| tree | f2a053ca33700f8641abe826335cc5c0513c373e /src/main/java/eu/siacs/conversations/services | |
| parent | a13c59fa1b3a05b72b0c98147d251d2003b099a8 (diff) | |
| parent | 1c600fefcf9cba751bc8bc0f151cc03e28d9c4b9 (diff) | |
Merge pull request #1042 from BrianBlade/FIXES_muc-dlrs_muc-lastseen
add delivery receipts for private muc msgs & enable update last-seen for muc-msgs
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index 188f1eb9..ca182867 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -2041,7 +2041,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa return null; } for (Conversation conversation : getConversations()) { - if (conversation.getJid().equals(recipient) && conversation.getAccount() == account) { + if (conversation.getJid().toBareJid().equals(recipient) && conversation.getAccount() == account) { final Message message = conversation.findSentMessageWithUuid(uuid); if (message != null) { markMessage(message, status); |