Fixing signed in message and disconnect/reconnect case.

remoting/ios/app/client_connection_view_controller.mm

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 #import "remoting/ios/app/client_connection_view_controller.h"
 
@@ skipping 91 matching lines @@
       [[_navBar trailingAnchor]
           constraintEqualToAnchor:[self.view trailingAnchor]],
       [[_navBar heightAnchor] constraintEqualToConstant:kBarHeight],
     ]];
 
     [self attemptConnectionToHost];
   }
   return self;
 }
 
+- (void)dealloc {
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
 #pragma mark - UIViewController
 
 - (void)viewDidLoad {
   [super viewDidLoad];
   self.view.backgroundColor = RemotingTheme.connectionViewBackgroundColor;
 
   _activityIndicator = [[MDCActivityIndicator alloc] initWithFrame:CGRectZero];
   _activityIndicator.radius = kActivityIndicatorRadius;
   _activityIndicator.trackEnabled = YES;
   _activityIndicator.strokeWidth = kActivityIndicatorStrokeWidth;
@@ skipping 24 matching lines @@
   _reconnectView.translatesAutoresizingMaskIntoConstraints = NO;
   [self.view addSubview:_reconnectView];
   _reconnectView.delegate = self;
 
   _pinEntryView = [[PinEntryView alloc] init];
   _pinEntryView.hidden = YES;
   _pinEntryView.translatesAutoresizingMaskIntoConstraints = NO;
   [self.view addSubview:_pinEntryView];
   _pinEntryView.delegate = self;
 
+  _reconnectView.hidden = YES;
+
   [self
       initializeLayoutConstraintsWithViews:NSDictionaryOfVariableBindings(
                                                _activityIndicator, _statusLabel,
                                                _iconView, _reconnectView,
                                                _pinEntryView)];
+
+  [[NSNotificationCenter defaultCenter]
+      addObserver:self
+         selector:@selector(hostSessionStatusChanged:)
+             name:kHostSessionStatusChanged
+           object:nil];
 }
 
 - (void)initializeLayoutConstraintsWithViews:(NSDictionary*)views {
   // Metrics to use in visual format strings.
   NSDictionary* layoutMetrics = @{
     @"padding" : @(kPadding),
     @"margin" : @(kMargin),
     @"topPadding" : @(kTopPadding),
     @"iconDiameter" : @(kIconRadius * 2),
     @"pinEntryViewWidth" : @(kPinEntryViewWidth),
     @"pinEntryViewHeight" : @(kPinEntryViewHeight),
     @"reconnectViewWidth" : @(kReconnectViewWidth),
     @"reconnectViewHeight" : @(kReconnectViewHeight),
   };
   [_activityIndicator sizeToFit];
   NSString* f;
 
   // Horizontal constraints:
-
   [self.view addConstraints:
                  [NSLayoutConstraint
                      constraintsWithVisualFormat:@"H:[_iconView(iconDiameter)]"
                                          options:0
                                          metrics:layoutMetrics
                                            views:views]];
 
   [self.view addConstraints:[NSLayoutConstraint
                                 constraintsWithVisualFormat:
                                     @"H:|-margin-[_statusLabel]-margin-|"
                                                     options:0
                                                     metrics:layoutMetrics
                                                       views:views]];
 
   [self.view addConstraints:[NSLayoutConstraint
                                 constraintsWithVisualFormat:
                                     @"H:[_pinEntryView(pinEntryViewWidth)]"
                                                     options:0
                                                     metrics:layoutMetrics
                                                       views:views]];
 
   [self.view addConstraints:[NSLayoutConstraint
                                 constraintsWithVisualFormat:
                                     @"H:[_reconnectView(reconnectViewWidth)]"
                                                     options:0
                                                     metrics:layoutMetrics
                                                       views:views]];
 
   // Anchors:
-
   _activityIndicatorTopConstraintFull =
       [_activityIndicator.topAnchor constraintEqualToAnchor:self.view.topAnchor
                                                    constant:kTopPadding];
   _activityIndicatorTopConstraintFull.active = YES;
 
   [_iconView.centerYAnchor
       constraintEqualToAnchor:_activityIndicator.centerYAnchor]
       .active = YES;
 
   // Vertical constraints:
-
   [self.view addConstraints:
                  [NSLayoutConstraint
                      constraintsWithVisualFormat:@"V:[_iconView(iconDiameter)]"
                                          options:0
                                          metrics:layoutMetrics
                                            views:views]];
 
   [self.view addConstraints:
                  [NSLayoutConstraint
                      constraintsWithVisualFormat:
@@ skipping 25 matching lines @@
                                          options:NSLayoutFormatAlignAllCenterX
                                          metrics:layoutMetrics
                                            views:views]];
 
   [self.view setNeedsUpdateConstraints];
 }
 
 - (void)viewWillAppear:(BOOL)animated {
   [super viewWillAppear:animated];
   [self.navigationController setNavigationBarHidden:YES animated:animated];
-
-  [[NSNotificationCenter defaultCenter]
-      addObserver:self
-         selector:@selector(hostSessionStatusChanged:)
-             name:kHostSessionStatusChanged
-           object:nil];
 }
 
 - (void)viewDidAppear:(BOOL)animated {
   [super viewDidAppear:animated];
   [[NSNotificationCenter defaultCenter]
       addObserver:self
          selector:@selector(keyboardWillShow:)
              name:UIKeyboardWillShowNotification
            object:nil];
 
   [[NSNotificationCenter defaultCenter]
       addObserver:self
          selector:@selector(keyboardWillHide:)
              name:UIKeyboardWillHideNotification
            object:nil];
 
   [_activityIndicator startAnimating];
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
   [super viewWillDisappear:animated];
   [_activityIndicator stopAnimating];
-  [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
 - (BOOL)prefersStatusBarHidden {
   return YES;
 }
 
 #pragma mark - Keyboard
 
+// TODO(nicholss): We need to listen to screen rotation and re-adjust the
+// topAnchor.
+
 - (void)keyboardWillShow:(NSNotification*)notification {
   CGSize keyboardSize =
       [[[notification userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey]
           CGRectValue]
           .size;
 
   CGFloat newHeight = self.view.frame.size.height - keyboardSize.height;
   CGFloat overlap = newHeight - (_pinEntryView.frame.origin.y +
                                  _pinEntryView.frame.size.height + kPadding);
   if (overlap > 0) {
@@ skipping 27 matching lines @@
   switch (_state) {
     case ClientViewConnecting:
       [self showConnectingState];
       break;
     case ClientViewPinPrompt:
       [self showPinPromptState];
       break;
     case ClientViewConnected:
       [self showConnectedState];
       break;
+    case ClientViewReconnect:
+      [self showReconnect];
+      break;
     case ClientViewClosed:
       [self.navigationController popToRootViewControllerAnimated:YES];
       break;
     case ClientViewError:
       [self showError];
       break;
   }
 }
 
 #pragma mark - SessionReconnectViewDelegate
@@ skipping 15 matching lines @@
                          username:userEmail
                       accessToken:accessToken];
       }];
   [self setState:ClientViewConnecting];
 }
 
 - (void)showConnectingState {
   [_pinEntryView endEditing:YES];
   _statusLabel.text =
       [NSString stringWithFormat:@"Connecting to %@", _remoteHostName];
+
+  _pinEntryView.hidden = YES;
+
+  _reconnectView.hidden = YES;
+
   [_activityIndicator stopAnimating];
   _activityIndicator.cycleColors = @[ [UIColor whiteColor] ];
   _activityIndicator.indicatorMode = MDCActivityIndicatorModeIndeterminate;
   _activityIndicator.hidden = NO;
-  _pinEntryView.hidden = YES;
-  _reconnectView.hidden = YES;
   [_activityIndicator startAnimating];
 }
 
 - (void)showPinPromptState {
   _statusLabel.text = [NSString stringWithFormat:@"%@", _remoteHostName];
   [_activityIndicator stopAnimating];
   _activityIndicator.hidden = YES;
+
   _pinEntryView.hidden = NO;
+
   _reconnectView.hidden = YES;
 
   // TODO(yuweih): This may be called before viewDidAppear and miss the keyboard
   // callback.
   [_pinEntryView becomeFirstResponder];
 }
 
 - (void)showConnectedState {
   [_pinEntryView endEditing:YES];
   _statusLabel.text =
       [NSString stringWithFormat:@"Connected to %@", _remoteHostName];
+
+  _pinEntryView.hidden = YES;
+  [_pinEntryView clearPinEntry];
+
   _activityIndicator.progress = 0.0;
-  _pinEntryView.hidden = YES;
   _activityIndicator.hidden = NO;
   _activityIndicator.indicatorMode = MDCActivityIndicatorModeDeterminate;
   _activityIndicator.cycleColors = @[ [UIColor greenColor] ];
   [_activityIndicator startAnimating];
   _activityIndicator.progress = 1.0;
+
   _reconnectView.hidden = YES;
 
   HostViewController* hostViewController =
       [[HostViewController alloc] initWithClient:_client];
   _client = nil;
 
-  // Replaces current (topmost) view controller with |hostViewController|.
-  NSMutableArray* controllers =
-      [self.navigationController.viewControllers mutableCopy];
-  [controllers removeLastObject];
-  [controllers addObject:hostViewController];
-  [self.navigationController setViewControllers:controllers animated:NO];
+  [self.navigationController pushViewController:hostViewController animated:NO];
+}
+
+- (void)showReconnect {
+  _statusLabel.text =
+      [NSString stringWithFormat:@"Connection closed for %@", _remoteHostName];
+  [_activityIndicator stopAnimating];
+  _activityIndicator.hidden = YES;
+
+  _pinEntryView.hidden = YES;
+
+  _reconnectView.hidden = NO;
+
+  [self.navigationController popToViewController:self animated:YES];
+  [MDCSnackbarManager
+      showMessage:[MDCSnackbarMessage messageWithText:@"Connection Closed."]];

[Yuwei, 2017/07/06 22:29:45]

Do we really need to show the message twice?

[nicholss, 2017/07/06 22:40:01]

yessss.

 }
 
 - (void)showError {
   _statusLabel.text =
       [NSString stringWithFormat:@"Error connecting to %@", _remoteHostName];
-  _activityIndicator.progress = 0.0;
+
   _pinEntryView.hidden = YES;
-  _activityIndicator.hidden = NO;
+
   _activityIndicator.indicatorMode = MDCActivityIndicatorModeDeterminate;
   _activityIndicator.cycleColors = @[ [UIColor redColor] ];
+  _activityIndicator.progress = 1.0;
+  _activityIndicator.hidden = NO;
   [_activityIndicator startAnimating];
-  _activityIndicator.progress = 1.0;
+
   _reconnectView.hidden = NO;
 
   MDCSnackbarMessage* message = nil;
   switch (_lastError) {
     case SessionErrorOk:
       // Do nothing.
       break;
     case SessionErrorPeerIsOffline:
       message = [MDCSnackbarMessage
           messageWithText:@"Error: SessionErrorPeerIsOffline."];
@@ skipping 79 matching lines @@
     case SessionPinPrompt:
       state = ClientViewPinPrompt;
       break;
     case SessionConnected:
       state = ClientViewConnected;
       break;
     case SessionFailed:
       state = ClientViewError;
       break;
     case SessionClosed:
-      state = ClientViewClosed;
+      // If the session closes, offer the user to reconnect.
+      state = ClientViewReconnect;
       break;
     default:
       LOG(ERROR) << "Unknown State for Session, " << sessionDetails.state;
       return;
   }
   _lastError = sessionDetails.error;
   [[NSOperationQueue mainQueue] addOperationWithBlock:^{
     [self setState:state];
   }];
 }
 
 @end