moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-12-25 00:48:52 -05:00
Code Issues Releases Wiki Activity

fixed default autoaccept file size and wrongly marked message

Browse Source
This commit is contained in:
Daniel Gultsch 2014-04-19 01:51:50 +02:00
parent 5c0873c7ca
commit 1235e3daca
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -302,7 +302,7 @@ public class JingleConnection {
public void onFileTransmitted(JingleFile file) {
if (responder.equals(account.getFullJid())) {
sendSuccess();
mXmppConnectionService.markMessage(message, Message.STATUS_SEND);
mXmppConnectionService.markMessage(message, Message.STATUS_RECIEVED);
}
Log.d("xmppService","sucessfully transmitted file. sha1:"+file.getSha1Sum());
}

4
src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
View File

@ -120,11 +120,11 @@ public class JingleConnectionManager {
}
public long getAutoAcceptFileSize() {
String config = this.xmppConnectionService.getPreferences().getString("auto_accept_file_size", "0");
String config = this.xmppConnectionService.getPreferences().getString("auto_accept_file_size", "524288");
try {
return Long.parseLong(config);
} catch (NumberFormatException e) {
return 0;
return 524288;
}
}
}