From 564c57c1c782096877fe44342a6b2ff7666d1c7c Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Wed, 23 May 2018 12:48:41 +0300 Subject: [PATCH] go to accounts if spinner is pressed when there is no accounts --- .../kotlin/com/tutpro/baresip/MainActivity.kt | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt index 154f62ed..8b6bad70 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt @@ -144,15 +144,21 @@ class MainActivity : AppCompatActivity() { aorSpinner.setOnTouchListener { view, event -> if (event.action == MotionEvent.ACTION_DOWN) { - if ((event.x - view.left) < 100) { - val i = Intent(this, AccountActivity::class.java) - val b = Bundle() - b.putString("accp", uas[aorSpinner.selectedItemPosition].account.accp) - i.putExtras(b) - startActivityForResult(i, ACCOUNT_CODE) + if (aorSpinner.selectedItemPosition == -1) { + val i = Intent(this, AccountsActivity::class.java) + startActivityForResult(i, ACCOUNTS_CODE) true } else { - false + if ((event.x - view.left) < 100) { + val i = Intent(this, AccountActivity::class.java) + val b = Bundle() + b.putString("accp", uas[aorSpinner.selectedItemPosition].account.accp) + i.putExtras(b) + startActivityForResult(i, ACCOUNT_CODE) + true + } else { + false + } } } else { false @@ -415,6 +421,7 @@ class MainActivity : AppCompatActivity() { Log.d("Baresip", "Edit accounts OK") if (resultCode == RESULT_CANCELED) Log.d("Baresip", "Edit accounts canceled") + uaAdapter.notifyDataSetChanged() } EDIT_CONFIG_CODE -> {