Clean up ahead of PR.

pull/1/head
Matthew Chen 7 years ago
parent 0b4ed1175d
commit 8830f0a594

@ -15,7 +15,7 @@ public class MessageFetcherJob: NSObject {
public override init() public override init()
{ {
super.init() super.init()
SwiftSingletons.register(self) SwiftSingletons.register(self)
} }

@ -29,8 +29,7 @@ class DebugUINotifications: DebugUIPage {
return "Notifications" return "Notifications"
} }
override func section(thread aThread: TSThread?) -> OWSTableSection? override func section(thread aThread: TSThread?) -> OWSTableSection? {
{
guard let thread = aThread else { guard let thread = aThread else {
owsFailDebug("Notifications must specify thread.") owsFailDebug("Notifications must specify thread.")
return nil return nil

@ -11,8 +11,7 @@ import SignalMessaging
*/ */
@objc public class OutboundCallInitiator: NSObject { @objc public class OutboundCallInitiator: NSObject {
@objc public override init() @objc public override init() {
{
super.init() super.init()
SwiftSingletons.register(self) SwiftSingletons.register(self)

@ -48,8 +48,7 @@ import SignalMessaging
messageFetcherJob : MessageFetcherJob, messageFetcherJob : MessageFetcherJob,
notificationsManager : NotificationsManager, notificationsManager : NotificationsManager,
accountManager : AccountManager, accountManager : AccountManager,
callNotificationsAdapter : CallNotificationsAdapter) callNotificationsAdapter : CallNotificationsAdapter) {
{
self.callMessageHandler = callMessageHandler self.callMessageHandler = callMessageHandler
self.callService = callService self.callService = callService
self.outboundCallInitiator = outboundCallInitiator self.outboundCallInitiator = outboundCallInitiator
@ -66,8 +65,7 @@ import SignalMessaging
setup() setup()
} }
private override init() private override init() {
{
let accountManager = AccountManager() let accountManager = AccountManager()
let notificationsManager = NotificationsManager() let notificationsManager = NotificationsManager()
let callNotificationsAdapter = CallNotificationsAdapter() let callNotificationsAdapter = CallNotificationsAdapter()
@ -91,8 +89,7 @@ import SignalMessaging
setup() setup()
} }
private func setup() private func setup() {
{
callService.createCallUIAdapter() callService.createCallUIAdapter()
// Hang certain singletons on SSKEnvironment too. // Hang certain singletons on SSKEnvironment too.

@ -22,14 +22,6 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, nullable, weak) HomeViewController *homeViewController; @property (nonatomic, nullable, weak) HomeViewController *homeViewController;
@property (nonatomic, nullable, weak) OWSNavigationController *signUpFlowNavigationController; @property (nonatomic, nullable, weak) OWSNavigationController *signUpFlowNavigationController;
//@property (nonatomic, readonly) OWSWebRTCCallMessageHandler *callMessageHandler;
//@property (nonatomic, readonly) CallService *callService;
//@property (nonatomic, readonly) CallUIAdapter *callUIAdapter;
//@property (nonatomic, readonly) OutboundCallInitiator *outboundCallInitiator;
//@property (nonatomic, readonly) OWSMessageFetcherJob *messageFetcherJob;
//@property (nonatomic, readonly) NotificationsManager *notificationsManager;
//@property (nonatomic, readonly) AccountManager *accountManager;
- (instancetype)init NS_UNAVAILABLE; - (instancetype)init NS_UNAVAILABLE;
+ (instancetype)sharedApp; + (instancetype)sharedApp;

Loading…
Cancel
Save