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

kruks23 created 11 years ago

Change summary

AndroidManifest.xml                                 |  4 ++--
CHANGELOG.md                                        |  3 +++
src/eu/siacs/conversations/xmpp/XmppConnection.java | 15 ++++++++-------
3 files changed, 13 insertions(+), 9 deletions(-)

Detailed changes

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"

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

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) {