Clean up ahead of PR.
This commit is contained in:
parent
b4e8df79da
commit
2eba371656
|
@ -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];
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue