From 4ac7600c07120eda4f0cf17d0c6e14ca06b481a3 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Thu, 27 Jul 2017 10:24:07 -0400 Subject: [PATCH] Respond to CR. // FREEBIE --- Podfile.lock | 2 +- .../ViewControllers/CodeVerificationViewController.m | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index af8dda1fe..153b82414 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -125,7 +125,7 @@ EXTERNAL SOURCES: :branch: signal-master :git: https://github.com/WhisperSystems/JSQMessagesViewController.git SignalServiceKit: - :path: "." + :path: . SocketRocket: :git: https://github.com/facebook/SocketRocket.git diff --git a/Signal/src/ViewControllers/CodeVerificationViewController.m b/Signal/src/ViewControllers/CodeVerificationViewController.m index 756051416..a12a0770b 100644 --- a/Signal/src/ViewControllers/CodeVerificationViewController.m +++ b/Signal/src/ViewControllers/CodeVerificationViewController.m @@ -8,6 +8,7 @@ #import "SignalsNavigationController.h" #import "SignalsViewController.h" #import "StringUtil.h" +#import "UIViewController+OWS.h" #import #import #import @@ -263,7 +264,7 @@ NS_ASSUME_NONNULL_BEGIN OWSProdInfo(@"registration_registering_code"); [self.accountManager registerWithVerificationCode:[self validationCodeFromTextField]] .then(^{ - OWSProdInfo(@"registration_registered_complete"); + OWSProdInfo(@"registration_registering_submitted_code"); DDLogInfo(@"%@ Successfully registered Signal account.", self.tag); dispatch_async(dispatch_get_main_queue(), ^{ @@ -279,6 +280,7 @@ NS_ASSUME_NONNULL_BEGIN }); }) .catch(^(NSError *_Nonnull error) { + OWSProdInfo(@"registration_registration_failed"); DDLogError(@"%@ error verifying challenge: %@", self.tag, error); dispatch_async(dispatch_get_main_queue(), ^{ [self stopActivityIndicator]; @@ -322,6 +324,8 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - Send codes again - (void)sendCodeViaSMSAction:(id)sender { + OWSProdInfo(@"registration_registering_requested_new_code_by_sms"); + [self enableServerActions:NO]; [_requestCodeAgainSpinner startAnimating]; @@ -339,6 +343,8 @@ NS_ASSUME_NONNULL_BEGIN } - (void)sendCodeViaVoiceAction:(id)sender { + OWSProdInfo(@"registration_registering_requested_new_code_by_voice"); + [self enableServerActions:NO]; [_requestCallSpinner startAnimating]; @@ -368,6 +374,8 @@ NS_ASSUME_NONNULL_BEGIN } - (void)backButtonPressed:(id)sender { + OWSProdInfo(@"registration_verification_back"); + [self.navigationController popViewControllerAnimated:YES]; }