From 8830f0a594bc87baa3926075748eb349e7052c13 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Mon, 15 Oct 2018 15:11:20 -0400
Subject: [PATCH] Clean up ahead of PR.

---
 Signal/src/Jobs/MessageFetcherJob.swift                  | 2 +-
 .../ViewControllers/DebugUI/DebugUINotifications.swift   | 3 +--
 Signal/src/call/OutboundCallInitiator.swift              | 3 +--
 Signal/src/environment/AppEnvironment.swift              | 9 +++------
 Signal/src/environment/SignalApp.h                       | 8 --------
 5 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/Signal/src/Jobs/MessageFetcherJob.swift b/Signal/src/Jobs/MessageFetcherJob.swift
index 1f0dc6188..628cab509 100644
--- a/Signal/src/Jobs/MessageFetcherJob.swift
+++ b/Signal/src/Jobs/MessageFetcherJob.swift
@@ -15,7 +15,7 @@ public class MessageFetcherJob: NSObject {
     public override init()
     {
         super.init()
-        
+
         SwiftSingletons.register(self)
     }
 
diff --git a/Signal/src/ViewControllers/DebugUI/DebugUINotifications.swift b/Signal/src/ViewControllers/DebugUI/DebugUINotifications.swift
index e8d1d31b4..150fecddd 100644
--- a/Signal/src/ViewControllers/DebugUI/DebugUINotifications.swift
+++ b/Signal/src/ViewControllers/DebugUI/DebugUINotifications.swift
@@ -29,8 +29,7 @@ class DebugUINotifications: DebugUIPage {
         return "Notifications"
     }
 
-    override func section(thread aThread: TSThread?) -> OWSTableSection?
-    {
+    override func section(thread aThread: TSThread?) -> OWSTableSection? {
         guard let thread = aThread else {
             owsFailDebug("Notifications must specify thread.")
             return nil
diff --git a/Signal/src/call/OutboundCallInitiator.swift b/Signal/src/call/OutboundCallInitiator.swift
index 021b03462..fab377192 100644
--- a/Signal/src/call/OutboundCallInitiator.swift
+++ b/Signal/src/call/OutboundCallInitiator.swift
@@ -11,8 +11,7 @@ import SignalMessaging
  */
 @objc public class OutboundCallInitiator: NSObject {
 
-    @objc public override init()
-    {
+    @objc public override init() {
         super.init()
 
         SwiftSingletons.register(self)
diff --git a/Signal/src/environment/AppEnvironment.swift b/Signal/src/environment/AppEnvironment.swift
index 71fb474c0..68a7dcf0b 100644
--- a/Signal/src/environment/AppEnvironment.swift
+++ b/Signal/src/environment/AppEnvironment.swift
@@ -48,8 +48,7 @@ import SignalMessaging
                 messageFetcherJob : MessageFetcherJob,
                 notificationsManager : NotificationsManager,
                 accountManager : AccountManager,
-                callNotificationsAdapter : CallNotificationsAdapter)
-    {
+                callNotificationsAdapter : CallNotificationsAdapter) {
         self.callMessageHandler = callMessageHandler
         self.callService = callService
         self.outboundCallInitiator = outboundCallInitiator
@@ -66,8 +65,7 @@ import SignalMessaging
         setup()
     }
     
-    private override init()
-    {
+    private override init() {
         let accountManager = AccountManager()
         let notificationsManager = NotificationsManager()
         let callNotificationsAdapter = CallNotificationsAdapter()
@@ -91,8 +89,7 @@ import SignalMessaging
         setup()
     }
     
-    private func setup()
-    {
+    private func setup() {
         callService.createCallUIAdapter()
 
         // Hang certain singletons on SSKEnvironment too.
diff --git a/Signal/src/environment/SignalApp.h b/Signal/src/environment/SignalApp.h
index eddb77594..b25dce838 100644
--- a/Signal/src/environment/SignalApp.h
+++ b/Signal/src/environment/SignalApp.h
@@ -22,14 +22,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, nullable, weak) HomeViewController *homeViewController;
 @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)sharedApp;