narayana/Conversations-Classic
3
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

version bump to 0.6 with changelogs

Browse source
This commit is contained in:
iNPUTmice 2014-08-30 08:51:55 +02:00
parent 8840d082ba
commit 9ad5c6925d
3 changed files with 27 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
AndroidManifest.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="eu.siacs.conversations"
android:versionCode="24"
android:versionName="0.6-alpha" >
android:versionCode="25"
android:versionName="0.6" >
<uses-sdk
android:minSdkVersion="14"
@ -117,4 +117,4 @@
<activity android:name="de.duenndns.ssl.MemorizingActivity" />
</application>
</manifest>
</manifest>

7
CHANGELOG.md
View file

@ -1,5 +1,12 @@
###Changelog
####Version 0.6
* Support for server side avatars
* save images in gallery
* show contact name and picture in non-anonymous conferences
* reworked account creation
* various bug fixes
####Version 0.5.2
* minor bug fixes

45
src/eu/siacs/conversations/generator/AbstractGenerator.java
View file

@ -12,40 +12,29 @@ public abstract class AbstractGenerator {
public final String[] FEATURES = { "urn:xmpp:jingle:1",
"urn:xmpp:jingle:apps:file-transfer:3",
"urn:xmpp:jingle:transports:s5b:1",
"urn:xmpp:jingle:transports:ibb:1",
"urn:xmpp:receipts",
"urn:xmpp:chat-markers:0",
"http://jabber.org/protocol/muc",
"jabber:x:conference",
"http://jabber.org/protocol/caps",
"urn:xmpp:jingle:transports:ibb:1", "urn:xmpp:receipts",
"urn:xmpp:chat-markers:0", "http://jabber.org/protocol/muc",
"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.5";
"urn:xmpp:avatar:metadata+notify" };
public final String IDENTITY_NAME = "Conversations 0.6";
public final String IDENTITY_TYPE = "phone";
/*public final String[] FEATURES = { "http://jabber.org/protocol/muc","http://jabber.org/protocol/disco#info", "http://jabber.org/protocol/disco#items", "http://jabber.org/protocol/caps" };
public final String IDENTITY_NAME = "Exodus 0.9.1";
public final String IDENTITY_TYPE = "pc";*/
public String getCapHash() {
StringBuilder s = new StringBuilder();
s.append("client/"+IDENTITY_TYPE+"//"+IDENTITY_NAME+"<");
s.append("client/" + IDENTITY_TYPE + "//" + IDENTITY_NAME + "<");
MessageDigest md = null;
try {
md = MessageDigest.getInstance("SHA-1");
}
catch(NoSuchAlgorithmException e) {
return null;
}
List<String> features = Arrays.asList(FEATURES);
try {
md = MessageDigest.getInstance("SHA-1");
} catch (NoSuchAlgorithmException e) {
return null;
}
List<String> features = Arrays.asList(FEATURES);
Collections.sort(features);
for(String feature : features) {
s.append(feature+"<");
}
for (String feature : features) {
s.append(feature + "<");
}
byte[] sha1 = md.digest(s.toString().getBytes());
return new String(Base64.encode(sha1, Base64.DEFAULT)).trim();
return new String(Base64.encode(sha1, Base64.DEFAULT)).trim();
}
}