From 922c6c077677645f33bf594df9e0cc06b0961e86 Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Wed, 1 Sep 2021 07:34:09 +0300 Subject: [PATCH] Variable linkAddresses can now be private --- .../kotlin/com/tutpro/baresip/BaresipService.kt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt index d7909825..6b7ee60d 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt @@ -57,6 +57,7 @@ class BaresipService: Service() { private var origVolume = -1 private val btAdapter = BluetoothAdapter.getDefaultAdapter() internal var activeNetwork = "" + private var linkAddresses = listOf() @SuppressLint("WakelockTimeout") override fun onCreate() { @@ -1174,10 +1175,10 @@ class BaresipService: Service() { } } - private fun updateLinkAddresses(linkAddresses: List) { + private fun updateLinkAddresses(linkAddrs: List) { 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() val chatTexts: MutableMap = mutableMapOf() val activities = mutableListOf() - var linkAddresses = listOf() var dnsServers = listOf() }