[expo-av] Allow creating sounds and recording when app is in background

expo · Mar 22, 2019 · 31e0c5b · 31e0c5b
1 parent 73f9403
commit 31e0c5b
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 10 deletions.
diff --git a/packages/expo-av/ios/EXAV/EXAV.h b/packages/expo-av/ios/EXAV/EXAV.h
@@ -28,6 +28,9 @@ typedef NS_OPTIONS(NSUInteger, EXAudioRecordingOptionBitRateStrategy)
 - (void)scopedModuleDidBackground:(id)scopedModule;
 - (void)scopedModuleDidForeground:(id)scopedModule;
 - (void)scopedModuleWillDeallocate:(id)scopedModule;
+- (BOOL)isActiveForScopedModule:(id)scopedModule;
+- (NSString *)activeCategory;
+- (AVAudioSessionCategoryOptions)activeCategoryOptions;
 - (NSError *)setActive:(BOOL)active forScopedModule:(id)scopedModule;
 - (NSError *)setCategory:(NSString *)category withOptions:(AVAudioSessionCategoryOptions)options forScopedModule:(id)scopedModule;
 

diff --git a/packages/expo-av/ios/EXAV/EXAV.m b/packages/expo-av/ios/EXAV/EXAV.m
@@ -209,33 +209,38 @@ - (NSError *)_setAudioMode:(NSDictionary *)mode
 
 - (NSError *)_updateAudioSessionCategoryForAudioSessionMode:(EXAVAudioSessionMode)audioSessionMode
 {
-  NSError *error;
-  EXAudioInterruptionMode activeInterruptionMode = audioSessionMode == EXAVAudioSessionModeActiveMuted
-    ? EXAudioInterruptionModeMixWithOthers : _audioInterruptionMode;
+  AVAudioSessionCategory requiredAudioCategory;
+  AVAudioSessionCategoryOptions requiredAudioCategoryOptions = 0;
 
   if (!_playsInSilentMode) {
     // _allowsRecording is guaranteed to be false, and _interruptionMode is guaranteed to not be EXAudioInterruptionModeDuckOthers (see above)
     if (_audioInterruptionMode == EXAudioInterruptionModeDoNotMix) {
-      error = [_kernelAudioSessionManagerDelegate setCategory:AVAudioSessionCategorySoloAmbient withOptions:0 forScopedModule:self];
+      requiredAudioCategory = AVAudioSessionCategorySoloAmbient;
     } else {
-      error = [_kernelAudioSessionManagerDelegate setCategory:AVAudioSessionCategoryAmbient withOptions:0 forScopedModule:self];
+      requiredAudioCategory = AVAudioSessionCategoryAmbient;
     }
   } else {
+    EXAudioInterruptionMode activeInterruptionMode = audioSessionMode == EXAVAudioSessionModeActiveMuted ? EXAudioInterruptionModeMixWithOthers : _audioInterruptionMode;
     NSString *category = _allowsAudioRecording ? AVAudioSessionCategoryPlayAndRecord : AVAudioSessionCategoryPlayback;
+    requiredAudioCategory = category;
     switch (activeInterruptionMode) {
       case EXAudioInterruptionModeDoNotMix:
-        error = [_kernelAudioSessionManagerDelegate setCategory:category withOptions:0 forScopedModule:self];
         break;
       case EXAudioInterruptionModeDuckOthers:
-        error = [_kernelAudioSessionManagerDelegate setCategory:category withOptions:AVAudioSessionCategoryOptionDuckOthers forScopedModule:self];
+        requiredAudioCategoryOptions = AVAudioSessionCategoryOptionDuckOthers;
         break;
       case EXAudioInterruptionModeMixWithOthers:
       default:
-        error = [_kernelAudioSessionManagerDelegate setCategory:category withOptions:AVAudioSessionCategoryOptionMixWithOthers forScopedModule:self];
+        requiredAudioCategoryOptions = AVAudioSessionCategoryOptionMixWithOthers;
         break;
     }
   }
-  return error;
+
+  if ([[_kernelAudioSessionManagerDelegate activeCategory] isEqual:requiredAudioCategory] && [_kernelAudioSessionManagerDelegate activeCategoryOptions] == requiredAudioCategoryOptions) {
+    return nil;
+  }
+
+  return [_kernelAudioSessionManagerDelegate setCategory:requiredAudioCategory withOptions:requiredAudioCategoryOptions forScopedModule:self];
 }
 
 - (EXAVAudioSessionMode)_getAudioSessionModeRequired
@@ -265,7 +270,7 @@ - (NSError *)promoteAudioSessionIfNecessary
   if (!_audioIsEnabled) {
     return UMErrorWithMessage(@"Expo Audio is disabled, so the audio session could not be activated.");
   }
-  if (_isBackgrounded) {
+  if (_isBackgrounded && ![_kernelAudioSessionManagerDelegate isActiveForScopedModule:self]) {
     return UMErrorWithMessage(@"This experience is currently in the background, so the audio session could not be activated.");
   }
 

diff --git a/packages/expo-av/ios/EXAV/EXAudioSessionManager.m b/packages/expo-av/ios/EXAV/EXAudioSessionManager.m
@@ -79,6 +79,20 @@ + (NSString *)getExperienceIdFromScopedModule:(id)scopedModule
   return nil;
 }
 
+- (BOOL)isActiveForScopedModule:(id)scopedModule {
+  return _activeScopedModule == scopedModule;
+}
+
+- (NSString *)activeCategory
+{
+  return [[AVAudioSession sharedInstance] category];
+}
+
+- (AVAudioSessionCategoryOptions)activeCategoryOptions
+{
+  return [[AVAudioSession sharedInstance] categoryOptions];
+}
+
 - (NSError *)setActive:(BOOL)active forScopedModule:(id)scopedModule {
   NSString *experienceId = [EXAudioSessionManager getExperienceIdFromScopedModule:scopedModule];
   if (!experienceId) {