Updating Pin Entry View and creating Connection Status View.

remoting/client/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/client/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/client/ios/app/client_connection_view_controller.h"
 #import "remoting/client/ios/app/host_collection_view_controller.h"
 #import "remoting/client/ios/app/host_view_controller.h"
-#import "remoting/client/ios/app/pin_entry_view_controller.h"
 #import "remoting/client/ios/app/remoting_settings_view_controller.h"
+#import "remoting/client/ios/domain/client_session_details.h"
 #import "remoting/client/ios/facade/remoting_service.h"
 #import "remoting/client/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 28 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];
   [self presentStatus];
@@ skipping 30 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];
+  [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 {
-  RemotingClient* client = [[RemotingClient alloc] init];
+  _client = [[RemotingClient alloc] init];
 
   [_remotingService
       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;
-        DCHECK(hostInfo);
-        DCHECK(hostInfo.jabberId);
-        DCHECK(hostInfo.hostId);
-        DCHECK(hostInfo.publicKey);
-
-        remoting::ConnectToHostInfo info;
-        info.username = user_email;
-        info.auth_token = access_token;
-        info.host_jid = base::SysNSStringToUTF8(hostInfo.jabberId);
-        info.host_id = base::SysNSStringToUTF8(hostInfo.hostId);
-        info.host_pubkey = base::SysNSStringToUTF8(hostInfo.publicKey);
-        // TODO(nicholss): If iOS supports pairing, pull the stored data and
-        // insert it here.
-        info.pairing_id = "";
-        info.pairing_secret = "";
-
-        // TODO(nicholss): I am not sure about the following fields yet.
-        // info.capabilities =
-        // info.flags =
-        // info.host_version =
-        // info.host_os =
-        // info.host_os_version =
-        [client connectToHost:info];
+        [_client connectToHost:hostInfo
+                      username:base::SysUTF8ToNSString(user_email)
+                   accessToken:base::SysUTF8ToNSString(access_token)];
       })];
 
-  HostViewController* hostViewController =
-      [[HostViewController alloc] initWithClient:client];
-
-  // TODO(nicholss): Add feedback on status of request.
-  [self presentViewController:hostViewController animated:YES completion:nil];
-
+  ClientConnectionViewController* clientConnectionViewController =
+      [[ClientConnectionViewController alloc] init];
+  clientConnectionViewController.delegate = self;
+  [self presentViewController:clientConnectionViewController
+                     animated:YES
+                   completion:nil];
   completionBlock();
 }
 
 - (NSInteger)getHostCount {
   NSArray<HostInfo*>* hosts = [_remotingService getHosts];
   return [hosts count];
 }
 
 - (HostInfo*)getHostAtIndexPath:(NSIndexPath*)path {
   NSArray<HostInfo*>* hosts = [_remotingService getHosts];
@@ skipping 21 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) implement this.
   NSLog(@"Should refresh...");
   _dialogTransitionController = [[MDCDialogTransitionController alloc] init];
-  PinEntryViewController* vc =
-      [[PinEntryViewController alloc] initWithCallback:nil];
-  vc.modalPresentationStyle = UIModalPresentationCustom;
-  vc.transitioningDelegate = _dialogTransitionController;
-  [self presentViewController:vc animated:YES completion:nil];
 }
 
 - (void)didSelectSettings {
-  RemotingSettingsViewController* settingsVC =
-      [RemotingSettingsViewController new];
-  [self presentViewController:settingsVC animated:YES completion:nil];
+  RemotingSettingsViewController* settingsViewController =
+      [[RemotingSettingsViewController alloc] init];
+  [self presentViewController:settingsViewController
+                     animated:YES
+                   completion:nil];
 }
 
 - (void)presentStatus {
   MDCSnackbarMessage* message = [[MDCSnackbarMessage alloc] init];
   if (_isAuthenticated) {
     UserInfo* user = [_remotingService getUser];
     message.text = [NSString
         stringWithFormat:@"Currently signed in as %@.", [user userEmail]];
     [MDCSnackbarManager showMessage:message];
   }
 }
 
 @end