diff options
author | Christian S <christian@pix-art.de> | 2016-05-04 21:39:59 +0200 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2016-05-04 21:39:59 +0200 |
commit | 7f82dca8612ded6f9091e8a122b678f21f912eaa (patch) | |
tree | 1ba2322e9e5a2b548eb840ffe33bad80439b0230 /src/main/java/eu/siacs/conversations/xmpp | |
parent | fe60bd582aee184b49d1af14357cb88ad2637c3e (diff) | |
parent | c27663c4566762d06ff1ed1c98ed943c01a172f4 (diff) |
Merge remote-tracking branch 'refs/remotes/siacs/master' into HEAD
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp')
-rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | 2 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java | 4 |
2 files changed, 3 insertions, 3 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() diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java index beed92fa5..c9ee6bdc2 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java @@ -266,7 +266,7 @@ public class JingleConnection implements Transferable { @Override public void established() { Log.d(Config.LOGTAG, - "succesfully connected to our own primary candidate"); + "successfully connected to our own primary candidate"); mergeCandidate(candidate); sendInitRequest(); } @@ -594,7 +594,7 @@ public class JingleConnection implements Transferable { this.connect(); } else { Log.d(Config.LOGTAG, - "ignoring because file is already in transmission or we havent sent our candidate yet"); + "ignoring because file is already in transmission or we haven't sent our candidate yet"); } return true; } else { |