Merge pull request #576 from mluksha/master

[Android] Fix permission checking in the Quit state
react-native-webrtc · May 19, 2022 · 8fef467 · 8fef467
2 parents e96cecb + 5e465fa
commit 8fef467
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java b/android/src/main/java/io/wazo/callkeep/RNCallKeepModule.java
@@ -965,15 +965,11 @@ private String getApplicationName(Context appContext) {
     }
 
     private Boolean hasPermissions() {
-        Activity currentActivity = this.getCurrentReactActivity();
-
-        if (currentActivity == null) {
-            return false;
-        }
+        ReactApplicationContext context = getContext();
 
         boolean hasPermissions = true;
         for (String permission : permissions) {
-            int permissionCheck = ContextCompat.checkSelfPermission(currentActivity, permission);
+            int permissionCheck = ContextCompat.checkSelfPermission(context, permission);
             if (permissionCheck != PackageManager.PERMISSION_GRANTED) {
                 hasPermissions = false;
             }