diff options
| author | Christian S <christian@pix-art.de> | 2016-05-04 22:03:52 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-05-04 22:03:52 +0200 |
| commit | e840a51629bd6de238168c5fc9013a2bf50ed1f7 (patch) | |
| tree | 0740154bae719dc91b5446b5f9ef88602ad72ad9 /src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | |
| parent | 6a5563cc14e3595c65282c217e264cd717dd657b (diff) | |
| parent | 222d70d5e7219ab0206cca192952748fcd17bdbf (diff) | |
Merge branch 'refs/heads/news' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | 2 |
1 files changed, 1 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 602aee53a..f48acfe7b 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java @@ -498,7 +498,7 @@ public class XmppConnection implements Runnable { if ("true".equals(enabled.getAttribute("resume"))) { this.streamId = enabled.getAttribute("id"); Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() - + ": stream managment(" + smVersion + + ": stream management(" + smVersion + ") enabled (resumable)"); } else { Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() |