diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-03-30 22:12:49 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-03-30 22:12:49 +0200 |
| commit | 75c5275f7e9a27019b9517770603ca4c77f1fbd9 (patch) | |
| tree | 567d10bd9e559089487f5627c436000e2a1a8fc8 /src/main/java/eu/siacs/conversations/utils/DNSHelper.java | |
| parent | c8fe93cf0a99481bfe7a30bbc1cd98383205bcaa (diff) | |
| parent | 7eabdfd80f50634282307f45c5f99ab46181805d (diff) | |
Merge tag '1.2.0' into trz/master
Conflicts:
src/main/java/eu/siacs/conversations/parser/AbstractParser.java
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/res/values-de/strings.xml
src/main/res/xml/preferences.xml
Diffstat (limited to 'src/main/java/eu/siacs/conversations/utils/DNSHelper.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/utils/DNSHelper.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java index a09b4d0f..bcb2ca44 100644 --- a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java @@ -140,18 +140,13 @@ public class DNSHelper { } ArrayList<Bundle> values = new ArrayList<>(); for (SRV srv : result) { - boolean added = false; if (ips6.containsKey(srv.getName())) { values.add(createNamePortBundle(srv.getName(),srv.getPort(),ips6)); - added = true; } if (ips4.containsKey(srv.getName())) { values.add(createNamePortBundle(srv.getName(),srv.getPort(),ips4)); - added = true; - } - if (!added) { - values.add(createNamePortBundle(srv.getName(),srv.getPort(),null)); } + values.add(createNamePortBundle(srv.getName(),srv.getPort(),null)); } bundle.putParcelableArrayList("values", values); } catch (SocketTimeoutException e) { |