fix usage directTLS of manuelle enter an address
This commit is contained in:
parent
658c1c58d5
commit
aa8b9f338f
14
build.gradle
14
build.gradle
|
@ -93,7 +93,7 @@ android {
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion 21
|
minSdkVersion 21
|
||||||
targetSdkVersion 29
|
targetSdkVersion 29
|
||||||
versionCode 42023
|
versionCode 4202301
|
||||||
versionName "2.10.2"
|
versionName "2.10.2"
|
||||||
archivesBaseName += "-$versionName"
|
archivesBaseName += "-$versionName"
|
||||||
applicationId "eu.sum7.conversations"
|
applicationId "eu.sum7.conversations"
|
||||||
|
@ -262,16 +262,4 @@ android {
|
||||||
exclude 'META-INF/BCKEY.DSA'
|
exclude 'META-INF/BCKEY.DSA'
|
||||||
exclude 'META-INF/BCKEY.SF'
|
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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
• Fix usage directTLS of manuelle enter an address
|
|
@ -408,6 +408,7 @@ public class Resolver {
|
||||||
Result result = new Result();
|
Result result = new Result();
|
||||||
result.timeRequested = System.currentTimeMillis();
|
result.timeRequested = System.currentTimeMillis();
|
||||||
result.port = port;
|
result.port = port;
|
||||||
|
result.directTls = useDirectTls(port);
|
||||||
result.hostname = hostname;
|
result.hostname = hostname;
|
||||||
result.ip = ip;
|
result.ip = ip;
|
||||||
return result;
|
return result;
|
||||||
|
|
Loading…
Reference in New Issue