diff --git a/build.gradle b/build.gradle index 31d8a3033..d21757aac 100644 --- a/build.gradle +++ b/build.gradle @@ -93,7 +93,7 @@ android { defaultConfig { minSdkVersion 21 targetSdkVersion 29 - versionCode 42023 + versionCode 4202301 versionName "2.10.2" archivesBaseName += "-$versionName" applicationId "eu.sum7.conversations" @@ -262,16 +262,4 @@ android { exclude 'META-INF/BCKEY.DSA' exclude 'META-INF/BCKEY.SF' } - - android.applicationVariants.all { variant -> - variant.outputs.each { output -> - def baseAbiVersionCode = project.ext.abiCodes.get(output.getFilter(com.android.build.OutputFile.ABI)) - if (baseAbiVersionCode != null) { - output.versionCodeOverride = (100 * project.android.defaultConfig.versionCode) + baseAbiVersionCode - } else { - output.versionCodeOverride = 100 * project.android.defaultConfig.versionCode - } - } - - } } diff --git a/metadata/en-US/changelogs/4202301.txt b/metadata/en-US/changelogs/4202301.txt new file mode 100644 index 000000000..4135301d6 --- /dev/null +++ b/metadata/en-US/changelogs/4202301.txt @@ -0,0 +1 @@ +• Fix usage directTLS of manuelle enter an address diff --git a/src/main/java/eu/siacs/conversations/utils/Resolver.java b/src/main/java/eu/siacs/conversations/utils/Resolver.java index 3344e0290..2824d8ce4 100644 --- a/src/main/java/eu/siacs/conversations/utils/Resolver.java +++ b/src/main/java/eu/siacs/conversations/utils/Resolver.java @@ -408,6 +408,7 @@ public class Resolver { Result result = new Result(); result.timeRequested = System.currentTimeMillis(); result.port = port; + result.directTls = useDirectTls(port); result.hostname = hostname; result.ip = ip; return result;