diff options
author | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-03-21 22:16:39 +0100 |
---|---|---|
committer | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-03-21 22:16:39 +0100 |
commit | df9db8c8b61ae090309933a8dff395e690ff9ba3 (patch) | |
tree | c58a2630c4543fca8aeb191acbfc33c9a999e89f /src/eu/siacs/conversations/entities/Conversation.java | |
parent | f1c8b0e1b8bb16cceb32b12403166775b639f53a (diff) | |
parent | a9e34d34926d7df3fb01143d6733b481c31c292d (diff) |
Merge branch 'development'
Diffstat (limited to 'src/eu/siacs/conversations/entities/Conversation.java')
-rw-r--r-- | src/eu/siacs/conversations/entities/Conversation.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/entities/Conversation.java b/src/eu/siacs/conversations/entities/Conversation.java index b4ec210c..a13d4ea6 100644 --- a/src/eu/siacs/conversations/entities/Conversation.java +++ b/src/eu/siacs/conversations/entities/Conversation.java @@ -219,7 +219,6 @@ public class Conversation extends AbstractEntity { } public void startOtrSession(Context context, String presence) { - Log.d("xmppService", "starting otr session with " + presence); SessionID sessionId = new SessionID(this.getContactJid(), presence, "xmpp"); this.otrSession = new SessionImpl(sessionId, getAccount().getOtrEngine( |