From 4325d96a5abdc5dc6edf73371b8c79ea941fb446 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Thu, 29 Sep 2022 11:19:41 -0400 Subject: [PATCH] Fix crash when checking phone call state. --- .../org/thoughtcrime/securesms/util/TelephonyUtil.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/TelephonyUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/TelephonyUtil.java index 982921de4..e886ed09d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/TelephonyUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/TelephonyUtil.java @@ -1,11 +1,14 @@ package org.thoughtcrime.securesms.util; +import android.Manifest; import android.content.Context; +import android.content.pm.PackageManager; import android.content.res.Configuration; import android.net.ConnectivityManager; import android.telephony.TelephonyManager; import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; import org.signal.core.util.logging.Log; @@ -44,6 +47,10 @@ public class TelephonyUtil { } public static boolean isAnyPstnLineBusy(@NonNull Context context) { - return getManager(context).getCallState() != TelephonyManager.CALL_STATE_IDLE; + if (ContextCompat.checkSelfPermission(context, Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) { + return getManager(context).getCallState() != TelephonyManager.CALL_STATE_IDLE; + } else { + return false; + } } }