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

Avoid duplicate code with private function

Browse Source
This commit is contained in:
Juha Heinanen
2023-07-06 10:11:59 +03:00
parent 04c5b00070
commit 9eab15ced1
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
View File

@ -1090,10 +1090,7 @@ class MainActivity : AppCompatActivity() {
val redirectUri = ev[1]
val target = Utils.friendlyUri(this, redirectUri, acc)
if (acc.autoRedirect) {
if (ua.account.aor != aorSpinner.tag)
spinToAor(ua.account.aor)
callUri.setText(redirectUri)
callButton.performClick()
redirect(ua, target)
Toast.makeText(applicationContext,
String.format(getString(R.string.redirect_notice), target),
Toast.LENGTH_SHORT
@ -1103,10 +1100,7 @@ class MainActivity : AppCompatActivity() {
setTitle(R.string.redirect_request)
setMessage(String.format(getString(R.string.redirect_request_query), target))
setPositiveButton(getString(R.string.yes)) { dialog, _ ->
if (ua.account.aor != aorSpinner.tag)
spinToAor(ua.account.aor)
callUri.setText(redirectUri)
callButton.performClick()
redirect(ua, target)
dialog.dismiss()
}
setNeutralButton(getString(R.string.no)) { dialog, _ ->
@ -1278,6 +1272,13 @@ class MainActivity : AppCompatActivity() {
handleNextEvent()
}
private fun redirect(ua: UserAgent, redirectUri: String) {
if (ua.account.aor != aorSpinner.tag)
spinToAor(ua.account.aor)
callUri.setText(redirectUri)
callButton.performClick()
}
private fun reStart() {
Log.d(TAG, "Trigger restart")
val pm = applicationContext.packageManager