diff --git a/Signal/src/UserInterface/Notifications/AppNotifications.swift b/Signal/src/UserInterface/Notifications/AppNotifications.swift index 237158c39..eb804a629 100644 --- a/Signal/src/UserInterface/Notifications/AppNotifications.swift +++ b/Signal/src/UserInterface/Notifications/AppNotifications.swift @@ -153,6 +153,10 @@ public class NotificationPresenter: NSObject, NotificationsProtocol { // MARK: - Dependencies + var contactsManager: OWSContactsManager { + return Environment.shared.contactsManager + } + var identityManager: OWSIdentityManager { return OWSIdentityManager.shared() } @@ -332,8 +336,7 @@ public class NotificationPresenter: NSObject, NotificationsProtocol { } } - // MJK TODO DI contactsManager - public func notifyUser(for incomingMessage: TSIncomingMessage, in thread: TSThread, contactsManager: ContactsManagerProtocol, transaction: YapDatabaseReadTransaction) { + public func notifyUser(for incomingMessage: TSIncomingMessage, in thread: TSThread, transaction: YapDatabaseReadTransaction) { guard !thread.isMuted else { return diff --git a/Signal/src/ViewControllers/DebugUI/DebugUINotifications.swift b/Signal/src/ViewControllers/DebugUI/DebugUINotifications.swift index 98cfa91e3..b2e474abb 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUINotifications.swift +++ b/Signal/src/ViewControllers/DebugUI/DebugUINotifications.swift @@ -170,7 +170,6 @@ class DebugUINotifications: DebugUIPage { self.notificationPresenter.notifyUser(for: incomingMessage, in: thread, - contactsManager: self.contactsManager, transaction: transaction) } } diff --git a/SignalServiceKit/src/Messages/OWSMessageManager.m b/SignalServiceKit/src/Messages/OWSMessageManager.m index 36e0bc8ed..3c8858186 100644 --- a/SignalServiceKit/src/Messages/OWSMessageManager.m +++ b/SignalServiceKit/src/Messages/OWSMessageManager.m @@ -1490,7 +1490,6 @@ NS_ASSUME_NONNULL_BEGIN [SSKEnvironment.shared.notificationsManager notifyUserForIncomingMessage:incomingMessage inThread:thread - contactsManager:self.contactsManager transaction:transaction]; dispatch_async(dispatch_get_main_queue(), ^{ diff --git a/SignalServiceKit/src/Protocols/NotificationsProtocol.h b/SignalServiceKit/src/Protocols/NotificationsProtocol.h index 7bb14ea2b..423d607e7 100644 --- a/SignalServiceKit/src/Protocols/NotificationsProtocol.h +++ b/SignalServiceKit/src/Protocols/NotificationsProtocol.h @@ -1,5 +1,5 @@ // -// Copyright (c) 2018 Open Whisper Systems. All rights reserved. +// Copyright (c) 2019 Open Whisper Systems. All rights reserved. // NS_ASSUME_NONNULL_BEGIN @@ -16,7 +16,6 @@ NS_ASSUME_NONNULL_BEGIN - (void)notifyUserForIncomingMessage:(TSIncomingMessage *)incomingMessage inThread:(TSThread *)thread - contactsManager:(id)contactsManager transaction:(YapDatabaseReadTransaction *)transaction; - (void)notifyUserForErrorMessage:(TSErrorMessage *)error diff --git a/SignalServiceKit/src/TestUtils/NoopNotificationsManager.swift b/SignalServiceKit/src/TestUtils/NoopNotificationsManager.swift index ef782bc90..cb1c34536 100644 --- a/SignalServiceKit/src/TestUtils/NoopNotificationsManager.swift +++ b/SignalServiceKit/src/TestUtils/NoopNotificationsManager.swift @@ -5,7 +5,7 @@ @objc public class NoopNotificationsManager: NSObject, NotificationsProtocol { - public func notifyUser(for incomingMessage: TSIncomingMessage, in thread: TSThread, contactsManager: ContactsManagerProtocol, transaction: YapDatabaseReadTransaction) { + public func notifyUser(for incomingMessage: TSIncomingMessage, in thread: TSThread, transaction: YapDatabaseReadTransaction) { owsFailDebug("") }