diff options
author | steckbrief <steckbrief@chefmail.de> | 2015-12-10 20:37:34 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2015-12-10 20:37:34 +0100 |
commit | 3b1723dcf19dc6e3390df63a71df903d9cb7dd94 (patch) | |
tree | a912db2e2204645fc3138cce62bb75a8d1a9b7d3 /src/main/java/eu/siacs/conversations/utils/DNSHelper.java | |
parent | aa6a2e1c182858e7bcc077f5220546e08df12ec1 (diff) | |
parent | a7454223008c78dcf5e0ff727bca64241f99daa1 (diff) |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils/DNSHelper.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/DNSHelper.java | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java index d5271903..f755b74b 100644 --- a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java @@ -1,5 +1,16 @@ package eu.siacs.conversations.utils; +import java.io.IOException; +import java.net.InetAddress; +import java.net.SocketTimeoutException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Random; +import java.util.TreeMap; +import java.util.regex.Pattern; + +import android.os.Bundle; + import de.measite.minidns.Client; import de.measite.minidns.DNSMessage; import de.measite.minidns.Record; @@ -10,20 +21,11 @@ import de.measite.minidns.record.A; import de.measite.minidns.record.AAAA; import de.measite.minidns.record.Data; import de.measite.minidns.util.NameUtil; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.xmpp.jid.Jid; -import java.io.IOException; -import java.net.InetAddress; -import java.net.SocketTimeoutException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Random; -import java.util.TreeMap; -import java.util.regex.Pattern; +import de.thedevstack.android.logcat.Logging; -import android.os.Bundle; -import de.thedevstack.conversationsplus.utils.Logging; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.xmpp.jid.Jid; public class DNSHelper { |