narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

always show conversations with pending subscription requests

Browse source
This commit is contained in:
Daniel Gultsch 2015-12-09 12:18:06 +01:00
parent 5e151c7311
commit 5bd70cfee8
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/eu/siacs/conversations/parser/PresenceParser.java
View file

@ -200,10 +200,12 @@ public class PresenceParser extends AbstractParser implements
mPresenceGenerator.sendPresenceUpdatesTo(contact)); mPresenceGenerator.sendPresenceUpdatesTo(contact));
} else { } else {
contact.setOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST); contact.setOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST);
final Conversation conversation = mXmppConnectionService.findOrCreateConversation(
account, contact.getJid().toBareJid(), false);
final String statusMessage = packet.findChildContent("status"); final String statusMessage = packet.findChildContent("status");
if (statusMessage != null && !statusMessage.isEmpty()) { if (statusMessage != null
final Conversation conversation = mXmppConnectionService.findOrCreateConversation( && !statusMessage.isEmpty()
account, contact.getJid().toBareJid(), false); && conversation.countMessages() == 0) {
conversation.add(new Message( conversation.add(new Message(
conversation, conversation,
statusMessage, statusMessage,