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

Simplified account re-registering

Browse Source
This commit is contained in:
Juha Heinanen
2022-06-09 09:47:34 +03:00
parent 8e45b814e1
commit dec984a37f
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
+9 -12
View File
@@ -458,19 +458,19 @@ class AccountActivity : AppCompatActivity() {
} }
} else { } else {
if (acc.regint != 0) { if (acc.regint != 0) {
Api.ua_unregister(ua.uap)
ua.status = R.drawable.dot_white ua.status = R.drawable.dot_white
newRegint = 0 newRegint = 0
} }
} }
if (newRegint != -1) if (newRegint != -1) {
if (Api.account_set_regint(acc.accp, newRegint) == 0) { if (Api.account_set_regint(acc.accp, newRegint) != 0) {
Log.e(TAG, "Setting of regint failed")
} else {
acc.regint = Api.account_regint(acc.accp) acc.regint = Api.account_regint(acc.accp)
Log.d(TAG, "New regint is ${acc.regint}") Log.d(TAG, "New regint is ${acc.regint}")
save = true save = true
} else {
Log.e(TAG, "Setting of regint failed")
} }
}
if (mediaNat != acc.mediaNat) { if (mediaNat != acc.mediaNat) {
if (Api.account_set_medianat(acc.accp, mediaNat) == 0) { if (Api.account_set_medianat(acc.accp, mediaNat) == 0) {
@@ -616,15 +616,12 @@ class AccountActivity : AppCompatActivity() {
if (save) { if (save) {
AccountsActivity.saveAccounts() AccountsActivity.saveAccounts()
if (Api.ua_update_account(ua.uap) != 0) if (newRegint == 0)
Log.e(TAG, "Failed to update UA ${ua.uap} with AoR $aor") Api.ua_unregister(ua.uap)
//else else if (acc.regint != 0)
//Api.ua_debug(ua.uap) Api.ua_register(ua.uap)
} }
if (regCheck.isChecked && !((acc.authUser != "") && (acc.authPass == "")))
Api.ua_register(ua.uap)
BaresipService.activities.remove("account,$aor") BaresipService.activities.remove("account,$aor")
returnResult(Activity.RESULT_OK) returnResult(Activity.RESULT_OK)
return true return true