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

Avoid douple mobile account in account spinner when default phone app setting is enabled

Browse Source
This commit is contained in:
Juha Heinanen
2026-08-07 22:20:28 +03:00
parent 7ea2b7699d
commit 88664e709c
3 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -866,22 +866,34 @@ class BaresipService: Service() {
if (ev[0] == "create") {
val ua = UserAgent(uap)
if (VERSION.SDK_INT < 29 && ua.account.isMobile) {
Log.d(TAG, "Removing Mobile account on API < 29")
if (Utils.uriMatch(ua.account.aor, "sip:mobile@pstn"))
ua.account.isMobile = true
var removeMobile = false
if (ua.account.isMobile) {
if (VERSION.SDK_INT < 29) {
Log.d(TAG, "Removing Mobile account on API < 29")
removeMobile = true
} else if (Utils.pstnAccountHandle(this) == null || !isSimReady()) {
Log.d(TAG, "Removing Mobile account (SIM not ready or not default dialer)")
removeMobile = true
}
}
if (removeMobile) {
CallHistoryNew.clear(ua.account.aor)
Message.clearMessagesOfAor(ua.account.aor)
Blocked.clear(ua.account.aor)
BlockRule.clear(ua.account.aor)
Api.ua_destroy(uap)
Account.saveAccounts()
if (isNativeReady) Account.saveAccounts()
return
}
ua.status = if (ua.account.isMobile) {
val isAirplaneModeOn = Utils.isAirplaneModeOn(this)
val isSimReady = isSimReady()
if (VERSION.SDK_INT >= 29) {
if (Utils.pstnAccountHandle(this) == null || !isSimReady || isAirplaneModeOn)
if (isAirplaneModeOn)
R.drawable.circle_white
else
circleRed.getValue(colorblind)
@ -905,7 +917,7 @@ class BaresipService: Service() {
Api.account_set_auth_pass(acc.accp, NO_AUTH_PASS)
}
Log.d(TAG, "got uaEvent $event/${acc.aor}")
Log.d(TAG, "got uaEvent $ev/${acc.aor}")
return
}
@ -1787,6 +1799,7 @@ class BaresipService: Service() {
Handler(Looper.getMainLooper()).post {
addMobileUserAgent()
Account.saveAccounts()
if (VERSION.SDK_INT >= 29)
updateMobileStatus()
@ -2303,7 +2316,7 @@ class BaresipService: Service() {
val mobileAccountHandle = Utils.pstnAccountHandle(this)
val isSimReady = isSimReady()
val existingMobileUa = uas.value.find { it.account.isMobile }
val existingMobileUa = uas.value.find { it.account.isMobile || Utils.uriMatch(it.account.aor, "sip:mobile@pstn") }
if (mobileAccountHandle == null || !isSimReady) {
if (existingMobileUa != null) {
@ -2311,7 +2324,7 @@ class BaresipService: Service() {
if (existingMobileUa.uap != 0L)
Api.ua_destroy(existingMobileUa.uap)
existingMobileUa.remove()
Account.saveAccounts()
if (isNativeReady) Account.saveAccounts()
updateStatusNotification()
}
return
@ -2347,13 +2360,10 @@ class BaresipService: Service() {
val mobileUa = UserAgent(0L, account)
mobileUa.status = status
val updatedUas = uas.value.toMutableList()
updatedUas.add(mobileUa)
uas.value = updatedUas.toList()
uasStatus.value = UserAgent.statusMap()
mobileUa.add()
registerTelephony()
Account.saveAccounts()
if (isNativeReady) Account.saveAccounts()
CallHistoryNew.save()
Message.save()
updateStatusNotification()

11
app/src/main/kotlin/com/tutpro/baresip/UserAgent.kt
View File

@ -18,7 +18,16 @@ class UserAgent(val uap: Long, virtualAccount: Account? = null) {
fun add() {
synchronized(uas) {
val updatedUas = uas.value.toMutableList()
updatedUas.add(this)
val index = updatedUas.indexOfFirst { Utils.uriMatch(it.account.aor, this.account.aor) }
if (index == -1) {
updatedUas.add(this)
} else {
if (updatedUas[index].uap == 0L && this.uap != 0L) {
updatedUas[index] = this
} else {
return
}
}
uas.value = updatedUas.toList()
uasStatus.value = statusMap()
}

21
app/src/main/kotlin/com/tutpro/baresip/Utils.kt
View File

@ -152,11 +152,14 @@ object Utils {
}
fun uriMatch(firstUri: String, secondUri: String): Boolean {
if (firstUri.startsWith("tel:"))
return firstUri == secondUri || firstUri.substringAfter(":") == uriUserPart(secondUri)
if (firstUri.startsWith("sip:"))
return uriUserPart(firstUri) == uriUserPart(secondUri) &&
uriHostPart(firstUri) == uriHostPart(secondUri)
val first = firstUri.removePrefix("<").removeSuffix(">")
val second = secondUri.removePrefix("<").removeSuffix(">")
if (first.startsWith("tel:", ignoreCase = true))
return first.equals(second, ignoreCase = true) ||
first.substringAfter(":").equals(uriUserPart(second), ignoreCase = true)
if (first.startsWith("sip:", ignoreCase = true))
return uriUserPart(first).equals(uriUserPart(second), ignoreCase = true) &&
uriHostPart(first).equals(uriHostPart(second), ignoreCase = true)
return false
}
@ -346,14 +349,18 @@ object Utils {
fun paramValue(params: String, name: String): String {
if (params == "") return ""
for (param in params.split(";"))
for (p in params.split(";")) {
val param = p.trim()
if (param.substringBefore("=") == name) return param.substringAfter("=")
}
return ""
}
fun paramExists(params: String, name: String): Boolean {
for (param in params.split(";"))
for (p in params.split(";")) {
val param = p.trim()
if (param.substringBefore("=") == name) return true
}
return false
}