diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt index 883f930c..5cfccde2 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt @@ -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