- At resume, notify AoR spinner about changed dataset only if the

spinner is currently shown.
This commit is contained in:
Juha Heinanen
2019-04-29 14:43:12 +03:00
parent 1afac77f25
commit 21876b54c1

View File

@ -74,6 +74,7 @@ class MainActivity : AppCompatActivity() {
setContentView(R.layout.activity_main) setContentView(R.layout.activity_main)
layout = findViewById(R.id.mainActivityLayout) as RelativeLayout layout = findViewById(R.id.mainActivityLayout) as RelativeLayout
aorSpinner = findViewById(R.id.AoRList)
callTitle = findViewById(R.id.callTitle) as TextView callTitle = findViewById(R.id.callTitle) as TextView
callUri = findViewById(R.id.callUri) as AutoCompleteTextView callUri = findViewById(R.id.callUri) as AutoCompleteTextView
securityButton = findViewById(R.id.securityButton) as ImageButton securityButton = findViewById(R.id.securityButton) as ImageButton
@ -132,7 +133,6 @@ class MainActivity : AppCompatActivity() {
arrayOf(Manifest.permission.RECORD_AUDIO), PERMISSION_REQUEST_CODE) arrayOf(Manifest.permission.RECORD_AUDIO), PERMISSION_REQUEST_CODE)
} }
aorSpinner = findViewById(R.id.AoRList)
uaAdapter = UaSpinnerAdapter(applicationContext, UserAgent.uas(), UserAgent.status()) uaAdapter = UaSpinnerAdapter(applicationContext, UserAgent.uas(), UserAgent.status())
aorSpinner.adapter = uaAdapter aorSpinner.adapter = uaAdapter
aorSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { aorSpinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
@ -531,9 +531,8 @@ class MainActivity : AppCompatActivity() {
handleServiceEvent(resumeAction, arrayListOf(resumeUap, resumeUri)) handleServiceEvent(resumeAction, arrayListOf(resumeUap, resumeUri))
else -> { else -> {
if (UserAgent.uas().size > 0) { if (UserAgent.uas().size > 0) {
if (aorSpinner.selectedItemPosition == -1) if (aorSpinner.selectedItemPosition == -1) aorSpinner.setSelection(0)
aorSpinner.setSelection(0) if (aorSpinner.isShown) uaAdapter.notifyDataSetChanged()
uaAdapter.notifyDataSetChanged()
showCall(UserAgent.uas()[aorSpinner.selectedItemPosition]) showCall(UserAgent.uas()[aorSpinner.selectedItemPosition])
updateIcons(UserAgent.uas()[aorSpinner.selectedItemPosition].account) updateIcons(UserAgent.uas()[aorSpinner.selectedItemPosition].account)
} }