Avoid warnings in Config

This commit is contained in:
Juha Heinanen
2021-06-08 08:27:28 +03:00
parent 4dcf00a76f
commit ef82d83b23
@@ -74,10 +74,10 @@ object Config {
if (config.contains(Regex("dyn_dns[ ]+yes"))) { if (config.contains(Regex("dyn_dns[ ]+yes"))) {
removeVariable("dns_server") removeVariable("dns_server")
for (dnsServer in BaresipService.dnsServers) for (dnsServer in BaresipService.dnsServers)
if (Utils.checkIpV4(dnsServer.hostAddress)) config = if (Utils.checkIpV4(dnsServer.hostAddress))
config = "${config}dns_server ${dnsServer.hostAddress}:53\n" "${config}dns_server ${dnsServer.hostAddress}:53\n"
else else
config = "${config}dns_server [${dnsServer.hostAddress}]:53\n" "${config}dns_server [${dnsServer.hostAddress}]:53\n"
BaresipService.dynDns = true BaresipService.dynDns = true
} }
} }
@@ -132,7 +132,7 @@ object Config {
fun save() { fun save() {
var result = "" var result = ""
for (line in config.split("\n")) for (line in config.split("\n"))
if (line.length > 0) if (line.isNotEmpty())
result = result + line + '\n' result = result + line + '\n'
config = result config = result
Utils.putFileContents(configPath, config.toByteArray()) Utils.putFileContents(configPath, config.toByteArray())
@@ -145,14 +145,14 @@ object Config {
var servers = "" var servers = ""
for (dnsServer in dnsServers) { for (dnsServer in dnsServers) {
var address = dnsServer.hostAddress.removePrefix("/") var address = dnsServer.hostAddress.removePrefix("/")
if (Utils.checkIpV4(address)) address = if (Utils.checkIpV4(address))
address = "${address}:53" "${address}:53"
else else
address = "[${address}]:53" "[${address}]:53"
if (servers == "") servers = if (servers == "")
servers = address address
else else
servers = "${servers},${address}" "${servers},${address}"
} }
return Api.net_use_nameserver(servers) return Api.net_use_nameserver(servers)
} }