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

special treatment for presence errors known to be mucs

Browse source
This commit is contained in:
Daniel Gultsch 2018-08-28 15:04:55 +02:00
parent 320eb46515
commit cbea85c4dd
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -353,6 +353,8 @@ public class PresenceParser extends AbstractParser implements
this.parseConferencePresence(packet, account); this.parseConferencePresence(packet, account);
} else if (packet.hasChild("x", "http://jabber.org/protocol/muc")) { } else if (packet.hasChild("x", "http://jabber.org/protocol/muc")) {
this.parseConferencePresence(packet, account); this.parseConferencePresence(packet, account);
} else if ("error".equals(packet.getAttribute("type")) && mXmppConnectionService.isMuc(account, packet.getFrom())) {
this.parseConferencePresence(packet, account);
} else { } else {
this.parseContactPresence(packet, account); this.parseContactPresence(packet, account);
} }

5
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -547,6 +547,11 @@ public class XmppConnectionService extends Service {
return find(getConversations(), account, jid); return find(getConversations(), account, jid);
} }
public boolean isMuc(final Account account, final Jid jid) {
final Conversation c = find(account, jid);
return c != null && c.getMode() == Conversational.MODE_MULTI;
}
public void search(List<String> term, OnSearchResultsAvailable onSearchResultsAvailable) { public void search(List<String> term, OnSearchResultsAvailable onSearchResultsAvailable) {
MessageSearchTask.search(this, term, onSearchResultsAvailable); MessageSearchTask.search(this, term, onSearchResultsAvailable);
} }