[Webapp Refactor] Reliably cancels a connection.

remoting/webapp/crd/js/it2me_activity.js

 // Copyright 2015 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.
 
 /** @suppress {duplicate} */
 var remoting = remoting || {};
 
 (function() {
 
 'use strict';
@@ skipping 26 matching lines @@
 };
 
 remoting.It2MeActivity.prototype.dispose = function() {
   base.dispose(this.desktopActivity_);
   this.desktopActivity_ = null;
 };
 
 remoting.It2MeActivity.prototype.start = function() {
   var that = this;
 
+  this.desktopActivity_ = new remoting.DesktopRemotingActivity(this);
+  remoting.app.setConnectionMode(remoting.Application.Mode.IT2ME);
+
   this.accessCodeDialog_.show().then(function(/** string */ accessCode) {
-    remoting.setMode(remoting.AppMode.CLIENT_CONNECTING);
+    that.desktopActivity_.getConnectingDialog().show();
     return that.verifyAccessCode_(accessCode);
   }).then(function() {
     return remoting.identity.getToken();
   }).then(function(/** string */ token) {
     return that.getHostInfo_(token);
   }).then(function(/** !remoting.Xhr.Response */ response) {
     return that.onHostInfo_(response);
   }).then(function(/** remoting.Host */ host) {
     that.connect_(host);
-  }).catch(function(/** remoting.Error */ error) {
+  }).catch(remoting.Error.handler(function(/** remoting.Error */ error) {
     if (error.hasTag(remoting.Error.Tag.CANCELLED)) {
       remoting.setMode(remoting.AppMode.HOME);
     } else {
       var errorDiv = document.getElementById('connect-error-message');
       l10n.localizeElementFromTag(errorDiv, error.getTag());
       remoting.setMode(remoting.AppMode.CLIENT_CONNECT_FAILED_IT2ME);
     }
-  });
+  }));
 };
 
 remoting.It2MeActivity.prototype.stop = function() {
   this.desktopActivity_.stop();
 };
 
 /**
  * @param {!remoting.Error} error
  */
 remoting.It2MeActivity.prototype.onConnectionFailed = function(error) {
-  this.onError(error);
+  this.showErrorMessage_(error);
+  base.dispose(this.desktopActivity_);
+  this.desktopActivity_ = null;
 };
 
 /**
  * @param {!remoting.ConnectionInfo} connectionInfo
  */
 remoting.It2MeActivity.prototype.onConnected = function(connectionInfo) {
   this.accessCodeDialog_.inputField().value = '';
 };
 
-remoting.It2MeActivity.prototype.onDisconnected = function() {
-  this.showFinishDialog_(remoting.AppMode.CLIENT_SESSION_FINISHED_IT2ME);
+remoting.It2MeActivity.prototype.onDisconnected = function(error) {
+  if (error.isNone()) {
+    this.showFinishDialog_(remoting.AppMode.CLIENT_SESSION_FINISHED_IT2ME);
+  } else {
+    this.showErrorMessage_(error);
+  }
+
+  base.dispose(this.desktopActivity_);
+  this.desktopActivity_ = null;
 };
 
 /**
  * @param {!remoting.Error} error
+ * @private
  */
-remoting.It2MeActivity.prototype.onError = function(error) {
+remoting.It2MeActivity.prototype.showErrorMessage_ = function(error) {
   var errorDiv = document.getElementById('connect-error-message');
   l10n.localizeElementFromTag(errorDiv, error.getTag());
   this.showFinishDialog_(remoting.AppMode.CLIENT_CONNECT_FAILED_IT2ME);
 };
 
 /** @return {remoting.DesktopRemotingActivity} */
 remoting.It2MeActivity.prototype.getDesktopActivityForTesting = function() {
   return this.desktopActivity_;
 };
 
@@ skipping 71 matching lines @@
   } else {
     return Promise.reject(translateSupportHostsError(xhrResponse.status));
   }
 };
 
 /**
  * @param {remoting.Host} host
  * @private
  */
 remoting.It2MeActivity.prototype.connect_ = function(host) {
-  base.dispose(this.desktopActivity_);
-  this.desktopActivity_ = new remoting.DesktopRemotingActivity(this);
-  remoting.app.setConnectionMode(remoting.Application.Mode.IT2ME);
   this.desktopActivity_.start(
       host, new remoting.CredentialsProvider({ accessCode: this.passCode_ }));
 };
 
 /**
  * TODO(jrw): Replace with remoting.Error.fromHttpStatus.
  * @param {number} error An HTTP error code returned by the support-hosts
  *     endpoint.
  * @return {remoting.Error} The equivalent remoting.Error code.
  */
 function translateSupportHostsError(error) {
   switch (error) {
     case 0: return new remoting.Error(remoting.Error.Tag.NETWORK_FAILURE);
     case 404: return new remoting.Error(remoting.Error.Tag.INVALID_ACCESS_CODE);
     case 502: // No break
     case 503: return new remoting.Error(remoting.Error.Tag.SERVICE_UNAVAILABLE);
     default: return remoting.Error.unexpected();
   }
 }
 
 })();