[CRD iOS] Create RemotingClient in ClientConnectionViewController

remoting/ios/app/remoting_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/remoting_view_controller.h"
 
 #import "base/mac/bind_objc_block.h"
 #import "ios/third_party/material_components_ios/src/components/AnimationTiming/src/MaterialAnimationTiming.h"
 #import "ios/third_party/material_components_ios/src/components/AppBar/src/MaterialAppBar.h"
 #import "ios/third_party/material_components_ios/src/components/Dialogs/src/MaterialDialogs.h"
 #import "ios/third_party/material_components_ios/src/components/Snackbar/src/MaterialSnackbar.h"
 #import "remoting/ios/app/client_connection_view_controller.h"
 #import "remoting/ios/app/host_collection_view_controller.h"
 #import "remoting/ios/app/host_view_controller.h"
 #import "remoting/ios/app/remoting_settings_view_controller.h"
 #import "remoting/ios/domain/client_session_details.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/base/oauth_token_getter.h"
 #include "remoting/client/connect_to_host_info.h"
 
 static CGFloat kHostInset = 5.f;
 
 @interface RemotingViewController ()<HostCollectionViewControllerDelegate,
-                                     ClientConnectionViewControllerDelegate,
                                      UIViewControllerAnimatedTransitioning,
                                      UIViewControllerTransitioningDelegate> {
   bool _isAuthenticated;
   MDCDialogTransitionController* _dialogTransitionController;
   MDCAppBar* _appBar;
   HostCollectionViewController* _collectionViewController;
   RemotingService* _remotingService;
-  RemotingClient* _client;
 }
 @end
 
 // TODO(nicholss): Localize this file.
 // TODO(nicholss): This file is not finished with integration, the app flow is
 // still pending development.
 
 @implementation RemotingViewController
 
 - (instancetype)init {
@@ skipping 27 matching lines @@
                                         target:self
                                         action:@selector(didSelectSettings)];
     self.navigationItem.leftBarButtonItem = menuButton;
 
     UIBarButtonItem* refreshButton =
         [[UIBarButtonItem alloc] initWithTitle:@"Refresh"
                                          style:UIBarButtonItemStyleDone
                                         target:self
                                         action:@selector(didSelectRefresh)];
     self.navigationItem.rightBarButtonItem = refreshButton;
-
-    [[NSNotificationCenter defaultCenter]
-        addObserver:self
-           selector:@selector(hostSessionStatusChanged:)
-               name:kHostSessionStatusChanged
-             object:nil];
   }
   return self;
 }
 
 #pragma mark - UIViewController
 
 - (void)viewDidLoad {
   [super viewDidLoad];
   [_appBar addSubviewsToParent];
 
@@ skipping 72 matching lines @@
 }
 
 #pragma mark - RemotingHostListDelegate
 
 // TODO(nicholss): these need to be a stats change like "none, loading,
 // updated"...
 - (void)hostListUpdated {
   [_collectionViewController.collectionView reloadData];
 }
 
-#pragma mark - ClientConnectionViewControllerDelegate
-
-- (void)clientConnected {
-  HostViewController* hostViewController =
-      [[HostViewController alloc] initWithClient:_client];
-  _client = nil;
-  [self presentViewController:hostViewController animated:YES completion:nil];
-}
-
-- (NSString*)getConnectingHostName {
-  if (_client) {
-    return _client.hostInfo.hostName;
-  }
-  return nil;
-}
-
 #pragma mark - HostCollectionViewControllerDelegate
 
 - (void)didSelectCell:(HostCollectionViewCell*)cell
            completion:(void (^)())completionBlock {
   if (![cell.hostInfo isOnline]) {
     MDCSnackbarMessage* message = [[MDCSnackbarMessage alloc] init];
     message.text = @"Host is offline.";
     [MDCSnackbarManager showMessage:message];
     return;
   }
 
-  _client = [[RemotingClient alloc] init];
-
-  [_remotingService.authentication
-      callbackWithAccessToken:base::BindBlockArc(^(
-                                  remoting::OAuthTokenGetter::Status status,
-                                  const std::string& user_email,
-                                  const std::string& access_token) {
-        // TODO(nicholss): Check status.
-        HostInfo* hostInfo = cell.hostInfo;
-        [_client connectToHost:hostInfo
-                      username:base::SysUTF8ToNSString(user_email)
-                   accessToken:base::SysUTF8ToNSString(access_token)];
-      })];
-
   ClientConnectionViewController* clientConnectionViewController =
-      [[ClientConnectionViewController alloc] init];
-  clientConnectionViewController.delegate = self;
+      [[ClientConnectionViewController alloc] initWithHostInfo:cell.hostInfo];
   [self presentViewController:clientConnectionViewController
                      animated:YES
                    completion:nil];
   completionBlock();
 }
 
 - (NSInteger)getHostCount {
   return _remotingService.hosts.count;
 }
 
@@ skipping 22 matching lines @@
     (id<UIViewControllerContextTransitioning>)transitionContext {
 }
 
 - (NSTimeInterval)transitionDuration:
     (id<UIViewControllerContextTransitioning>)transitionContext {
   return 0.2;
 }
 
 #pragma mark - Private
 
-- (void)hostSessionStatusChanged:(NSNotification*)notification {
-  NSLog(@"hostSessionStatusChanged: %@", [notification userInfo]);
-}
-
 - (void)closeViewController {
   [self dismissViewControllerAnimated:true completion:nil];
 }
 
 - (void)didSelectRefresh {
   // TODO(nicholss): Might want to rate limit this. Maybe remoting service
   // controls that.
   [_remotingService requestHostListFetch];
 }
 
 - (void)didSelectSettings {
   RemotingSettingsViewController* settingsViewController =
       [[RemotingSettingsViewController alloc] init];
   [self presentViewController:settingsViewController
                      animated:YES
                    completion:nil];
 }
 
 - (void)presentStatus {
   MDCSnackbarMessage* message = [[MDCSnackbarMessage alloc] init];
   if (_isAuthenticated) {
     message.text = [NSString
         stringWithFormat:@"Currently signed in as %@.",
                          _remotingService.authentication.user.userEmail];
     [MDCSnackbarManager showMessage:message];
   }
 }
 
 @end