Merge branch 'master' into development

Daniel Gultsch created 10 years ago

Change summary

build.gradle                                              | 4 ++--
src/main/java/eu/siacs/conversations/utils/DNSHelper.java | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)

Detailed changes

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 {

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;
 			}