From 367700e33fc22909bcdfd9ababea037e3f6c6036 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 7 Jul 2022 09:31:25 +0200
Subject: [PATCH] Fixed telecom manager enabled even if device doesn't support
 the feature

---
 .../main/dialer/fragments/DialerFragment.kt   |  3 ++-
 .../fragments/CallSettingsFragment.kt         | 24 +++++++++++--------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt b/app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt
index 92a02e0bf..983f52c3e 100644
--- a/app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/dialer/fragments/DialerFragment.kt
@@ -282,7 +282,8 @@ class DialerFragment : SecureFragment<DialerFragmentBinding>() {
             if (requireContext().packageManager.hasSystemFeature(PackageManager.FEATURE_CONNECTION_SERVICE)) {
                 TelecomHelper.create(requireContext())
             } else {
-                Log.e("[Dialer] Telecom Helper can't be created, device doesn't support connection service")
+                Log.e("[Dialer] Telecom Helper can't be created, device doesn't support connection service!")
+                return
             }
         } else {
             Log.e("[Dialer] Telecom Manager was already created ?!")
diff --git a/app/src/main/java/org/linphone/activities/main/settings/fragments/CallSettingsFragment.kt b/app/src/main/java/org/linphone/activities/main/settings/fragments/CallSettingsFragment.kt
index 30cc77fed..0dbd881de 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/fragments/CallSettingsFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/fragments/CallSettingsFragment.kt
@@ -89,17 +89,21 @@ class CallSettingsFragment : GenericSettingFragment<SettingsCallFragmentBinding>
             viewLifecycleOwner
         ) {
             it.consume {
-                if (!Compatibility.hasTelecomManagerPermissions(requireContext())) {
-                    Compatibility.requestTelecomManagerPermissions(requireActivity(), 1)
-                } else if (!TelecomHelper.exists()) {
-                    corePreferences.useTelecomManager = true
-                    Log.w("[Telecom Helper] Doesn't exists yet, creating it")
-                    if (requireContext().packageManager.hasSystemFeature(PackageManager.FEATURE_CONNECTION_SERVICE)) {
-                        TelecomHelper.create(requireContext())
-                        updateTelecomManagerAccount()
-                    } else {
-                        Log.e("[Telecom Helper] Telecom Helper can't be created, device doesn't support connection service")
+                if (requireContext().packageManager.hasSystemFeature(PackageManager.FEATURE_CONNECTION_SERVICE)) {
+                    if (!Compatibility.hasTelecomManagerPermissions(requireContext())) {
+                        Compatibility.requestTelecomManagerPermissions(requireActivity(), 1)
+                    } else if (!TelecomHelper.exists()) {
+                        corePreferences.useTelecomManager = true
+                        Log.w("[Telecom Helper] Doesn't exists yet, creating it")
+                        if (requireContext().packageManager.hasSystemFeature(PackageManager.FEATURE_CONNECTION_SERVICE)) {
+                            TelecomHelper.create(requireContext())
+                            updateTelecomManagerAccount()
+                        } else {
+                            Log.e("[Telecom Helper] Telecom Helper can't be created, device doesn't support connection service")
+                        }
                     }
+                } else {
+                    Log.e("[Telecom Helper] Telecom Helper can't be created, device doesn't support connection service!")
                 }
             }
         }