react-native-audio-api 0.6.1-rc.9 → 0.6.1

package/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)
@@ -53,10 +54,8 @@ class AudioAPIModule(
     return true
   }
 
-  @Synchronized
   override fun getDevicePreferredSampleRate(): Double = MediaSessionManager.getDevicePreferredSampleRate()
 
-  @Synchronized
   override fun setAudioSessionActivity(
     enabled: Boolean,
     promise: Promise?,
@@ -64,7 +63,6 @@ class AudioAPIModule(
     // noting to do here
   }
 
-  @Synchronized
   override fun setAudioSessionOptions(
     category: String?,
     mode: String?,
@@ -73,17 +71,14 @@ class AudioAPIModule(
     // noting to do here
   }
 
-  @Synchronized
   override fun setLockScreenInfo(info: ReadableMap?) {
     MediaSessionManager.setLockScreenInfo(info)
   }
 
-  @Synchronized
   override fun resetLockScreenInfo() {
     MediaSessionManager.resetLockScreenInfo()
   }
 
-  @Synchronized
   override fun enableRemoteCommand(
     name: String?,
     enabled: Boolean,
@@ -91,25 +86,20 @@ class AudioAPIModule(
     MediaSessionManager.enableRemoteCommand(name!!, enabled)
   }
 
-  @Synchronized
   override fun observeAudioInterruptions(enabled: Boolean) {
     MediaSessionManager.observeAudioInterruptions(enabled)
   }
 
-  @Synchronized
   override fun observeVolumeChanges(enabled: Boolean) {
     MediaSessionManager.observeVolumeChanges(enabled)
   }
 
-  @Synchronized
-  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)
   }
 
-  @Synchronized
-  override fun checkRecordingPermissions(promise: Promise?) {
-    val res = MediaSessionManager.checkRecordingPermissions()
-    promise!!.resolve(res)
+  override fun checkRecordingPermissions(promise: Promise) {
+    promise.resolve(MediaSessionManager.checkRecordingPermissions())
   }
 }

package/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
     ) {

package/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
+  }
+}

package/common/cpp/audioapi/core/sources/AudioScheduledSourceNode.cpp

@@ -100,7 +100,7 @@ void AudioScheduledSourceNode::updatePlaybackInfo(
     assert(nonSilentFramesToProcess <= framesToProcess);
 
     // stop will happen in the same render quantum
-    if (stopFrame < lastFrame && stopFrame >= firstFrame) {
+    if (stopFrame <= lastFrame && stopFrame >= firstFrame) {
       playbackState_ = PlaybackState::STOP_SCHEDULED;
       processingBus->zero(stopFrame - firstFrame, lastFrame - stopFrame);
     }

package/ios/audioapi/ios/AudioAPIModule.mm

@@ -131,15 +131,13 @@ RCT_EXPORT_METHOD(
     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

package/ios/audioapi/ios/core/NativeAudioPlayer.m

@@ -63,7 +63,7 @@
 {
   AudioEngine *audioEngine = [AudioEngine sharedInstance];
   assert(audioEngine != nil);
-  [audioEngine pauseEngine];
+  [audioEngine pauseEngine:self.sourceNodeId];
 }
 
 - (void)cleanup

package/ios/audioapi/ios/system/AudioEngine.h

@@ -10,6 +10,7 @@
 @property (nonatomic, strong) AVAudioEngine *audioEngine;
 @property (nonatomic, strong) NSMutableDictionary *sourceNodes;
 @property (nonatomic, strong) NSMutableDictionary *sourceFormats;
+@property (nonatomic, strong) NSMutableDictionary *sourceStates;
 @property (nonatomic, strong) AVAudioSinkNode *inputNode;
 @property (nonatomic, weak) AudioSessionManager *sessionManager;
 
@@ -20,7 +21,7 @@
 - (bool)rebuildAudioEngine;
 - (void)startEngine;
 - (void)stopEngine;
-- (void)pauseEngine;
+- (void)pauseEngine:(NSString *)sourceNodeId;
 - (bool)isRunning;
 
 - (NSString *)attachSourceNode:(AVAudioSourceNode *)sourceNode format:(AVAudioFormat *)format;
@@ -29,7 +30,4 @@
 - (void)attachInputNode:(AVAudioSinkNode *)inputNode;
 - (void)detachInputNode;
 
-- (void)startIfNecessary;
-- (void)stopIfNecessary;
-
 @end

package/ios/audioapi/ios/system/AudioEngine.mm

@@ -18,6 +18,7 @@ static AudioEngine *_sharedInstance = nil;
 
     self.sourceNodes = [[NSMutableDictionary alloc] init];
     self.sourceFormats = [[NSMutableDictionary alloc] init];
+    self.sourceStates = [[NSMutableDictionary alloc] init];
 
     self.sessionManager = sessionManager;
   }
@@ -37,6 +38,7 @@ static AudioEngine *_sharedInstance = nil;
   self.audioEngine = nil;
   self.sourceNodes = nil;
   self.sourceFormats = nil;
+  self.sourceStates = nil;
   self.inputNode = nil;
 
   [self.sessionManager setActive:false];
@@ -74,8 +76,8 @@ static AudioEngine *_sharedInstance = nil;
     return;
   }
 
-  [self.audioEngine startAndReturnError:&error];
   [self.sessionManager setActive:true];
+  [self.audioEngine startAndReturnError:&error];
 
   if (error != nil) {
     NSLog(@"Error while starting the audio engine: %@", [error debugDescription]);
@@ -92,14 +94,14 @@ static AudioEngine *_sharedInstance = nil;
   [self.audioEngine stop];
 }
 
-- (void)pauseEngine
+- (void)pauseEngine:(NSString *)sourceNodeId
 {
-  NSLog(@"[AudioEngine] pauseEngine");
   if (![self.audioEngine isRunning]) {
     return;
   }
 
-  [self.audioEngine pause];
+  [self.sourceStates setValue:@false forKey:sourceNodeId];
+  [self pauseIfNecessary];
 }
 
 - (bool)isRunning
@@ -114,6 +116,7 @@ static AudioEngine *_sharedInstance = nil;
 
   [self.sourceNodes setValue:sourceNode forKey:sourceNodeId];
   [self.sourceFormats setValue:format forKey:sourceNodeId];
+  [self.sourceStates setValue:@true forKey:sourceNodeId];
 
   [self.audioEngine attachNode:sourceNode];
   [self.audioEngine connect:sourceNode to:self.audioEngine.mainMixerNode format:format];
@@ -133,6 +136,7 @@ static AudioEngine *_sharedInstance = nil;
 
     [self.sourceNodes removeObjectForKey:sourceNodeId];
     [self.sourceFormats removeObjectForKey:sourceNodeId];
+    [self.sourceStates removeObjectForKey:sourceNodeId];
   }
 
   [self stopIfNecessary];
@@ -180,4 +184,21 @@ static AudioEngine *_sharedInstance = nil;
   }
 }
 
+- (void)pauseIfNecessary
+{
+  if (![self isRunning]) {
+    return;
+  }
+
+  for (NSString *sourceId in self.sourceStates) {
+    if ([self.sourceStates[sourceId] boolValue]) {
+      NSLog(@"state %c", self.sourceStates[sourceId]);
+      return;
+    }
+  }
+
+  NSLog(@"[AudioEngine] pauseEngine");
+  [self.audioEngine pause];
+}
+
 @end

package/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

package/ios/audioapi/ios/system/AudioSessionManager.mm

@@ -175,11 +175,62 @@
   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

package/lib/commonjs/plugin/withAudioAPI.js

@@ -9,8 +9,8 @@ const pkg = require('react-native-audio-api/package.json');
 const withDefaultOptions = options => {
   return {
     iosBackgroundMode: true,
+    androidPermissions: ['android.permission.FOREGROUND_SERVICE', 'android.permission.WAKE_LOCK'],
     androidForegroundService: true,
-    androidFSPermissions: ['android.permission.FOREGROUND_SERVICE', 'android.permission.WAKE_LOCK'],
     androidFSTypes: ['mediaPlayback'],
     ...options
   };
@@ -22,9 +22,9 @@ const withBackgroundAudio = config => {
   });
 };
 const withAndroidPermissions = (config, {
-  androidFSPermissions
+  androidPermissions
 }) => {
-  return _configPlugins.AndroidConfig.Permissions.withPermissions(config, androidFSPermissions);
+  return _configPlugins.AndroidConfig.Permissions.withPermissions(config, androidPermissions);
 };
 const withForegroundService = (config, {
   androidFSTypes
@@ -53,8 +53,8 @@ const withAudioAPI = (config, optionsIn) => {
   if (options.iosBackgroundMode) {
     config = withBackgroundAudio(config);
   }
+  config = withAndroidPermissions(config, options);
   if (options.androidForegroundService) {
-    config = withAndroidPermissions(config, options);
     config = withForegroundService(config, options);
   }
   return config;

package/lib/commonjs/plugin/withAudioAPI.js.map

@@ -1 +1 @@
-{"version":3,"names":["_configPlugins","require","pkg","withDefaultOptions","options","iosBackgroundMode","androidForegroundService","androidFSPermissions","androidFSTypes","withBackgroundAudio","config","withInfoPlist","iosConfig","modResults","UIBackgroundModes","Array","from","Set","withAndroidPermissions","AndroidConfig","Permissions","withPermissions","withForegroundService","withAndroidManifest","mod","manifest","mainApplication","Manifest","getMainApplicationOrThrow","SFTypes","join","serviceElement","$","intentFilter","service","push","withAudioAPI","optionsIn","_default","exports","default","createRunOncePlugin","name","version"],"sourceRoot":"../../../src","sources":["plugin/withAudioAPI.ts"],"mappings":";;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AAOA,MAAMC,GAAG,GAAGD,OAAO,CAAC,qCAAqC,CAAC;AAS1D,MAAME,kBAAkB,GAAIC,OAAyB,IAAc;EACjE,OAAO;IACLC,iBAAiB,EAAE,IAAI;IACvBC,wBAAwB,EAAE,IAAI;IAC9BC,oBAAoB,EAAE,CACpB,uCAAuC,EACvC,8BAA8B,CAC/B;IACDC,cAAc,EAAE,CAAC,eAAe,CAAC;IACjC,GAAGJ;EACL,CAAC;AACH,CAAC;AAED,MAAMK,mBAAiC,GAAIC,MAAM,IAAK;EACpD,OAAO,IAAAC,4BAAa,EAACD,MAAM,EAAGE,SAAS,IAAK;IAC1CA,SAAS,CAACC,UAAU,CAACC,iBAAiB,GAAG,CACvC,GAAGC,KAAK,CAACC,IAAI,CACX,IAAIC,GAAG,CAAC,CAAC,IAAIL,SAAS,CAACC,UAAU,CAACC,iBAAiB,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,CACtE,CAAC,CACF;IAED,OAAOF,SAAS;EAClB,CAAC,CAAC;AACJ,CAAC;AAED,MAAMM,sBAA6C,GAAGA,CACpDR,MAAM,EACN;EAAEH;AAA8B,CAAC,KAC9B;EACH,OAAOY,4BAAa,CAACC,WAAW,CAACC,eAAe,CAC9CX,MAAM,EACNH,oBACF,CAAC;AACH,CAAC;AAED,MAAMe,qBAA4C,GAAGA,CACnDZ,MAAM,EACN;EAAEF;AAAwB,CAAC,KACxB;EACH,OAAO,IAAAe,kCAAmB,EAACb,MAAM,EAAGc,GAAG,IAAK;IAC1C,MAAMC,QAAQ,GAAGD,GAAG,CAACX,UAAU;IAC/B,MAAMa,eAAe,GACnBP,4BAAa,CAACQ,QAAQ,CAACC,yBAAyB,CAACH,QAAQ,CAAC;IAE5D,MAAMI,OAAO,GAAGrB,cAAc,CAACsB,IAAI,CAAC,GAAG,CAAC;IAExC,MAAMC,cAAc,GAAG;MACrBC,CAAC,EAAE;QACD,cAAc,EACZ,4EAA4E;QAC9E,sBAAsB,EAAE,MAAM;QAC9B,+BAA+B,EAAEH;MACnC,CAAC;MACDI,YAAY,EAAE;IAChB,CAAC;IAED,IAAI,CAACP,eAAe,CAACQ,OAAO,EAAE;MAC5BR,eAAe,CAACQ,OAAO,GAAG,EAAE;IAC9B;IAEAR,eAAe,CAACQ,OAAO,CAACC,IAAI,CAACJ,cAAc,CAAC;IAE5C,OAAOP,GAAG;EACZ,CAAC,CAAC;AACJ,CAAC;AAED,MAAMY,YAAmC,GAAGA,CAAC1B,MAAM,EAAE2B,SAAS,KAAK;EACjE,MAAMjC,OAAO,GAAGD,kBAAkB,CAACkC,SAAS,IAAI,CAAC,CAAC,CAAC;EAEnD,IAAIjC,OAAO,CAACC,iBAAiB,EAAE;IAC7BK,MAAM,GAAGD,mBAAmB,CAACC,MAAM,CAAC;EACtC;EAEA,IAAIN,OAAO,CAACE,wBAAwB,EAAE;IACpCI,MAAM,GAAGQ,sBAAsB,CAACR,MAAM,EAAEN,OAAO,CAAC;IAChDM,MAAM,GAAGY,qBAAqB,CAACZ,MAAM,EAAEN,OAAO,CAAC;EACjD;EAEA,OAAOM,MAAM;AACf,CAAC;AAAC,IAAA4B,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEa,IAAAC,kCAAmB,EAACL,YAAY,EAAElC,GAAG,CAACwC,IAAI,EAAExC,GAAG,CAACyC,OAAO,CAAC","ignoreList":[]}
+{"version":3,"names":["_configPlugins","require","pkg","withDefaultOptions","options","iosBackgroundMode","androidPermissions","androidForegroundService","androidFSTypes","withBackgroundAudio","config","withInfoPlist","iosConfig","modResults","UIBackgroundModes","Array","from","Set","withAndroidPermissions","AndroidConfig","Permissions","withPermissions","withForegroundService","withAndroidManifest","mod","manifest","mainApplication","Manifest","getMainApplicationOrThrow","SFTypes","join","serviceElement","$","intentFilter","service","push","withAudioAPI","optionsIn","_default","exports","default","createRunOncePlugin","name","version"],"sourceRoot":"../../../src","sources":["plugin/withAudioAPI.ts"],"mappings":";;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AAOA,MAAMC,GAAG,GAAGD,OAAO,CAAC,qCAAqC,CAAC;AAS1D,MAAME,kBAAkB,GAAIC,OAAyB,IAAc;EACjE,OAAO;IACLC,iBAAiB,EAAE,IAAI;IACvBC,kBAAkB,EAAE,CAClB,uCAAuC,EACvC,8BAA8B,CAC/B;IACDC,wBAAwB,EAAE,IAAI;IAC9BC,cAAc,EAAE,CAAC,eAAe,CAAC;IACjC,GAAGJ;EACL,CAAC;AACH,CAAC;AAED,MAAMK,mBAAiC,GAAIC,MAAM,IAAK;EACpD,OAAO,IAAAC,4BAAa,EAACD,MAAM,EAAGE,SAAS,IAAK;IAC1CA,SAAS,CAACC,UAAU,CAACC,iBAAiB,GAAG,CACvC,GAAGC,KAAK,CAACC,IAAI,CACX,IAAIC,GAAG,CAAC,CAAC,IAAIL,SAAS,CAACC,UAAU,CAACC,iBAAiB,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,CACtE,CAAC,CACF;IAED,OAAOF,SAAS;EAClB,CAAC,CAAC;AACJ,CAAC;AAED,MAAMM,sBAA6C,GAAGA,CACpDR,MAAM,EACN;EAAEJ;AAA4B,CAAC,KAC5B;EACH,OAAOa,4BAAa,CAACC,WAAW,CAACC,eAAe,CAACX,MAAM,EAAEJ,kBAAkB,CAAC;AAC9E,CAAC;AAED,MAAMgB,qBAA4C,GAAGA,CACnDZ,MAAM,EACN;EAAEF;AAAwB,CAAC,KACxB;EACH,OAAO,IAAAe,kCAAmB,EAACb,MAAM,EAAGc,GAAG,IAAK;IAC1C,MAAMC,QAAQ,GAAGD,GAAG,CAACX,UAAU;IAC/B,MAAMa,eAAe,GACnBP,4BAAa,CAACQ,QAAQ,CAACC,yBAAyB,CAACH,QAAQ,CAAC;IAE5D,MAAMI,OAAO,GAAGrB,cAAc,CAACsB,IAAI,CAAC,GAAG,CAAC;IAExC,MAAMC,cAAc,GAAG;MACrBC,CAAC,EAAE;QACD,cAAc,EACZ,4EAA4E;QAC9E,sBAAsB,EAAE,MAAM;QAC9B,+BAA+B,EAAEH;MACnC,CAAC;MACDI,YAAY,EAAE;IAChB,CAAC;IAED,IAAI,CAACP,eAAe,CAACQ,OAAO,EAAE;MAC5BR,eAAe,CAACQ,OAAO,GAAG,EAAE;IAC9B;IAEAR,eAAe,CAACQ,OAAO,CAACC,IAAI,CAACJ,cAAc,CAAC;IAE5C,OAAOP,GAAG;EACZ,CAAC,CAAC;AACJ,CAAC;AAED,MAAMY,YAAmC,GAAGA,CAAC1B,MAAM,EAAE2B,SAAS,KAAK;EACjE,MAAMjC,OAAO,GAAGD,kBAAkB,CAACkC,SAAS,IAAI,CAAC,CAAC,CAAC;EAEnD,IAAIjC,OAAO,CAACC,iBAAiB,EAAE;IAC7BK,MAAM,GAAGD,mBAAmB,CAACC,MAAM,CAAC;EACtC;EAEAA,MAAM,GAAGQ,sBAAsB,CAACR,MAAM,EAAEN,OAAO,CAAC;EAEhD,IAAIA,OAAO,CAACG,wBAAwB,EAAE;IACpCG,MAAM,GAAGY,qBAAqB,CAACZ,MAAM,EAAEN,OAAO,CAAC;EACjD;EAEA,OAAOM,MAAM;AACf,CAAC;AAAC,IAAA4B,QAAA,GAAAC,OAAA,CAAAC,OAAA,GAEa,IAAAC,kCAAmB,EAACL,YAAY,EAAElC,GAAG,CAACwC,IAAI,EAAExC,GAAG,CAACyC,OAAO,CAAC","ignoreList":[]}

package/lib/module/plugin/withAudioAPI.js

@@ -5,8 +5,8 @@ const pkg = require('react-native-audio-api/package.json');
 const withDefaultOptions = options => {
   return {
     iosBackgroundMode: true,
+    androidPermissions: ['android.permission.FOREGROUND_SERVICE', 'android.permission.WAKE_LOCK'],
     androidForegroundService: true,
-    androidFSPermissions: ['android.permission.FOREGROUND_SERVICE', 'android.permission.WAKE_LOCK'],
     androidFSTypes: ['mediaPlayback'],
     ...options
   };
@@ -18,9 +18,9 @@ const withBackgroundAudio = config => {
   });
 };
 const withAndroidPermissions = (config, {
-  androidFSPermissions
+  androidPermissions
 }) => {
-  return AndroidConfig.Permissions.withPermissions(config, androidFSPermissions);
+  return AndroidConfig.Permissions.withPermissions(config, androidPermissions);
 };
 const withForegroundService = (config, {
   androidFSTypes
@@ -49,8 +49,8 @@ const withAudioAPI = (config, optionsIn) => {
   if (options.iosBackgroundMode) {
     config = withBackgroundAudio(config);
   }
+  config = withAndroidPermissions(config, options);
   if (options.androidForegroundService) {
-    config = withAndroidPermissions(config, options);
     config = withForegroundService(config, options);
   }
   return config;

package/lib/module/plugin/withAudioAPI.js.map

@@ -1 +1 @@
-{"version":3,"names":["AndroidConfig","createRunOncePlugin","withInfoPlist","withAndroidManifest","pkg","require","withDefaultOptions","options","iosBackgroundMode","androidForegroundService","androidFSPermissions","androidFSTypes","withBackgroundAudio","config","iosConfig","modResults","UIBackgroundModes","Array","from","Set","withAndroidPermissions","Permissions","withPermissions","withForegroundService","mod","manifest","mainApplication","Manifest","getMainApplicationOrThrow","SFTypes","join","serviceElement","$","intentFilter","service","push","withAudioAPI","optionsIn","name","version"],"sourceRoot":"../../../src","sources":["plugin/withAudioAPI.ts"],"mappings":";;AAAA,SACEA,aAAa,EACbC,mBAAmB,EAEnBC,aAAa,EACbC,mBAAmB,QACd,sBAAsB;AAC7B,MAAMC,GAAG,GAAGC,OAAO,CAAC,qCAAqC,CAAC;AAS1D,MAAMC,kBAAkB,GAAIC,OAAyB,IAAc;EACjE,OAAO;IACLC,iBAAiB,EAAE,IAAI;IACvBC,wBAAwB,EAAE,IAAI;IAC9BC,oBAAoB,EAAE,CACpB,uCAAuC,EACvC,8BAA8B,CAC/B;IACDC,cAAc,EAAE,CAAC,eAAe,CAAC;IACjC,GAAGJ;EACL,CAAC;AACH,CAAC;AAED,MAAMK,mBAAiC,GAAIC,MAAM,IAAK;EACpD,OAAOX,aAAa,CAACW,MAAM,EAAGC,SAAS,IAAK;IAC1CA,SAAS,CAACC,UAAU,CAACC,iBAAiB,GAAG,CACvC,GAAGC,KAAK,CAACC,IAAI,CACX,IAAIC,GAAG,CAAC,CAAC,IAAIL,SAAS,CAACC,UAAU,CAACC,iBAAiB,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,CACtE,CAAC,CACF;IAED,OAAOF,SAAS;EAClB,CAAC,CAAC;AACJ,CAAC;AAED,MAAMM,sBAA6C,GAAGA,CACpDP,MAAM,EACN;EAAEH;AAA8B,CAAC,KAC9B;EACH,OAAOV,aAAa,CAACqB,WAAW,CAACC,eAAe,CAC9CT,MAAM,EACNH,oBACF,CAAC;AACH,CAAC;AAED,MAAMa,qBAA4C,GAAGA,CACnDV,MAAM,EACN;EAAEF;AAAwB,CAAC,KACxB;EACH,OAAOR,mBAAmB,CAACU,MAAM,EAAGW,GAAG,IAAK;IAC1C,MAAMC,QAAQ,GAAGD,GAAG,CAACT,UAAU;IAC/B,MAAMW,eAAe,GACnB1B,aAAa,CAAC2B,QAAQ,CAACC,yBAAyB,CAACH,QAAQ,CAAC;IAE5D,MAAMI,OAAO,GAAGlB,cAAc,CAACmB,IAAI,CAAC,GAAG,CAAC;IAExC,MAAMC,cAAc,GAAG;MACrBC,CAAC,EAAE;QACD,cAAc,EACZ,4EAA4E;QAC9E,sBAAsB,EAAE,MAAM;QAC9B,+BAA+B,EAAEH;MACnC,CAAC;MACDI,YAAY,EAAE;IAChB,CAAC;IAED,IAAI,CAACP,eAAe,CAACQ,OAAO,EAAE;MAC5BR,eAAe,CAACQ,OAAO,GAAG,EAAE;IAC9B;IAEAR,eAAe,CAACQ,OAAO,CAACC,IAAI,CAACJ,cAAc,CAAC;IAE5C,OAAOP,GAAG;EACZ,CAAC,CAAC;AACJ,CAAC;AAED,MAAMY,YAAmC,GAAGA,CAACvB,MAAM,EAAEwB,SAAS,KAAK;EACjE,MAAM9B,OAAO,GAAGD,kBAAkB,CAAC+B,SAAS,IAAI,CAAC,CAAC,CAAC;EAEnD,IAAI9B,OAAO,CAACC,iBAAiB,EAAE;IAC7BK,MAAM,GAAGD,mBAAmB,CAACC,MAAM,CAAC;EACtC;EAEA,IAAIN,OAAO,CAACE,wBAAwB,EAAE;IACpCI,MAAM,GAAGO,sBAAsB,CAACP,MAAM,EAAEN,OAAO,CAAC;IAChDM,MAAM,GAAGU,qBAAqB,CAACV,MAAM,EAAEN,OAAO,CAAC;EACjD;EAEA,OAAOM,MAAM;AACf,CAAC;AAED,eAAeZ,mBAAmB,CAACmC,YAAY,EAAEhC,GAAG,CAACkC,IAAI,EAAElC,GAAG,CAACmC,OAAO,CAAC","ignoreList":[]}
+{"version":3,"names":["AndroidConfig","createRunOncePlugin","withInfoPlist","withAndroidManifest","pkg","require","withDefaultOptions","options","iosBackgroundMode","androidPermissions","androidForegroundService","androidFSTypes","withBackgroundAudio","config","iosConfig","modResults","UIBackgroundModes","Array","from","Set","withAndroidPermissions","Permissions","withPermissions","withForegroundService","mod","manifest","mainApplication","Manifest","getMainApplicationOrThrow","SFTypes","join","serviceElement","$","intentFilter","service","push","withAudioAPI","optionsIn","name","version"],"sourceRoot":"../../../src","sources":["plugin/withAudioAPI.ts"],"mappings":";;AAAA,SACEA,aAAa,EACbC,mBAAmB,EAEnBC,aAAa,EACbC,mBAAmB,QACd,sBAAsB;AAC7B,MAAMC,GAAG,GAAGC,OAAO,CAAC,qCAAqC,CAAC;AAS1D,MAAMC,kBAAkB,GAAIC,OAAyB,IAAc;EACjE,OAAO;IACLC,iBAAiB,EAAE,IAAI;IACvBC,kBAAkB,EAAE,CAClB,uCAAuC,EACvC,8BAA8B,CAC/B;IACDC,wBAAwB,EAAE,IAAI;IAC9BC,cAAc,EAAE,CAAC,eAAe,CAAC;IACjC,GAAGJ;EACL,CAAC;AACH,CAAC;AAED,MAAMK,mBAAiC,GAAIC,MAAM,IAAK;EACpD,OAAOX,aAAa,CAACW,MAAM,EAAGC,SAAS,IAAK;IAC1CA,SAAS,CAACC,UAAU,CAACC,iBAAiB,GAAG,CACvC,GAAGC,KAAK,CAACC,IAAI,CACX,IAAIC,GAAG,CAAC,CAAC,IAAIL,SAAS,CAACC,UAAU,CAACC,iBAAiB,IAAI,EAAE,CAAC,EAAE,OAAO,CAAC,CACtE,CAAC,CACF;IAED,OAAOF,SAAS;EAClB,CAAC,CAAC;AACJ,CAAC;AAED,MAAMM,sBAA6C,GAAGA,CACpDP,MAAM,EACN;EAAEJ;AAA4B,CAAC,KAC5B;EACH,OAAOT,aAAa,CAACqB,WAAW,CAACC,eAAe,CAACT,MAAM,EAAEJ,kBAAkB,CAAC;AAC9E,CAAC;AAED,MAAMc,qBAA4C,GAAGA,CACnDV,MAAM,EACN;EAAEF;AAAwB,CAAC,KACxB;EACH,OAAOR,mBAAmB,CAACU,MAAM,EAAGW,GAAG,IAAK;IAC1C,MAAMC,QAAQ,GAAGD,GAAG,CAACT,UAAU;IAC/B,MAAMW,eAAe,GACnB1B,aAAa,CAAC2B,QAAQ,CAACC,yBAAyB,CAACH,QAAQ,CAAC;IAE5D,MAAMI,OAAO,GAAGlB,cAAc,CAACmB,IAAI,CAAC,GAAG,CAAC;IAExC,MAAMC,cAAc,GAAG;MACrBC,CAAC,EAAE;QACD,cAAc,EACZ,4EAA4E;QAC9E,sBAAsB,EAAE,MAAM;QAC9B,+BAA+B,EAAEH;MACnC,CAAC;MACDI,YAAY,EAAE;IAChB,CAAC;IAED,IAAI,CAACP,eAAe,CAACQ,OAAO,EAAE;MAC5BR,eAAe,CAACQ,OAAO,GAAG,EAAE;IAC9B;IAEAR,eAAe,CAACQ,OAAO,CAACC,IAAI,CAACJ,cAAc,CAAC;IAE5C,OAAOP,GAAG;EACZ,CAAC,CAAC;AACJ,CAAC;AAED,MAAMY,YAAmC,GAAGA,CAACvB,MAAM,EAAEwB,SAAS,KAAK;EACjE,MAAM9B,OAAO,GAAGD,kBAAkB,CAAC+B,SAAS,IAAI,CAAC,CAAC,CAAC;EAEnD,IAAI9B,OAAO,CAACC,iBAAiB,EAAE;IAC7BK,MAAM,GAAGD,mBAAmB,CAACC,MAAM,CAAC;EACtC;EAEAA,MAAM,GAAGO,sBAAsB,CAACP,MAAM,EAAEN,OAAO,CAAC;EAEhD,IAAIA,OAAO,CAACG,wBAAwB,EAAE;IACpCG,MAAM,GAAGU,qBAAqB,CAACV,MAAM,EAAEN,OAAO,CAAC;EACjD;EAEA,OAAOM,MAAM;AACf,CAAC;AAED,eAAeZ,mBAAmB,CAACmC,YAAY,EAAEhC,GAAG,CAACkC,IAAI,EAAElC,GAAG,CAACmC,OAAO,CAAC","ignoreList":[]}

package/lib/typescript/plugin/withAudioAPI.d.ts

@@ -1,8 +1,8 @@
 import { ConfigPlugin } from '@expo/config-plugins';
 interface Options {
     iosBackgroundMode: boolean;
+    androidPermissions: string[];
     androidForegroundService: boolean;
-    androidFSPermissions: string[];
     androidFSTypes: string[];
 }
 declare const _default: ConfigPlugin<Options>;

package/lib/typescript/plugin/withAudioAPI.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withAudioAPI.d.ts","sourceRoot":"","sources":["../../../src/plugin/withAudioAPI.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EAGb,MAAM,sBAAsB,CAAC;AAG9B,UAAU,OAAO;IACf,iBAAiB,EAAE,OAAO,CAAC;IAC3B,wBAAwB,EAAE,OAAO,CAAC;IAClC,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B;;AAmFD,wBAAwE"}
+{"version":3,"file":"withAudioAPI.d.ts","sourceRoot":"","sources":["../../../src/plugin/withAudioAPI.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EAGb,MAAM,sBAAsB,CAAC;AAG9B,UAAU,OAAO;IACf,iBAAiB,EAAE,OAAO,CAAC;IAC3B,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,wBAAwB,EAAE,OAAO,CAAC;IAClC,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B;;AAiFD,wBAAwE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-audio-api",
-  "version": "0.6.1-rc.9",
+  "version": "0.6.1",
   "description": "react-native-audio-api provides system for controlling audio in React Native environment compatible with Web Audio API specification",
   "bin": {
     "setup-rn-audio-api-web": "./scripts/setup-rn-audio-api-web.js"

package/src/plugin/withAudioAPI.ts

@@ -9,19 +9,19 @@ const pkg = require('react-native-audio-api/package.json');
 
 interface Options {
   iosBackgroundMode: boolean;
+  androidPermissions: string[];
   androidForegroundService: boolean;
-  androidFSPermissions: string[];
   androidFSTypes: string[];
 }
 
 const withDefaultOptions = (options: Partial<Options>): Options => {
   return {
     iosBackgroundMode: true,
-    androidForegroundService: true,
-    androidFSPermissions: [
+    androidPermissions: [
       'android.permission.FOREGROUND_SERVICE',
       'android.permission.WAKE_LOCK',
     ],
+    androidForegroundService: true,
     androidFSTypes: ['mediaPlayback'],
     ...options,
   };
@@ -41,12 +41,9 @@ const withBackgroundAudio: ConfigPlugin = (config) => {
 
 const withAndroidPermissions: ConfigPlugin<Options> = (
   config,
-  { androidFSPermissions }: Options
+  { androidPermissions }: Options
 ) => {
-  return AndroidConfig.Permissions.withPermissions(
-    config,
-    androidFSPermissions
-  );
+  return AndroidConfig.Permissions.withPermissions(config, androidPermissions);
 };
 
 const withForegroundService: ConfigPlugin<Options> = (
@@ -87,8 +84,9 @@ const withAudioAPI: ConfigPlugin<Options> = (config, optionsIn) => {
     config = withBackgroundAudio(config);
   }
 
+  config = withAndroidPermissions(config, options);
+
   if (options.androidForegroundService) {
-    config = withAndroidPermissions(config, options);
     config = withForegroundService(config, options);
   }