From 2eba371656d5a2a25cbf6fabc9f71afe875b6c8a Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Mon, 4 Dec 2017 10:56:59 -0500
Subject: [PATCH] Clean up ahead of PR.

---
 Signal/src/AppDelegate.m                                | 2 +-
 Signal/src/ViewControllers/RegistrationViewController.m | 4 ++--
 Signal/src/environment/SignalApp.h                      | 1 +
 SignalMessaging/SignalMessaging.h                       | 2 +-
 SignalMessaging/environment/Environment.h               | 4 ----
 SignalMessaging/environment/Environment.m               | 8 --------
 6 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m
index 654b8542c..a85124163 100644
--- a/Signal/src/AppDelegate.m
+++ b/Signal/src/AppDelegate.m
@@ -337,7 +337,7 @@ static NSString *const kURLHostVerifyPrefix             = @"verify";
          annotation:(id)annotation {
     if ([url.scheme isEqualToString:kURLSchemeSGNLKey]) {
         if ([url.host hasPrefix:kURLHostVerifyPrefix] && ![TSAccountManager isRegistered]) {
-            id signupController = [Environment current].signUpFlowNavigationController;
+            id signupController = SignalApp.sharedApp.signUpFlowNavigationController;
             if ([signupController isKindOfClass:[UINavigationController class]]) {
                 UINavigationController *navController = (UINavigationController *)signupController;
                 UIViewController *controller          = [navController.childViewControllers lastObject];
diff --git a/Signal/src/ViewControllers/RegistrationViewController.m b/Signal/src/ViewControllers/RegistrationViewController.m
index ceba79316..51bdff0d4 100644
--- a/Signal/src/ViewControllers/RegistrationViewController.m
+++ b/Signal/src/ViewControllers/RegistrationViewController.m
@@ -5,7 +5,6 @@
 #import "RegistrationViewController.h"
 #import "CodeVerificationViewController.h"
 #import "CountryCodeViewController.h"
-#import "Environment.h"
 #import "NSString+OWS.h"
 #import "PhoneNumber.h"
 #import "PhoneNumberUtil.h"
@@ -14,6 +13,7 @@
 #import "UIView+OWS.h"
 #import "ViewControllerUtils.h"
 #import <SAMKeychain/SAMKeychain.h>
+#import <SignalMessaging/Environment.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -50,7 +50,7 @@ NSString *const kKeychainKey_LastRegisteredPhoneNumber = @"kKeychainKey_LastRegi
 
     // Do any additional setup after loading the view.
     [self populateDefaultCountryNameAndCode];
-    [[Environment current] setSignUpFlowNavigationController:self.navigationController];
+    [SignalApp.sharedApp setSignUpFlowNavigationController:self.navigationController];
 }
 
 - (void)viewDidLoad {
diff --git a/Signal/src/environment/SignalApp.h b/Signal/src/environment/SignalApp.h
index d83cfc44b..f5480119f 100644
--- a/Signal/src/environment/SignalApp.h
+++ b/Signal/src/environment/SignalApp.h
@@ -15,6 +15,7 @@
 @interface SignalApp : NSObject
 
 @property (nonatomic, weak) HomeViewController *homeViewController;
+@property (nonatomic, weak) UINavigationController *signUpFlowNavigationController;
 
 // TODO: Convert to singletons?
 @property (nonatomic, readonly) OWSWebRTCCallMessageHandler *callMessageHandler;
diff --git a/SignalMessaging/SignalMessaging.h b/SignalMessaging/SignalMessaging.h
index 20d378835..b3c6da959 100644
--- a/SignalMessaging/SignalMessaging.h
+++ b/SignalMessaging/SignalMessaging.h
@@ -18,4 +18,4 @@ FOUNDATION_EXPORT const unsigned char SignalMessagingVersionString[];
 #import <SignalMessaging/OWSLogger.h>
 #import <SignalMessaging/OWSMath.h>
 #import <SignalMessaging/OWSProfileManager.h>
-#import <SignalMessaging/Rel.h>
+#import <SignalMessaging/Release.h>
diff --git a/SignalMessaging/environment/Environment.h b/SignalMessaging/environment/Environment.h
index db61340f9..233d04ece 100644
--- a/SignalMessaging/environment/Environment.h
+++ b/SignalMessaging/environment/Environment.h
@@ -34,13 +34,9 @@
 @property (nonatomic, readonly) OWSMessageSender *messageSender;
 @property (nonatomic, readonly) OWSPreferences *preferences;
 
-@property (nonatomic, readonly, weak) UINavigationController *signUpFlowNavigationController;
-
 + (Environment *)current;
 + (void)setCurrent:(Environment *)environment;
 
 + (OWSPreferences *)preferences;
 
-- (void)setSignUpFlowNavigationController:(UINavigationController *)signUpFlowNavigationController;
-
 @end
diff --git a/SignalMessaging/environment/Environment.m b/SignalMessaging/environment/Environment.m
index aa82d96d5..8204ff971 100644
--- a/SignalMessaging/environment/Environment.m
+++ b/SignalMessaging/environment/Environment.m
@@ -22,9 +22,6 @@ static Environment *sharedEnvironment = nil;
 @property (nonatomic) OWSMessageSender *messageSender;
 @property (nonatomic) OWSPreferences *preferences;
 
-// TODO: Move to SignalApp.
-@property (nonatomic, weak) UINavigationController *signUpFlowNavigationController;
-
 @end
 
 #pragma mark -
@@ -114,9 +111,4 @@ static Environment *sharedEnvironment = nil;
     return _preferences;
 }
 
-- (void)setSignUpFlowNavigationController:(UINavigationController *)navigationController
-{
-    _signUpFlowNavigationController = navigationController;
-}
-
 @end