Account related simplifications
This commit is contained in:
@@ -141,14 +141,8 @@ class CodecsActivity : AppCompatActivity() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (save) {
|
if (save)
|
||||||
AccountsActivity.saveAccounts()
|
AccountsActivity.saveAccounts()
|
||||||
if (Api.ua_update_account(ua.uap) != 0)
|
|
||||||
Log.e(TAG, "Failed to update UA ${ua.uap} with AoR $aor")
|
|
||||||
}
|
|
||||||
|
|
||||||
if ((acc.regint > 0) && !((acc.authUser != "") && (acc.authPass == "")))
|
|
||||||
Api.ua_register(ua.uap)
|
|
||||||
|
|
||||||
BaresipService.activities.remove("codecs,$aor,$media")
|
BaresipService.activities.remove("codecs,$aor,$media")
|
||||||
finish()
|
finish()
|
||||||
|
|||||||
@@ -25,16 +25,14 @@ class TaskReceiver : BroadcastReceiver() {
|
|||||||
"com.tutpro.baresip.REGISTER" -> {
|
"com.tutpro.baresip.REGISTER" -> {
|
||||||
Log.d(TAG, "TaskReceiver: registering $aor")
|
Log.d(TAG, "TaskReceiver: registering $aor")
|
||||||
Api.account_set_regint(acc.accp, REGISTRATION_INTERVAL)
|
Api.account_set_regint(acc.accp, REGISTRATION_INTERVAL)
|
||||||
Api.ua_update_account(ua.uap)
|
|
||||||
if (!Api.ua_isregistered(ua.uap))
|
if (!Api.ua_isregistered(ua.uap))
|
||||||
Api.ua_register(ua.uap)
|
Api.ua_register(ua.uap)
|
||||||
}
|
}
|
||||||
"com.tutpro.baresip.UNREGISTER" -> {
|
"com.tutpro.baresip.UNREGISTER" -> {
|
||||||
Log.d(TAG, "TaskReceiver: un-registering $aor")
|
Log.d(TAG, "TaskReceiver: un-registering $aor")
|
||||||
|
Api.account_set_regint(acc.accp,0)
|
||||||
if (Api.ua_isregistered(ua.uap))
|
if (Api.ua_isregistered(ua.uap))
|
||||||
Api.ua_unregister(ua.uap)
|
Api.ua_unregister(ua.uap)
|
||||||
Api.account_set_regint(acc.accp,0)
|
|
||||||
Api.ua_update_account(ua.uap)
|
|
||||||
}
|
}
|
||||||
else -> return
|
else -> return
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user