diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-06-11 21:53:25 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-06-11 21:53:25 +0200 |
| commit | bb9045267393b2a7765d7c121b58c5e7043b525e (patch) | |
| tree | a6441672710b78e3041ece15b60481257466b9fa /src/eu/siacs/conversations/entities/Conversation.java | |
| parent | 95f1a3d57d6f4a35d4579cf93d24a7621f39cf07 (diff) | |
groundwork for offline otr messages
Diffstat (limited to 'src/eu/siacs/conversations/entities/Conversation.java')
| -rw-r--r-- | src/eu/siacs/conversations/entities/Conversation.java | 4 |
1 files changed, 2 insertions, 2 deletions
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(); } } } |