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

- Made code a bit easier to read with new var.

Browse Source
This commit is contained in:
Juha Heinanen
2019-06-04 20:18:42 +03:00
parent 50b320967d
commit 49ca0a757f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
+5 -4
View File
@@ -15,6 +15,7 @@ import kotlinx.android.synthetic.main.activity_account.*
class AccountActivity : AppCompatActivity() { class AccountActivity : AppCompatActivity() {
internal lateinit var acc: Account internal lateinit var acc: Account
internal lateinit var ua: UserAgent
internal lateinit var displayName: EditText internal lateinit var displayName: EditText
internal lateinit var aor: String internal lateinit var aor: String
internal lateinit var authUser: EditText internal lateinit var authUser: EditText
@@ -39,6 +40,7 @@ class AccountActivity : AppCompatActivity() {
acc = Account.find(intent.getStringExtra("accp"))!! acc = Account.find(intent.getStringExtra("accp"))!!
aor = acc.aor aor = acc.aor
uaIndex = UserAgent.findAorIndex(aor)!! uaIndex = UserAgent.findAorIndex(aor)!!
ua = UserAgent.uas()[uaIndex]
setTitle(aor.replace("sip:", "")) setTitle(aor.replace("sip:", ""))
@@ -257,7 +259,6 @@ class AccountActivity : AppCompatActivity() {
if (acc.regint != 3600) newRegint = 3600 if (acc.regint != 3600) newRegint = 3600
} else { } else {
if (acc.regint != 0) { if (acc.regint != 0) {
val ua = UserAgent.uas()[uaIndex]
Api.ua_unregister(ua.uap) Api.ua_unregister(ua.uap)
UserAgent.updateStatus(ua, R.drawable.dot_yellow) UserAgent.updateStatus(ua, R.drawable.dot_yellow)
newRegint = 0 newRegint = 0
@@ -369,11 +370,11 @@ class AccountActivity : AppCompatActivity() {
if (save) { if (save) {
AccountsActivity.saveAccounts() AccountsActivity.saveAccounts()
if (Api.ua_update_account(UserAgent.uas()[uaIndex].uap) != 0) if (Api.ua_update_account(ua.uap) != 0)
Log.e("Baresip", "Failed to update UA with AoR $aor") Log.e("Baresip", "Failed to update UA ${ua.uap} with AoR $aor")
} }
if (regCheck.isChecked) Api.ua_register(UserAgent.uas()[uaIndex].uap) if (regCheck.isChecked) Api.ua_register(ua.uap)
val i = Intent() val i = Intent()
setResult(Activity.RESULT_OK, i) setResult(Activity.RESULT_OK, i)