diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index 29f9109b4..3f9648d92 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -967,7 +967,6 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl presence, "xmpp"); this.otrSession = new SessionImpl(sessionId, getAccount().getOtrService()); - android.util.Log.e("41fd", "new session " + System.identityHashCode(this), new RuntimeException()); try { if (sendStart) { this.otrSession.startSession(); @@ -986,7 +985,6 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl } public void resetOtrSession() { - android.util.Log.e("41fd", "reset " + System.identityHashCode(this), new RuntimeException()); this.otrFingerprint = null; this.otrSession = null; this.mSmp.hint = null; diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index 575e8c8e7..88f637304 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -2617,15 +2617,11 @@ public class XmppConnectionService extends Service { public Conversation findOrCreateConversation(final Account account, final Jid jid, final MessageArchiveService.Query query, final boolean muc, final boolean joinAfterCreate, final boolean async, Jid counterpart) { synchronized (this.conversations) { - android.util.Log.e("41fd", jid.toString() + " " + counterpart); - Conversation conversation = find(account, jid, counterpart); if (conversation != null) { return conversation; } - android.util.Log.e("41fd 1 not find", jid.toString() + " " + counterpart); - conversation = databaseBackend.findConversation(account, jid, counterpart); final boolean loadMessagesFromDb; if (conversation != null) { @@ -2657,8 +2653,6 @@ public class XmppConnectionService extends Service { Conversation.MODE_SINGLE, counterpart); } this.databaseBackend.createConversation(conversation); - android.util.Log.e("41fd 2 not find", jid.toString() + " " + counterpart); - loadMessagesFromDb = false; } final Conversation c = conversation;