diff options
Diffstat (limited to 'src/eu/siacs')
5 files changed, 24 insertions, 25 deletions
diff --git a/src/eu/siacs/conversations/xmpp/XmppConnection.java b/src/eu/siacs/conversations/xmpp/XmppConnection.java index 114f0c2f..1ca7cd8b 100644 --- a/src/eu/siacs/conversations/xmpp/XmppConnection.java +++ b/src/eu/siacs/conversations/xmpp/XmppConnection.java @@ -74,6 +74,7 @@ public class XmppConnection implements Runnable { private List<String> discoItems = new ArrayList<String>(); private String streamId = null; + private int smVersion = 3; private int stanzasReceived = 0; private int stanzasSent = 0; @@ -241,13 +242,13 @@ public class XmppConnection implements Runnable { Element enabled = tagReader.readElement(nextTag); if ("true".equals(enabled.getAttribute("resume"))) { this.streamId = enabled.getAttribute("id"); - Log.d(LOGTAG,account.getJid()+": stream managment enabled (resumable)"); + Log.d(LOGTAG,account.getJid()+": stream managment("+smVersion+") enabled (resumable)"); } else { - Log.d(LOGTAG,account.getJid()+": stream managment enabled"); + Log.d(LOGTAG,account.getJid()+": stream managment("+smVersion+") enabled"); } this.lastSessionStarted = SystemClock.elapsedRealtime(); this.stanzasReceived = 0; - RequestPacket r = new RequestPacket(); + RequestPacket r = new RequestPacket(smVersion); tagWriter.writeStanzaAsync(r); } else if (nextTag.isStart("resumed")) { tagReader.readElement(nextTag); @@ -256,7 +257,7 @@ public class XmppConnection implements Runnable { Log.d(LOGTAG,account.getJid()+": session resumed"); } else if (nextTag.isStart("r")) { tagReader.readElement(nextTag); - AckPacket ack = new AckPacket(this.stanzasReceived); + AckPacket ack = new AckPacket(this.stanzasReceived,smVersion); //Log.d(LOGTAG,ack.toString()); tagWriter.writeStanzaAsync(ack); } else if (nextTag.isStart("a")) { @@ -531,8 +532,8 @@ public class XmppConnection implements Runnable { } else if (mechanisms.contains("DIGEST-MD5")) { sendSaslAuthDigestMd5(); } - } else if (this.streamFeatures.hasChild("sm") && streamId != null) { - ResumePacket resume = new ResumePacket(this.streamId,stanzasReceived); + } else if (this.streamFeatures.hasChild("sm","urn:xmpp:sm:"+smVersion) && streamId != null) { + ResumePacket resume = new ResumePacket(this.streamId,stanzasReceived,smVersion); this.tagWriter.writeStanzaAsync(resume); } else if (this.streamFeatures.hasChild("bind") && shouldBind) { sendBindRequest(); @@ -633,9 +634,13 @@ public class XmppConnection implements Runnable { String resource = packet.findChild("bind").findChild("jid") .getContent().split("/")[1]; account.setResource(resource); - if (streamFeatures.hasChild("sm")) { - String xmlns = streamFeatures.findChild("sm").getAttribute("xmlns"); - EnablePacket enable = new EnablePacket(xmlns); + if (streamFeatures.hasChild("sm","urn:xmpp:sm:3")) { + smVersion = 3; + EnablePacket enable = new EnablePacket(smVersion); + tagWriter.writeStanzaAsync(enable); + } else if (streamFeatures.hasChild("sm","urn:xmpp:sm:2")) { + smVersion = 2; + EnablePacket enable = new EnablePacket(smVersion); tagWriter.writeStanzaAsync(enable); } sendInitialPresence(); @@ -765,7 +770,7 @@ public class XmppConnection implements Runnable { public void sendPing() { if (streamFeatures.hasChild("sm")) { - tagWriter.writeStanzaAsync(new RequestPacket()); + tagWriter.writeStanzaAsync(new RequestPacket(smVersion)); } else { IqPacket iq = new IqPacket(IqPacket.TYPE_GET); iq.setFrom(account.getFullJid()); @@ -849,7 +854,7 @@ public class XmppConnection implements Runnable { } public void r() { - this.tagWriter.writeStanzaAsync(new RequestPacket()); + this.tagWriter.writeStanzaAsync(new RequestPacket(smVersion)); } public int getReceivedStanzas() { diff --git a/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java b/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java index 7bc66e9b..6fe3ea2b 100644 --- a/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java +++ b/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java @@ -4,9 +4,9 @@ import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; public class AckPacket extends AbstractStanza { - public AckPacket(int sequence) { + public AckPacket(int sequence, int smVersion) { super("a"); - this.setAttribute("xmlns","urn:xmpp:sm:3"); + this.setAttribute("xmlns","urn:xmpp:sm:"+smVersion); this.setAttribute("h", ""+sequence); } diff --git a/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java b/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java index f6a0adb2..0ca7a4fd 100644 --- a/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java +++ b/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java @@ -4,15 +4,9 @@ import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; public class EnablePacket extends AbstractStanza { - public EnablePacket() { + public EnablePacket(int smVersion) { super("enable"); - this.setAttribute("xmlns","urn:xmpp:sm:3"); - this.setAttribute("resume", "true"); - } - - public EnablePacket(String xmlns) { - super("enable"); - this.setAttribute("xmlns",xmlns); + this.setAttribute("xmlns","urn:xmpp:sm:"+smVersion); this.setAttribute("resume", "true"); } diff --git a/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java b/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java index 4d409fd2..d42ae9b0 100644 --- a/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java +++ b/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java @@ -4,9 +4,9 @@ import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; public class RequestPacket extends AbstractStanza { - public RequestPacket() { + public RequestPacket(int smVersion) { super("r"); - this.setAttribute("xmlns","urn:xmpp:sm:3"); + this.setAttribute("xmlns","urn:xmpp:sm:"+smVersion); } } diff --git a/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java b/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java index bebfa1a2..dcf32101 100644 --- a/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java +++ b/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java @@ -4,9 +4,9 @@ import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; public class ResumePacket extends AbstractStanza { - public ResumePacket(String id, int sequence) { + public ResumePacket(String id, int sequence, int smVersion) { super("resume"); - this.setAttribute("xmlns","urn:xmpp:sm:3"); + this.setAttribute("xmlns","urn:xmpp:sm:"+smVersion); this.setAttribute("previd", id); this.setAttribute("h", ""+sequence); } |