diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-06-01 20:35:51 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-06-01 20:35:51 +0200 |
| commit | 05100b0a4de85edc6c49c15cdc050ed7ece2b3d0 (patch) | |
| tree | f702f2a42f7d09a0d2ff20ca7f9f8b65f64643eb /src/main/java/eu/siacs/conversations/xmpp | |
| parent | c41e6004909c10d4d24c7030d584f8e9fdf52d7c (diff) | |
| parent | 20ba1add1eaeb43a522189a85471ac3c4e1a3933 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java index 53da1485c..bd570d82e 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java @@ -937,7 +937,8 @@ public class XmppConnection implements Runnable { if (jid != null && jid.getContent() != null) { try { account.setResource(Jid.fromString(jid.getContent()).getResourcepart()); - if (streamFeatures.hasChild("session")) { + if (streamFeatures.hasChild("session") + && !streamFeatures.findChild("session").hasChild("optional")) { sendStartSession(); } else { sendPostBindInitialization(); @@ -1003,6 +1004,7 @@ public class XmppConnection implements Runnable { } private void sendStartSession() { + Log.d(Config.LOGTAG,account.getJid().toBareJid()+": sending legacy session to outdated server"); final IqPacket startSession = new IqPacket(IqPacket.TYPE.SET); startSession.addChild("session", "urn:ietf:params:xml:ns:xmpp-session"); this.sendUnmodifiedIqPacket(startSession, new OnIqPacketReceived() { |