narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

Merge branch 'development' of https://github.com/siacs/Conversations into development

Browse source
This commit is contained in:
kruks23 2014-05-17 22:03:12 +02:00
parent 2abb57be34 66aacf7e3e
commit b79ff3af6c
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
AndroidManifest.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<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="13" android:versionCode="14"
android:versionName="0.2.2" > android:versionName="0.2.3" >
<uses-sdk <uses-sdk
android:minSdkVersion="14" android:minSdkVersion="14"

3
CHANGELOG.md
View file

@ -1,5 +1,8 @@
###Changelog ###Changelog
####Version 0.2.3
* regression fix with receiving encrypted images
####Version 0.2.2 ####Version 0.2.2
* Ability to take photos directly * Ability to take photos directly
* Improved openPGP offline handling * Improved openPGP offline handling

15
src/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -542,13 +542,6 @@ public class XmppConnection implements Runnable {
this.tagWriter.writeStanzaAsync(resume); this.tagWriter.writeStanzaAsync(resume);
} else if (this.streamFeatures.hasChild("bind") && shouldBind) { } else if (this.streamFeatures.hasChild("bind") && shouldBind) {
sendBindRequest(); 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) { if (bindListener !=null) {
bindListener.onBind(account); bindListener.onBind(account);
} }
changeStatus(Account.STATUS_ONLINE); 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) { private void sendServiceDiscoveryInfo(final String server) {