Merge pull request #556 from grit96/patch-2

manuquentin · web-flow · commit 09b533a75257 · 2022-04-15T07:40:42.000-04:00
Check permissions in hasPhoneAccount
diff --git a/android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java b/android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java
@@ -982,9 +982,10 @@ private Boolean hasPermissions() {
         return hasPermissions;
     }
 
-    private static boolean hasPhoneAccount() {
-        return isConnectionServiceAvailable() && telecomManager != null
-            && telecomManager.getPhoneAccount(handle) != null && telecomManager.getPhoneAccount(handle).isEnabled();
+    private boolean hasPhoneAccount() {
+        return isConnectionServiceAvailable() && telecomManager != null &&
+            hasPermissions() && telecomManager.getPhoneAccount(handle) != null &&
+            telecomManager.getPhoneAccount(handle).isEnabled();
     }
 
     private void registerReceiver() {

Original file line number	Diff line number	Diff line change
`@@ -982,9 +982,10 @@ private Boolean hasPermissions() {`
`982`	`982`	`return hasPermissions;`
`983`	`983`	`}`
`984`	`984`
`985`		`- private static boolean hasPhoneAccount() {`
`986`		`- return isConnectionServiceAvailable() && telecomManager != null`
`987`		`- && telecomManager.getPhoneAccount(handle) != null && telecomManager.getPhoneAccount(handle).isEnabled();`
	`985`	`+ private boolean hasPhoneAccount() {`
	`986`	`+ return isConnectionServiceAvailable() && telecomManager != null &&`
	`987`	`+ hasPermissions() && telecomManager.getPhoneAccount(handle) != null &&`
	`988`	`+ telecomManager.getPhoneAccount(handle).isEnabled();`
`988`	`989`	`}`
`989`	`990`
`990`	`991`	`private void registerReceiver() {`