always show conversations with pending subscription requests

Daniel Gultsch created 10 years ago

Change summary

src/main/java/eu/siacs/conversations/parser/PresenceParser.java | 8 +-
1 file changed, 5 insertions(+), 3 deletions(-)

Detailed changes

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,