diff options
| author | kruks23 <scardenas@openmailbox.org> | 2014-05-17 22:03:12 +0200 |
|---|---|---|
| committer | kruks23 <scardenas@openmailbox.org> | 2014-05-17 22:03:12 +0200 |
| commit | b79ff3af6c8f5de936eff26ee6235bcb5ca23b30 (patch) | |
| tree | 6f8f258bcfd6d52f6714ff40636b9ee3801d624c | |
| parent | 2abb57be34effbb0606ae099bfefee472542662e (diff) | |
| parent | 66aacf7e3edae1e4a6ec6cab72df82ae38daa096 (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
| -rw-r--r-- | AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/xmpp/XmppConnection.java | 15 |
3 files changed, 13 insertions, 9 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4806ac32..32e83085 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="13" - android:versionName="0.2.2" > + android:versionCode="14" + android:versionName="0.2.3" > <uses-sdk android:minSdkVersion="14" diff --git a/CHANGELOG.md b/CHANGELOG.md index f24146ee..7e9aa5cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ ###Changelog +####Version 0.2.3 +* regression fix with receiving encrypted images + ####Version 0.2.2 * Ability to take photos directly * Improved openPGP offline handling diff --git a/src/eu/siacs/conversations/xmpp/XmppConnection.java b/src/eu/siacs/conversations/xmpp/XmppConnection.java index a04105a8..6e55ebfe 100644 --- a/src/eu/siacs/conversations/xmpp/XmppConnection.java +++ b/src/eu/siacs/conversations/xmpp/XmppConnection.java @@ -542,13 +542,6 @@ public class XmppConnection implements Runnable { this.tagWriter.writeStanzaAsync(resume); } else if (this.streamFeatures.hasChild("bind") && shouldBind) { sendBindRequest(); - if (this.streamFeatures.hasChild("session")) { - Log.d(LOGTAG,account.getJid()+": sending deprecated session"); - IqPacket startSession = new IqPacket(IqPacket.TYPE_SET); - startSession.addChild("session","urn:ietf:params:xml:ns:xmpp-session"); //setContent("") - startSession.setId(nextRandomId()); - this.sendPacket(startSession, null); - } } } @@ -655,9 +648,17 @@ public class XmppConnection implements Runnable { if (bindListener !=null) { bindListener.onBind(account); } + changeStatus(Account.STATUS_ONLINE); } }); + if (this.streamFeatures.hasChild("session")) { + Log.d(LOGTAG,account.getJid()+": sending deprecated session"); + IqPacket startSession = new IqPacket(IqPacket.TYPE_SET); + startSession.addChild("session","urn:ietf:params:xml:ns:xmpp-session"); //setContent("") + startSession.setId(nextRandomId()); + this.sendPacket(startSession, null); + } } private void sendServiceDiscoveryInfo(final String server) { |