keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Modify environment accessors to use our 'shared' convention.

Browse Source
pull/1/head
Matthew Chen 7 years ago
parent 3a12446be8
commit cc117b385c
20 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File

4
Signal/src/Jobs/ConversationConfigurationSyncOperation.swift
Unescape Escape View File

@ -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 {

8
Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift
Unescape Escape View File

@ -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))
}}()

2
Signal/src/ViewControllers/AddContactShareToExistingContactViewController.swift
Unescape Escape View File

@ -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

14
Signal/src/ViewControllers/CallViewController.swift
Unescape Escape View File

@ -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.

2
Signal/src/ViewControllers/ContactViewController.swift
Unescape Escape View File

@ -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)

2
Signal/src/ViewControllers/ContactsPicker.swift
Unescape Escape View File

@ -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.

2
Signal/src/ViewControllers/DebugUI/DebugUICalling.swift
Unescape Escape View File

@ -11,7 +11,7 @@ class DebugUICalling: DebugUIPage {
// MARK: Dependencies
var messageSender: MessageSender {
return Environment.shared().messageSender
return Environment.shared.messageSender
}
// MARK: Overrides

4
Signal/src/ViewControllers/DebugUI/DebugUINotifications.swift
Unescape Escape View File

@ -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

2
Signal/src/ViewControllers/DebugUI/DebugUIProfile.swift
Unescape Escape View File

@ -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()

2
Signal/src/ViewControllers/HomeView/ConversationSearchViewController.swift
Unescape Escape View File

@ -36,7 +36,7 @@ class ConversationSearchViewController: UITableViewController {
}
private var contactsManager: OWSContactsManager {
return Environment.shared().contactsManager
return Environment.shared.contactsManager
}
enum SearchSection: Int {

2
Signal/src/ViewControllers/MediaPageViewController.swift
Unescape Escape View File

@ -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 {

4
Signal/src/ViewControllers/MessageDetailViewController.swift
Unescape Escape View File

@ -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()

4
Signal/src/call/CallService.swift
Unescape Escape View File

@ -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)

2
Signal/src/call/UserInterface/CallUIAdapter.swift
Unescape Escape View File

@ -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

4
Signal/test/util/SearcherTest.swift
Unescape Escape View File

@ -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
}

2
SignalMessaging/environment/AppSetup.m
Unescape Escape View File

@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
// Order matters here.
[[OWSBackgroundTaskManager sharedManager] observeNotifications];
[Environment setCurrent:[Release releaseEnvironment]];
[Environment setShared:[Release releaseEnvironment]];
id<OWSCallMessageHandler> callMessageHandler = callMessageHandlerBlock();
id<NotificationsProtocol> notificationsManager = notificationsManagerBlock();

2
SignalMessaging/environment/migrations/OWS106EnsureProfileComplete.swift
Unescape Escape View File

@ -88,7 +88,7 @@ public class OWS106EnsureProfileComplete: OWSDatabaseMigration {
let (promise, fulfill, reject) = Promise<Void>.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"))
}

2
SignalMessaging/utils/ConversationSearcher.swift
Unescape Escape View File

@ -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 {

2
SignalServiceKit/src/Storage/FullTextSearchFinder.swift
Unescape Escape View File

@ -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<TSGroupThread> = SearchIndexer { (groupThread: TSGroupThread, transaction: YapDatabaseReadTransaction) in

6
SignalShareExtension/ShareViewController.swift
Unescape Escape View File

@ -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()

Write Preview
Loading…
Cancel
Save