From 08412ef99a47d236749908ac9894b0cccd0fdf71 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 18 Mar 2025 12:51:25 +0100
Subject: [PATCH] Prevent some crashes seen on Play Store console

---
 .../main/java/org/linphone/telecom/TelecomManager.kt   | 10 ++++++++--
 .../linphone/ui/assistant/fragment/RegisterFragment.kt |  4 +++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/linphone/telecom/TelecomManager.kt b/app/src/main/java/org/linphone/telecom/TelecomManager.kt
index 785d43182..f71b43fe8 100644
--- a/app/src/main/java/org/linphone/telecom/TelecomManager.kt
+++ b/app/src/main/java/org/linphone/telecom/TelecomManager.kt
@@ -185,8 +185,14 @@ class TelecomManager
                         }
                     }
                 }
-            } catch (e: CallException) {
-                Log.e("$TAG Failed to add call to Telecom's CallsManager: $e")
+            } catch (ce: CallException) {
+                Log.e("$TAG Failed to add call to Telecom's CallsManager: $ce")
+            } catch (se: SecurityException) {
+                Log.e("$TAG Security exception trying to add call to Telecom's CallsManager: $se")
+            } catch (ise: IllegalArgumentException) {
+                Log.e("$TAG Illegal argument exception trying to add call to Telecom's CallsManager: $ise")
+            } catch (e: Exception) {
+                Log.e("$TAG Exception trying to add call to Telecom's CallsManager: $e")
             }
         }
     }
diff --git a/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterFragment.kt b/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterFragment.kt
index 4a0d49cd1..8cfee0ff2 100644
--- a/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterFragment.kt
+++ b/app/src/main/java/org/linphone/ui/assistant/fragment/RegisterFragment.kt
@@ -186,8 +186,10 @@ class RegisterFragment : GenericFragment() {
         val telephonyManager = requireContext().getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
         val countryIso = telephonyManager.networkCountryIso
         coreContext.postOnCoreThread {
+            val fragmentContext = context ?: return@postOnCoreThread
+
             val adapter = object : ArrayAdapter<String>(
-                requireContext(),
+                fragmentContext,
                 R.layout.drop_down_item,
                 viewModel.dialPlansLabelList
             ) {