implement client support for muc push
Staying connected to a MUC room hosted on a remote server can be challenging. If a server reboots it will usually send a shut down notification to all participants. However even if a client knows that a server was shut down it doesn’t know when it comes up again. In some corner cases that shut down notification might not even be delivered successfully leaving the client in a state where it thinks it is connected but it really isn’t. The possible work around implemented in this commit is to register the clients full JID (user@domain.tld/Conversations.r4nd) as an App Server according to XEP-0357 with the room. (Conversations checks for the push:0 namespace on the room.) After cycling through a reboot the first message send to a room will trigger pubsub notifications to each registered full JID. This event will be used to trigger a XEP-0410 ping and if necessary a subsequent rejoin of the MUC. If the resource has become unavailable during down time of the MUC server the user’s server will respond with an IQ error which in turn leads to the MUC server disabling that push target. Leaving a MUC will send a `disable` command. If sending that disable command failed for some reason (network outage) and the client receives a pubsub notification for a room it is no longer joined in it will respond with an item-not-found IQ error which also disables subsequent pushes from the server. Note: We 0410-ping before a join to avoid unnecessary full joins which can be quite costly. Further client side optimazations will also surpress pings when a ping is already in flight to further save traffic.
This commit is contained in:
Daniel Gultsch
parent
b6d059ed89
commit
e467fe341e
|
|
@ -17,6 +17,7 @@ import eu.siacs.conversations.services.AvatarService;
|
|||
import eu.siacs.conversations.services.MessageArchiveService;
|
||||
import eu.siacs.conversations.utils.JidHelper;
|
||||
import eu.siacs.conversations.utils.UIHelper;
|
||||
import eu.siacs.conversations.xml.Namespace;
|
||||
import eu.siacs.conversations.xmpp.chatstate.ChatState;
|
||||
import eu.siacs.conversations.xmpp.forms.Data;
|
||||
import eu.siacs.conversations.xmpp.forms.Field;
|
||||
|
|
@ -113,6 +114,10 @@ public class MucOptions {
|
|||
return MessageArchiveService.Version.has(getFeatures());
|
||||
}
|
||||
|
||||
public boolean push() {
|
||||
return getFeatures().contains(Namespace.PUSH);
|
||||
}
|
||||
|
||||
public boolean updateConfiguration(ServiceDiscoveryResult serviceDiscoveryResult) {
|
||||
this.serviceDiscoveryResult = serviceDiscoveryResult;
|
||||
String name;
|
||||
|
|
|
|||
|
|
@ -436,16 +436,26 @@ public class IqGenerator extends AbstractGenerator {
|
|||
return packet;
|
||||
}
|
||||
|
||||
public IqPacket enablePush(Jid jid, String node, String secret) {
|
||||
public IqPacket enablePush(final Jid jid, final String node, final String secret) {
|
||||
IqPacket packet = new IqPacket(IqPacket.TYPE.SET);
|
||||
Element enable = packet.addChild("enable", "urn:xmpp:push:0");
|
||||
Element enable = packet.addChild("enable", Namespace.PUSH);
|
||||
enable.setAttribute("jid", jid.toString());
|
||||
enable.setAttribute("node", node);
|
||||
if (secret != null) {
|
||||
Data data = new Data();
|
||||
data.setFormType(Namespace.PUBSUB_PUBLISH_OPTIONS);
|
||||
data.put("secret", secret);
|
||||
data.submit();
|
||||
enable.addChild(data);
|
||||
}
|
||||
return packet;
|
||||
}
|
||||
|
||||
public IqPacket disablePush(final Jid jid, final String node) {
|
||||
IqPacket packet = new IqPacket(IqPacket.TYPE.SET);
|
||||
Element disable = packet.addChild("disable", Namespace.PUSH);
|
||||
disable.setAttribute("jid", jid.toString());
|
||||
disable.setAttribute("node", node);
|
||||
return packet;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ import eu.siacs.conversations.Config;
|
|||
import eu.siacs.conversations.crypto.axolotl.AxolotlService;
|
||||
import eu.siacs.conversations.entities.Account;
|
||||
import eu.siacs.conversations.entities.Contact;
|
||||
import eu.siacs.conversations.entities.Conversation;
|
||||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
import eu.siacs.conversations.xml.Namespace;
|
||||
import eu.siacs.conversations.xml.Element;
|
||||
|
|
@ -71,7 +72,7 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
|
|||
}
|
||||
boolean both = contact.getOption(Contact.Options.TO) && contact.getOption(Contact.Options.FROM);
|
||||
if ((both != bothPre) && both) {
|
||||
Log.d(Config.LOGTAG,account.getJid().asBareJid()+": gained mutual presence subscription with "+contact.getJid());
|
||||
Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": gained mutual presence subscription with " + contact.getJid());
|
||||
AxolotlService axolotlService = account.getAxolotlService();
|
||||
if (axolotlService != null) {
|
||||
axolotlService.clearErrorsInFetchStatusMap(contact.getJid());
|
||||
|
|
@ -124,7 +125,7 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
|
|||
Integer id = Integer.valueOf(device.getAttribute("id"));
|
||||
deviceIds.add(id);
|
||||
} catch (NumberFormatException e) {
|
||||
Log.e(Config.LOGTAG, AxolotlService.LOGPREFIX+" : "+"Encountered invalid <device> node in PEP ("+e.getMessage()+"):" + device.toString()+ ", skipping...");
|
||||
Log.e(Config.LOGTAG, AxolotlService.LOGPREFIX + " : " + "Encountered invalid <device> node in PEP (" + e.getMessage() + "):" + device.toString() + ", skipping...");
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
|
@ -135,7 +136,7 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
|
|||
|
||||
public Integer signedPreKeyId(final Element bundle) {
|
||||
final Element signedPreKeyPublic = bundle.findChild("signedPreKeyPublic");
|
||||
if(signedPreKeyPublic == null) {
|
||||
if (signedPreKeyPublic == null) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
|
|
@ -148,26 +149,26 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
|
|||
public ECPublicKey signedPreKeyPublic(final Element bundle) {
|
||||
ECPublicKey publicKey = null;
|
||||
final Element signedPreKeyPublic = bundle.findChild("signedPreKeyPublic");
|
||||
if(signedPreKeyPublic == null) {
|
||||
if (signedPreKeyPublic == null) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
publicKey = Curve.decodePoint(Base64.decode(signedPreKeyPublic.getContent(),Base64.DEFAULT), 0);
|
||||
publicKey = Curve.decodePoint(Base64.decode(signedPreKeyPublic.getContent(), Base64.DEFAULT), 0);
|
||||
} catch (Throwable e) {
|
||||
Log.e(Config.LOGTAG, AxolotlService.LOGPREFIX+" : "+"Invalid signedPreKeyPublic in PEP: " + e.getMessage());
|
||||
Log.e(Config.LOGTAG, AxolotlService.LOGPREFIX + " : " + "Invalid signedPreKeyPublic in PEP: " + e.getMessage());
|
||||
}
|
||||
return publicKey;
|
||||
}
|
||||
|
||||
public byte[] signedPreKeySignature(final Element bundle) {
|
||||
final Element signedPreKeySignature = bundle.findChild("signedPreKeySignature");
|
||||
if(signedPreKeySignature == null) {
|
||||
if (signedPreKeySignature == null) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
return Base64.decode(signedPreKeySignature.getContent(), Base64.DEFAULT);
|
||||
} catch (Throwable e) {
|
||||
Log.e(Config.LOGTAG,AxolotlService.LOGPREFIX+" : Invalid base64 in signedPreKeySignature");
|
||||
Log.e(Config.LOGTAG, AxolotlService.LOGPREFIX + " : Invalid base64 in signedPreKeySignature");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
@ -175,13 +176,13 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
|
|||
public IdentityKey identityKey(final Element bundle) {
|
||||
IdentityKey identityKey = null;
|
||||
final Element identityKeyElement = bundle.findChild("identityKey");
|
||||
if(identityKeyElement == null) {
|
||||
if (identityKeyElement == null) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
identityKey = new IdentityKey(Base64.decode(identityKeyElement.getContent(), Base64.DEFAULT), 0);
|
||||
} catch (Throwable e) {
|
||||
Log.e(Config.LOGTAG,AxolotlService.LOGPREFIX+" : "+"Invalid identityKey in PEP: "+e.getMessage());
|
||||
Log.e(Config.LOGTAG, AxolotlService.LOGPREFIX + " : " + "Invalid identityKey in PEP: " + e.getMessage());
|
||||
}
|
||||
return identityKey;
|
||||
}
|
||||
|
|
@ -190,21 +191,21 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
|
|||
Map<Integer, ECPublicKey> preKeyRecords = new HashMap<>();
|
||||
Element item = getItem(packet);
|
||||
if (item == null) {
|
||||
Log.d(Config.LOGTAG, AxolotlService.LOGPREFIX+" : "+"Couldn't find <item> in bundle IQ packet: " + packet);
|
||||
Log.d(Config.LOGTAG, AxolotlService.LOGPREFIX + " : " + "Couldn't find <item> in bundle IQ packet: " + packet);
|
||||
return null;
|
||||
}
|
||||
final Element bundleElement = item.findChild("bundle");
|
||||
if(bundleElement == null) {
|
||||
if (bundleElement == null) {
|
||||
return null;
|
||||
}
|
||||
final Element prekeysElement = bundleElement.findChild("prekeys");
|
||||
if(prekeysElement == null) {
|
||||
Log.d(Config.LOGTAG, AxolotlService.LOGPREFIX+" : "+"Couldn't find <prekeys> in bundle IQ packet: " + packet);
|
||||
if (prekeysElement == null) {
|
||||
Log.d(Config.LOGTAG, AxolotlService.LOGPREFIX + " : " + "Couldn't find <prekeys> in bundle IQ packet: " + packet);
|
||||
return null;
|
||||
}
|
||||
for(Element preKeyPublicElement : prekeysElement.getChildren()) {
|
||||
if(!preKeyPublicElement.getName().equals("preKeyPublic")){
|
||||
Log.d(Config.LOGTAG, AxolotlService.LOGPREFIX+" : "+"Encountered unexpected tag in prekeys list: " + preKeyPublicElement);
|
||||
for (Element preKeyPublicElement : prekeysElement.getChildren()) {
|
||||
if (!preKeyPublicElement.getName().equals("preKeyPublic")) {
|
||||
Log.d(Config.LOGTAG, AxolotlService.LOGPREFIX + " : " + "Encountered unexpected tag in prekeys list: " + preKeyPublicElement);
|
||||
continue;
|
||||
}
|
||||
Integer preKeyId = null;
|
||||
|
|
@ -213,17 +214,17 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
|
|||
final ECPublicKey preKeyPublic = Curve.decodePoint(Base64.decode(preKeyPublicElement.getContent(), Base64.DEFAULT), 0);
|
||||
preKeyRecords.put(preKeyId, preKeyPublic);
|
||||
} catch (NumberFormatException e) {
|
||||
Log.e(Config.LOGTAG, AxolotlService.LOGPREFIX+" : "+"could not parse preKeyId from preKey "+preKeyPublicElement.toString());
|
||||
Log.e(Config.LOGTAG, AxolotlService.LOGPREFIX + " : " + "could not parse preKeyId from preKey " + preKeyPublicElement.toString());
|
||||
} catch (Throwable e) {
|
||||
Log.e(Config.LOGTAG, AxolotlService.LOGPREFIX+" : "+"Invalid preKeyPublic (ID="+preKeyId+") in PEP: "+ e.getMessage()+", skipping...");
|
||||
Log.e(Config.LOGTAG, AxolotlService.LOGPREFIX + " : " + "Invalid preKeyPublic (ID=" + preKeyId + ") in PEP: " + e.getMessage() + ", skipping...");
|
||||
}
|
||||
}
|
||||
return preKeyRecords;
|
||||
}
|
||||
|
||||
public Pair<X509Certificate[],byte[]> verification(final IqPacket packet) {
|
||||
public Pair<X509Certificate[], byte[]> verification(final IqPacket packet) {
|
||||
Element item = getItem(packet);
|
||||
Element verification = item != null ? item.findChild("verification",AxolotlService.PEP_PREFIX) : null;
|
||||
Element verification = item != null ? item.findChild("verification", AxolotlService.PEP_PREFIX) : null;
|
||||
Element chain = verification != null ? verification.findChild("chain") : null;
|
||||
Element signature = verification != null ? verification.findChild("signature") : null;
|
||||
if (chain != null && signature != null) {
|
||||
|
|
@ -232,11 +233,11 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
|
|||
try {
|
||||
CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509");
|
||||
int i = 0;
|
||||
for(Element cert : certElements) {
|
||||
certificates[i] = (X509Certificate) certificateFactory.generateCertificate(new ByteArrayInputStream(Base64.decode(cert.getContent(),Base64.DEFAULT)));
|
||||
for (Element cert : certElements) {
|
||||
certificates[i] = (X509Certificate) certificateFactory.generateCertificate(new ByteArrayInputStream(Base64.decode(cert.getContent(), Base64.DEFAULT)));
|
||||
++i;
|
||||
}
|
||||
return new Pair<>(certificates,Base64.decode(signature.getContent(),Base64.DEFAULT));
|
||||
return new Pair<>(certificates, Base64.decode(signature.getContent(), Base64.DEFAULT));
|
||||
} catch (CertificateException e) {
|
||||
return null;
|
||||
}
|
||||
|
|
@ -247,18 +248,18 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
|
|||
|
||||
public PreKeyBundle bundle(final IqPacket bundle) {
|
||||
Element bundleItem = getItem(bundle);
|
||||
if(bundleItem == null) {
|
||||
if (bundleItem == null) {
|
||||
return null;
|
||||
}
|
||||
final Element bundleElement = bundleItem.findChild("bundle");
|
||||
if(bundleElement == null) {
|
||||
if (bundleElement == null) {
|
||||
return null;
|
||||
}
|
||||
ECPublicKey signedPreKeyPublic = signedPreKeyPublic(bundleElement);
|
||||
Integer signedPreKeyId = signedPreKeyId(bundleElement);
|
||||
byte[] signedPreKeySignature = signedPreKeySignature(bundleElement);
|
||||
IdentityKey identityKey = identityKey(bundleElement);
|
||||
if(signedPreKeyId == null || signedPreKeyPublic == null || identityKey == null) {
|
||||
if (signedPreKeyId == null || signedPreKeyPublic == null || identityKey == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
|
@ -269,7 +270,7 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
|
|||
public List<PreKeyBundle> preKeys(final IqPacket preKeys) {
|
||||
List<PreKeyBundle> bundles = new ArrayList<>();
|
||||
Map<Integer, ECPublicKey> preKeyPublics = preKeyPublics(preKeys);
|
||||
if ( preKeyPublics != null) {
|
||||
if (preKeyPublics != null) {
|
||||
for (Integer preKeyId : preKeyPublics.keySet()) {
|
||||
ECPublicKey preKeyPublic = preKeyPublics.get(preKeyId);
|
||||
bundles.add(new PreKeyBundle(0, 0, preKeyId, preKeyPublic,
|
||||
|
|
@ -321,8 +322,8 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
|
|||
account.getBlocklist().addAll(jids);
|
||||
if (packet.getType() == IqPacket.TYPE.SET) {
|
||||
boolean removed = false;
|
||||
for(Jid jid : jids) {
|
||||
removed |= mXmppConnectionService.removeBlockedConversations(account,jid);
|
||||
for (Jid jid : jids) {
|
||||
removed |= mXmppConnectionService.removeBlockedConversations(account, jid);
|
||||
}
|
||||
if (removed) {
|
||||
mXmppConnectionService.updateConversationUi();
|
||||
|
|
@ -359,35 +360,58 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
|
|||
mXmppConnectionService.sendIqPacket(account, response, null);
|
||||
} else if (packet.hasChild("open", "http://jabber.org/protocol/ibb")
|
||||
|| packet.hasChild("data", "http://jabber.org/protocol/ibb")
|
||||
|| packet.hasChild("close","http://jabber.org/protocol/ibb")) {
|
||||
|| packet.hasChild("close", "http://jabber.org/protocol/ibb")) {
|
||||
mXmppConnectionService.getJingleConnectionManager()
|
||||
.deliverIbbPacket(account, packet);
|
||||
} else if (packet.hasChild("query", "http://jabber.org/protocol/disco#info")) {
|
||||
final IqPacket response = mXmppConnectionService.getIqGenerator().discoResponse(account, packet);
|
||||
mXmppConnectionService.sendIqPacket(account, response, null);
|
||||
} else if (packet.hasChild("query","jabber:iq:version") && isGet) {
|
||||
} else if (packet.hasChild("query", "jabber:iq:version") && isGet) {
|
||||
final IqPacket response = mXmppConnectionService.getIqGenerator().versionResponse(packet);
|
||||
mXmppConnectionService.sendIqPacket(account,response,null);
|
||||
mXmppConnectionService.sendIqPacket(account, response, null);
|
||||
} else if (packet.hasChild("ping", "urn:xmpp:ping") && isGet) {
|
||||
final IqPacket response = packet.generateResponse(IqPacket.TYPE.RESULT);
|
||||
mXmppConnectionService.sendIqPacket(account, response, null);
|
||||
} else if (packet.hasChild("time","urn:xmpp:time") && isGet) {
|
||||
} else if (packet.hasChild("time", "urn:xmpp:time") && isGet) {
|
||||
final IqPacket response;
|
||||
if (mXmppConnectionService.useTorToConnect() || account.isOnion()) {
|
||||
response = packet.generateResponse(IqPacket.TYPE.ERROR);
|
||||
final Element error = response.addChild("error");
|
||||
error.setAttribute("type","cancel");
|
||||
error.addChild("not-allowed","urn:ietf:params:xml:ns:xmpp-stanzas");
|
||||
error.setAttribute("type", "cancel");
|
||||
error.addChild("not-allowed", "urn:ietf:params:xml:ns:xmpp-stanzas");
|
||||
} else {
|
||||
response = mXmppConnectionService.getIqGenerator().entityTimeResponse(packet);
|
||||
}
|
||||
mXmppConnectionService.sendIqPacket(account,response, null);
|
||||
mXmppConnectionService.sendIqPacket(account, response, null);
|
||||
} else if (packet.hasChild("pubsub", Namespace.PUBSUB) && packet.getType() == IqPacket.TYPE.SET) {
|
||||
final Jid server = packet.getFrom();
|
||||
final Element pubsub = packet.findChild("pubsub", Namespace.PUBSUB);
|
||||
final Element publish = pubsub == null ? null : pubsub.findChild("publish");
|
||||
final String node = publish == null ? null : publish.getAttribute("node");
|
||||
final Element item = publish == null ? null : publish.findChild("item");
|
||||
final Element notification = item == null ? null : item.findChild("notification", Namespace.PUSH);
|
||||
if (notification != null && node != null && server != null) {
|
||||
final Conversation conversation = mXmppConnectionService.findConversationByUuid(node);
|
||||
if (conversation != null && conversation.getAccount() == account && conversation.getJid().getDomain().equals(server.getDomain())) {
|
||||
Log.d(Config.LOGTAG,account.getJid().asBareJid()+": received muc push event for "+conversation.getJid().asBareJid());
|
||||
mXmppConnectionService.sendIqPacket(account, packet.generateResponse(IqPacket.TYPE.RESULT), null);
|
||||
mXmppConnectionService.mucSelfPingAndRejoin(conversation);
|
||||
} else {
|
||||
Log.d(Config.LOGTAG,account.getJid().asBareJid()+": received push event for unknown conference from "+server);
|
||||
final IqPacket response = packet.generateResponse(IqPacket.TYPE.ERROR);
|
||||
final Element error = response.addChild("error");
|
||||
error.setAttribute("type", "cancel");
|
||||
error.addChild("item-not-found", "urn:ietf:params:xml:ns:xmpp-stanzas");
|
||||
mXmppConnectionService.sendIqPacket(account, response, null);
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
if (packet.getType() == IqPacket.TYPE.GET || packet.getType() == IqPacket.TYPE.SET) {
|
||||
final IqPacket response = packet.generateResponse(IqPacket.TYPE.ERROR);
|
||||
final Element error = response.addChild("error");
|
||||
error.setAttribute("type", "cancel");
|
||||
error.addChild("feature-not-implemented","urn:ietf:params:xml:ns:xmpp-stanzas");
|
||||
error.addChild("feature-not-implemented", "urn:ietf:params:xml:ns:xmpp-stanzas");
|
||||
account.getXmppConnection().sendIqPacket(response, null);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2536,6 +2536,9 @@ public class XmppConnectionService extends Service {
|
|||
if (followedInvite && conversation.getBookmark() == null) {
|
||||
saveConversationAsBookmark(conversation, null);
|
||||
}
|
||||
}
|
||||
if (mucOptions.push()) {
|
||||
enableMucPush(conversation);
|
||||
}
|
||||
synchronized (account.inProgressConferenceJoins) {
|
||||
account.inProgressConferenceJoins.remove(conversation);
|
||||
|
|
@ -2580,6 +2583,35 @@ public class XmppConnectionService extends Service {
|
|||
}
|
||||
}
|
||||
|
||||
private void enableMucPush(final Conversation conversation) {
|
||||
final Account account = conversation.getAccount();
|
||||
final Jid room = conversation.getJid().asBareJid();
|
||||
final IqPacket enable = mIqGenerator.enablePush(conversation.getAccount().getJid(), conversation.getUuid(), null);
|
||||
enable.setTo(room);
|
||||
sendIqPacket(account, enable, (a, response) -> {
|
||||
if (response.getType() == IqPacket.TYPE.RESULT) {
|
||||
Log.d(Config.LOGTAG,a.getJid().asBareJid()+": enabled push for muc "+room);
|
||||
} else if (response.getType() == IqPacket.TYPE.ERROR) {
|
||||
Log.d(Config.LOGTAG,a.getJid().asBareJid()+": unable to enable push for muc "+room+" "+response.getError());
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
private void disableMucPush(final Conversation conversation) {
|
||||
final Account account = conversation.getAccount();
|
||||
final Jid room = conversation.getJid().asBareJid();
|
||||
final IqPacket disable = mIqGenerator.disablePush(conversation.getAccount().getJid(), conversation.getUuid());
|
||||
disable.setTo(room);
|
||||
sendIqPacket(account, disable, (a, response) -> {
|
||||
if (response.getType() == IqPacket.TYPE.RESULT) {
|
||||
Log.d(Config.LOGTAG,a.getJid().asBareJid()+": disabled push for muc "+room);
|
||||
} else if (response.getType() == IqPacket.TYPE.ERROR) {
|
||||
Log.d(Config.LOGTAG,a.getJid().asBareJid()+": unable to disable push for muc "+room+" "+response.getError());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void fetchConferenceMembers(final Conversation conversation) {
|
||||
final Account account = conversation.getAccount();
|
||||
final AxolotlService axolotlService = account.getAxolotlService();
|
||||
|
|
@ -2759,6 +2791,9 @@ public class XmppConnectionService extends Service {
|
|||
account.pendingConferenceJoins.remove(conversation);
|
||||
account.pendingConferenceLeaves.remove(conversation);
|
||||
if (account.getStatus() == Account.State.ONLINE || now) {
|
||||
if (conversation.getMucOptions().push()) {
|
||||
disableMucPush(conversation);
|
||||
}
|
||||
sendPresencePacket(conversation.getAccount(), mPresenceGenerator.leave(conversation.getMucOptions()));
|
||||
conversation.getMucOptions().setOffline();
|
||||
Bookmark bookmark = conversation.getBookmark();
|
||||
|
|
|
|||
|
|
@ -28,4 +28,5 @@ public final class Namespace {
|
|||
public static final String JINGLE_TRANSPORTS_S5B = "urn:xmpp:jingle:transports:s5b:1";
|
||||
public static final String JINGLE_TRANSPORTS_IBB = "urn:xmpp:jingle:transports:ibb:1";
|
||||
public static final String PING = "urn:xmpp:ping";
|
||||
public static final String PUSH = "urn:xmpp:push:0";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1819,8 +1819,8 @@ public class XmppConnection implements Runnable {
|
|||
}
|
||||
|
||||
public boolean push() {
|
||||
return hasDiscoFeature(account.getJid().asBareJid(), "urn:xmpp:push:0")
|
||||
|| hasDiscoFeature(Jid.of(account.getServer()), "urn:xmpp:push:0");
|
||||
return hasDiscoFeature(account.getJid().asBareJid(), Namespace.PUSH)
|
||||
|| hasDiscoFeature(Jid.of(account.getServer()), Namespace.PUSH);
|
||||
}
|
||||
|
||||
public boolean rosterVersioning() {
|
||||
|
|
|
|||
Loading…
Reference in New Issue