sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

code cleanup

This commit is contained in:
Daniel Gultsch 2014-03-27 14:41:01 +01:00
parent 8988873d77
commit 592068e7cf
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/eu/siacs/conversations/utils/DNSHelper.java
View File

@ -29,24 +29,17 @@ public class DNSHelper {
if (value != null && !"".equals(value) if (value != null && !"".equals(value)
&& !servers.contains(value)) { && !servers.contains(value)) {
ip = InetAddress.getByName(value); ip = InetAddress.getByName(value);
servers.add(value); servers.add(value);
Bundle result = queryDNS(host, ip); Bundle result = queryDNS(host, ip);
if (!result.containsKey("error")) { if (!result.containsKey("error")) {
return result; return result;
} }
} }
} }
} catch (ClassNotFoundException e) { } catch (Exception e) {
ip = InetAddress.getByName("8.8.8.8"); Log.d("xmppService","error during system calls");
} catch (NoSuchMethodException e) {
ip = InetAddress.getByName("8.8.8.8");
} catch (IllegalAccessException e) {
ip = InetAddress.getByName("8.8.8.8");
} catch (IllegalArgumentException e) {
ip = InetAddress.getByName("8.8.8.8");
} catch (InvocationTargetException e) {
ip = InetAddress.getByName("8.8.8.8");
} }
ip = InetAddress.getByName("8.8.8.8");
return queryDNS(host, ip); return queryDNS(host, ip);
} }
@ -90,7 +83,6 @@ public class DNSHelper {
datagramSocket.setSoTimeout(3000); datagramSocket.setSoTimeout(3000);
datagramSocket.receive(receivePacket); datagramSocket.receive(receivePacket);
if (receiveData[3] != -128) { if (receiveData[3] != -128) {
Log.d("xmppService", "not the right count");
namePort.putString("error", "nosrv"); namePort.putString("error", "nosrv");
return namePort; return namePort;
} }