Update activation flow for lte devices not to show 3G loading page.

chrome/browser/resources/chromeos/mobile_setup.js

 // Copyright (c) 2012 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.
 
 
 cr.define('mobile', function() {
 
   function MobileSetup() {
   }
 
   cr.addSingletonGetter(MobileSetup);
 
+  MobileSetup.PLAN_ACTIVATION_UNKNOWN = -2;
   MobileSetup.PLAN_ACTIVATION_PAGE_LOADING = -1;
   MobileSetup.PLAN_ACTIVATION_START = 0;
   MobileSetup.PLAN_ACTIVATION_TRYING_OTASP = 1;
   MobileSetup.PLAN_ACTIVATION_INITIATING_ACTIVATION = 3;
   MobileSetup.PLAN_ACTIVATION_RECONNECTING = 4;
-  MobileSetup.PLAN_ACTIVATION_PAYMENT_PORTAL_LOADING = 5;
-  MobileSetup.PLAN_ACTIVATION_SHOWING_PAYMENT = 6;
-  MobileSetup.PLAN_ACTIVATION_RECONNECTING_PAYMENT = 7;
-  MobileSetup.PLAN_ACTIVATION_DELAY_OTASP = 8;
-  MobileSetup.PLAN_ACTIVATION_START_OTASP = 9;
-  MobileSetup.PLAN_ACTIVATION_OTASP = 10;
+  MobileSetup.PLAN_ACTIVATION_WAITING_FOR_CONNECTION = 5;
+  MobileSetup.PLAN_ACTIVATION_PAYMENT_PORTAL_LOADING = 6;
+  MobileSetup.PLAN_ACTIVATION_SHOWING_PAYMENT = 7;
+  MobileSetup.PLAN_ACTIVATION_RECONNECTING_PAYMENT = 8;
+  MobileSetup.PLAN_ACTIVATION_DELAY_OTASP = 9;
+  MobileSetup.PLAN_ACTIVATION_START_OTASP = 10;
+  MobileSetup.PLAN_ACTIVATION_OTASP = 11;
   MobileSetup.PLAN_ACTIVATION_DONE = 12;
   MobileSetup.PLAN_ACTIVATION_ERROR = 0xFF;
 
   MobileSetup.EXTENSION_PAGE_URL =
       'chrome-extension://iadeocfgjdjdmpenejdbfeaocpbikmab';
   MobileSetup.ACTIVATION_PAGE_URL = MobileSetup.EXTENSION_PAGE_URL +
                                     '/activation.html';
+  MobileSetup.PORTAL_OFFLINE_PAGE_URL = MobileSetup.EXTENSION_PAGE_URL +
+                                        '/portal_offline.html';
   MobileSetup.REDIRECT_POST_PAGE_URL = MobileSetup.EXTENSION_PAGE_URL +
                                        '/redirect.html';
 
   MobileSetup.localStrings_ = new LocalStrings();
 
   MobileSetup.prototype = {
     // Mobile device information.
     deviceInfo_: null,
     frameName_: '',
     initialized_: false,
     fakedTransaction_: false,
     paymentShown_: false,
     frameLoadError_: 0,
     frameLoadIgnored_: true,
+    carrierPageUrl_: null,
     spinnerInt_: -1,
     // UI states.
-    state_: -1,
+    state_: MobileSetup.PLAN_ACTIVATION_UNKNOWN,
     STATE_UNKNOWN_: 'unknown',
     STATE_CONNECTING_: 'connecting',
     STATE_ERROR_: 'error',
     STATE_PAYMENT_: 'payment',
     STATE_ACTIVATING_: 'activating',
     STATE_CONNECTED_: 'connected',
 
     initialize: function(frame_name, carrierPage) {
       if (this.initialized_) {
         console.log('calling initialize() again?');
@@ skipping 10 matching lines @@
       this.confirm_ = new cr.ui.dialogs.ConfirmDialog(document.body);
 
       window.addEventListener('message', function(e) {
           self.onMessageReceived_(e);
       });
 
       $('closeButton').addEventListener('click', function(e) {
         $('finalStatus').classList.add('hidden');
       });
 
-      this.changeState_({state: MobileSetup.PLAN_ACTIVATION_PAGE_LOADING});
       // Kick off activation process.
       chrome.send('startActivation');
     },
 
     startSpinner_: function() {
       this.stopSpinner_();
       this.spinnerInt_ = setInterval(mobile.MobileSetup.drawProgress, 100);
     },
 
     stopSpinner_: function() {
@@ skipping 39 matching lines @@
       } else if (e.data.type == 'reportTransactionStatusMsg') {
         console.log('calling setTransactionStatus from onMessageReceived_');
         chrome.send('setTransactionStatus', [e.data.status]);
       }
     },
 
     changeState_: function(deviceInfo) {
       var newState = deviceInfo.state;
       if (this.state_ == newState)
         return;
-      var main = $('mainbody');
+
+      // The mobile setup is already in its final state.
+      if (this.state_ == MobileSetup.PLAN_ACTIVATION_DONE ||
+          this.state_ == MobileSetup.PLAN_ACTIVATION_ERROR) {
+        return;
+      }
+
       // Map handler state to UX.
       switch (newState) {
         case MobileSetup.PLAN_ACTIVATION_PAGE_LOADING:
         case MobileSetup.PLAN_ACTIVATION_START:
         case MobileSetup.PLAN_ACTIVATION_DELAY_OTASP:
         case MobileSetup.PLAN_ACTIVATION_START_OTASP:
         case MobileSetup.PLAN_ACTIVATION_RECONNECTING:
         case MobileSetup.PLAN_ACTIVATION_RECONNECTING_PAYMENT:
+          // Activation page should not be shown for devices that are activated
+          // over non cellular network.
+          if (deviceInfo.activate_over_non_cellular_network)
+            break;
+
           $('statusHeader').textContent =
               MobileSetup.localStrings_.getString('connecting_header');
           $('auxHeader').textContent =
               MobileSetup.localStrings_.getString('please_wait');
           $('paymentForm').classList.add('hidden');
           $('finalStatus').classList.add('hidden');
+          this.setCarrierPage_(MobileSetup.ACTIVATION_PAGE_URL);
           $('systemStatus').classList.remove('hidden');
-          $('carrierPage').classList.remove('hidden');
           $('canvas').classList.remove('hidden');
           this.startSpinner_();
           break;
         case MobileSetup.PLAN_ACTIVATION_TRYING_OTASP:
         case MobileSetup.PLAN_ACTIVATION_INITIATING_ACTIVATION:
         case MobileSetup.PLAN_ACTIVATION_OTASP:
+          // Activation page should not be shown for devices that are activated
+          // over non cellular network.
+          if (deviceInfo.activate_over_non_cellular_network)
+            break;
+
           $('statusHeader').textContent =
               MobileSetup.localStrings_.getString('activating_header');
           $('auxHeader').textContent =
               MobileSetup.localStrings_.getString('please_wait');
           $('paymentForm').classList.add('hidden');
           $('finalStatus').classList.add('hidden');
+          this.setCarrierPage_(MobileSetup.ACTIVATION_PAGE_URL);
           $('systemStatus').classList.remove('hidden');
-          $('carrierPage').classList.remove('hidden');
           $('canvas').classList.remove('hidden');
           this.startSpinner_();
           break;
         case MobileSetup.PLAN_ACTIVATION_PAYMENT_PORTAL_LOADING:
+          // Activation page should not be shown for devices that are activated
+          // over non cellular network.
+          if (!deviceInfo.activate_over_non_cellular_network) {
+            $('statusHeader').textContent =
+                MobileSetup.localStrings_.getString('connecting_header');
+            $('auxHeader').textContent = '';
+            $('paymentForm').classList.add('hidden');
+            $('finalStatus').classList.add('hidden');
+            this.setCarrierPage_(MobileSetup.ACTIVATION_PAGE_URL);
+            $('systemStatus').classList.remove('hidden');
+            $('canvas').classList.remove('hidden');
+          }
+          this.loadPaymentFrame_(deviceInfo);
+          break;
+        case MobileSetup.PLAN_ACTIVATION_WAITING_FOR_CONNECTION:
           $('statusHeader').textContent =
-              MobileSetup.localStrings_.getString('connecting_header');
+              MobileSetup.localStrings_.getString('portal_unreachable_header');
           $('auxHeader').textContent = '';
+          $('auxHeader').classList.add('hidden');
           $('paymentForm').classList.add('hidden');
           $('finalStatus').classList.add('hidden');
           $('systemStatus').classList.remove('hidden');
+          this.setCarrierPage_(MobileSetup.PORTAL_OFFLINE_PAGE_URL);
           $('canvas').classList.remove('hidden');
-          this.loadPaymentFrame_(deviceInfo);
+          this.startSpinner_();
           break;
         case MobileSetup.PLAN_ACTIVATION_SHOWING_PAYMENT:
           $('statusHeader').textContent = '';
           $('auxHeader').textContent = '';
           $('finalStatus').classList.add('hidden');
           $('systemStatus').classList.add('hidden');
-          $('carrierPage').classList.add('hidden');
           $('paymentForm').classList.remove('hidden');
           $('canvas').classList.add('hidden');
           this.stopSpinner_();
           this.paymentShown_ = true;
           break;
         case MobileSetup.PLAN_ACTIVATION_DONE:
           $('statusHeader').textContent = '';
           $('auxHeader').textContent = '';
           $('finalHeader').textContent =
               MobileSetup.localStrings_.getString('completed_header');
           $('finalMessage').textContent =
               MobileSetup.localStrings_.getString('completed_text');
           $('systemStatus').classList.add('hidden');
-          $('carrierPage').classList.add('hidden');
-          $('paymentForm').classList.remove('hidden');
           $('closeButton').classList.remove('hidden');
           $('finalStatus').classList.remove('hidden');
           $('canvas').classList.add('hidden');
           this.stopSpinner_();
           if (this.paymentShown_) {
             $('closeButton').classList.remove('hidden');
+            $('paymentForm').classList.remove('hidden');
           } else {
             $('closeButton').classList.add('hidden');
+            $('paymentForm').classList.add('hidden');

[xiyuan, 2013/03/14 01:29:17]

nit: you can simplify the whole "if" using classList.toggle like this:

$('closeButton').classList.toggle('hidden', !this.paymentShown_);
$('paymentForm').classList.toggle('hidden', !this.paymentShown_);

[tbarzic, 2013/03/14 01:36:28]

cool

           }
           break;
         case MobileSetup.PLAN_ACTIVATION_ERROR:
           $('statusHeader').textContent = '';
           $('auxHeader').textContent = '';
           $('finalHeader').textContent =
               MobileSetup.localStrings_.getString('error_header');
           $('finalMessage').textContent = deviceInfo.error;
           $('systemStatus').classList.add('hidden');
-          $('carrierPage').classList.add('hidden');
-          $('paymentForm').classList.remove('hidden');
           $('canvas').classList.add('hidden');
           this.stopSpinner_();
           if (this.paymentShown_) {
             $('closeButton').classList.remove('hidden');
+            $('paymentForm').classList.remove('hidden');
           } else {
             $('closeButton').classList.add('hidden');
+            $('paymentForm').classList.add('hidden');

[xiyuan, 2013/03/14 01:29:17]

nit: same here.

[tbarzic, 2013/03/14 01:36:28]

Done.

           }
           $('finalStatus').classList.remove('hidden');
           break;
       }
       this.state_ = newState;
     },
 
+    setCarrierPage_: function(url) {
+      if (this.carrierPageUrl_ == url)
+        return;
+      this.carrierPageUrl_ = url;
+      $('carrierPage').contentWindow.location.href = url;
+    },
+
     updateDeviceStatus_: function(deviceInfo) {
       this.changeState_(deviceInfo);
     },
 
     portalFrameLoadError_: function(errorCode) {
       if (this.frameLoadIgnored_)
         return;
       console.log('Portal frame load error detected: ', errorCode);
       this.frameLoadError_ = errorCode;
     },
@@ skipping 79 matching lines @@
 
   MobileSetup.loadPage = function() {
     mobile.MobileSetup.getInstance().initialize('paymentForm',
         mobile.MobileSetup.ACTIVATION_PAGE_URL);
   };
 
   // Export
   return {
     MobileSetup: MobileSetup
   };
-
 });
 
+document.addEventListener('DOMContentLoaded', mobile.MobileSetup.loadPage);