From 3599fd21da78a2d7154e6e9adc32e2c8ae58acea Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 19 Apr 2022 09:09:40 +0200
Subject: [PATCH] Catching another exception in ContactsLoader + prevent crash
 if cursor is null

---
 app/src/main/java/org/linphone/contact/ContactLoader.kt | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/linphone/contact/ContactLoader.kt b/app/src/main/java/org/linphone/contact/ContactLoader.kt
index 82e5d9ad3..07bf6ab2e 100644
--- a/app/src/main/java/org/linphone/contact/ContactLoader.kt
+++ b/app/src/main/java/org/linphone/contact/ContactLoader.kt
@@ -71,7 +71,11 @@ class ContactLoader : LoaderManager.LoaderCallbacks<Cursor> {
         )
     }
 
-    override fun onLoadFinished(loader: Loader<Cursor>, cursor: Cursor) {
+    override fun onLoadFinished(loader: Loader<Cursor>, cursor: Cursor?) {
+        if (cursor == null) {
+            Log.e("[Contacts Loader] Cursor is null!")
+            return
+        }
         Log.i("[Contacts Loader] Load finished, found ${cursor.count} entries in cursor")
 
         val core = coreContext.core
@@ -211,6 +215,9 @@ class ContactLoader : LoaderManager.LoaderCallbacks<Cursor> {
                     }
                 } catch (sde: StaleDataException) {
                     Log.e("[Contacts Loader] State Data Exception: $sde")
+                } catch (ise: IllegalStateException) {
+                    Log.e("[Contacts Loader] Illegal State Exception: $ise")
+                } finally {
                     cancel()
                 }
             }