diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-12-09 12:18:06 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-12-09 12:18:06 +0100 |
| commit | 5bd70cfee8d3a71cce5bfb0a1a3e3330091333a6 (patch) | |
| tree | 2a78baca08925d20b169dd5ea45f96b7ef03d32a /src/main | |
| parent | 5e151c7311bed98ce7eafa041735484c32bd7dda (diff) | |
always show conversations with pending subscription requests
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/parser/PresenceParser.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java index d9806dfc7..d27182c19 100644 --- a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java +++ b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java @@ -200,10 +200,12 @@ public class PresenceParser extends AbstractParser implements mPresenceGenerator.sendPresenceUpdatesTo(contact)); } else { contact.setOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST); + final Conversation conversation = mXmppConnectionService.findOrCreateConversation( + account, contact.getJid().toBareJid(), false); final String statusMessage = packet.findChildContent("status"); - if (statusMessage != null && !statusMessage.isEmpty()) { - final Conversation conversation = mXmppConnectionService.findOrCreateConversation( - account, contact.getJid().toBareJid(), false); + if (statusMessage != null + && !statusMessage.isEmpty() + && conversation.countMessages() == 0) { conversation.add(new Message( conversation, statusMessage, |