Merge pull request ResearchKit#137 from dephillipsmichael/bug/FPHS-670

bug/FPHS-670

Author: syoung-smallwisdom

APCAppCore/APCAppCore/Startup/APCAppDelegate.h

@@ -151,6 +151,7 @@ extern NSString *const kNewsFeedStoryBoardKey;
  * Otherwise, post a "APCUserForgotPasscodeNotification" notification and the alert will be shown for you
  */
 - (void) resetAppAndProceedToSignIn;
+- (void) resetAppAndProceedToOnboarding;
 
 - (void) clearPreviousUserData;
 

APCAppCore/APCAppCore/Startup/APCAppDelegate.m

@@ -758,13 +758,12 @@ - (void) logOutNotification: (NSNotification*) __unused notification
     [self.tasksReminder updateTasksReminder];
 }
 
-- (void) logOutAndGoToSignIn
+- (void)logoutData
 {
     self.dataSubstrate.currentUser.signedUp = NO;
     self.dataSubstrate.currentUser.signedIn = NO;
     [APCKeychainStore removeValueForKey:kPasswordKey];
     [self.tasksReminder updateTasksReminder];
-    [self showOnBoardingAndThenSignIn];
 }
 
 - (void) showOnBoardingAndThenSignIn
@@ -1240,7 +1239,21 @@ - (void) showResetPasscodeAlert:(__unused NSNotification*)notification
 
 #pragma mark - Reset Methods
 
+- (void) resetAppAndProceedToOnboarding
+{
+    [self clearUserInfo];
+    [self logoutData];
+    [self showOnBoarding];
+}
+
 - (void) resetAppAndProceedToSignIn
+{
+    [self clearUserInfo];
+    [self logoutData];
+    [self showOnBoardingAndThenSignIn];
+}
+
+- (void) clearUserInfo
 {
     APCAppDelegate * appDelegate = (APCAppDelegate*) [UIApplication sharedApplication].delegate;
     UIViewController * vc =  [[UIViewController alloc] init];
@@ -1250,8 +1263,6 @@ - (void) resetAppAndProceedToSignIn
     // This is all that is needed to force the re-registration of the PIN
     APCUser* user = [((id<APCOnboardingManagerProvider>)appDelegate) onboardingManager].user;
     user.secondaryInfoSaved = NO;
-    
-    [self logOutAndGoToSignIn];
 }
 
 - (void) clearPreviousUserData

APCAppCore/APCAppCore/UI/TabBarControllers/Profile/APCWithdrawSurveyViewController.m

@@ -269,14 +269,19 @@ - (IBAction) submit: (id) __unused sender
         }
         else {
             [spinnerController dismissViewControllerAnimated:NO completion:^{
-                APCWithdrawCompleteViewController *viewController = [[UIStoryboard storyboardWithName:@"APCProfile" bundle:[NSBundle appleCoreBundle]] instantiateViewControllerWithIdentifier:@"APCWithdrawCompleteViewController"];
-                UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:viewController];
-                [weakSelf.navigationController presentViewController:navController animated:YES completion:nil];
+                [weakSelf showWithdrawCompleteViewController];
             }];
         }
     }];
 }
 
+- (void) showWithdrawCompleteViewController
+{
+    APCWithdrawCompleteViewController *viewController = [[UIStoryboard storyboardWithName:@"APCProfile" bundle:[NSBundle appleCoreBundle]] instantiateViewControllerWithIdentifier:@"APCWithdrawCompleteViewController"];
+    UINavigationController *navController = [[UINavigationController alloc] initWithRootViewController:viewController];
+    [self.navigationController presentViewController:navController animated:YES completion:nil];
+}
+
 - (IBAction)cancel:(id) __unused sender
 {
     [self dismissViewControllerAnimated:YES completion:nil];