avoid crash if caller hangs up during heads-up notification

This commit is contained in:
Juha Heinanen
2018-07-17 09:25:07 +03:00
parent 19ca0e7cfd
commit b42c027226
2 changed files with 9 additions and 13 deletions
+1 -1
View File
@@ -8,7 +8,7 @@ android {
applicationId = 'com.tutpro.baresip' applicationId = 'com.tutpro.baresip'
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 26 targetSdkVersion 26
versionCode = 5 versionCode = 7
versionName = '1.0' versionName = '1.0'
ndk { ndk {
abiFilters 'armeabi-v7a' abiFilters 'armeabi-v7a'
@@ -521,13 +521,15 @@ class MainActivity : AppCompatActivity() {
if (callButton.tag == "Call") { if (callButton.tag == "Call") {
callee.setOnKeyListener(null) callee.setOnKeyListener(null)
} }
val caller_heading = layout.findViewById(view_id) as TextView val caller_heading = layout.findViewById(view_id) as TextView?
if (caller_heading != null) {
val view_index = layout.indexOfChild(caller_heading) val view_index = layout.indexOfChild(caller_heading)
layout.removeViews(view_index, 3 * remove_count) layout.removeViews(view_index, 3 * remove_count)
val callsIn = Call.uaCalls(calls, ua, "in") val callsIn = Call.uaCalls(calls, ua, "in")
for (i in inIndex until callsIn.size) { for (i in inIndex until callsIn.size) {
addCallViews(ua, callsIn[i], (i + 1) * 10) addCallViews(ua, callsIn[i], (i + 1) * 10)
} }
}
historyButton.visibility = View.VISIBLE historyButton.visibility = View.VISIBLE
} }
if (!call.hasHistory) { if (!call.hasHistory) {
@@ -613,12 +615,6 @@ class MainActivity : AppCompatActivity() {
} }
} }
override fun onAttachedToWindow() {
super.onAttachedToWindow()
Log.d("Baresip", "View count at onAttachedToWindow is ${layout.childCount}")
Toast.makeText(this, "Hi UI is fully loaded", Toast.LENGTH_SHORT).show();
}
override fun onBackPressed() { override fun onBackPressed() {
moveTaskToBack(true) moveTaskToBack(true)
} }