aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java')
-rw-r--r--src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
index 972489d0..924674a7 100644
--- a/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
+++ b/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
@@ -43,8 +43,6 @@ public class JingleConnectionManager {
.getCounterPart().equals(packet.getFrom())) {
connection.deliverPacket(packet);
return;
- } else {
- Log.d("xmppService","no match sid:"+connection.getSessionId()+"="+packet.getSessionId()+" counterpart:"+connection.getCounterPart()+"="+packet.getFrom()+" account:"+connection.getAccountJid()+"="+packet.getTo());
}
}
Log.d("xmppService","delivering packet failed "+packet.toString());
@@ -135,6 +133,11 @@ public class JingleConnectionManager {
}
public long getAutoAcceptFileSize() {
- return this.xmppConnectionService.getPreferences().getLong("auto_accept_file_size", 0);
+ String config = this.xmppConnectionService.getPreferences().getString("auto_accept_file_size", "0");
+ try {
+ return Long.parseLong(config);
+ } catch (NumberFormatException e) {
+ return 0;
+ }
}
}