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

Minor code simplification

Browse Source
This commit is contained in:
Juha Heinanen
2025-04-05 08:54:54 +03:00
parent 63e4506df9
commit 52b23e39f3
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/Account.kt
+4 -4
View File
@@ -94,7 +94,7 @@ class Account(val accp: Long) {
if ((authPass != "") && !BaresipService.aorPasswords.containsKey(aor)) if ((authPass != "") && !BaresipService.aorPasswords.containsKey(aor))
res += ";auth_pass=\"${authPass}\"" res += ";auth_pass=\"${authPass}\""
if (outbound.size > 0) { if (outbound.isNotEmpty()) {
res += ";outbound=\"${outbound[0]}\"" res += ";outbound=\"${outbound[0]}\""
if (outbound.size > 1) res += ";outbound2=\"${outbound[1]}\"" if (outbound.size > 1) res += ";outbound2=\"${outbound[1]}\""
res = "$res;sipnat=outbound" res = "$res;sipnat=outbound"
@@ -111,7 +111,7 @@ class Account(val accp: Long) {
if (stunPass != "") if (stunPass != "")
res += ";stunpass=\"${stunPass}\"" res += ";stunpass=\"${stunPass}\""
if (audioCodec.size > 0) { if (audioCodec.isNotEmpty()) {
var first = true var first = true
res = "$res;audio_codecs=" res = "$res;audio_codecs="
for (c in audioCodec) for (c in audioCodec)
@@ -252,7 +252,7 @@ class Account(val accp: Long) {
fun checkDisplayName(dn: String): Boolean { fun checkDisplayName(dn: String): Boolean {
if (dn == "") return true if (dn == "") return true
val dnRegex = Regex("^([* .!%_`'~]|[+]|[-a-zA-Z0-9]){1,64}\$") val dnRegex = Regex("^([* .!%_`'~]|[+]|[-a-zA-Z0-9]){1,64}$")
return dnRegex.matches(dn) return dnRegex.matches(dn)
} }
@@ -268,7 +268,7 @@ class Account(val accp: Long) {
fun checkAuthPass(ap: String): Boolean { fun checkAuthPass(ap: String): Boolean {
return (ap.isNotEmpty()) && (ap.length <= 64) && return (ap.isNotEmpty()) && (ap.length <= 64) &&
Regex("^[ -~]*\$").matches(ap) && !ap.contains('"') Regex("^[ -~]*$").matches(ap) && !ap.contains('"')
} }
fun uniqueNickName(nickName: String): Boolean { fun uniqueNickName(nickName: String): Boolean {