fix returning status in requestRecordingPermissions (#473)

* fix: ios fix

* fix: android fix

* fix: 2nd iteration of andoroid implementation

Author: mdydek

packages/react-native-audio-api/android/src/main/java/com/swmansion/audioapi/AudioAPIModule.kt

@@ -9,6 +9,7 @@ import com.facebook.react.common.annotations.FrameworkAPI
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.turbomodule.core.CallInvokerHolderImpl
 import com.swmansion.audioapi.system.MediaSessionManager
+import com.swmansion.audioapi.system.PermissionRequestListener
 import java.lang.ref.WeakReference
 
 @OptIn(FrameworkAPI::class)
@@ -93,13 +94,12 @@ class AudioAPIModule(
     MediaSessionManager.observeVolumeChanges(enabled)
   }
 
-  override fun requestRecordingPermissions(promise: Promise?) {
-    val res = MediaSessionManager.requestRecordingPermissions(currentActivity)
-    promise!!.resolve(res)
+  override fun requestRecordingPermissions(promise: Promise) {
+    val permissionRequestListener = PermissionRequestListener(promise)
+    MediaSessionManager.requestRecordingPermissions(permissionRequestListener)
   }
 
-  override fun checkRecordingPermissions(promise: Promise?) {
-    val res = MediaSessionManager.checkRecordingPermissions()
-    promise!!.resolve(res)
+  override fun checkRecordingPermissions(promise: Promise) {
+    promise.resolve(MediaSessionManager.checkRecordingPermissions())
   }
 }

packages/react-native-audio-api/android/src/main/java/com/swmansion/audioapi/system/MediaSessionManager.kt

@@ -1,7 +1,6 @@
 package com.swmansion.audioapi.system
 
 import android.Manifest
-import android.app.Activity
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.ComponentName
@@ -16,12 +15,14 @@ import android.os.IBinder
 import android.support.v4.media.session.MediaSessionCompat
 import android.util.Log
 import androidx.annotation.RequiresApi
-import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.modules.core.PermissionAwareActivity
+import com.facebook.react.modules.core.PermissionListener
 import com.swmansion.audioapi.AudioAPIModule
+import com.swmansion.audioapi.system.PermissionRequestListener.Companion.RECORDING_REQUEST_CODE
 import java.lang.ref.WeakReference
 
 object MediaSessionManager {
@@ -158,14 +159,13 @@ object MediaSessionManager {
     }
   }
 
-  fun requestRecordingPermissions(currentActivity: Activity?): String {
-    ActivityCompat.requestPermissions(currentActivity!!, arrayOf(Manifest.permission.RECORD_AUDIO), 200)
-    return checkRecordingPermissions()
+  fun requestRecordingPermissions(permissionListener: PermissionListener) {
+    val permissionAwareActivity = reactContext.get()!!.currentActivity as PermissionAwareActivity
+    permissionAwareActivity.requestPermissions(arrayOf(Manifest.permission.RECORD_AUDIO), RECORDING_REQUEST_CODE, permissionListener)
   }
 
   fun checkRecordingPermissions(): String =
-    if (ContextCompat.checkSelfPermission(
-        reactContext.get()!!,
+    if (reactContext.get()!!.checkSelfPermission(
         Manifest.permission.RECORD_AUDIO,
       ) == PackageManager.PERMISSION_GRANTED
     ) {

packages/react-native-audio-api/android/src/main/java/com/swmansion/audioapi/system/PermissionRequestListener.kt

@@ -0,0 +1,33 @@
+package com.swmansion.audioapi.system
+
+import android.content.pm.PackageManager
+import com.facebook.react.bridge.Promise
+import com.facebook.react.modules.core.PermissionListener
+
+class PermissionRequestListener(
+  private val promise: Promise,
+) : PermissionListener {
+  companion object {
+    const val RECORDING_REQUEST_CODE = 1234
+  }
+
+  override fun onRequestPermissionsResult(
+    requestCode: Int,
+    permissions: Array<String>,
+    grantResults: IntArray,
+  ): Boolean {
+    if (requestCode == RECORDING_REQUEST_CODE) {
+      if (grantResults.isEmpty()) {
+        this.promise.resolve("Undetermined")
+      } else {
+        val granted = grantResults[0] == PackageManager.PERMISSION_GRANTED
+        if (granted) {
+          this.promise.resolve("Granted")
+        } else {
+          this.promise.resolve("Denied")
+        }
+      }
+    }
+    return true
+  }
+}

packages/react-native-audio-api/ios/audioapi/ios/AudioAPIModule.mm

@@ -131,15 +131,13 @@ - (void)invalidate
     requestRecordingPermissions : (nonnull RCTPromiseResolveBlock)resolve reject : (nonnull RCTPromiseRejectBlock)
         reject)
 {
-  NSString *res = [self.audioSessionManager requestRecordingPermissions];
-  resolve(res);
+  [self.audioSessionManager requestRecordingPermissions:resolve reject:reject];
 }
 
 RCT_EXPORT_METHOD(
     checkRecordingPermissions : (nonnull RCTPromiseResolveBlock)resolve reject : (nonnull RCTPromiseRejectBlock)reject)
 {
-  NSString *res = [self.audioSessionManager checkRecordingPermissions];
-  resolve(res);
+  [self.audioSessionManager checkRecordingPermissions:resolve reject:reject];
 }
 
 #ifdef RCT_NEW_ARCH_ENABLED

packages/react-native-audio-api/ios/audioapi/ios/system/AudioSessionManager.h

@@ -2,6 +2,7 @@
 
 #import <AVFoundation/AVFoundation.h>
 #import <Foundation/Foundation.h>
+#import <React/RCTBridgeModule.h>
 
 @interface AudioSessionManager : NSObject
 
@@ -20,7 +21,7 @@
 - (NSNumber *)getDevicePreferredSampleRate;
 - (void)setAudioSessionOptions:(NSString *)category mode:(NSString *)mode options:(NSArray *)options;
 - (bool)setActive:(bool)active;
-- (NSString *)requestRecordingPermissions;
-- (NSString *)checkRecordingPermissions;
+- (void)requestRecordingPermissions:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject;
+- (void)checkRecordingPermissions:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject;
 
 @end

packages/react-native-audio-api/ios/audioapi/ios/system/AudioSessionManager.mm

@@ -175,11 +175,62 @@ - (bool)configureAudioSession
   return true;
 }
 
-- (NSString *)requestRecordingPermissions
+- (void)requestRecordingPermissions:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject
 {
-  [self.audioSession requestRecordPermission:^(BOOL granted){
-  }];
-  return [self checkRecordingPermissions];
+  if (@available(iOS 17, *)) {
+    [AVAudioSession.sharedInstance requestRecordPermission:^(BOOL granted) {
+      if (granted) {
+        resolve(@"Granted");
+      } else {
+        resolve(@"Denied");
+      }
+    }];
+  } else {
+    [self.audioSession requestRecordPermission:^(BOOL granted) {
+      if (granted) {
+        resolve(@"Granted");
+      } else {
+        resolve(@"Denied");
+      }
+    }];
+  }
+}
+
+- (void)checkRecordingPermissions:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject
+{
+  if (@available(iOS 17, *)) {
+    NSInteger res = [[AVAudioApplication sharedInstance] recordPermission];
+    switch (res) {
+      case AVAudioApplicationRecordPermissionUndetermined:
+        resolve(@"Undetermined");
+        break;
+      case AVAudioApplicationRecordPermissionGranted:
+        resolve(@"Granted");
+        break;
+      case AVAudioApplicationRecordPermissionDenied:
+        resolve(@"Denied");
+        break;
+      default:
+        resolve(@"Undetermined");
+        break;
+    }
+  } else {
+    NSInteger res = [self.audioSession recordPermission];
+    switch (res) {
+      case AVAudioSessionRecordPermissionUndetermined:
+        resolve(@"Undetermined");
+        break;
+      case AVAudioSessionRecordPermissionGranted:
+        resolve(@"Granted");
+        break;
+      case AVAudioSessionRecordPermissionDenied:
+        resolve(@"Denied");
+        break;
+      default:
+        resolve(@"Undetermined");
+        break;
+    }
+  }
 }
 
 - (NSString *)checkRecordingPermissions