aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu
diff options
context:
space:
mode:
Diffstat (limited to 'src/eu')
-rw-r--r--src/eu/siacs/conversations/generator/AbstractGenerator.java2
-rw-r--r--src/eu/siacs/conversations/services/XmppConnectionService.java2
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 ecee8253..05d3d988 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 5c5288de..f272486c 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);
}