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

some bug fixes concerning 0byte files. fixes #1126

Browse source
This commit is contained in:
iNPUTmice 2015-04-15 15:36:16 +02:00
parent f99e234b88
commit 65e760aefd
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
View file

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

1
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
View file

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