diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-09-09 14:30:16 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-09-09 14:30:16 +0200 |
| commit | 4b2e06b9c34e24b73a5e324e6d082fe817044729 (patch) | |
| tree | fee30cae9379bcbefd399a3388d41cc7208f9d7f /src/eu | |
| parent | c02ef8008621049b803803fd131626c2365035ae (diff) | |
version bump, changelog and one last minute change for OTR
Diffstat (limited to 'src/eu')
| -rw-r--r-- | src/eu/siacs/conversations/generator/AbstractGenerator.java | 2 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/services/XmppConnectionService.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/generator/AbstractGenerator.java b/src/eu/siacs/conversations/generator/AbstractGenerator.java index ecee82531..05d3d9883 100644 --- a/src/eu/siacs/conversations/generator/AbstractGenerator.java +++ b/src/eu/siacs/conversations/generator/AbstractGenerator.java @@ -17,7 +17,7 @@ public abstract class AbstractGenerator { "jabber:x:conference", "http://jabber.org/protocol/caps", "http://jabber.org/protocol/disco#info", "urn:xmpp:avatar:metadata+notify" }; - public final String IDENTITY_NAME = "Conversations 0.6"; + public final String IDENTITY_NAME = "Conversations 0.7"; public final String IDENTITY_TYPE = "phone"; public String getCapHash() { diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java index 5c5288de6..f272486cc 100644 --- a/src/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/eu/siacs/conversations/services/XmppConnectionService.java @@ -115,7 +115,7 @@ public class XmppConnectionService extends Service { public void onContactStatusChanged(Contact contact, boolean online) { Conversation conversation = find(getConversations(), contact); if (conversation != null) { - conversation.resetOtrSession(); + conversation.endOtrIfNeeded(); if (online && (contact.getPresences().size() == 1)) { sendUnsendMessages(conversation); } |