diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-08-30 08:51:55 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-08-30 08:51:55 +0200 |
| commit | 9ad5c6925d103f5d0a030bd7af76cb8d15551189 (patch) | |
| tree | 6b99109c828fda7d54c1d15c8e55a9e73a568f8b | |
| parent | 8840d082bae00fde2f053b77368677b203598629 (diff) | |
version bump to 0.6 with changelogs0.6
| -rw-r--r-- | AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | CHANGELOG.md | 7 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/generator/AbstractGenerator.java | 45 |
3 files changed, 27 insertions, 31 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 5133041b..16d1476e 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -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>
\ No newline at end of file +</manifest> diff --git a/CHANGELOG.md b/CHANGELOG.md index 37e3c920..298bb37d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/src/eu/siacs/conversations/generator/AbstractGenerator.java b/src/eu/siacs/conversations/generator/AbstractGenerator.java index d9839572..ecee8253 100644 --- a/src/eu/siacs/conversations/generator/AbstractGenerator.java +++ b/src/eu/siacs/conversations/generator/AbstractGenerator.java @@ -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(); } } |