From 57394f00152d1b6541404304750d1548d700e76b Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 14 Feb 2019 09:23:50 -0500 Subject: [PATCH] Respond to CR. --- Signal/Signal-Info.plist | 4 -- Signal/src/AppDelegate.m | 6 ++- .../OnboardingPhoneNumberViewController.swift | 37 +++++++------------ Signal/src/util/MainAppContext.m | 9 ----- .../src/TestUtils/TestAppContext.m | 9 ----- SignalServiceKit/src/Util/AppContext.h | 11 +++++- .../utils/ShareAppExtensionContext.m | 9 ----- 7 files changed, 28 insertions(+), 57 deletions(-) diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index 4fe947497..bbc073f5d 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -6,14 +6,10 @@ CarthageVersion 0.31.2 - DateTime - Wed Feb 13 22:13:11 UTC 2019 OSXVersion 10.14.3 WebRTCCommit 55de5593cc261fa9368c5ccde98884ed1e278ba0 M72 - XCodeVersion - 1000.1010 CFBundleDevelopmentRegion en diff --git a/Signal/src/AppDelegate.m b/Signal/src/AppDelegate.m index ca35cfd8b..4c4c7f017 100644 --- a/Signal/src/AppDelegate.m +++ b/Signal/src/AppDelegate.m @@ -1478,7 +1478,11 @@ static NSTimeInterval launchStartedAt; rootViewController = [HomeViewController new]; } } else { - rootViewController = [RegistrationViewController new]; + if (OWSIsDebugBuild()) { + rootViewController = [[OnboardingControllerImpl new] initialViewController]; + } else { + rootViewController = [RegistrationViewController new]; + } navigationBarHidden = YES; } OWSAssertDebug(rootViewController); diff --git a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift index cddbc39b5..64b398946 100644 --- a/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift +++ b/Signal/src/ViewControllers/Registration/OnboardingPhoneNumberViewController.swift @@ -144,8 +144,6 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { super.viewWillAppear(animated) self.navigationController?.isNavigationBarHidden = false - - phoneNumberTextField.becomeFirstResponder() } public override func viewDidAppear(_ animated: Bool) { @@ -267,7 +265,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { private let kKeychainKey_LastRegisteredPhoneNumber = "kKeychainKey_LastRegisteredPhoneNumber" private func debugValue(forKey key: String) -> String? { - guard CurrentAppContext().isDebugBuild() else { + guard OWSIsDebugBuild() else { return nil } @@ -281,7 +279,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { } private func setDebugValue(_ value: String, forKey key: String) { - guard CurrentAppContext().isDebugBuild() else { + guard OWSIsDebugBuild() else { return } @@ -310,13 +308,6 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { // MARK: - Events - @objc func explanationLabelTapped(sender: UIGestureRecognizer) { - guard sender.state == .recognized else { - return - } - // TODO: - } - @objc func countryRowTapped(sender: UIGestureRecognizer) { guard sender.state == .recognized else { return @@ -334,7 +325,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { @objc func nextPressed() { Logger.info("") - onboardingController.onboardingPhoneNumberDidComplete(viewController: self) + parseAndTryToRegister() } // MARK: - Country Picker @@ -353,7 +344,7 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { // MARK: - Register - private func didTapRegisterButton() { + private func parseAndTryToRegister() { guard let phoneNumberText = phoneNumberTextField.text?.ows_stripped(), phoneNumberText.count > 0 else { OWSAlerts.showAlert(title: @@ -388,20 +379,20 @@ public class OnboardingPhoneNumberViewController: OnboardingBaseViewController { proceedTitle: NSLocalizedString("REGISTRATION_IPAD_CONFIRM_BUTTON", comment: "button text to proceed with registration when on an iPad"), proceedAction: { (_) in - self.sendCode(parsedPhoneNumber: parsedPhoneNumber, - phoneNumberText: phoneNumberText, - countryCode: countryCode) + self.tryToRegister(parsedPhoneNumber: parsedPhoneNumber, + phoneNumberText: phoneNumberText, + countryCode: countryCode) }) } else { - sendCode(parsedPhoneNumber: parsedPhoneNumber, - phoneNumberText: phoneNumberText, - countryCode: countryCode) + tryToRegister(parsedPhoneNumber: parsedPhoneNumber, + phoneNumberText: phoneNumberText, + countryCode: countryCode) } } - private func sendCode(parsedPhoneNumber: String, - phoneNumberText: String, - countryCode: String) { + private func tryToRegister(parsedPhoneNumber: String, + phoneNumberText: String, + countryCode: String) { ModalActivityIndicatorViewController.present(fromViewController: self, canCancel: true) { (modal) in self.setLastRegisteredCountryCode(value: countryCode) @@ -456,7 +447,7 @@ extension OnboardingPhoneNumberViewController: UITextFieldDelegate { } public func textFieldShouldReturn(_ textField: UITextField) -> Bool { - didTapRegisterButton() + parseAndTryToRegister() textField.resignFirstResponder() return false } diff --git a/Signal/src/util/MainAppContext.m b/Signal/src/util/MainAppContext.m index f3cf57c97..8631e9291 100644 --- a/Signal/src/util/MainAppContext.m +++ b/Signal/src/util/MainAppContext.m @@ -314,15 +314,6 @@ NSString *const ReportedApplicationStateDidChangeNotification = @"ReportedApplic return [[NSUserDefaults alloc] initWithSuiteName:SignalApplicationGroup]; } -- (BOOL)isDebugBuild -{ -#ifdef DEBUG - return YES; -#else - return NO; -#endif -} - @end NS_ASSUME_NONNULL_END diff --git a/SignalServiceKit/src/TestUtils/TestAppContext.m b/SignalServiceKit/src/TestUtils/TestAppContext.m index 4ff166493..191442f93 100644 --- a/SignalServiceKit/src/TestUtils/TestAppContext.m +++ b/SignalServiceKit/src/TestUtils/TestAppContext.m @@ -148,15 +148,6 @@ NS_ASSUME_NONNULL_BEGIN return self.mockAppSharedDataDirectoryPath; } -- (BOOL)isDebugBuild -{ -#ifdef DEBUG - return YES; -#else - return NO; -#endif -} - @end #endif diff --git a/SignalServiceKit/src/Util/AppContext.h b/SignalServiceKit/src/Util/AppContext.h index 5ebd5eb0d..bcb8cde8d 100755 --- a/SignalServiceKit/src/Util/AppContext.h +++ b/SignalServiceKit/src/Util/AppContext.h @@ -4,6 +4,15 @@ NS_ASSUME_NONNULL_BEGIN +static inline BOOL OWSIsDebugBuild() +{ +#ifdef DEBUG + return YES; +#else + return NO; +#endif +} + // These are fired whenever the corresponding "main app" or "app extension" // notification is fired. // @@ -102,8 +111,6 @@ NSString *NSStringForUIApplicationState(UIApplicationState value); - (NSUserDefaults *)appUserDefaults; -- (BOOL)isDebugBuild; - @end id CurrentAppContext(void); diff --git a/SignalShareExtension/utils/ShareAppExtensionContext.m b/SignalShareExtension/utils/ShareAppExtensionContext.m index 7e9cc3e21..2635afd28 100644 --- a/SignalShareExtension/utils/ShareAppExtensionContext.m +++ b/SignalShareExtension/utils/ShareAppExtensionContext.m @@ -234,15 +234,6 @@ NS_ASSUME_NONNULL_BEGIN return [[NSUserDefaults alloc] initWithSuiteName:SignalApplicationGroup]; } -- (BOOL)isDebugBuild -{ -#ifdef DEBUG - return YES; -#else - return NO; -#endif -} - @end NS_ASSUME_NONNULL_END