From 18c3333271541a63d3ce626601661b7fc9bb7f53 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 14 Apr 2014 20:35:11 +0200 Subject: tried to fix some race conditions. not adding duplicate candidates. needs more checks though --- .../siacs/conversations/xmpp/jingle/JingleConnectionManager.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java') diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java index 972489d0e..924674a7a 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; + } } } -- cgit v1.2.3