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

- Return AoR of the account as the result from AccountActivity.

Browse Source
This commit is contained in:
Juha Heinanen
2020-04-05 17:24:39 +03:00
parent 73e004bb5a
commit dd8a8c1100
3 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
+11 -15
View File
@@ -212,6 +212,9 @@ class AccountActivity : AppCompatActivity() {
if (BaresipService.activities.indexOf("account,$accp") == -1) return true if (BaresipService.activities.indexOf("account,$accp") == -1) return true
val intent = Intent()
intent.putExtra("aor", aor)
when (item.itemId) { when (item.itemId) {
R.id.checkIcon -> { R.id.checkIcon -> {
@@ -466,25 +469,17 @@ class AccountActivity : AppCompatActivity() {
if (regCheck.isChecked && !((acc.authUser != "") && (acc.authPass == ""))) if (regCheck.isChecked && !((acc.authUser != "") && (acc.authPass == "")))
Api.ua_register(ua.uap) Api.ua_register(ua.uap)
BaresipService.activities.remove("account,$accp") setResult(Activity.RESULT_OK, intent)
val i = Intent()
i.putExtra("accp", accp)
setResult(Activity.RESULT_OK, i)
finish()
} }
android.R.id.home -> { android.R.id.home ->
setResult(Activity.RESULT_CANCELED, intent)
}
BaresipService.activities.remove("account,$accp") BaresipService.activities.remove("account,$accp")
val i = Intent()
setResult(Activity.RESULT_CANCELED, i)
finish() finish()
}
}
return true return true
} }
@@ -492,8 +487,9 @@ class AccountActivity : AppCompatActivity() {
override fun onBackPressed() { override fun onBackPressed() {
BaresipService.activities.remove("account,$accp") BaresipService.activities.remove("account,$accp")
val i = Intent() val intent = Intent()
setResult(Activity.RESULT_CANCELED, i) intent.putExtra("aor", aor)
setResult(Activity.RESULT_CANCELED, intent)
finish() finish()
super.onBackPressed() super.onBackPressed()
app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
+1 -1
View File
@@ -79,7 +79,7 @@ class AccountsActivity : AppCompatActivity() {
when (requestCode) { when (requestCode) {
ACCOUNT_CODE -> { ACCOUNT_CODE -> {
if (resultCode == Activity.RESULT_OK) { if (resultCode == Activity.RESULT_OK) {
val aor = Account.find(data!!.getStringExtra("accp"))!!.aor val aor = data!!.getStringExtra("aor")
val ua = UserAgent.uas()[UserAgent.findAorIndex(aor)!!] val ua = UserAgent.uas()[UserAgent.findAorIndex(aor)!!]
if (aorPasswords.containsKey(aor) && aorPasswords[aor] == "") if (aorPasswords.containsKey(aor) && aorPasswords[aor] == "")
askPassword(String.format(getString(R.string.account_password), askPassword(String.format(getString(R.string.account_password),
app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+6 -5
View File
@@ -1114,13 +1114,14 @@ class MainActivity : AppCompatActivity() {
} }
ACCOUNT_CODE -> { ACCOUNT_CODE -> {
val ua = UserAgent.uas()[aorSpinner.selectedItemPosition] val aor = data!!.getStringExtra("aor")
val account = ua.account spinToAor(aor)
updateIcons(account) val ua = Account.findUa(aor)!!
updateIcons(ua.account)
if (resultCode == Activity.RESULT_OK) if (resultCode == Activity.RESULT_OK)
if (aorPasswords.containsKey(account.aor) && aorPasswords[account.aor] == "") if (aorPasswords.containsKey(aor) && aorPasswords[aor] == "")
askPassword(String.format(getString(R.string.account_password), askPassword(String.format(getString(R.string.account_password),
Utils.plainAor(account.aor)), ua) Utils.plainAor(aor)), ua)
} }
CONTACTS_CODE -> { CONTACTS_CODE -> {