From b42c02722692fc7dc9b937fc2c82a429f166e3a6 Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Tue, 17 Jul 2018 09:25:07 +0300 Subject: [PATCH] avoid crash if caller hangs up during heads-up notification --- app/build.gradle | 2 +- .../kotlin/com/tutpro/baresip/MainActivity.kt | 20 ++++++++----------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index adf369a5..138dc055 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ android { applicationId = 'com.tutpro.baresip' minSdkVersion 21 targetSdkVersion 26 - versionCode = 5 + versionCode = 7 versionName = '1.0' ndk { abiFilters 'armeabi-v7a' diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt index e26fed07..e657a77f 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt @@ -521,12 +521,14 @@ class MainActivity : AppCompatActivity() { if (callButton.tag == "Call") { callee.setOnKeyListener(null) } - val caller_heading = layout.findViewById(view_id) as TextView - val view_index = layout.indexOfChild(caller_heading) - layout.removeViews(view_index, 3 * remove_count) - val callsIn = Call.uaCalls(calls, ua, "in") - for (i in inIndex until callsIn.size) { - addCallViews(ua, callsIn[i], (i + 1) * 10) + val caller_heading = layout.findViewById(view_id) as TextView? + if (caller_heading != null) { + val view_index = layout.indexOfChild(caller_heading) + layout.removeViews(view_index, 3 * remove_count) + val callsIn = Call.uaCalls(calls, ua, "in") + for (i in inIndex until callsIn.size) { + addCallViews(ua, callsIn[i], (i + 1) * 10) + } } historyButton.visibility = View.VISIBLE } @@ -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() { moveTaskToBack(true) }