rename CallNotificationsAdapter->NotificationsAdapter

Signal/src/UserInterface/Notifications/CallNotificationsAdapter.swift

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
 //
 
 import Foundation
@@ -7,8 +7,8 @@ import Foundation
 /**
  * Present call related notifications to the user.
  */
-@objc(OWSCallNotificationsAdapter)
-public class CallNotificationsAdapter: NSObject {
+@objc(OWSNotificationsAdapter)
+public class NotificationsAdapter: NSObject {
 
     var adaptee: OWSCallNotificationsAdaptee {
         // TODO: We may eventually want to use UserNotificationsAdaptee instead.

Signal/src/ViewControllers/DebugUI/DebugUINotifications.swift

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
 //
 
 import Foundation
@@ -13,8 +13,8 @@ class DebugUINotifications: DebugUIPage {
     var notificationsManager: NotificationsManager {
         return AppEnvironment.shared.notificationsManager
     }
-    var notificationsAdapter: CallNotificationsAdapter {
-        return AppEnvironment.shared.callNotificationsAdapter
+    var notificationsAdapter: NotificationsAdapter {
+        return AppEnvironment.shared.NotificationsAdapter
     }
     var messageSender: MessageSender {
         return SSKEnvironment.shared.messageSender

Signal/src/call/CallService.swift

@@ -401,8 +401,8 @@ private class SignalCallData: NSObject {
         return AppEnvironment.shared.accountManager
     }
 
-    private var notificationsAdapter: CallNotificationsAdapter {
-        return AppEnvironment.shared.callNotificationsAdapter
+    private var notificationsAdapter: NotificationsAdapter {
+        return AppEnvironment.shared.NotificationsAdapter
     }
 
     // MARK: - Notifications

Signal/src/call/NonCallKitCallUIAdaptee.swift

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
 //
 
 import Foundation
@@ -11,13 +11,13 @@ import SignalMessaging
  */
 class NonCallKitCallUIAdaptee: NSObject, CallUIAdaptee {
 
-    let notificationsAdapter: CallNotificationsAdapter
+    let notificationsAdapter: NotificationsAdapter
     let callService: CallService
 
     // Starting/Stopping incoming call ringing is our apps responsibility for the non CallKit interface.
     let hasManualRinger = true
 
-    required init(callService: CallService, notificationsAdapter: CallNotificationsAdapter) {
+    required init(callService: CallService, notificationsAdapter: NotificationsAdapter) {
         AssertIsOnMainThread()
 
         self.callService = callService

Signal/src/call/Speakerbox/CallKitCallUIAdaptee.swift

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
 //
 
 import Foundation
@@ -20,7 +20,7 @@ final class CallKitCallUIAdaptee: NSObject, CallUIAdaptee, CXProviderDelegate {
 
     private let callManager: CallKitCallManager
     internal let callService: CallService
-    internal let notificationsAdapter: CallNotificationsAdapter
+    internal let notificationsAdapter: NotificationsAdapter
     internal let contactsManager: OWSContactsManager
     private let showNamesOnCallScreen: Bool
     private let provider: CXProvider
@@ -76,7 +76,7 @@ final class CallKitCallUIAdaptee: NSObject, CallUIAdaptee, CXProviderDelegate {
         return providerConfiguration
     }
 
-    init(callService: CallService, contactsManager: OWSContactsManager, notificationsAdapter: CallNotificationsAdapter, showNamesOnCallScreen: Bool, useSystemCallLog: Bool) {
+    init(callService: CallService, contactsManager: OWSContactsManager, notificationsAdapter: NotificationsAdapter, showNamesOnCallScreen: Bool, useSystemCallLog: Bool) {
         AssertIsOnMainThread()
 
         Logger.debug("")

Signal/src/call/UserInterface/CallUIAdapter.swift

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
 //
 
 import Foundation
@@ -10,7 +10,7 @@ import SignalMessaging
 import WebRTC
 
 protocol CallUIAdaptee {
-    var notificationsAdapter: CallNotificationsAdapter { get }
+    var notificationsAdapter: NotificationsAdapter { get }
     var callService: CallService { get }
     var hasManualRinger: Bool { get }
 
@@ -88,7 +88,7 @@ extension CallUIAdaptee {
     internal let audioService: CallAudioService
     internal let callService: CallService
 
-    public required init(callService: CallService, contactsManager: OWSContactsManager, notificationsAdapter: CallNotificationsAdapter) {
+    public required init(callService: CallService, contactsManager: OWSContactsManager, notificationsAdapter: NotificationsAdapter) {
         AssertIsOnMainThread()
 
         self.contactsManager = contactsManager

Signal/src/environment/AppEnvironment.swift

@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2018 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2019 Open Whisper Systems. All rights reserved.
 //
 
 import Foundation
@@ -44,7 +44,7 @@ import SignalMessaging
     public var accountManager: AccountManager
 
     @objc
-    public var callNotificationsAdapter: CallNotificationsAdapter
+    public var NotificationsAdapter: NotificationsAdapter
 
     @objc
     public var pushRegistrationManager: PushRegistrationManager
@@ -68,7 +68,7 @@ import SignalMessaging
         self.messageFetcherJob = MessageFetcherJob()
         self.notificationsManager = NotificationsManager()
         self.accountManager = AccountManager()
-        self.callNotificationsAdapter = CallNotificationsAdapter()
+        self.notificationsAdapter = NotificationsAdapter()
         self.pushRegistrationManager = PushRegistrationManager()
         self.pushManager = PushManager()
         self.sessionResetJobQueue = SessionResetJobQueue()