sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

version bump, changelog and one last minute change for OTR

This commit is contained in:
iNPUTmice 2014-09-09 14:30:16 +02:00
parent c02ef80086
commit 4b2e06b9c3
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="eu.siacs.conversations" package="eu.siacs.conversations"
android:versionCode="26" android:versionCode="26"
android:versionName="0.7-alpha" > android:versionName="0.7" >
<uses-sdk <uses-sdk
android:minSdkVersion="14" android:minSdkVersion="14"

8
CHANGELOG.md
View File

@ -1,4 +1,12 @@
###Changelog ###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 ####Version 0.6
* Support for server side avatars * Support for server side avatars

2
src/eu/siacs/conversations/generator/AbstractGenerator.java
View File

@ -17,7 +17,7 @@ public abstract class AbstractGenerator {
"jabber:x:conference", "http://jabber.org/protocol/caps", "jabber:x:conference", "http://jabber.org/protocol/caps",
"http://jabber.org/protocol/disco#info", "http://jabber.org/protocol/disco#info",
"urn:xmpp:avatar:metadata+notify" }; "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 final String IDENTITY_TYPE = "phone";
public String getCapHash() { public String getCapHash() {

2
src/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -115,7 +115,7 @@ public class XmppConnectionService extends Service {
public void onContactStatusChanged(Contact contact, boolean online) { public void onContactStatusChanged(Contact contact, boolean online) {
Conversation conversation = find(getConversations(), contact); Conversation conversation = find(getConversations(), contact);
if (conversation != null) { if (conversation != null) {
conversation.resetOtrSession(); conversation.endOtrIfNeeded();
if (online && (contact.getPresences().size() == 1)) { if (online && (contact.getPresences().size() == 1)) {
sendUnsendMessages(conversation); sendUnsendMessages(conversation);
} }