aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-07-03 13:09:05 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-07-03 13:09:05 +0200
commit1c86098f3b4360eae76f39359281dbdf88321d9f (patch)
tree95d325b6d440368d815945d08c55e966f9f1798e
parentc745fbb562b6f25cb57a06538b4c54fdfe619fa3 (diff)
parentbfe1d2489ae41f21c2899c6eea4273357a6aa20b (diff)
Merge branch 'master' into development
-rw-r--r--build.gradle4
-rw-r--r--src/main/java/eu/siacs/conversations/utils/DNSHelper.java1
2 files changed, 3 insertions, 2 deletions
diff --git a/build.gradle b/build.gradle
index 3706aca50..e4d2168bf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,8 +45,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 21
- versionCode 73
- versionName "1.4.5"
+ versionCode 74
+ versionName "1.4.6"
}
compileOptions {
diff --git a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java
index bb354ae05..064263405 100644
--- a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java
@@ -105,6 +105,7 @@ public class DNSHelper {
for(int i = 0; i < response.getAnswers().length; ++i) {
values.add(createNamePortBundle(host,5222,response.getAnswers()[i].getPayload()));
}
+ values.add(createNamePortBundle(host,5222));
bundle.putParcelableArrayList("values", values);
return bundle;
}