From cc117b385c2a07d53f5a3c26cbbc70b26cca2666 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 31 Aug 2018 13:22:19 -0400 Subject: [PATCH] Modify environment accessors to use our 'shared' convention. --- .../ConversationConfigurationSyncOperation.swift | 4 ++-- .../Notifications/UserNotificationsAdaptee.swift | 8 ++++---- ...ntactShareToExistingContactViewController.swift | 2 +- .../src/ViewControllers/CallViewController.swift | 14 +++++++------- .../ViewControllers/ContactViewController.swift | 2 +- Signal/src/ViewControllers/ContactsPicker.swift | 2 +- .../ViewControllers/DebugUI/DebugUICalling.swift | 2 +- .../DebugUI/DebugUINotifications.swift | 4 ++-- .../ViewControllers/DebugUI/DebugUIProfile.swift | 2 +- .../ConversationSearchViewController.swift | 2 +- .../ViewControllers/MediaPageViewController.swift | 2 +- .../MessageDetailViewController.swift | 4 ++-- Signal/src/call/CallService.swift | 4 ++-- Signal/src/call/UserInterface/CallUIAdapter.swift | 2 +- Signal/test/util/SearcherTest.swift | 4 ++-- SignalMessaging/environment/AppSetup.m | 2 +- .../migrations/OWS106EnsureProfileComplete.swift | 2 +- SignalMessaging/utils/ConversationSearcher.swift | 2 +- .../src/Storage/FullTextSearchFinder.swift | 2 +- SignalShareExtension/ShareViewController.swift | 6 +++--- 20 files changed, 36 insertions(+), 36 deletions(-) diff --git a/Signal/src/Jobs/ConversationConfigurationSyncOperation.swift b/Signal/src/Jobs/ConversationConfigurationSyncOperation.swift index a7d66afed..5256c0ad5 100644 --- a/Signal/src/Jobs/ConversationConfigurationSyncOperation.swift +++ b/Signal/src/Jobs/ConversationConfigurationSyncOperation.swift @@ -16,11 +16,11 @@ class ConversationConfigurationSyncOperation: OWSOperation { } private var messageSender: MessageSender { - return Environment.shared().messageSender + return Environment.shared.messageSender } private var contactsManager: OWSContactsManager { - return Environment.shared().contactsManager + return Environment.shared.contactsManager } private var profileManager: OWSProfileManager { diff --git a/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift b/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift index 36a54c10b..ee6e28622 100644 --- a/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift +++ b/Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift @@ -66,7 +66,7 @@ class UserNotificationsAdaptee: NSObject, OWSCallNotificationsAdaptee, UNUserNot private let center: UNUserNotificationCenter var previewType: NotificationType { - return Environment.shared().preferences.notificationPreviewType() + return Environment.shared.preferences.notificationPreviewType() } override init() { @@ -117,7 +117,7 @@ class UserNotificationsAdaptee: NSObject, OWSCallNotificationsAdaptee, UNUserNot case .noNameNoPreview: return CallStrings.missedCallNotificationBodyWithoutCallerName case .nameNoPreview, .namePreview: - return (Environment.shared().preferences.isCallKitPrivacyEnabled() + return (Environment.shared.preferences.isCallKitPrivacyEnabled() ? CallStrings.missedCallNotificationBodyWithoutCallerName : String(format: CallStrings.missedCallNotificationBodyWithCallerName, callerName)) }}() @@ -143,7 +143,7 @@ class UserNotificationsAdaptee: NSObject, OWSCallNotificationsAdaptee, UNUserNot case .noNameNoPreview: return CallStrings.missedCallWithIdentityChangeNotificationBodyWithoutCallerName case .nameNoPreview, .namePreview: - return (Environment.shared().preferences.isCallKitPrivacyEnabled() + return (Environment.shared.preferences.isCallKitPrivacyEnabled() ? CallStrings.missedCallWithIdentityChangeNotificationBodyWithoutCallerName : String(format: CallStrings.missedCallWithIdentityChangeNotificationBodyWithCallerName, callerName)) }}() @@ -169,7 +169,7 @@ class UserNotificationsAdaptee: NSObject, OWSCallNotificationsAdaptee, UNUserNot case .noNameNoPreview: return CallStrings.missedCallWithIdentityChangeNotificationBodyWithoutCallerName case .nameNoPreview, .namePreview: - return (Environment.shared().preferences.isCallKitPrivacyEnabled() + return (Environment.shared.preferences.isCallKitPrivacyEnabled() ? CallStrings.missedCallWithIdentityChangeNotificationBodyWithoutCallerName : String(format: CallStrings.missedCallWithIdentityChangeNotificationBodyWithCallerName, callerName)) }}() diff --git a/Signal/src/ViewControllers/AddContactShareToExistingContactViewController.swift b/Signal/src/ViewControllers/AddContactShareToExistingContactViewController.swift index 34e251e56..0bbf7fc51 100644 --- a/Signal/src/ViewControllers/AddContactShareToExistingContactViewController.swift +++ b/Signal/src/ViewControllers/AddContactShareToExistingContactViewController.swift @@ -58,7 +58,7 @@ class AddContactShareToExistingContactViewController: ContactsPicker, ContactsPi func contactsPicker(_: ContactsPicker, didSelectContact oldContact: Contact) { Logger.debug("") - let contactsManager = Environment.shared().contactsManager + let contactsManager = Environment.shared.contactsManager guard let oldCNContact = contactsManager?.cnContact(withId: oldContact.cnContactId) else { owsFailDebug("could not load old CNContact.") return diff --git a/Signal/src/ViewControllers/CallViewController.swift b/Signal/src/ViewControllers/CallViewController.swift index 4642c6acc..ee77f706c 100644 --- a/Signal/src/ViewControllers/CallViewController.swift +++ b/Signal/src/ViewControllers/CallViewController.swift @@ -140,7 +140,7 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver, } required init(call: SignalCall) { - contactsManager = Environment.shared().contactsManager + contactsManager = Environment.shared.contactsManager self.call = call self.thread = TSContactThread.getOrCreateThread(contactId: call.remotePhoneNumber) super.init(nibName: nil, bundle: nil) @@ -942,7 +942,7 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver, private func markSettingsNagAsComplete() { Logger.info("") - let preferences = Environment.shared().preferences! + let preferences = Environment.shared.preferences! preferences.setIsCallKitEnabled(preferences.isCallKitEnabled()) preferences.setIsCallKitPrivacyEnabled(preferences.isCallKitPrivacyEnabled()) @@ -1064,13 +1064,13 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver, } else if !ignoreNag && call.direction == .incoming && UIDevice.current.supportsCallKit && - (!Environment.shared().preferences.isCallKitEnabled() || - Environment.shared().preferences.isCallKitPrivacyEnabled()) { + (!Environment.shared.preferences.isCallKitEnabled() || + Environment.shared.preferences.isCallKitPrivacyEnabled()) { isShowingSettingsNag = true // Update the nag view's copy to reflect the settings state. - if Environment.shared().preferences.isCallKitEnabled() { + if Environment.shared.preferences.isCallKitEnabled() { settingsNagDescriptionLabel.text = NSLocalizedString("CALL_VIEW_SETTINGS_NAG_DESCRIPTION_PRIVACY", comment: "Reminder to the user of the benefits of disabling CallKit privacy.") } else { @@ -1079,8 +1079,8 @@ class CallViewController: OWSViewController, CallObserver, CallServiceObserver, } settingsNagDescriptionLabel.superview?.setNeedsLayout() - if Environment.shared().preferences.isCallKitEnabledSet() || - Environment.shared().preferences.isCallKitPrivacySet() { + if Environment.shared.preferences.isCallKitEnabledSet() || + Environment.shared.preferences.isCallKitPrivacySet() { // User has already touched these preferences, only show // the "fleeting" nag, not the "blocking" nag. diff --git a/Signal/src/ViewControllers/ContactViewController.swift b/Signal/src/ViewControllers/ContactViewController.swift index d1f38f4e8..0fdadd71e 100644 --- a/Signal/src/ViewControllers/ContactViewController.swift +++ b/Signal/src/ViewControllers/ContactViewController.swift @@ -50,7 +50,7 @@ class ContactViewController: OWSViewController, ContactShareViewHelperDelegate { @objc required init(contactShare: ContactShareViewModel) { - contactsManager = Environment.shared().contactsManager + contactsManager = Environment.shared.contactsManager self.contactShare = contactShare self.contactShareViewHelper = ContactShareViewHelper(contactsManager: contactsManager) diff --git a/Signal/src/ViewControllers/ContactsPicker.swift b/Signal/src/ViewControllers/ContactsPicker.swift index 8afbb6c1e..f6ae989cc 100644 --- a/Signal/src/ViewControllers/ContactsPicker.swift +++ b/Signal/src/ViewControllers/ContactsPicker.swift @@ -36,7 +36,7 @@ public class ContactsPicker: OWSViewController, UITableViewDelegate, UITableView private let contactCellReuseIdentifier = "contactCellReuseIdentifier" private var contactsManager: OWSContactsManager { - return Environment.shared().contactsManager + return Environment.shared.contactsManager } // HACK: Though we don't have an input accessory view, the VC we are presented above (ConversationVC) does. diff --git a/Signal/src/ViewControllers/DebugUI/DebugUICalling.swift b/Signal/src/ViewControllers/DebugUI/DebugUICalling.swift index 60475d62b..0a4074c19 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUICalling.swift +++ b/Signal/src/ViewControllers/DebugUI/DebugUICalling.swift @@ -11,7 +11,7 @@ class DebugUICalling: DebugUIPage { // MARK: Dependencies var messageSender: MessageSender { - return Environment.shared().messageSender + return Environment.shared.messageSender } // MARK: Overrides diff --git a/Signal/src/ViewControllers/DebugUI/DebugUINotifications.swift b/Signal/src/ViewControllers/DebugUI/DebugUINotifications.swift index 4f98f3e43..2561a3ad1 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUINotifications.swift +++ b/Signal/src/ViewControllers/DebugUI/DebugUINotifications.swift @@ -17,10 +17,10 @@ class DebugUINotifications: DebugUIPage { return SignalApp.shared().callService.notificationsAdapter } var messageSender: MessageSender { - return Environment.shared().messageSender + return Environment.shared.messageSender } var contactsManager: OWSContactsManager { - return Environment.shared().contactsManager + return Environment.shared.contactsManager } // MARK: Overrides diff --git a/Signal/src/ViewControllers/DebugUI/DebugUIProfile.swift b/Signal/src/ViewControllers/DebugUI/DebugUIProfile.swift index d76daa9c3..8dc6416c1 100644 --- a/Signal/src/ViewControllers/DebugUI/DebugUIProfile.swift +++ b/Signal/src/ViewControllers/DebugUI/DebugUIProfile.swift @@ -11,7 +11,7 @@ class DebugUIProfile: DebugUIPage { // MARK: Dependencies var messageSender: MessageSender { - return Environment.shared().messageSender + return Environment.shared.messageSender } var profileManager: OWSProfileManager { return OWSProfileManager.shared() diff --git a/Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift b/Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift index d2b53e718..3ecea585f 100644 --- a/Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift +++ b/Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift @@ -36,7 +36,7 @@ class ConversationSearchViewController: UITableViewController { } private var contactsManager: OWSContactsManager { - return Environment.shared().contactsManager + return Environment.shared.contactsManager } enum SearchSection: Int { diff --git a/Signal/src/ViewControllers/MediaPageViewController.swift b/Signal/src/ViewControllers/MediaPageViewController.swift index 1684338e4..a12ce8456 100644 --- a/Signal/src/ViewControllers/MediaPageViewController.swift +++ b/Signal/src/ViewControllers/MediaPageViewController.swift @@ -562,7 +562,7 @@ class MediaPageViewController: UIPageViewController, UIPageViewControllerDataSou // MARK: Dynamic Header private var contactsManager: OWSContactsManager { - return Environment.shared().contactsManager + return Environment.shared.contactsManager } private func senderName(message: TSMessage) -> String { diff --git a/Signal/src/ViewControllers/MessageDetailViewController.swift b/Signal/src/ViewControllers/MessageDetailViewController.swift index a8d890dd9..261481460 100644 --- a/Signal/src/ViewControllers/MessageDetailViewController.swift +++ b/Signal/src/ViewControllers/MessageDetailViewController.swift @@ -52,7 +52,7 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele @objc required init(viewItem: ConversationViewItem, message: TSMessage, thread: TSThread, mode: MessageMetadataViewMode) { - self.contactsManager = Environment.shared().contactsManager + self.contactsManager = Environment.shared.contactsManager self.viewItem = viewItem self.message = message self.mode = mode @@ -191,7 +191,7 @@ class MessageDetailViewController: OWSViewController, MediaGalleryDataSourceDele } var rows = [UIView]() - let contactsManager = Environment.shared().contactsManager! + let contactsManager = Environment.shared.contactsManager! // Content rows += contentRows() diff --git a/Signal/src/call/CallService.swift b/Signal/src/call/CallService.swift index 503333838..4cf086349 100644 --- a/Signal/src/call/CallService.swift +++ b/Signal/src/call/CallService.swift @@ -390,7 +390,7 @@ private class SignalCallData: NSObject { throw CallError.assertionError(description: errorDescription) } - let useTurnOnly = Environment.shared().preferences.doCallsHideIPAddress() + let useTurnOnly = Environment.shared.preferences.doCallsHideIPAddress() let peerConnectionClient = PeerConnectionClient(iceServers: iceServers, delegate: self, callDirection: .outgoing, useTurnOnly: useTurnOnly) Logger.debug("setting peerConnectionClient for call: \(call.identifiersForLogs)") @@ -697,7 +697,7 @@ private class SignalCallData: NSObject { // a TURN connection, so as not to reveal any connectivity information (IP/port) to the caller. let isUnknownCaller = !self.contactsManager.hasSignalAccount(forRecipientId: thread.contactIdentifier()) - let useTurnOnly = isUnknownCaller || Environment.shared().preferences.doCallsHideIPAddress() + let useTurnOnly = isUnknownCaller || Environment.shared.preferences.doCallsHideIPAddress() Logger.debug("setting peerConnectionClient for: \(newCall.identifiersForLogs)") let peerConnectionClient = PeerConnectionClient(iceServers: iceServers, delegate: self, callDirection: .incoming, useTurnOnly: useTurnOnly) diff --git a/Signal/src/call/UserInterface/CallUIAdapter.swift b/Signal/src/call/UserInterface/CallUIAdapter.swift index aa29b316a..05a692308 100644 --- a/Signal/src/call/UserInterface/CallUIAdapter.swift +++ b/Signal/src/call/UserInterface/CallUIAdapter.swift @@ -106,7 +106,7 @@ extension CallUIAdaptee { let useSystemCallLog = Environment.preferences().isSystemCallLogEnabled() adaptee = CallKitCallUIAdaptee(callService: callService, contactsManager: contactsManager, notificationsAdapter: notificationsAdapter, showNamesOnCallScreen: showNames, useSystemCallLog: useSystemCallLog) - } else if #available(iOS 10.0, *), Environment.shared().preferences.isCallKitEnabled() { + } else if #available(iOS 10.0, *), Environment.shared.preferences.isCallKitEnabled() { Logger.info("choosing callkit adaptee for iOS10") let hideNames = Environment.preferences().isCallKitPrivacyEnabled() || Environment.preferences().notificationPreviewType() == .noNameNoPreview let showNames = !hideNames diff --git a/Signal/test/util/SearcherTest.swift b/Signal/test/util/SearcherTest.swift index 21a0b92b3..4538aaa63 100644 --- a/Signal/test/util/SearcherTest.swift +++ b/Signal/test/util/SearcherTest.swift @@ -118,7 +118,7 @@ class ConversationSearcherTest: XCTestCase { TSGroupThread.removeAllObjectsInCollection() TSMessage.removeAllObjectsInCollection() - originalEnvironment = SSKEnvironment.shared() + originalEnvironment = SSKEnvironment.shared assert(originalEnvironment != nil) let testEnvironment: StubbableEnvironment = StubbableEnvironment(proxy: originalEnvironment!) @@ -375,7 +375,7 @@ class ConversationSearcherTest: XCTestCase { private func getResultSet(searchText: String) -> SearchResultSet { var results: SearchResultSet! self.dbConnection.read { transaction in - results = self.searcher.results(searchText: searchText, transaction: transaction, contactsManager: SSKEnvironment.shared().contactsManager) + results = self.searcher.results(searchText: searchText, transaction: transaction, contactsManager: SSKEnvironment.shared.contactsManager) } return results } diff --git a/SignalMessaging/environment/AppSetup.m b/SignalMessaging/environment/AppSetup.m index be07dea08..0eb9f27ed 100644 --- a/SignalMessaging/environment/AppSetup.m +++ b/SignalMessaging/environment/AppSetup.m @@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN // Order matters here. [[OWSBackgroundTaskManager sharedManager] observeNotifications]; - [Environment setCurrent:[Release releaseEnvironment]]; + [Environment setShared:[Release releaseEnvironment]]; id callMessageHandler = callMessageHandlerBlock(); id notificationsManager = notificationsManagerBlock(); diff --git a/SignalMessaging/environment/migrations/OWS106EnsureProfileComplete.swift b/SignalMessaging/environment/migrations/OWS106EnsureProfileComplete.swift index 9469e9eb6..cec609271 100644 --- a/SignalMessaging/environment/migrations/OWS106EnsureProfileComplete.swift +++ b/SignalMessaging/environment/migrations/OWS106EnsureProfileComplete.swift @@ -88,7 +88,7 @@ public class OWS106EnsureProfileComplete: OWSDatabaseMigration { let (promise, fulfill, reject) = Promise.pending() - guard let networkManager = Environment.shared().networkManager else { + guard let networkManager = Environment.shared.networkManager else { return Promise(error: OWSErrorMakeAssertionError("network manager was unexpectedly not set")) } diff --git a/SignalMessaging/utils/ConversationSearcher.swift b/SignalMessaging/utils/ConversationSearcher.swift index e62d30b81..8669715c9 100644 --- a/SignalMessaging/utils/ConversationSearcher.swift +++ b/SignalMessaging/utils/ConversationSearcher.swift @@ -216,7 +216,7 @@ public class ConversationSearcher: NSObject { } private var contactsManager: OWSContactsManager { - return Environment.shared().contactsManager + return Environment.shared.contactsManager } private func indexingString(recipientId: String) -> String { diff --git a/SignalServiceKit/src/Storage/FullTextSearchFinder.swift b/SignalServiceKit/src/Storage/FullTextSearchFinder.swift index f36194c9b..72691e95d 100644 --- a/SignalServiceKit/src/Storage/FullTextSearchFinder.swift +++ b/SignalServiceKit/src/Storage/FullTextSearchFinder.swift @@ -154,7 +154,7 @@ public class FullTextSearchFinder: NSObject { // MARK: - Index Building private class var contactsManager: ContactsManagerProtocol { - return SSKEnvironment.shared().contactsManager + return SSKEnvironment.shared.contactsManager } private static let groupThreadIndexer: SearchIndexer = SearchIndexer { (groupThread: TSGroupThread, transaction: YapDatabaseReadTransaction) in diff --git a/SignalShareExtension/ShareViewController.swift b/SignalShareExtension/ShareViewController.swift index 4084cf1f9..c0bca6e35 100644 --- a/SignalShareExtension/ShareViewController.swift +++ b/SignalShareExtension/ShareViewController.swift @@ -201,7 +201,7 @@ public class ShareViewController: UIViewController, ShareViewDelegate, SAEFailed // We don't need to use the TSSocketManager in the SAE. - Environment.shared().contactsManager.fetchSystemContactsOnceIfAlreadyAuthorized() + Environment.shared.contactsManager.fetchSystemContactsOnceIfAlreadyAuthorized() // We don't need to fetch messages in the SAE. @@ -267,8 +267,8 @@ public class ShareViewController: UIViewController, ShareViewDelegate, SAEFailed AppVersion.sharedInstance().saeLaunchDidComplete() - Environment.shared().contactsManager.loadSignalAccountsFromCache() - Environment.shared().contactsManager.startObserving() + Environment.shared.contactsManager.loadSignalAccountsFromCache() + Environment.shared.contactsManager.startObserving() ensureRootViewController()