- Removed Bind Address from Settings (it didn't work as expected).
This commit is contained in:
@@ -274,14 +274,6 @@ class BaresipService: Service() {
|
|||||||
|
|
||||||
showStatusNotification()
|
showStatusNotification()
|
||||||
|
|
||||||
if (Config.variable("dyn_dns")[0] == "yes")
|
|
||||||
Config.removeVariable("dns_server")
|
|
||||||
|
|
||||||
if (bindAddress != "") {
|
|
||||||
Config.removeVariable("net_interface")
|
|
||||||
Config.save()
|
|
||||||
}
|
|
||||||
|
|
||||||
if (AccountsActivity.noAccounts()) {
|
if (AccountsActivity.noAccounts()) {
|
||||||
val newIntent = Intent(this, MainActivity::class.java)
|
val newIntent = Intent(this, MainActivity::class.java)
|
||||||
newIntent.flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_CLEAR_TOP or
|
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 callVolume = 0
|
||||||
var dynDns = false
|
var dynDns = false
|
||||||
var preferIpV6 = false
|
var preferIpV6 = false
|
||||||
var bindAddress = ""
|
|
||||||
var filesPath = ""
|
var filesPath = ""
|
||||||
var downloadsPath = ""
|
var downloadsPath = ""
|
||||||
|
|
||||||
|
|||||||
@@ -76,7 +76,6 @@ object Config {
|
|||||||
} else {
|
} else {
|
||||||
if (config.contains(Regex("dyn_dns[ ]+yes"))) {
|
if (config.contains(Regex("dyn_dns[ ]+yes"))) {
|
||||||
removeVariable("dns_server")
|
removeVariable("dns_server")
|
||||||
Log.d("Baresip", "DNS servers ${BaresipService.dnsServers}")
|
|
||||||
for (dnsServer in BaresipService.dnsServers)
|
for (dnsServer in BaresipService.dnsServers)
|
||||||
if (Utils.checkIpV4(dnsServer.hostAddress))
|
if (Utils.checkIpV4(dnsServer.hostAddress))
|
||||||
config = "${config}dns_server ${dnsServer.hostAddress}:53\n"
|
config = "${config}dns_server ${dnsServer.hostAddress}:53\n"
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ class ConfigActivity : AppCompatActivity() {
|
|||||||
|
|
||||||
internal lateinit var autoStart: CheckBox
|
internal lateinit var autoStart: CheckBox
|
||||||
internal lateinit var listenAddr: EditText
|
internal lateinit var listenAddr: EditText
|
||||||
internal lateinit var bindAddr: EditText
|
|
||||||
internal lateinit var preferIPv6: CheckBox
|
internal lateinit var preferIPv6: CheckBox
|
||||||
internal lateinit var dnsServers: EditText
|
internal lateinit var dnsServers: EditText
|
||||||
internal lateinit var certificateFile: CheckBox
|
internal lateinit var certificateFile: CheckBox
|
||||||
@@ -35,7 +34,6 @@ class ConfigActivity : AppCompatActivity() {
|
|||||||
|
|
||||||
private var oldAutoStart = ""
|
private var oldAutoStart = ""
|
||||||
private var oldListenAddr = ""
|
private var oldListenAddr = ""
|
||||||
private var oldBindAddr = ""
|
|
||||||
private var oldPreferIPv6 = ""
|
private var oldPreferIPv6 = ""
|
||||||
private var oldDnsServers = ""
|
private var oldDnsServers = ""
|
||||||
private var oldCertificateFile = false
|
private var oldCertificateFile = false
|
||||||
@@ -68,11 +66,6 @@ class ConfigActivity : AppCompatActivity() {
|
|||||||
oldListenAddr = if (laCv.size == 0) "" else laCv[0]
|
oldListenAddr = if (laCv.size == 0) "" else laCv[0]
|
||||||
listenAddr.setText(oldListenAddr)
|
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
|
preferIPv6 = findViewById(R.id.PreferIPv6) as CheckBox
|
||||||
val piCv = Config.variable("prefer_ipv6")
|
val piCv = Config.variable("prefer_ipv6")
|
||||||
oldPreferIPv6 = if (piCv.size == 0) "no" else piCv[0]
|
oldPreferIPv6 = if (piCv.size == 0) "no" else piCv[0]
|
||||||
@@ -222,19 +215,6 @@ class ConfigActivity : AppCompatActivity() {
|
|||||||
restart = true
|
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"
|
var preferIPv6String = "no"
|
||||||
if (preferIPv6.isChecked) preferIPv6String = "yes"
|
if (preferIPv6.isChecked) preferIPv6String = "yes"
|
||||||
if (oldPreferIPv6 != preferIPv6String) {
|
if (oldPreferIPv6 != preferIPv6String) {
|
||||||
@@ -472,10 +452,6 @@ class ConfigActivity : AppCompatActivity() {
|
|||||||
Utils.alertView(this, getString(R.string.listen_address),
|
Utils.alertView(this, getString(R.string.listen_address),
|
||||||
getString(R.string.listen_address_help))
|
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-> {
|
findViewById(R.id.PreferIPv6Title) as TextView-> {
|
||||||
Utils.alertView(this, getString(R.string.prefer_ipv6),
|
Utils.alertView(this, getString(R.string.prefer_ipv6),
|
||||||
getString(R.string.prefer_ipv6_help))
|
getString(R.string.prefer_ipv6_help))
|
||||||
|
|||||||
@@ -64,26 +64,6 @@
|
|||||||
android:importantForAutofill="no" >
|
android:importantForAutofill="no" >
|
||||||
</EditText>
|
</EditText>
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/BindAddressTitle"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:onClick="onClick"
|
|
||||||
android:text="@string/bind_address"
|
|
||||||
android:textColor="@android:color/black"
|
|
||||||
android:textSize="18sp" >
|
|
||||||
</TextView>
|
|
||||||
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/BindAddress"
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginBottom="12dp"
|
|
||||||
android:textSize="18sp"
|
|
||||||
android:inputType="textUri"
|
|
||||||
android:importantForAutofill="no" >
|
|
||||||
</EditText>
|
|
||||||
|
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
|||||||
@@ -168,12 +168,6 @@
|
|||||||
osoitteilla.
|
osoitteilla.
|
||||||
</string>
|
</string>
|
||||||
<string name="invalid_listen_address">Virheellinen kuunteluosoite</string>
|
<string name="invalid_listen_address">Virheellinen kuunteluosoite</string>
|
||||||
<string name="bind_address">Verkko-osoite</string>
|
|
||||||
<string name="bind_address_help">Verkkoliitännän nimi tai IP-osoite,
|
|
||||||
jota baresip käyttää lähdeliitäntänä tai -osoitteena. Normaalisti
|
|
||||||
tätä ei tarvitse asettaa.
|
|
||||||
</string>
|
|
||||||
<string name="invalid_bind_address">Virheellinen verkko-osoite</string>
|
|
||||||
<string name="prefer_ipv6">Suosi IPv6-protokollaa</string>
|
<string name="prefer_ipv6">Suosi IPv6-protokollaa</string>
|
||||||
<string name="prefer_ipv6_help">Jos merkitty, baresip suosii
|
<string name="prefer_ipv6_help">Jos merkitty, baresip suosii
|
||||||
IPv6-protokollaa, mikäli sekä IPv4 että IPv6 ovat käytettävissä.</string>
|
IPv6-protokollaa, mikäli sekä IPv4 että IPv6 ovat käytettävissä.</string>
|
||||||
|
|||||||
@@ -175,8 +175,6 @@
|
|||||||
<string name="read_cert_error">Klarte ikke å lese filen \"cert.pem\" fra Nedlastinger.</string>
|
<string name="read_cert_error">Klarte ikke å lese filen \"cert.pem\" fra Nedlastinger.</string>
|
||||||
<string name="read_ca_certs_error">Klarte ikke å lese filen \"ca_certs.crt\" fra Nedlastinger.</string>
|
<string name="read_ca_certs_error">Klarte ikke å lese filen \"ca_certs.crt\" fra Nedlastinger.</string>
|
||||||
<string name="invalid_listen_address">Ugyldig lyttadresse</string>
|
<string name="invalid_listen_address">Ugyldig lyttadresse</string>
|
||||||
<string name="bind_address">Bindingsadresse</string>
|
|
||||||
<string name="bind_address_help">IP-adresse eller navnet på grensesnittet baresip bruker som kilde-IP-adresse. Vanligvis trengs ikke dette.</string>
|
|
||||||
<string name="invalid_dns_servers">Ugyldige DNS-tjenere</string>
|
<string name="invalid_dns_servers">Ugyldige DNS-tjenere</string>
|
||||||
<string name="failed_to_set_dns_servers">Klarte ikke å sette DNS-tjenere</string>
|
<string name="failed_to_set_dns_servers">Klarte ikke å sette DNS-tjenere</string>
|
||||||
<string name="invalid_opus_bitrate">Ugyldig Opus-bitrate</string>
|
<string name="invalid_opus_bitrate">Ugyldig Opus-bitrate</string>
|
||||||
|
|||||||
@@ -158,11 +158,6 @@
|
|||||||
</string>
|
</string>
|
||||||
<string name="invalid_listen_address">Invalid Listen Address</string>
|
<string name="invalid_listen_address">Invalid Listen Address</string>
|
||||||
<string name="_0_0_0_0_5060" translatable="false">0.0.0.0:5060</string>
|
<string name="_0_0_0_0_5060" translatable="false">0.0.0.0:5060</string>
|
||||||
<string name="bind_address">Bind Address</string>
|
|
||||||
<string name="bind_address_help">IP address or name of interface that baresip uses as source
|
|
||||||
IP address. Usually there is no need to set this.
|
|
||||||
</string>
|
|
||||||
<string name="invalid_bind_address">Invalid Bind Address</string>
|
|
||||||
<string name="prefer_ipv6">Prefer IPv6</string>
|
<string name="prefer_ipv6">Prefer IPv6</string>
|
||||||
<string name="prefer_ipv6_help">Prefer IPv6 if both IPv4 and IPv6 are available.</string>
|
<string name="prefer_ipv6_help">Prefer IPv6 if both IPv4 and IPv6 are available.</string>
|
||||||
<string name="dns_servers">DNS Servers</string>
|
<string name="dns_servers">DNS Servers</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user