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 | |
| parent | c02ef8008621049b803803fd131626c2365035ae (diff) | |
version bump, changelog and one last minute change for OTR
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/generator/AbstractGenerator.java | 2 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/services/XmppConnectionService.java | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 786496a1..3999b487 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,7 +2,7 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="eu.siacs.conversations" android:versionCode="26" - android:versionName="0.7-alpha" > + android:versionName="0.7" > <uses-sdk android:minSdkVersion="14" diff --git a/CHANGELOG.md b/CHANGELOG.md index 298bb37d..38162aa2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,12 @@ ###Changelog +####Version 0.7 +* Ability to disable notifications for single conversations +* Merge messages in chat bubbles +* Fixes for OpenPGP and OTR (please republish your public key) +* Improved reliability on sending messages +* Join password protected Conferences +* Configurable font size +* Expert options for encryption ####Version 0.6 * Support for server side avatars 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); } |