[CRD iOS] Create RemotingClient in ClientConnectionViewController

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"
 
+#import "base/mac/bind_objc_block.h"
 #import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MDCActivityIndicator.h"
 #import "ios/third_party/material_components_ios/src/components/Buttons/src/MaterialButtons.h"
 #import "ios/third_party/material_components_ios/src/components/NavigationBar/src/MaterialNavigationBar.h"
+#import "remoting/ios/app/host_view_controller.h"
 #import "remoting/ios/app/pin_entry_view.h"
 #import "remoting/ios/domain/client_session_details.h"
+#import "remoting/ios/domain/host_info.h"
+#import "remoting/ios/facade/remoting_authentication.h"
+#import "remoting/ios/facade/remoting_service.h"
 #import "remoting/ios/session/remoting_client.h"
 
 #include "base/strings/sys_string_conversions.h"
 #include "remoting/protocol/client_authentication_config.h"
 
 static const CGFloat kIconRadius = 30.f;
 static const CGFloat kActivityIndicatorStrokeWidth = 3.f;
 static const CGFloat kActivityIndicatorRadius = 33.f;
 
 static const CGFloat kPinEntryViewWidth = 240.f;
 static const CGFloat kPinEntryViewHeight = 90.f;
 
 static const CGFloat kCenterShift = -80.f;
 static const CGFloat kPadding = 20.f;
 static const CGFloat kMargin = 20.f;
 
 static const CGFloat kBarHeight = 58.f;
 
 static const CGFloat kKeyboardAnimationTime = 0.3;
 
 @interface ClientConnectionViewController ()<PinEntryDelegate> {
   UIImageView* _iconView;
   MDCActivityIndicator* _activityIndicator;
   UILabel* _statusLabel;
   MDCNavigationBar* _navBar;
   PinEntryView* _pinEntryView;
   NSString* _remoteHostName;
+  RemotingClient* _client;
 }
 @end
 
 @implementation ClientConnectionViewController
 
 @synthesize state = _state;
-@synthesize delegate = _delegate;
 
-- (id)init {
+- (instancetype)initWithHostInfo:(HostInfo*)hostInfo {
   self = [super init];
   if (self) {
+    _client = [[RemotingClient alloc] init];
+
+    __weak RemotingClient* weakClient = _client;
+    [[RemotingService SharedInstance].authentication
+        callbackWithAccessToken:base::BindBlockArc(^(
+                                    remoting::OAuthTokenGetter::Status status,
+                                    const std::string& user_email,
+                                    const std::string& access_token) {
+          [weakClient connectToHost:hostInfo
+                           username:base::SysUTF8ToNSString(user_email)
+                        accessToken:base::SysUTF8ToNSString(access_token)];
+        })];
+
+    _remoteHostName = hostInfo.hostName;
+
     // TODO(yuweih): This logic may be reused by other views.
     UIButton* cancelButton = [UIButton buttonWithType:UIButtonTypeSystem];
     [cancelButton setTitle:@"CANCEL" forState:UIControlStateNormal];
     [cancelButton setImage:[[UIImage imageNamed:@"Back"]
                                imageFlippedForRightToLeftLayoutDirection]
                   forState:UIControlStateNormal];
     [cancelButton addTarget:self
                      action:@selector(didTapCancel:)
            forControlEvents:UIControlEventTouchUpInside];
     self.navigationItem.leftBarButtonItem =
@@ skipping 11 matching lines @@
 
     // Attach navBar to the top of the view.
     [NSLayoutConstraint activateConstraints:@[
       [[_navBar topAnchor] constraintEqualToAnchor:[self.view topAnchor]],
       [[_navBar leadingAnchor]
           constraintEqualToAnchor:[self.view leadingAnchor]],
       [[_navBar trailingAnchor]
           constraintEqualToAnchor:[self.view trailingAnchor]],
       [[_navBar heightAnchor] constraintEqualToConstant:kBarHeight],
     ]];
-
-    _remoteHostName = @"";
   }
   return self;
 }
 
 #pragma mark - UIViewController
 
 - (void)loadView {
   [super loadView];
 
   self.view.backgroundColor = [UIColor blackColor];
@@ skipping 83 matching lines @@
 
   [_activityIndicator startAnimating];
 }
 
 - (void)viewWillDisappear:(BOOL)animated {
   [super viewWillDisappear:animated];
   [_activityIndicator stopAnimating];
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
+- (BOOL)prefersStatusBarHidden {
+  return YES;
+}
+
 #pragma mark - Keyboard
 
 - (void)keyboardWillShow:(NSNotification*)notification {
   CGSize keyboardSize =
       [[[notification userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey]
           CGRectValue]
           .size;
 
   [UIView
       animateWithDuration:kKeyboardAnimationTime
@@ skipping 33 matching lines @@
       break;
     case ClientViewConnected:
       [self showConnectedState];
       break;
     case ClientViewClosed:
       [self dismissViewControllerAnimated:YES completion:nil];
       break;
   }
 }
 
-- (void)setDelegate:(id<ClientConnectionViewControllerDelegate>)delegate {
-  _delegate = delegate;
-  if (_delegate) {
-    _remoteHostName = [_delegate getConnectingHostName];
-    // To get the view to use the new remote host name.
-    [self setState:_state];
-  }
-}
-
 #pragma mark - Private
 
 - (void)showConnectingState {
   [_pinEntryView endEditing:YES];
   _statusLabel.text =
       [NSString stringWithFormat:@"Connecting to %@", _remoteHostName];
   [_activityIndicator stopAnimating];
   _activityIndicator.cycleColors = @[ [UIColor whiteColor] ];
   _activityIndicator.indicatorMode = MDCActivityIndicatorModeIndeterminate;
   _activityIndicator.hidden = NO;
@@ skipping 13 matching lines @@
   [_pinEntryView endEditing:YES];
   _statusLabel.text =
       [NSString stringWithFormat:@"Connected to %@", _remoteHostName];
   _activityIndicator.progress = 0.0;
   _pinEntryView.hidden = YES;
   _activityIndicator.hidden = NO;
   _activityIndicator.indicatorMode = MDCActivityIndicatorModeDeterminate;
   _activityIndicator.cycleColors = @[ [UIColor greenColor] ];
   [_activityIndicator startAnimating];
   _activityIndicator.progress = 1.0;
+
+  HostViewController* hostViewController =
+      [[HostViewController alloc] initWithClient:_client];
+  _client = nil;
+
+  __weak UIViewController* parentController = self.presentingViewController;
+
   [self dismissViewControllerAnimated:YES

[nicholss, 2017/06/05 18:24:13]

I think if you set this animated and the animated below to NO you can remove the
funky transitions for connecting.

[Yuwei, 2017/06/05 19:07:25]

Done.

This does fix the transition but I still see a flash of the host list. I'm just
thinking could we just use a UINavigationController and remove the second stage
from the view stack here to prevent that churn...

                            completion:^{
-                             [_delegate clientConnected];
+                             [parentController
+                                 presentViewController:hostViewController
+                                              animated:YES
+                                            completion:nil];
                            }];
 }
 
 - (void)didProvidePin:(NSString*)pin createPairing:(BOOL)createPairing {
   // TODO(nicholss): There is an open question if createPairing is supported on
   // iOS. Need to fingure this out.
   [[NSNotificationCenter defaultCenter]
       postNotificationName:kHostSessionPinProvided
                     object:self
                   userInfo:[NSDictionary dictionaryWithObject:pin
                                                        forKey:kHostSessionPin]];
 }
 
 - (void)didTapCancel:(id)sender {
-  NSLog(@"%@ was tapped.", NSStringFromClass([sender class]));
-  // TODO(nicholss): Need to cancel the pending connection.
+  _client = nil;
   [self dismissViewControllerAnimated:YES completion:nil];
 }
 
 - (void)hostSessionStatusChanged:(NSNotification*)notification {
+  NSLog(@"hostSessionStatusChanged: %@", [notification userInfo]);
   ClientConnectionViewState state;
   ClientSessionDetails* sessionDetails =
       [[notification userInfo] objectForKey:kSessionDetails];
   switch (sessionDetails.state) {
     case SessionInitializing:
     // Same as HostConnecting in UI. Fall-though.
     case SessionAuthenticated:
     // Same as HostConnecting in UI. Fall-though.
     case SessionConnecting:
       state = ClientViewConnecting;
@@ skipping 12 matching lines @@
     default:
       LOG(ERROR) << "Unknown State for Session, " << sessionDetails.state;
       return;
   }
   [[NSOperationQueue mainQueue] addOperationWithBlock:^{
     [self setState:state];
   }];
 }
 
 @end