oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'charlesmchen/swiftSingletons'

Browse source
This commit is contained in:
Matthew Chen 2017-12-07 14:31:33 -05:00
commit c36c4d6ec3
23 changed files with 115 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Signal.xcodeproj/project.pbxproj
View file

@ -106,6 +106,7 @@
3478506A1FD9B78A007B8332 /* AppSetup.h in Headers */ = {isa = PBXBuildFile; fileRef = 347850661FD9B789007B8332 /* AppSetup.h */; settings = {ATTRIBUTES = (Public, ); }; };
3478506B1FD9B78A007B8332 /* NoopCallMessageHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 347850671FD9B78A007B8332 /* NoopCallMessageHandler.swift */; };
3478506C1FD9B78A007B8332 /* NoopNotificationsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 347850681FD9B78A007B8332 /* NoopNotificationsManager.swift */; };
347850591FD9972E007B8332 /* SwiftSingletons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 347850581FD9972E007B8332 /* SwiftSingletons.swift */; };
3497DBEC1ECE257500DB2605 /* OWSCountryMetadata.m in Sources */ = {isa = PBXBuildFile; fileRef = 3497DBEB1ECE257500DB2605 /* OWSCountryMetadata.m */; };
3497DBEF1ECE2E4700DB2605 /* DomainFrontingCountryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3497DBEE1ECE2E4700DB2605 /* DomainFrontingCountryViewController.m */; };
34B0796D1FCF46B100E248C2 /* MainAppContext.m in Sources */ = {isa = PBXBuildFile; fileRef = 34B0796B1FCF46B000E248C2 /* MainAppContext.m */; };
@ -572,6 +573,7 @@
347850661FD9B789007B8332 /* AppSetup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppSetup.h; sourceTree = "<group>"; };
347850671FD9B78A007B8332 /* NoopCallMessageHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NoopCallMessageHandler.swift; sourceTree = "<group>"; };
347850681FD9B78A007B8332 /* NoopNotificationsManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NoopNotificationsManager.swift; sourceTree = "<group>"; };
347850581FD9972E007B8332 /* SwiftSingletons.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftSingletons.swift; sourceTree = "<group>"; };
348F2EAD1F0D21BC00D4ECE0 /* DeviceSleepManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DeviceSleepManager.swift; sourceTree = "<group>"; };
3495BC911F1426B800B478F5 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = translations/ar.lproj/Localizable.strings; sourceTree = "<group>"; };
3497DBEA1ECE257500DB2605 /* OWSCountryMetadata.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OWSCountryMetadata.h; sourceTree = "<group>"; };
@ -1097,6 +1099,7 @@
346129BE1FD2068600532771 /* ThreadUtil.m */,
B97940251832BD2400BD66CB /* UIUtil.h */,
B97940261832BD2400BD66CB /* UIUtil.m */,
347850581FD9972E007B8332 /* SwiftSingletons.swift */,
346129751FD1E0B500532771 /* WeakTimer.swift */,
);
path = utils;
@ -2685,6 +2688,7 @@
346129E61FD5C0C600532771 /* OWSDatabaseMigrationRunner.m in Sources */,
346129AB1FD1F0EE00532771 /* OWSFormat.m in Sources */,
451F8A461FD715BA005CB9DA /* OWSGroupAvatarBuilder.m in Sources */,
347850591FD9972E007B8332 /* SwiftSingletons.swift in Sources */,
346129961FD1E30000532771 /* OWSDatabaseMigration.m in Sources */,
346129CD1FD2072E00532771 /* UIImage+OWS.m in Sources */,
450998661FD8BD9C00D89EB3 /* FullImageViewController.m in Sources */,

2
Signal/src/AppDelegate.m
View file

@ -914,7 +914,7 @@ static NSString *const kURLHostVerifyPrefix = @"verify";
[[TSStorageManager sharedManager].newDatabaseConnection
readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
[[ExperienceUpgradeFinder new] markAllAsSeenWithTransaction:transaction];
[ExperienceUpgradeFinder.sharedManager markAllAsSeenWithTransaction:transaction];
}];
// Start running the disappearing messages job in case the newly registered user
// enables this feature

4
Signal/src/Jobs/MessageFetcherJob.swift
View file

@ -20,6 +20,10 @@ class MessageFetcherJob: NSObject {
self.messageReceiver = messageReceiver
self.networkManager = networkManager
self.signalService = signalService
super.init()
SwiftSingletons.register(self)
}
public func run() -> Promise<Void> {

4
Signal/src/Models/AccountManager.swift
View file

@ -26,6 +26,10 @@ class AccountManager: NSObject {
self.networkManager = textSecureAccountManager.networkManager
self.textSecureAccountManager = textSecureAccountManager
self.preferences = preferences
super.init()
SwiftSingletons.register(self)
}
// MARK: registration

4
Signal/src/UserInterface/Notifications/CallNotificationsAdapter.swift
View file

@ -24,6 +24,10 @@ class CallNotificationsAdapter: NSObject {
// } else {
adaptee = SignalApp.shared().notificationsManager
// }
super.init()
SwiftSingletons.register(self)
}
func presentIncomingCall(_ call: SignalCall, callerName: String) {

3
Signal/src/UserInterface/Notifications/UserNotificationsAdaptee.swift
View file

@ -72,8 +72,11 @@ class UserNotificationsAdaptee: NSObject, OWSCallNotificationsAdaptee, UNUserNot
override init() {
self.center = UNUserNotificationCenter.current()
super.init()
SwiftSingletons.register(self)
center.delegate = self
// FIXME TODO only do this after user has registered.

8
Signal/src/ViewControllers/HomeViewController.m
View file

@ -56,7 +56,6 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
@property (nonatomic, readonly) AccountManager *accountManager;
@property (nonatomic, readonly) OWSContactsManager *contactsManager;
@property (nonatomic, readonly) ExperienceUpgradeFinder *experienceUpgradeFinder;
@property (nonatomic, readonly) OWSMessageManager *messagesManager;
@property (nonatomic, readonly) OWSMessageSender *messageSender;
@property (nonatomic, readonly) OWSBlockingManager *blockingManager;
@ -111,7 +110,8 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
_blockingManager = [OWSBlockingManager sharedManager];
_blockedPhoneNumberSet = [NSSet setWithArray:[_blockingManager blockedPhoneNumbers]];
_experienceUpgradeFinder = [ExperienceUpgradeFinder new];
// Ensure ExperienceUpgradeFinder has been initialized.
ExperienceUpgradeFinder.sharedManager;
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(blockedPhoneNumbersDidChange:)
@ -530,7 +530,7 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
__block NSArray<ExperienceUpgrade *> *unseenUpgrades;
[self.editingDbConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
unseenUpgrades = [self.experienceUpgradeFinder allUnseenWithTransaction:transaction];
unseenUpgrades = [ExperienceUpgradeFinder.sharedManager allUnseenWithTransaction:transaction];
}];
return unseenUpgrades;
}
@ -540,7 +540,7 @@ typedef NS_ENUM(NSInteger, CellState) { kArchiveState, kInboxState };
AssertIsOnMainThread();
[self.editingDbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *_Nonnull transaction) {
[self.experienceUpgradeFinder markAllAsSeenWithTransaction:transaction];
[ExperienceUpgradeFinder.sharedManager markAllAsSeenWithTransaction:transaction];
}];
}

2
Signal/src/call/CallAudioService.swift
View file

@ -148,6 +148,8 @@ struct AudioSource: Hashable {
super.init()
SwiftSingletons.register(self)
// Configure audio session so we don't prompt user with Record permission until call is connected.
audioSession.configure()
}

2
Signal/src/call/CallService.swift
View file

@ -224,6 +224,8 @@ protocol CallServiceObserver: class {
super.init()
SwiftSingletons.register(self)
self.createCallUIAdapter()
NotificationCenter.default.addObserver(self,

8
Signal/src/call/NonCallKitCallUIAdaptee.swift
View file

@ -9,7 +9,7 @@ import SignalMessaging
/**
* Manage call related UI in a pre-CallKit world.
*/
class NonCallKitCallUIAdaptee: CallUIAdaptee {
class NonCallKitCallUIAdaptee: NSObject, CallUIAdaptee {
let TAG = "[NonCallKitCallUIAdaptee]"
@ -20,8 +20,14 @@ class NonCallKitCallUIAdaptee: CallUIAdaptee {
let hasManualRinger = true
required init(callService: CallService, notificationsAdapter: CallNotificationsAdapter) {
AssertIsOnMainThread()
self.callService = callService
self.notificationsAdapter = notificationsAdapter
super.init()
SwiftSingletons.register(self)
}
func startOutgoingCall(handle: String) -> SignalCall {

2
Signal/src/call/OutboundCallInitiator.swift
View file

@ -20,6 +20,8 @@ import SignalMessaging
self.contactsUpdater = contactsUpdater
super.init()
SwiftSingletons.register(self)
}
/**

8
Signal/src/call/Speakerbox/CallKitCallManager.swift
View file

@ -20,6 +20,14 @@ final class CallKitCallManager: NSObject {
let callController = CXCallController()
static let kAnonymousCallHandlePrefix = "Signal:"
override required init() {
AssertIsOnMainThread()
super.init()
SwiftSingletons.register(self)
}
// MARK: Actions
func startCall(_ call: SignalCall) {

2
Signal/src/call/Speakerbox/CallKitCallUIAdaptee.swift
View file

@ -63,6 +63,8 @@ final class CallKitCallUIAdaptee: NSObject, CallUIAdaptee, CXProviderDelegate {
super.init()
SwiftSingletons.register(self)
self.provider.setDelegate(self, queue: nil)
}

2
Signal/src/call/UserInterface/CallUIAdapter.swift
View file

@ -103,6 +103,8 @@ extension CallUIAdaptee {
super.init()
SwiftSingletons.register(self)
callService.addObserverAndSyncState(observer: self)
}

4
Signal/src/call/WebRTCCallMessageHandler.swift
View file

@ -25,6 +25,10 @@ class WebRTCCallMessageHandler: NSObject, OWSCallMessageHandler {
self.accountManager = accountManager
self.callService = callService
self.messageSender = messageSender
super.init()
SwiftSingletons.register(self)
}
// MARK: - Call Handlers

14
Signal/src/environment/ExperienceUpgrades/ExperienceUpgradeFinder.swift
View file

@ -13,7 +13,17 @@ enum ExperienceUpgradeId: String {
}
class ExperienceUpgradeFinder: NSObject {
public let TAG = "[ExperienceUpgradeFinder]"
// MARK - Singleton class
@objc(sharedManager)
public static let shared = ExperienceUpgradeFinder()
private override init() {
super.init()
SwiftSingletons.register(self)
}
var videoCalling: ExperienceUpgrade {
return ExperienceUpgrade(uniqueId: ExperienceUpgradeId.videoCalling.rawValue,
@ -64,7 +74,7 @@ class ExperienceUpgradeFinder: NSObject {
}
public func markAllAsSeen(transaction: YapDatabaseReadWriteTransaction) {
Logger.info("\(TAG) marking experience upgrades as seen")
Logger.info("\(logTag) marking experience upgrades as seen")
allExperienceUpgrades.forEach { $0.save(with: transaction) }
}
}

2
Signal/src/environment/PushRegistrationManager.swift
View file

@ -31,6 +31,8 @@ public enum PushRegistrationError: Error {
private override init() {
super.init()
SwiftSingletons.register(self)
}
private var userNotificationSettingsPromise: Promise<Void>?

6
Signal/src/network/GiphyAPI.swift
View file

@ -271,7 +271,11 @@ extension GiphyError: LocalizedError {
static let sharedInstance = GiphyAPI()
// Force usage as a singleton
override private init() {}
override private init() {
super.init()
SwiftSingletons.register(self)
}
deinit {
NotificationCenter.default.removeObserver(self)

2
Signal/src/network/GiphyDownloader.swift
View file

@ -450,6 +450,8 @@ extension URLSessionTask {
super.init()
SwiftSingletons.register(self)
ensureGifFolder()
}

6
Signal/translations/en.lproj/Localizable.strings
View file

@ -428,7 +428,7 @@
"DATABASE_VIEW_OVERLAY_TITLE" = "Updating Database";
/* Message indicating that the debug log is being uploaded. */
"DEBUG_LOG_ACTIVITY_INDICATOR" = "Sending debug log...";
"DEBUG_LOG_ACTIVITY_INDICATOR" = "Sending Debug Log...";
/* Message of the debug log alert. */
"DEBUG_LOG_ALERT_MESSAGE" = "What would you like to do with the link to your debug log?";
@ -449,13 +449,13 @@
"DEBUG_LOG_ALERT_TITLE" = "One More Step";
/* Title of the alert indicating the debug log upload failed. */
"DEBUG_LOG_FAILURE_ALERT_TITLE" = "Failed to submit debug log";
"DEBUG_LOG_FAILURE_ALERT_TITLE" = "Failed to Submit Debug Log";
/* Message of the alert before redirecting to Github Issues. */
"DEBUG_LOG_GITHUB_ISSUE_ALERT_MESSAGE" = "The gist link was copied in your clipboard. You are about to be redirected to the GitHub issue list.";
/* Title of the alert before redirecting to Github Issues. */
"DEBUG_LOG_GITHUB_ISSUE_ALERT_TITLE" = "GitHub redirection";
"DEBUG_LOG_GITHUB_ISSUE_ALERT_TITLE" = "GitHub Redirection";
/* {{Short Date}} when device last communicated with Signal Server. */
"DEVICE_LAST_ACTIVE_AT_LABEL" = "Last active: %@";

4
SignalMessaging/contacts/SystemContactsFetcher.swift
View file

@ -351,6 +351,10 @@ public class SystemContactsFetcher: NSObject {
override init() {
self.contactStoreAdapter = ContactStoreAdapter()
super.init()
SwiftSingletons.register(self)
}
@objc

2
SignalMessaging/utils/DeviceSleepManager.swift
View file

@ -38,6 +38,8 @@ public class DeviceSleepManager: NSObject {
private override init() {
super.init()
SwiftSingletons.register(self)
NotificationCenter.default.addObserver(self,
selector:#selector(didEnterBackground),
name:NSNotification.Name.UIApplicationDidEnterBackground,

32
SignalMessaging/utils/SwiftSingletons.swift Normal file
View file

@ -0,0 +1,32 @@
//
// Copyright (c) 2017 Open Whisper Systems. All rights reserved.
//
import Foundation
public class SwiftSingletons: NSObject {
public static let shared = SwiftSingletons()
private var classSet = Set<String>()
private override init() {
super.init()
}
public func register(_ singleton: AnyObject) {
guard _isDebugAssertConfiguration() else {
return
}
let singletonClassName = String(describing:type(of:singleton))
guard !classSet.contains(singletonClassName) else {
owsFail("\(self.logTag()) in \(#function) Duplicate singleton: \(singletonClassName).")
return
}
Logger.verbose("\(self.logTag()) in \(#function) Registering singleton: \(singletonClassName).")
classSet.insert(singletonClassName)
}
public static func register(_ singleton: AnyObject) {
shared.register(singleton)
}
}