aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-19 01:51:50 +0200
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-04-19 01:51:50 +0200
commit1235e3daca59d107e663319fc72e800ed94378bd (patch)
treebb98b6038db1a7a70d6079e97ffee23172e31f6f /src/eu/siacs/conversations
parent5c0873c7cab8bdb95754f4a67839aa6ed5a3d2e8 (diff)
fixed default autoaccept file size and wrongly marked message
Diffstat (limited to 'src/eu/siacs/conversations')
-rw-r--r--src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java2
-rw-r--r--src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index b221ec0c..7c5a0f63 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
@@ -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());
}
diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
index 44af51a3..a45ebb76 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
@@ -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;
}
}
}