From 8ab60426afbc2effeebc908d4a1ded4cfe3acf50 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 18 May 2020 12:40:55 +0200
Subject: [PATCH] adding some crashfixes

---
 app/build.gradle                              |  2 +-
 .../dialer/activities/CallActivity.kt         | 30 +++++++++++++------
 .../dialer/activities/MainActivity.kt         |  2 +-
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5c24d0ec..3e58f42f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,6 +56,6 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.28.3'
+    implementation 'com.simplemobiletools:commons:5.28.5'
     implementation 'com.github.tibbi:IndicatorFastScroll:08f512858a'
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt
index 4712a391..08cac7ad 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt
@@ -255,7 +255,10 @@ class CallActivity : SimpleActivity() {
     private fun callStarted() {
         incoming_call_holder.beGone()
         ongoing_call_holder.beVisible()
-        callTimer.scheduleAtFixedRate(getCallTimerUpdateTask(), 1000, 1000)
+        try {
+            callTimer.scheduleAtFixedRate(getCallTimerUpdateTask(), 1000, 1000)
+        } catch (ignored: Exception) {
+        }
     }
 
     private fun showPhoneAccountPicker() {
@@ -270,12 +273,16 @@ class CallActivity : SimpleActivity() {
             proximityWakeLock!!.release()
         }
 
-        audioManager.mode = AudioManager.MODE_NORMAL
         if (isCallEnded) {
             finish()
             return
         }
 
+        try {
+            audioManager.mode = AudioManager.MODE_NORMAL
+        } catch (ignored: Exception) {
+        }
+
         isCallEnded = true
         if (callDuration > 0) {
             runOnUiThread {
@@ -400,14 +407,19 @@ class CallActivity : SimpleActivity() {
         var bitmap: Bitmap? = null
         if (callContact?.photoUri?.isNotEmpty() == true) {
             val photoUri = Uri.parse(callContact!!.photoUri)
-            bitmap = if (isQPlus()) {
-                val tmbSize = resources.getDimension(R.dimen.list_avatar_size).toInt()
-                contentResolver.loadThumbnail(photoUri, Size(tmbSize, tmbSize), null)
-            } else {
-                MediaStore.Images.Media.getBitmap(contentResolver, photoUri)
-            }
+            try {
+                bitmap = if (isQPlus()) {
+                    val tmbSize = resources.getDimension(R.dimen.list_avatar_size).toInt()
+                    contentResolver.loadThumbnail(photoUri, Size(tmbSize, tmbSize), null)
+                } else {
+                    MediaStore.Images.Media.getBitmap(contentResolver, photoUri)
 
-            bitmap = getCircularBitmap(bitmap!!)
+                }
+
+                bitmap = getCircularBitmap(bitmap!!)
+            } catch (ignored: Exception) {
+                return null
+            }
         }
 
         return bitmap
diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt
index 00c9f1ee..0efd0300 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt
@@ -162,7 +162,7 @@ class MainActivity : SimpleActivity() {
 
                 override fun onQueryTextChange(newText: String): Boolean {
                     if (isSearchOpen) {
-                        contacts_fragment.onSearchQueryChanged(newText)
+                        contacts_fragment?.onSearchQueryChanged(newText)
                     }
                     return true
                 }