jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fixed crash when resuming to previously destroyed main activity.

Browse Source 
- Correctly show incoming call when resuming to main activity.
This commit is contained in:
Juha Heinanen
2019-10-14 11:59:25 +03:00
parent 5020893450
commit 26cccaa1f4
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+14 -18
View File
@@ -549,26 +549,22 @@ class MainActivity : AppCompatActivity() {
"message show", "message reply" -> "message show", "message reply" ->
handleServiceEvent(resumeAction, arrayListOf(resumeUap, resumeUri)) handleServiceEvent(resumeAction, arrayListOf(resumeUap, resumeUri))
else -> { else -> {
if (!BaresipService.activities.isEmpty()) { if (!BaresipService.activities.isEmpty()) restoreActivities()
restoreActivities() if (UserAgent.uas().size > 0) {
} else { val currentPosition = aorSpinner.selectedItemPosition
if (UserAgent.uas().size > 0) { uaAdapter = UaSpinnerAdapter(applicationContext, UserAgent.uas(),
val currentPosition = aorSpinner.selectedItemPosition UserAgent.status())
uaAdapter = UaSpinnerAdapter(applicationContext, UserAgent.uas(), aorSpinner.adapter = uaAdapter
UserAgent.status()) if (currentPosition == -1) {
aorSpinner.adapter = uaAdapter if (Call.calls().size > 0)
if (currentPosition == -1) { spinToAor(Call.calls()[0].ua.account.aor)
if (Call.calls().size > 0) else
spinToAor(Call.calls()[0].ua.account.aor) aorSpinner.setSelection(0)
else } else {
aorSpinner.setSelection(0) aorSpinner.setSelection(currentPosition)
} else {
aorSpinner.setSelection(currentPosition)
}
showCall(UserAgent.uas()[aorSpinner.selectedItemPosition])
} }
showCall(UserAgent.uas()[aorSpinner.selectedItemPosition])
} }
uaAdapter.notifyDataSetChanged()
} }
} }
resumeAction = "" resumeAction = ""