From f151a8820194973fb4a1c278adaf83d05b42786d Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Wed, 6 Nov 2019 11:19:29 +0200 Subject: [PATCH] - Removed Bind Address from Settings (it didn't work as expected). --- .../com/tutpro/baresip/BaresipService.kt | 9 ------- .../main/kotlin/com/tutpro/baresip/Config.kt | 1 - .../com/tutpro/baresip/ConfigActivity.kt | 24 ------------------- app/src/main/res/layout/activity_config.xml | 20 ---------------- app/src/main/res/values-fi/strings.xml | 6 ----- app/src/main/res/values-nb-rNO/strings.xml | 2 -- app/src/main/res/values/strings.xml | 5 ---- 7 files changed, 67 deletions(-) diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt index 3e6ddac4..a0c7ce68 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt @@ -274,14 +274,6 @@ class BaresipService: Service() { showStatusNotification() - if (Config.variable("dyn_dns")[0] == "yes") - Config.removeVariable("dns_server") - - if (bindAddress != "") { - Config.removeVariable("net_interface") - Config.save() - } - if (AccountsActivity.noAccounts()) { val newIntent = Intent(this, MainActivity::class.java) newIntent.flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP or @@ -1056,7 +1048,6 @@ class BaresipService: Service() { var callVolume = 0 var dynDns = false var preferIpV6 = false - var bindAddress = "" var filesPath = "" var downloadsPath = "" diff --git a/app/src/main/kotlin/com/tutpro/baresip/Config.kt b/app/src/main/kotlin/com/tutpro/baresip/Config.kt index c2eb0f59..8bb180c2 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/Config.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/Config.kt @@ -76,7 +76,6 @@ object Config { } else { if (config.contains(Regex("dyn_dns[ ]+yes"))) { removeVariable("dns_server") - Log.d("Baresip", "DNS servers ${BaresipService.dnsServers}") for (dnsServer in BaresipService.dnsServers) if (Utils.checkIpV4(dnsServer.hostAddress)) config = "${config}dns_server ${dnsServer.hostAddress}:53\n" diff --git a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt index c0afa82d..bd490b21 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt @@ -21,7 +21,6 @@ class ConfigActivity : AppCompatActivity() { internal lateinit var autoStart: CheckBox internal lateinit var listenAddr: EditText - internal lateinit var bindAddr: EditText internal lateinit var preferIPv6: CheckBox internal lateinit var dnsServers: EditText internal lateinit var certificateFile: CheckBox @@ -35,7 +34,6 @@ class ConfigActivity : AppCompatActivity() { private var oldAutoStart = "" private var oldListenAddr = "" - private var oldBindAddr = "" private var oldPreferIPv6 = "" private var oldDnsServers = "" private var oldCertificateFile = false @@ -68,11 +66,6 @@ class ConfigActivity : AppCompatActivity() { oldListenAddr = if (laCv.size == 0) "" else laCv[0] listenAddr.setText(oldListenAddr) - bindAddr = findViewById(R.id.BindAddress) as EditText - val baCv = Config.variable("net_interface") - oldBindAddr = if (baCv.size == 0) "" else baCv[0] - bindAddr.setText(oldBindAddr) - preferIPv6 = findViewById(R.id.PreferIPv6) as CheckBox val piCv = Config.variable("prefer_ipv6") oldPreferIPv6 = if (piCv.size == 0) "no" else piCv[0] @@ -222,19 +215,6 @@ class ConfigActivity : AppCompatActivity() { restart = true } - val bindAddr = bindAddr.text.toString().trim() - if (bindAddr != oldBindAddr) { - if ((bindAddr != "") && !Utils.checkIp(bindAddr) && !Utils.checkIfName(bindAddr)) { - Utils.alertView(this, getString(R.string.notice), - "${getString(R.string.invalid_bind_address)}: $bindAddr") - return false - } - Config.removeVariable("net_interface") - if (bindAddr != "") Config.addLine("net_interface $bindAddr") - save = true - restart = true - } - var preferIPv6String = "no" if (preferIPv6.isChecked) preferIPv6String = "yes" if (oldPreferIPv6 != preferIPv6String) { @@ -472,10 +452,6 @@ class ConfigActivity : AppCompatActivity() { Utils.alertView(this, getString(R.string.listen_address), getString(R.string.listen_address_help)) } - findViewById(R.id.BindAddressTitle) as TextView-> { - Utils.alertView(this, getString(R.string.bind_address), - getString(R.string.bind_address_help)) - } findViewById(R.id.PreferIPv6Title) as TextView-> { Utils.alertView(this, getString(R.string.prefer_ipv6), getString(R.string.prefer_ipv6_help)) diff --git a/app/src/main/res/layout/activity_config.xml b/app/src/main/res/layout/activity_config.xml index 87ef2633..cf241e06 100644 --- a/app/src/main/res/layout/activity_config.xml +++ b/app/src/main/res/layout/activity_config.xml @@ -64,26 +64,6 @@ android:importantForAutofill="no" > - - - - - - Virheellinen kuunteluosoite - Verkko-osoite - Verkkoliitännän nimi tai IP-osoite, - jota baresip käyttää lähdeliitäntänä tai -osoitteena. Normaalisti - tätä ei tarvitse asettaa. - - Virheellinen verkko-osoite Suosi IPv6-protokollaa Jos merkitty, baresip suosii IPv6-protokollaa, mikäli sekä IPv4 että IPv6 ovat käytettävissä. diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 74b55adc..4fd60e76 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -175,8 +175,6 @@ Klarte ikke å lese filen \"cert.pem\" fra Nedlastinger. Klarte ikke å lese filen \"ca_certs.crt\" fra Nedlastinger. Ugyldig lyttadresse - Bindingsadresse - IP-adresse eller navnet på grensesnittet baresip bruker som kilde-IP-adresse. Vanligvis trengs ikke dette. Ugyldige DNS-tjenere Klarte ikke å sette DNS-tjenere Ugyldig Opus-bitrate diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 93dedea6..c11aa624 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -158,11 +158,6 @@ Invalid Listen Address 0.0.0.0:5060 - Bind Address - IP address or name of interface that baresip uses as source - IP address. Usually there is no need to set this. - - Invalid Bind Address Prefer IPv6 Prefer IPv6 if both IPv4 and IPv6 are available. DNS Servers