Fix compilation issues

ipavlidakis · ipavlidakis · commit 697c91a8db4a · 2025-10-20T11:45:19.000+03:00
diff --git a/Sources/StreamVideo/Utils/AudioSession/CallAudioSession.swift b/Sources/StreamVideo/Utils/AudioSession/CallAudioSession.swift
@@ -40,7 +40,7 @@ final class CallAudioSession: @unchecked Sendable {
                 .setCategoryAndModeAndCategoryOptions(
                     .playAndRecord,
                     mode: .voiceChat,
-                    categoryOptions: [.allowBluetoothHFP, .allowBluetoothA2DP]
+                    categoryOptions: [.allowBluetooth, .allowBluetoothA2DP]
                 )
             )
         )
@@ -146,7 +146,7 @@ final class CallAudioSession: @unchecked Sendable {
             .avAudioSession(
                 .setOverrideOutputAudioPort(configuration.overrideOutputAudioPort ?? .none)
             ),
-            .setActive(configuration.isActive),
+            .setActive(configuration.isActive)
         ]
 
         if ownCapabilities.contains(.sendAudio) {
diff --git a/Sources/StreamVideo/Utils/AudioSession/RTCAudioStore/Components/RTCAudioStore+AVAudioSessionConfigurationValidator.swift b/Sources/StreamVideo/Utils/AudioSession/RTCAudioStore/Components/RTCAudioStore+AVAudioSessionConfigurationValidator.swift
@@ -1,12 +1,9 @@
 //
-//  Validator.swift
-//  StreamVideo
-//
-//  Created by Ilias Pavlidakis on 9/10/25.
+// Copyright © 2025 Stream.io Inc. All rights reserved.
 //
 
-import Foundation
 import AVFoundation
+import Foundation
 
 extension RTCAudioStore.StoreState.AVAudioSessionConfiguration {
 
@@ -58,27 +55,27 @@ extension RTCAudioStore.StoreState.AVAudioSessionConfiguration {
 
         // .playAndRecord
         var playAndRecordModes: Set<AVAudioSession.Mode> =
-        makeModes(
-            [
-                .default,
-                .voiceChat,
-                .videoChat,
-                .gameChat,
-                .videoRecording,
-                .measurement,
-                .spokenAudio
-            ]
-        )
+            makeModes(
+                [
+                    .default,
+                    .voiceChat,
+                    .videoChat,
+                    .gameChat,
+                    .videoRecording,
+                    .measurement,
+                    .spokenAudio
+                ]
+            )
         if #available(iOS 15.0, *) { playAndRecordModes.insert(.voicePrompt) }
         var playAndRecordOptions: AVAudioSession.CategoryOptions =
-        [
-            .mixWithOthers,
-            .duckOthers,
-            .interruptSpokenAudioAndMixWithOthers,
-            .defaultToSpeaker,
-            .allowBluetoothHFP,
-            .allowBluetoothA2DP
-        ]
+            [
+                .mixWithOthers,
+                .duckOthers,
+                .interruptSpokenAudioAndMixWithOthers,
+                .defaultToSpeaker,
+                .allowBluetooth,
+                .allowBluetoothA2DP
+            ]
         map[.playAndRecord] = AllowedConfiguration(
             modes: playAndRecordModes,
             options: playAndRecordOptions
diff --git a/StreamVideoTests/Utils/AudioSession/CallAudioSession/CallAudioSession_Tests.swift b/StreamVideoTests/Utils/AudioSession/CallAudioSession/CallAudioSession_Tests.swift
@@ -37,7 +37,7 @@ final class CallAudioSession_Tests: XCTestCase, @unchecked Sendable {
                 isActive: true,
                 category: .playAndRecord,
                 mode: .voiceChat,
-                options: [.allowBluetoothHFP, .allowBluetoothA2DP]
+                options: [.allowBluetooth, .allowBluetoothA2DP]
             )
         )
 
@@ -47,7 +47,7 @@ final class CallAudioSession_Tests: XCTestCase, @unchecked Sendable {
             let configuration = self.mockAudioStore.audioStore.state.audioSessionConfiguration
             return configuration.category == .playAndRecord
                 && configuration.mode == .voiceChat
-                && configuration.options.contains(.allowBluetoothHFP)
+                && configuration.options.contains(.allowBluetooth)
                 && configuration.options.contains(.allowBluetoothA2DP)
         }
     }
@@ -62,7 +62,7 @@ final class CallAudioSession_Tests: XCTestCase, @unchecked Sendable {
             isActive: true,
             category: .playAndRecord,
             mode: .voiceChat,
-            options: [.allowBluetoothHFP, .allowBluetoothA2DP],
+            options: [.allowBluetooth, .allowBluetoothA2DP],
             overrideOutputAudioPort: .speaker
         )
         policy.stub(for: .configuration, with: policyConfiguration)
@@ -158,7 +158,7 @@ final class CallAudioSession_Tests: XCTestCase, @unchecked Sendable {
                 isActive: true,
                 category: .playAndRecord,
                 mode: .voiceChat,
-                options: [.allowBluetoothHFP],
+                options: [.allowBluetooth],
                 overrideOutputAudioPort: .speaker
             )
         )
@@ -176,7 +176,7 @@ final class CallAudioSession_Tests: XCTestCase, @unchecked Sendable {
         capabilitiesSubject.send([.sendAudio])
 
         await fulfillment {
-            self.mockAudioStore.audioStore.state.audioSessionConfiguration.options.contains(.allowBluetoothHFP)
+            self.mockAudioStore.audioStore.state.audioSessionConfiguration.options.contains(.allowBluetooth)
         }
 
         let updatedPolicy = MockAudioSessionPolicy()
diff --git a/StreamVideoTests/Utils/AudioSession/RTCAudioStore/Components/RTCAudioStore_AVAudioSessionConfigurationValidatorTests.swift b/StreamVideoTests/Utils/AudioSession/RTCAudioStore/Components/RTCAudioStore_AVAudioSessionConfigurationValidatorTests.swift
@@ -32,7 +32,7 @@ final class RTCAudioStore_AVAudioSessionConfigurationValidatorTests: XCTestCase,
         subject = .init(
             category: .playAndRecord,
             mode: .voiceChat,
-            options: [.allowBluetoothHFP, .defaultToSpeaker],
+            options: [.allowBluetooth, .defaultToSpeaker],
             overrideOutputAudioPort: .none
         )
 
diff --git a/StreamVideoTests/Utils/AudioSession/RTCAudioStore/Namespace/Reducers/RTCAudioStore_AVAudioSessionReducerTests.swift b/StreamVideoTests/Utils/AudioSession/RTCAudioStore/Namespace/Reducers/RTCAudioStore_AVAudioSessionReducerTests.swift
@@ -105,16 +105,16 @@ final class RTCAudioStore_AVAudioSessionReducerTests: XCTestCase, @unchecked Sen
         let state = makeState(
             category: .playAndRecord,
             mode: .voiceChat,
-            options: [.allowBluetoothHFP]
+            options: [.allowBluetooth]
         )
         session.category = AVAudioSession.Category.playAndRecord.rawValue
         session.mode = AVAudioSession.Mode.voiceChat.rawValue
-        session.categoryOptions = [.allowBluetoothHFP]
+        session.categoryOptions = [.allowBluetooth]
         session.isActive = true
 
         let result = try subject.reduce(
             state: state,
-            action: .avAudioSession(.setCategoryOptions([.allowBluetoothHFP, .defaultToSpeaker])),
+            action: .avAudioSession(.setCategoryOptions([.allowBluetooth, .defaultToSpeaker])),
             file: #file,
             function: #function,
             line: #line

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ final class CallAudioSession: @unchecked Sendable {`
`40`	`40`	`.setCategoryAndModeAndCategoryOptions(`
`41`	`41`	`.playAndRecord,`
`42`	`42`	`mode: .voiceChat,`
`43`		`- categoryOptions: [.allowBluetoothHFP, .allowBluetoothA2DP]`
	`43`	`+ categoryOptions: [.allowBluetooth, .allowBluetoothA2DP]`
`44`	`44`	`)`
`45`	`45`	`)`
`46`	`46`	`)`
`@@ -146,7 +146,7 @@ final class CallAudioSession: @unchecked Sendable {`
`146`	`146`	`.avAudioSession(`
`147`	`147`	`.setOverrideOutputAudioPort(configuration.overrideOutputAudioPort ?? .none)`
`148`	`148`	`),`
`149`		`- .setActive(configuration.isActive),`
	`149`	`+ .setActive(configuration.isActive)`
`150`	`150`	`]`
`151`	`151`
`152`	`152`	`if ownCapabilities.contains(.sendAudio) {`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ final class CallAudioSession_Tests: XCTestCase, @unchecked Sendable {`
`37`	`37`	`isActive: true,`
`38`	`38`	`category: .playAndRecord,`
`39`	`39`	`mode: .voiceChat,`
`40`		`- options: [.allowBluetoothHFP, .allowBluetoothA2DP]`
	`40`	`+ options: [.allowBluetooth, .allowBluetoothA2DP]`
`41`	`41`	`)`
`42`	`42`	`)`
`43`	`43`
`@@ -47,7 +47,7 @@ final class CallAudioSession_Tests: XCTestCase, @unchecked Sendable {`
`47`	`47`	`let configuration = self.mockAudioStore.audioStore.state.audioSessionConfiguration`
`48`	`48`	`return configuration.category == .playAndRecord`
`49`	`49`	`&& configuration.mode == .voiceChat`
`50`		`- && configuration.options.contains(.allowBluetoothHFP)`
	`50`	`+ && configuration.options.contains(.allowBluetooth)`
`51`	`51`	`&& configuration.options.contains(.allowBluetoothA2DP)`
`52`	`52`	`}`
`53`	`53`	`}`
`@@ -62,7 +62,7 @@ final class CallAudioSession_Tests: XCTestCase, @unchecked Sendable {`
`62`	`62`	`isActive: true,`
`63`	`63`	`category: .playAndRecord,`
`64`	`64`	`mode: .voiceChat,`
`65`		`- options: [.allowBluetoothHFP, .allowBluetoothA2DP],`
	`65`	`+ options: [.allowBluetooth, .allowBluetoothA2DP],`
`66`	`66`	`overrideOutputAudioPort: .speaker`
`67`	`67`	`)`
`68`	`68`	`policy.stub(for: .configuration, with: policyConfiguration)`
`@@ -158,7 +158,7 @@ final class CallAudioSession_Tests: XCTestCase, @unchecked Sendable {`
`158`	`158`	`isActive: true,`
`159`	`159`	`category: .playAndRecord,`
`160`	`160`	`mode: .voiceChat,`
`161`		`- options: [.allowBluetoothHFP],`
	`161`	`+ options: [.allowBluetooth],`
`162`	`162`	`overrideOutputAudioPort: .speaker`
`163`	`163`	`)`
`164`	`164`	`)`
`@@ -176,7 +176,7 @@ final class CallAudioSession_Tests: XCTestCase, @unchecked Sendable {`
`176`	`176`	`capabilitiesSubject.send([.sendAudio])`
`177`	`177`
`178`	`178`	`await fulfillment {`
`179`		`- self.mockAudioStore.audioStore.state.audioSessionConfiguration.options.contains(.allowBluetoothHFP)`
	`179`	`+ self.mockAudioStore.audioStore.state.audioSessionConfiguration.options.contains(.allowBluetooth)`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`let updatedPolicy = MockAudioSessionPolicy()`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ final class RTCAudioStore_AVAudioSessionConfigurationValidatorTests: XCTestCase,`
`32`	`32`	`subject = .init(`
`33`	`33`	`category: .playAndRecord,`
`34`	`34`	`mode: .voiceChat,`
`35`		`- options: [.allowBluetoothHFP, .defaultToSpeaker],`
	`35`	`+ options: [.allowBluetooth, .defaultToSpeaker],`
`36`	`36`	`overrideOutputAudioPort: .none`
`37`	`37`	`)`
`38`	`38`