Audio route changes

README.md

@@ -823,21 +823,24 @@ RNCallKeep.addEventListener('didToggleHoldCallAction', ({ hold, callUUID }) => {
 
 });
 ```
+- `hold` (boolean)
+- `callUUID` (string)
+  - The UUID of the call.
 
 ### - didChangeAudioRoute
 
 Triggered when the audio route has been changed.
 ⚠️ Will send `Speaker` on iOS but `SPEAKER` on Android.
 
 ```js
-RNCallKeep.addEventListener('didChangeAudioRoute', ({ output }) => {
+RNCallKeep.addEventListener('didChangeAudioRoute', ({ output,reason }) => {
 
 });
 ```
-
-- `hold` (boolean)
-- `callUUID` (string)
-  - The UUID of the call.
+- `output` (object)
+  - `name` (string)
+  - `type` (string)
+- `reason` (int)
 
 ### - didPerformDTMFAction
 

example/README.md

@@ -1,11 +1,9 @@
 # CallKeep example
 
-
-
 ## How to install it
 
 ```
-# Install dependancies
+# Install dependencies
 yarn install
 
 cd ios
@@ -22,7 +20,6 @@ yarn start
 yarn android # or yarn ios
 ```
 
-
 ## How this example was setted up
 
 ```sh

ios/RNCallKeep/RNCallKeep.m

@@ -128,7 +128,7 @@ - (void)onAudioRouteChange:(NSNotification *)notification
 {
     NSDictionary *info = notification.userInfo;
     NSInteger reason = [[info valueForKey:AVAudioSessionRouteChangeReasonKey] integerValue];
-    NSString *output = [RNCallKeep getAudioOutput];
+    NSMutableDictionary *output = [RNCallKeep getAudioOutput];
 
     if (output == nil) {
         return;
@@ -160,8 +160,16 @@ + (void)initCallKitProvider {
     }
 }
 
-+ (NSString *) getAudioOutput {
-    return [AVAudioSession sharedInstance].currentRoute.outputs.count > 0 ? [AVAudioSession sharedInstance].currentRoute.outputs[0].portType : nil;
++ (NSMutableDictionary *) getAudioOutput {
+    NSArray<AVAudioSessionPortDescription *> *outputs = [AVAudioSession sharedInstance].currentRoute.outputs;
+    if (outputs.count > 0) {
+        NSMutableDictionary *output = [[NSMutableDictionary alloc]init];
+        NSString * type = [RNCallKeep getAudioPortType: outputs[0].portType];
+        [output setObject:outputs[0].portName forKey:@"name"];
+        [output setObject:type forKey:@"type"];
+        return output;
+    }
+    return nil;
 }
 
 + (void)setup:(NSDictionary *)options {
@@ -213,8 +221,8 @@ + (void)setup:(NSDictionary *)options {
 #ifdef DEBUG
     NSLog(@"[RNCallKeep][checkSpeaker]");
 #endif
-    NSString *output = [RNCallKeep getAudioOutput];
-    resolve(@([output isEqualToString:@"Speaker"]));
+    NSMutableDictionary *output = [RNCallKeep getAudioOutput];
+    resolve(@([output[@"name"] isEqualToString:@"Speaker"]));
 }
 
 #pragma mark - CXCallController call actions
@@ -447,6 +455,21 @@ + (void)setup:(NSDictionary *)options {
         }
 
         NSArray *ports = [RNCallKeep getAudioInputs];
+
+        BOOL isCategorySetted = [myAudioSession setCategory:AVAudioSessionCategoryPlayAndRecord withOptions:AVAudioSessionCategoryOptionAllowBluetooth |
+         AVAudioSessionCategoryOptionAllowBluetoothA2DP | AVAudioSessionCategoryOptionAllowAirPlay  error:&err];
+        if (!isCategorySetted)
+        {
+            NSLog(@"setCategory failed");
+            [NSException raise:@"setCategory failed" format:@"error: %@", err];
+        }
+        BOOL isCategoryActivated = [myAudioSession setActive:YES error:&err];
+        if (!isCategoryActivated)
+        {
+            NSLog(@"setActive failed");
+            [NSException raise:@"setActive failed" format:@"error: %@", err];
+        }
+
         for (AVAudioSessionPortDescription *port in ports) {
             if ([port.portName isEqualToString:inputName]) {
                 BOOL isSetted = [myAudioSession setPreferredInput:(AVAudioSessionPortDescription *)port error:&err];
@@ -496,7 +519,7 @@ + (NSMutableArray *) formatAudioInputs: (NSMutableArray *)inputs
         NSLog(@"%@",str);
         NSMutableDictionary *dict = [[NSMutableDictionary alloc]init];
         [dict setObject:input.portName forKey:@"name"];
-        NSString * type = [RNCallKeep getAudioInputType: input.portType];
+        NSString * type = [RNCallKeep getAudioPortType: input.portType];
         if(type)
         {
             [dict setObject:type forKey:@"type"];
@@ -509,18 +532,19 @@ + (NSMutableArray *) formatAudioInputs: (NSMutableArray *)inputs
 + (NSArray *) getAudioInputs
 {
     NSError* err = nil;
-    NSString *str = nil;
 
     AVAudioSession* myAudioSession = [AVAudioSession sharedInstance];
-
-    BOOL isCategorySetted = [myAudioSession setCategory:AVAudioSessionCategoryPlayAndRecord withOptions:AVAudioSessionCategoryOptionAllowBluetooth error:&err];
-    if (!isCategorySetted)
-    {
-        NSLog(@"setCategory failed");
-        [NSException raise:@"setCategory failed" format:@"error: %@", err];
+    NSArray *calls = [RNCallKeep getCalls];
+    if (!calls || !calls.count){
+        BOOL isCategorySetted = [myAudioSession setCategory:AVAudioSessionCategoryPlayAndRecord withOptions:AVAudioSessionCategoryOptionAllowBluetooth |
+         AVAudioSessionCategoryOptionAllowBluetoothA2DP | AVAudioSessionCategoryOptionAllowAirPlay  error:&err];
+        if (!isCategorySetted)
+        {
+            NSLog(@"setCategory failed");
+            [NSException raise:@"setCategory failed" format:@"error: %@", err];
+        }
     }
-
-    BOOL isCategoryActivated = [myAudioSession setActive:YES error:&err];
+    BOOL isCategoryActivated = [myAudioSession setActive:TRUE error:&err];
     if (!isCategoryActivated)
     {
         NSLog(@"setActive failed");
@@ -531,31 +555,41 @@ + (NSArray *) getAudioInputs
     return inputs;
 }
 
-+ (NSString *) getAudioInputType: (NSString *) type
++ (NSString *) getAudioPortType: (NSString *) type
 {
+    if ([type isEqualToString:AVAudioSessionPortAirPlay]){
+        return @"AirPlay";
+    }
+    if ([type isEqualToString:AVAudioSessionPortBuiltInReceiver]){
+        return @"Phone";
+    }
     if ([type isEqualToString:AVAudioSessionPortBuiltInMic]){
         return @"Phone";
     }
     else if ([type isEqualToString:AVAudioSessionPortHeadsetMic]){
-        return @"Headset";
+        return @"Headphones";
     }
     else if ([type isEqualToString:AVAudioSessionPortHeadphones]){
-        return @"Headset";
+        return @"Headphones";
     }
     else if ([type isEqualToString:AVAudioSessionPortBluetoothHFP]){
         return @"Bluetooth";
     }
     else if ([type isEqualToString:AVAudioSessionPortBluetoothA2DP]){
         return @"Bluetooth";
     }
+    else if ([type isEqualToString:AVAudioSessionPortBluetoothLE]){
+        return @"Bluetooth";
+    }
     else if ([type isEqualToString:AVAudioSessionPortBuiltInSpeaker]){
         return @"Speaker";
     }
     else{
-        return nil;
+        return type;
     }
 }
 
+
 - (void)requestTransaction:(CXTransaction *)transaction
 {
 #ifdef DEBUG
@@ -793,7 +827,8 @@ - (void)configureAudioSession
 #endif
 
     AVAudioSession* audioSession = [AVAudioSession sharedInstance];
-    [audioSession setCategory:AVAudioSessionCategoryPlayAndRecord withOptions:AVAudioSessionCategoryOptionAllowBluetooth error:nil];
+    [audioSession setCategory:AVAudioSessionCategoryPlayAndRecord withOptions:AVAudioSessionCategoryOptionAllowBluetooth |
+     AVAudioSessionCategoryOptionAllowBluetoothA2DP | AVAudioSessionCategoryOptionAllowAirPlay error:nil];
 
     [audioSession setMode:AVAudioSessionModeDefault error:nil];