some bug fixes concerning 0byte files. fixes #1126

iNPUTmice created 10 years ago

Change summary

src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java      | 2 
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java | 1 
2 files changed, 2 insertions(+), 1 deletion(-)

Detailed changes

src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java

@@ -317,7 +317,7 @@ public class JingleConnection implements Downloadable {
 				message.setBody(Long.toString(size));
 				conversation.add(message);
 				mXmppConnectionService.updateConversationUi();
-				if (size <= this.mJingleConnectionManager
+				if (size < this.mJingleConnectionManager
 						.getAutoAcceptFileSize()) {
 					Log.d(Config.LOGTAG, "auto accepting file from "
 							+ packet.getFrom());

src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java

@@ -207,6 +207,7 @@ public class JingleInbandTransport extends JingleTransport {
 			if (!established) {
 				established = true;
 				connected = true;
+				this.receiveNextBlock("");
 				this.account.getXmppConnection().sendIqPacket(
 						packet.generateResponse(IqPacket.TYPE.RESULT), null);
 			} else {