jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Variable linkAddresses can now be private

Browse Source
This commit is contained in:
Juha Heinanen
2021-09-01 07:34:09 +03:00
parent b1a1738729
commit 922c6c0776
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
View File

@ -57,6 +57,7 @@ class BaresipService: Service() {
private var origVolume = -1
private val btAdapter = BluetoothAdapter.getDefaultAdapter()
internal var activeNetwork = ""
private var linkAddresses = listOf<LinkAddress>()
@SuppressLint("WakelockTimeout")
override fun onCreate() {
@ -1174,10 +1175,10 @@ class BaresipService: Service() {
}
}
private fun updateLinkAddresses(linkAddresses: List<LinkAddress>) {
private fun updateLinkAddresses(linkAddrs: List<LinkAddress>) {
var updated = false
val ipV6Addr = Utils.findIpV6Address(linkAddresses)
if (ipV6Addr != Utils.findIpV6Address(BaresipService.linkAddresses)) {
val ipV6Addr = Utils.findIpV6Address(linkAddrs)
if (ipV6Addr != Utils.findIpV6Address(linkAddresses)) {
Log.d(TAG, "Updating IPv6 address to '$ipV6Addr'")
if (ipV6Addr != "") {
if (Api.net_set_address(ipV6Addr) != 0)
@ -1187,8 +1188,8 @@ class BaresipService: Service() {
}
updated = true
}
val ipV4Addr = Utils.findIpV4Address(linkAddresses)
if (ipV4Addr != Utils.findIpV4Address(BaresipService.linkAddresses)) {
val ipV4Addr = Utils.findIpV4Address(linkAddrs)
if (ipV4Addr != Utils.findIpV4Address(linkAddresses)) {
Log.d(TAG, "Updating IPv4 address to '$ipV4Addr'")
if (ipV4Addr != "") {
if (Api.net_set_address(ipV4Addr) != 0)
@ -1199,7 +1200,7 @@ class BaresipService: Service() {
updated = true
}
if (updated) {
BaresipService.linkAddresses = linkAddresses
linkAddresses = linkAddrs
Api.uag_reset_transp(register = true, reinvite = true)
Api.net_debug()
} else {
@ -1281,7 +1282,6 @@ class BaresipService: Service() {
val contacts = ArrayList<Contact>()
val chatTexts: MutableMap<String, String> = mutableMapOf()
val activities = mutableListOf<String>()
var linkAddresses = listOf<LinkAddress>()
var dnsServers = listOf<InetAddress>()
}