From 19b15e2b3b91e3d355d18db88663cd1d47c65cee Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 2 Nov 2021 12:40:54 +0100
Subject: [PATCH] Make sure PermissionHelper singleton is created

---
 app/src/main/java/org/linphone/core/CoreContext.kt      | 3 +--
 app/src/main/java/org/linphone/telecom/TelecomHelper.kt | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index 8e942a1a8..bb2197f9a 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -299,7 +299,6 @@ class CoreContext(val context: Context, coreConfig: Config) {
         Log.i("=========================================")
 
         core = Factory.instance().createCoreWithConfig(coreConfig, context)
-
         stopped = false
         Log.i("[Context] Ready")
     }
@@ -419,7 +418,7 @@ class CoreContext(val context: Context, coreConfig: Config) {
     /* Call related functions */
 
     fun initPhoneStateListener() {
-        if (PermissionHelper.get().hasReadPhoneStatePermission()) {
+        if (PermissionHelper.required(context).hasReadPhoneStatePermission()) {
             try {
                 phoneStateListener =
                     Compatibility.createPhoneListener(context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager)
diff --git a/app/src/main/java/org/linphone/telecom/TelecomHelper.kt b/app/src/main/java/org/linphone/telecom/TelecomHelper.kt
index 88dda9f2b..c9161ebee 100644
--- a/app/src/main/java/org/linphone/telecom/TelecomHelper.kt
+++ b/app/src/main/java/org/linphone/telecom/TelecomHelper.kt
@@ -98,8 +98,7 @@ class TelecomHelper private constructor(context: Context) {
 
     @SuppressLint("MissingPermission")
     fun findExistingAccount(context: Context): PhoneAccount? {
-        if (!PermissionHelper.exists()) PermissionHelper.create(context)
-        if (PermissionHelper.get().hasReadPhoneStateOrPhoneNumbersPermission()) {
+        if (PermissionHelper.required(context).hasReadPhoneStateOrPhoneNumbersPermission()) {
             var account: PhoneAccount? = null
             val phoneAccountHandleList: List<PhoneAccountHandle> =
                 telecomManager.selfManagedPhoneAccounts