From bb9045267393b2a7765d7c121b58c5e7043b525e Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Wed, 11 Jun 2014 21:53:25 +0200
Subject: groundwork for offline otr messages

---
 src/eu/siacs/conversations/entities/Conversation.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/eu/siacs/conversations/entities/Conversation.java')

diff --git a/src/eu/siacs/conversations/entities/Conversation.java b/src/eu/siacs/conversations/entities/Conversation.java
index f5542925b..e440b27cc 100644
--- a/src/eu/siacs/conversations/entities/Conversation.java
+++ b/src/eu/siacs/conversations/entities/Conversation.java
@@ -257,14 +257,14 @@ public class Conversation extends AbstractEntity {
 	public void endOtrIfNeeded() {
 		if (this.otrSession != null) {
 			if (this.otrSession.getSessionStatus() == SessionStatus.ENCRYPTED) {
-				Log.d("xmppService", "ending otr session with "
-						+ getContactJid());
 				try {
 					this.otrSession.endSession();
 					this.resetOtrSession();
 				} catch (OtrException e) {
 					this.resetOtrSession();
 				}
+			} else {
+				this.resetOtrSession();
 			}
 		}
 	}
-- 
cgit v1.2.3