From 65947fb023049ccfdd54afcc16a1ded07254c914 Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Sat, 20 Apr 2019 15:18:32 +0300 Subject: [PATCH] - Added possibility to set an account as the default account. --- .../com/tutpro/baresip/AccountActivity.kt | 15 ++++++++++++ app/src/main/res/layout/activity_account.xml | 24 +++++++++++++++++++ app/src/main/res/values/strings.xml | 2 ++ 3 files changed, 41 insertions(+) diff --git a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt index 7b9369f5..25be6867 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt @@ -24,6 +24,7 @@ class AccountActivity : AppCompatActivity() { internal lateinit var regCheck: CheckBox internal lateinit var mediaEnc: String internal lateinit var vmUri: EditText + internal lateinit var defaultCheck: CheckBox private var newCodecs = ArrayList() private var save = false @@ -130,6 +131,9 @@ class AccountActivity : AppCompatActivity() { vmUri = findViewById(R.id.voicemailUri) as EditText vmUri.setText(acc.vmUri) + defaultCheck = findViewById(R.id.Default) as CheckBox + defaultCheck.isChecked = uaIndex == 0 + } override fun onCreateOptionsMenu(menu: Menu): Boolean { @@ -338,6 +342,13 @@ class AccountActivity : AppCompatActivity() { save = true } + if (defaultCheck.isChecked && (uaIndex > 0)) { + val tmp = BaresipService.uas[0] + BaresipService.uas[0] = BaresipService.uas[uaIndex] + BaresipService.uas[uaIndex] = tmp + save = true + } + if (save) { AccountsActivity.saveAccounts() if (Api.ua_update_account(UserAgent.uas()[uaIndex].uap) != 0) @@ -395,6 +406,10 @@ class AccountActivity : AppCompatActivity() { Utils.alertView(this, "Voicemail URI", getText(R.string.vmUri).toString()) } + findViewById(R.id.DefaultTitle) as TextView -> { + Utils.alertView(this, "Default Account", + getText(R.string.defaultAccount).toString()) + } } } diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml index c3c1c5ea..ebb3d4c9 100644 --- a/app/src/main/res/layout/activity_account.xml +++ b/app/src/main/res/layout/activity_account.xml @@ -225,6 +225,30 @@ android:layout_width="fill_parent"> + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cda7ec6a..07f5ad96 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -48,6 +48,8 @@ SIP URI for checking of voicemail messages. If left empty, voicemail messages (Message Waiting Indications) are not subscribed to. > + If checked, this account is selected when baresip is started. + > If checked, baresip starts automatically after device (re)start. Comma separated list of DNS servers. Each DNS server is of form server:port. Factory default value is \'8.8.8.8:53\' pointing to public Google DNS server.