From 5e8cc5fbdbee8d8fe1d411cdcf78d23cf6788de4 Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Sat, 3 Nov 2018 15:53:39 +0200 Subject: [PATCH] avoid crash when coming first time back from accounts to main activity --- .../kotlin/com/tutpro/baresip/MainActivity.kt | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt index dd4eb956..32bb5695 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt @@ -860,15 +860,19 @@ class MainActivity : AppCompatActivity() { ACCOUNTS_CODE -> { uaAdapter.notifyDataSetChanged() - val acc = uas[aorSpinner.selectedItemPosition].account - if (acc.vmUri != "") { - if (acc.vmNew > 0) - voicemailButton.setImageResource(R.drawable.voicemail_new) - else - voicemailButton.setImageResource(R.drawable.voicemail) - voicemailButton.visibility = View.VISIBLE - } else { - voicemailButton.visibility = View.INVISIBLE + if ((aorSpinner.selectedItemPosition == -1) && (uas.size > 0)) + aorSpinner.setSelection(0) + if (aorSpinner.selectedItemPosition >= 0) { + val acc = uas[aorSpinner.selectedItemPosition].account + if (acc.vmUri != "") { + if (acc.vmNew > 0) + voicemailButton.setImageResource(R.drawable.voicemail_new) + else + voicemailButton.setImageResource(R.drawable.voicemail) + voicemailButton.visibility = View.VISIBLE + } else { + voicemailButton.visibility = View.INVISIBLE + } } baresipService.setAction("UpdateNotification") startService(baresipService)