build.gradle

@@ -93,7 +93,7 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 4202301
+        versionCode 42023
         versionName "2.10.2"
         archivesBaseName += "-$versionName"
         applicationId "eu.sum7.conversations"
@@ -262,4 +262,16 @@ 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
+            }
+        }
+
+    }
 }

metadata/en-US/changelogs/4202301.txt

@@ -1 +0,0 @@
-• Fix usage directTLS of manuelle enter an address

src/main/java/eu/siacs/conversations/utils/Resolver.java

@@ -408,7 +408,6 @@ 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;