Merge pull request #202 from eofster/delay-setting-audio-devices-afte…

…r-system-audio-devices-update Delay setting audio devices after system audio devices update
64characters · Apr 16, 2016 · 417d721 · 417d721
2 parents c08d860 + 4e72d00
commit 417d721
Show file tree

Hide file tree

Showing 25 changed files with 239 additions and 360 deletions.
diff --git a/Telephone.xcodeproj/project.pbxproj b/Telephone.xcodeproj/project.pbxproj
diff --git a/Telephone/AKSIPUserAgent+UserAgent.swift b/Telephone/AKSIPUserAgent+UserAgent.swift
@@ -19,6 +19,10 @@
 import UseCases
 
 extension AKSIPUserAgent: UserAgent {
+    public var hasActiveCalls: Bool {
+        return started && activeCallsCount > 0
+    }
+
     public func audioDevices() throws -> [UserAgentAudioDevice] {
         if started {
             return try UserAgentAudioDevices().all

diff --git a/Telephone/CompositionRoot.swift b/Telephone/CompositionRoot.swift
@@ -55,36 +55,35 @@ class CompositionRoot: NSObject {
             delegate: conditionalRingtonePlaybackInteractorDelegate
         )
 
+        let userAgentSoundIOSelection = DelayingUserAgentSoundIOSelectionInteractor(
+            interactor: UserAgentSoundIOSelectionInteractor(
+                repository: audioDevices,
+                userAgent: userAgent,
+                userDefaults: userDefaults
+            ),
+            userAgent: userAgent
+        )
+
         preferencesController = PreferencesController(
             delegate: preferencesControllerDelegate,
             soundPreferencesViewEventTarget: DefaultSoundPreferencesViewEventTarget(
                 interactorFactory: interactorFactory,
                 presenterFactory: PresenterFactory(),
+                userAgentSoundIOSelection: userAgentSoundIOSelection,
                 ringtoneOutputUpdate: RingtoneOutputUpdateInteractor(playback: ringtonePlayback),
-                ringtoneSoundPlayback: DefaultSoundPlaybackInteractor(factory: userDefaultsSoundFactory),
-                userAgent: userAgent
+                ringtoneSoundPlayback: DefaultSoundPlaybackInteractor(factory: userDefaultsSoundFactory)
             )
         )
 
         userAgentNotificationsToEventTargetAdapter = UserAgentNotificationsToEventTargetAdapter(
-            target: UserAgentSoundIOSelector(factory: interactorFactory),
+            target: userAgentSoundIOSelection,
             userAgent: userAgent
         )
         devicesChangeEventSource = SystemAudioDevicesChangeEventSource(
             target: SystemAudioDevicesChangeEventTargetComposite(
                 targets: [
-                    UserAgentAudioDeviceUpdater(
-                        interactor: UserAgentAudioDeviceUpdateAndSoundIOSelectionInteractor(
-                            update: UserAgentAudioDeviceUpdateInteractor(
-                                userAgent: userAgent
-                            ),
-                            selection: UserAgentSoundIOSelectionInteractor(
-                                repository: audioDevices,
-                                userAgent: userAgent,
-                                userDefaults: userDefaults
-                            )
-                        )
-                    ),
+                    UserAgentAudioDeviceUpdateInteractor(userAgent: userAgent),
+                    userAgentSoundIOSelection,
                     PreferencesSoundIOUpdater(preferences: preferencesController)
                 ]
             ),

diff --git a/Telephone/DefaultInteractorFactory.swift b/Telephone/DefaultInteractorFactory.swift
@@ -29,14 +29,6 @@ class DefaultInteractorFactory {
 }
 
 extension DefaultInteractorFactory: InteractorFactory {
-    func createUserAgentSoundIOSelectionInteractor(userAgent userAgent: UserAgent) -> ThrowingInteractor {
-        return UserAgentSoundIOSelectionInteractor(
-            repository: repository,
-            userAgent: userAgent,
-            userDefaults: userDefaults
-        )
-    }
-
     func createUserDefaultsSoundIOLoadInteractor(output output: UserDefaultsSoundIOLoadInteractorOutput) -> ThrowingInteractor {
         return UserDefaultsSoundIOLoadInteractor(
             repository: repository,

diff --git a/Telephone/DefaultSoundPreferencesViewEventTarget.swift b/Telephone/DefaultSoundPreferencesViewEventTarget.swift
@@ -21,20 +21,20 @@ import UseCases
 class DefaultSoundPreferencesViewEventTarget: NSObject {
     let interactorFactory: InteractorFactory
     let presenterFactory: PresenterFactory
+    let userAgentSoundIOSelection: Interactor
     let ringtoneOutputUpdate: ThrowingInteractor
     let ringtoneSoundPlayback: SoundPlaybackInteractor
-    let userAgent: UserAgent
 
     init(interactorFactory: InteractorFactory,
-        presenterFactory: PresenterFactory,
-        ringtoneOutputUpdate: ThrowingInteractor,
-        ringtoneSoundPlayback: SoundPlaybackInteractor,
-        userAgent: UserAgent) {
-            self.interactorFactory = interactorFactory
-            self.presenterFactory = presenterFactory
-            self.ringtoneOutputUpdate = ringtoneOutputUpdate
-            self.ringtoneSoundPlayback = ringtoneSoundPlayback
-            self.userAgent = userAgent
+         presenterFactory: PresenterFactory,
+         userAgentSoundIOSelection: Interactor,
+         ringtoneOutputUpdate: ThrowingInteractor,
+         ringtoneSoundPlayback: SoundPlaybackInteractor) {
+        self.interactorFactory = interactorFactory
+        self.presenterFactory = presenterFactory
+        self.userAgentSoundIOSelection = userAgentSoundIOSelection
+        self.ringtoneOutputUpdate = ringtoneOutputUpdate
+        self.ringtoneSoundPlayback = ringtoneSoundPlayback
     }
 }
 
@@ -51,7 +51,7 @@ extension DefaultSoundPreferencesViewEventTarget: SoundPreferencesViewEventTarge
         updateUserDefaultsWithSoundIO(
             PresentationSoundIO(input: input, output: output, ringtoneOutput: ringtoneOutput)
         )
-        selectUserAgentAudioDevicesOrLogError()
+        userAgentSoundIOSelection.execute()
         updateRingtoneOutputOrLogError()
     }
 
@@ -76,14 +76,6 @@ extension DefaultSoundPreferencesViewEventTarget: SoundPreferencesViewEventTarge
         interactorFactory.createUserDefaultsSoundIOSaveInteractor(soundIO: soundIO).execute()
     }
 
-    private func selectUserAgentAudioDevicesOrLogError() {
-        do {
-            try interactorFactory.createUserAgentSoundIOSelectionInteractor(userAgent: userAgent).execute()
-        } catch {
-            print("Could not select user agent audio devices: \(error)")
-        }
-    }
-
     private func updateRingtoneOutputOrLogError() {
         do {
             try ringtoneOutputUpdate.execute()

diff --git a/Telephone/UserAgentAudioDeviceUpdater.swift b/Telephone/UserAgentAudioDeviceUpdater.swift
diff --git a/Telephone/UserAgentSoundIOSelector.swift b/Telephone/UserAgentSoundIOSelector.swift
diff --git a/TelephoneTests/DefaultInteractorFactoryTests.swift b/TelephoneTests/DefaultInteractorFactoryTests.swift
@@ -32,17 +32,6 @@ class DefaultInteractorFactoryTests: XCTestCase {
         sut = DefaultInteractorFactory(repository: repository, userDefaults: userDefaults)
     }
 
-    func testCanCreateUserAgentSoundIOSelectionInteractor() {
-        let userAgent = UserAgentSpy()
-
-        let result = sut.createUserAgentSoundIOSelectionInteractor(userAgent: userAgent) as! UserAgentSoundIOSelectionInteractor
-
-        XCTAssertNotNil(result)
-        XCTAssertTrue(result.repository === repository)
-        XCTAssertTrue(result.userAgent === userAgent)
-        XCTAssertTrue(result.userDefaults === userDefaults)
-    }
-
     func testCanCreateUserDefaultsSoundIOLoadInteractor() {
         let output = UserDefaultsSoundIOLoadInteractorOutputSpy()
 

diff --git a/TelephoneTests/DefaultSoundPreferencesViewEventTargetTests.swift b/TelephoneTests/DefaultSoundPreferencesViewEventTargetTests.swift
@@ -21,21 +21,23 @@ import XCTest
 
 class DefaultSoundPreferencesViewEventTargetTests: XCTestCase {
     private var factory: InteractorFactorySpy!
+    private var userAgentSoundIOSelection: InteractorSpy!
     private var ringtoneOutputUpdate: ThrowingInteractorSpy!
     private var soundPlayback: SoundPlaybackInteractorSpy!
     private var sut: DefaultSoundPreferencesViewEventTarget!
 
     override func setUp() {
         super.setUp()
         factory = InteractorFactorySpy()
+        userAgentSoundIOSelection = InteractorSpy()
         ringtoneOutputUpdate = ThrowingInteractorSpy()
         soundPlayback = SoundPlaybackInteractorSpy()
         sut = DefaultSoundPreferencesViewEventTarget(
             interactorFactory: factory,
             presenterFactory: PresenterFactory(),
+            userAgentSoundIOSelection: userAgentSoundIOSelection,
             ringtoneOutputUpdate: ringtoneOutputUpdate,
-            ringtoneSoundPlayback: soundPlayback,
-            userAgent: UserAgentSpy()
+            ringtoneSoundPlayback: soundPlayback
         )
     }
 
@@ -60,7 +62,6 @@ class DefaultSoundPreferencesViewEventTargetTests: XCTestCase {
     func testExecutesUserDefaultsSoundIOSaveInteractorWithExpectedArgumentsOnSoundIOChange() {
         let interactor = InteractorSpy()
         factory.stubWithUserDefaultsSoundIOSave(interactor)
-        factory.stubWithUserAgentSoundIOSelection(ThrowingInteractorSpy())
         let soundIO = PresentationSoundIO(input: "input", output: "output1", ringtoneOutput: "output2")
 
         sut.viewDidChangeSoundIO(
@@ -72,17 +73,14 @@ class DefaultSoundPreferencesViewEventTargetTests: XCTestCase {
     }
 
     func testExecutesUserAgentSoundIOSelectionInteractorOnSoundIOChange() {
-        let interactor = ThrowingInteractorSpy()
-        factory.stubWithUserAgentSoundIOSelection(interactor)
         factory.stubWithUserDefaultsSoundIOSave(InteractorSpy())
 
         sut.viewDidChangeSoundIO(input: "any-input", output: "any-output", ringtoneOutput: "any-output")
 
-        XCTAssertTrue(interactor.didCallExecute)
+        XCTAssertTrue(userAgentSoundIOSelection.didCallExecute)
     }
 
     func testExecutesRingtoneOutputUpdateInteractorOnSoundIOChange() {
-        factory.stubWithUserAgentSoundIOSelection(ThrowingInteractorSpy())
         factory.stubWithUserDefaultsSoundIOSave(InteractorSpy())
 
         sut.viewDidChangeSoundIO(input: "any-input", output: "any-output", ringtoneOutput: "any-output")

diff --git a/TelephoneTests/UserAgentAudioDeviceUpdaterTests.swift b/TelephoneTests/UserAgentAudioDeviceUpdaterTests.swift