Avoid duplicate code with private function
This commit is contained in:
@@ -1090,10 +1090,7 @@ class MainActivity : AppCompatActivity() {
|
|||||||
val redirectUri = ev[1]
|
val redirectUri = ev[1]
|
||||||
val target = Utils.friendlyUri(this, redirectUri, acc)
|
val target = Utils.friendlyUri(this, redirectUri, acc)
|
||||||
if (acc.autoRedirect) {
|
if (acc.autoRedirect) {
|
||||||
if (ua.account.aor != aorSpinner.tag)
|
redirect(ua, target)
|
||||||
spinToAor(ua.account.aor)
|
|
||||||
callUri.setText(redirectUri)
|
|
||||||
callButton.performClick()
|
|
||||||
Toast.makeText(applicationContext,
|
Toast.makeText(applicationContext,
|
||||||
String.format(getString(R.string.redirect_notice), target),
|
String.format(getString(R.string.redirect_notice), target),
|
||||||
Toast.LENGTH_SHORT
|
Toast.LENGTH_SHORT
|
||||||
@@ -1103,10 +1100,7 @@ class MainActivity : AppCompatActivity() {
|
|||||||
setTitle(R.string.redirect_request)
|
setTitle(R.string.redirect_request)
|
||||||
setMessage(String.format(getString(R.string.redirect_request_query), target))
|
setMessage(String.format(getString(R.string.redirect_request_query), target))
|
||||||
setPositiveButton(getString(R.string.yes)) { dialog, _ ->
|
setPositiveButton(getString(R.string.yes)) { dialog, _ ->
|
||||||
if (ua.account.aor != aorSpinner.tag)
|
redirect(ua, target)
|
||||||
spinToAor(ua.account.aor)
|
|
||||||
callUri.setText(redirectUri)
|
|
||||||
callButton.performClick()
|
|
||||||
dialog.dismiss()
|
dialog.dismiss()
|
||||||
}
|
}
|
||||||
setNeutralButton(getString(R.string.no)) { dialog, _ ->
|
setNeutralButton(getString(R.string.no)) { dialog, _ ->
|
||||||
@@ -1278,6 +1272,13 @@ class MainActivity : AppCompatActivity() {
|
|||||||
handleNextEvent()
|
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() {
|
private fun reStart() {
|
||||||
Log.d(TAG, "Trigger restart")
|
Log.d(TAG, "Trigger restart")
|
||||||
val pm = applicationContext.packageManager
|
val pm = applicationContext.packageManager
|
||||||
|
|||||||
Reference in New Issue
Block a user