Respond to CR.

Signal/Signal-Info.plist

@@ -6,14 +6,10 @@
 	<dict>
 		<key>CarthageVersion</key>
 		<string>0.31.2</string>
-		<key>DateTime</key>
-		<string>Wed Feb 13 22:13:11 UTC 2019</string>
 		<key>OSXVersion</key>
 		<string>10.14.3</string>
 		<key>WebRTCCommit</key>
 		<string>55de5593cc261fa9368c5ccde98884ed1e278ba0 M72</string>
-		<key>XCodeVersion</key>
-		<string>1000.1010</string>
 	</dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>

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);

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
     }

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

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

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<AppContext> CurrentAppContext(void);

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