Some additional network settings cleanup

chrome/browser/resources/options/chromeos/internet_detail.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.
 
 // require: onc_data.js
 
 // NOTE(stevenjb): This code is in the process of being converted to be
 // compatible with the networkingPrivate extension API:
 // * The network property dictionaries are being converted to use ONC values.
 // * chrome.send calls will be replaced with an API object that simulates the
@@ skipping 68 matching lines @@
   function sendCheckedIfEnabled(path, message, checkbox) {
     if (!checkbox.hidden && !checkbox.disabled)
       chrome.send(message, [path, checkbox.checked ? 'true' : 'false']);
   }
 
   /**
    * Returns the netmask as a string for a given prefix length.
    * @param {string} prefixLength The ONC routing prefix length.
    * @return {string} The corresponding netmask.
    */
-  function PrefixLengthToNetmask(prefixLength) {
+  function prefixLengthToNetmask(prefixLength) {
     // Return the empty string for invalid inputs.
     if (prefixLength < 0 || prefixLength > 32)
       return '';
     var netmask = '';
     for (var i = 0; i < 4; ++i) {
       var remainder = 8;
       if (prefixLength >= 8) {
         prefixLength -= 8;
       } else {
         remainder = prefixLength;
@@ skipping 10 matching lines @@
   }
 
   /////////////////////////////////////////////////////////////////////////////
   // DetailsInternetPage class:
 
   /**
    * Encapsulated handling of ChromeOS internet details overlay page.
    * @constructor
    */
   function DetailsInternetPage() {
+    // Cached Apn properties
     this.userApnIndex_ = -1;
     this.selectedApnIndex_ = -1;
     this.userApn_ = {};
+    // We show the Proxy configuration tab for remembered networks and when
+    // configuring a proxy from the login screen.
+    this.showProxy_ = false;
+    // TODO(stevenjb): Use networkingPrivate.getNetworks to set this.
+    this.deviceConnected_ = false;
     Page.call(this, 'detailsInternetPage', null, 'details-internet-page');
   }
 
   cr.addSingletonGetter(DetailsInternetPage);
 
   DetailsInternetPage.prototype = {
     __proto__: Page.prototype,
 
     /** @override */
     initializePage: function() {
@@ skipping 240 matching lines @@
       }
 
       return event;
     },
 
     /**
      * Update details page controls.
      */
     updateControls: function() {
       var onc = this.onc_;
+      if (onc == undefined)
+        return;  // May get called from a pref update before initialized.
 
       // Only show ipconfig section if network is connected OR if nothing on
       // this device is connected. This is so that you can fix the ip configs
       // if you can't connect to any network.
-      // TODO(chocobo): Once ipconfig is moved to flimflam service objects,
-      //   we need to redo this logic to allow configuration of all networks.
+      // TODO(stevenjb): Support IP configuration (and improve the display)
+      // for non connected networks.
+
       var connected = onc.getActiveValue('ConnectionState') == 'Connected';
-      $('ipconfig-section').hidden = !connected && this.deviceConnected;
-      $('ipconfig-dns-section').hidden = !connected && this.deviceConnected;
+      $('ipconfig-section').hidden = !connected && this.deviceConnected_;
+      $('ipconfig-dns-section').hidden = !connected && this.deviceConnected_;
+
+      var isCellular = this.type_ == 'Cellular';
+      var isWiFi = this.type_ == 'WiFi';
+      var isWimax = this.type_ == 'Wimax';
+      var isVPN = this.type_ == 'VPN';

[armansito, 2014/09/11 17:01:15]

Maybe add instance methods for these, which you can then reuse in updateDetails_
below. (e.g. if (this.isCellular())).

[stevenjb, 2014/09/11 17:22:33]

Hm. I really only pulled these out for brevity in some of the code here;
this.isCellular() would defeat that purpose. I'd rather just eliminate these if
they are confusing.

[armansito, 2014/09/11 17:28:12]

Up to you then. I'd just be consistent here and below, i.e. either always use
the explicit comparison or have the temporaries.

[stevenjb, 2014/09/11 17:38:23]

Removed.

 
       // Network type related.
-      updateHidden('#details-internet-page .cellular-details',
-                   this.type_ != 'Cellular');
-      updateHidden('#details-internet-page .wifi-details',
-                   this.type_ != 'WiFi');
-      updateHidden('#details-internet-page .wimax-details',
-                   this.type_ != 'Wimax');
-      updateHidden('#details-internet-page .vpn-details', this.type_ != 'VPN');
-      updateHidden('#details-internet-page .proxy-details', !this.showProxy);
+      updateHidden('#details-internet-page .cellular-details', !isCellular);
+      updateHidden('#details-internet-page .wifi-details', !isWiFi);
+      updateHidden('#details-internet-page .wimax-details', !isWimax);
+      updateHidden('#details-internet-page .vpn-details', !isVPN);
+
+      updateHidden('#details-internet-page .proxy-details', !this.showProxy_);
 
       // Cellular
-
-      // Conditionally call updateHidden on .gsm-only, so that we don't unhide
-      // a previously hidden element.
-      if (this.gsm)
-        updateHidden('#details-internet-page .cdma-only', true);
-      else
-        updateHidden('#details-internet-page .gsm-only', true);
+      if (isCellular) {
+        // Hide gsm/cdma specific elements.
+        if (onc.getActiveValue('Cellular.Family') == 'GSM')
+          updateHidden('#details-internet-page .cdma-only', true);
+        else
+          updateHidden('#details-internet-page .gsm-only', true);
+      }
 
       // Wifi
 
       // Hide network tab for VPN.
-      updateHidden('#details-internet-page .network-details',
-                   this.type_ == 'VPN');
+      updateHidden('#details-internet-page .network-details', isVPN);
 
       // Password and shared.
       var source = onc.getSource();
       var shared = (source == 'Device' || source == 'DevicePolicy');
       updateHidden('#details-internet-page #password-details',
                    this.type_ != 'WiFi' || onc.getWiFiSecurity() == 'None');
       updateHidden('#details-internet-page #wifi-shared-network', !shared);
       updateHidden('#details-internet-page #prefer-network', source == 'None');
 
       // WiMAX.
@@ skipping 153 matching lines @@
       var connectable = onc.getActiveValue('Connectable');
       if (connectState != 'Connected' &&
           (!connectable || onc.getWiFiSecurity() != 'None' ||
           (this.type_ == 'Wimax' || this.type_ == 'VPN'))) {
         $('details-internet-configure').hidden = false;
       } else {
         $('details-internet-configure').hidden = true;
       }
     },
 
+    updateDetails_: function(data) {
+      var onc = this.onc_;
+
+      if ('deviceConnected' in data)
+        this.deviceConnected_ = data.deviceConnected;
+
+      var connectionStateString = onc.getTranslatedValue('ConnectionState');
+      $('connection-state').textContent = connectionStateString;
+
+      var type = this.type_;
+      var showViewAccount = false;
+      var showActivate = false;
+      if (type == 'WiFi') {
+        $('wifi-connection-state').textContent = connectionStateString;
+      } else if (type == 'Wimax') {
+        $('wimax-connection-state').textContent = connectionStateString;
+      } else if (type == 'Cellular') {
+        $('activation-state').textContent =
+            onc.getTranslatedValue('Cellular.ActivationState');
+        if (onc.getActiveValue('Cellular.Family') == 'GSM') {
+          var lockEnabled =
+              onc.getActiveValue('Cellular.SIMLockStatus.LockEnabled');
+          $('sim-card-lock-enabled').checked = lockEnabled;
+          $('change-pin').hidden = !lockEnabled;
+        }
+        showViewAccount = data.showViewAccountButton;
+        var activationState = onc.getActiveValue('Cellular.ActivationState');
+        showActivate = activationState == 'NotActivated' ||
+            activationState == 'PartiallyActivated';
+      }
+
+      $('view-account-details').hidden = !showViewAccount;
+      $('activate-details').hidden = !showActivate;
+      // If activation is not complete, hide the login button.
+      if (showActivate)
+        $('details-internet-login').hidden = true;
+    },
+
     populateHeader_: function() {
       var onc = this.onc_;
 
       $('network-details-title').textContent = onc.getTranslatedValue('Name');
       var connectionState = onc.getActiveValue('ConnectionState');
       var connectionStateString = onc.getTranslatedValue('ConnectionState');
       $('network-details-subtitle-status').textContent = connectionStateString;
+
       var typeKey;
       var type = this.type_;
       if (type == 'Ethernet')
         typeKey = 'ethernetTitle';
       else if (type == 'WiFi')
         typeKey = 'wifiTitle';
       else if (type == 'Wimax')
         typeKey = 'wimaxTitle';
       else if (type == 'Cellular')
         typeKey = 'cellularTitle';
@@ skipping 222 matching lines @@
 
   /**
    * Displays the InternetDetails dialog with only the proxy settings visible.
    */
   DetailsInternetPage.showProxySettings = function() {
     var detailsPage = DetailsInternetPage.getInstance();
     $('network-details-header').hidden = true;
     $('activate-details').hidden = true;
     $('view-account-details').hidden = true;
     $('web-proxy-auto-discovery').hidden = true;
-    detailsPage.showProxy = true;
+    detailsPage.showProxy_ = true;
     updateHidden('#internet-tab', true);
     updateHidden('#details-tab-strip', true);
     updateHidden('#details-internet-page .action-area', true);
     detailsPage.updateControls();
     detailsPage.visible = true;
     chrome.send('coreOptionsUserMetricsAction',
                 ['Options_NetworkShowProxyTab']);
   };
 
   /**
@@ skipping 162 matching lines @@
       return;
 
     if (update.servicePath != detailsPage.servicePath_)
       return;
 
     // Update our cached data object.
     var onc = detailsPage.onc_;
     onc.updateData(update);
 
     detailsPage.populateHeader_();
-
-    var connectionState = onc.getActiveValue('ConnectionState');
-    var connectionStateString = onc.getTranslatedValue('ConnectionState');
-    if ('deviceConnected' in update)
-      detailsPage.deviceConnected = update.deviceConnected;
-    $('connection-state').textContent = connectionStateString;
-
     detailsPage.updateConnectionButtonVisibilty_();
-
-    var type = detailsPage.type_;
-    if (type == 'WiFi') {
-      $('wifi-connection-state').textContent = connectionStateString;
-    } else if (type == 'Wimax') {
-      $('wimax-connection-state').textContent = connectionStateString;
-    } else if (type == 'Cellular') {
-      $('activation-state').textContent =
-          onc.getTranslatedValue('Cellular.ActivationState');
-      // These properties are only defined if they are true.
-      $('view-account-details').hidden = !update.showViewAccountButton;
-      $('activate-details').hidden = !update.showActivateButton;
-      if (update.showActivateButton)
-        $('details-internet-login').hidden = true;
-
-      if (detailsPage.gsm) {
-        var lockEnabled =
-            onc.getActiveValue('Cellular.SIMLockStatus.LockEnabled');
-        $('sim-card-lock-enabled').checked = lockEnabled;
-        $('change-pin').hidden = !lockEnabled;
-      }
-    }
+    detailsPage.updateDetails_(update);
   };
 
   DetailsInternetPage.showDetailedInfo = function(data) {
     var onc = new OncData(data);
 
     var detailsPage = DetailsInternetPage.getInstance();
     detailsPage.onc_ = onc;
     var type = onc.getActiveValue('Type');
     detailsPage.type_ = type;
     detailsPage.servicePath_ = data.servicePath;
 
     detailsPage.populateHeader_();
+    detailsPage.updateConnectionButtonVisibilty_();
+    detailsPage.updateDetails_(data);
 
-    $('activate-details').hidden = true;
-    $('view-account-details').hidden = true;
-
-    detailsPage.updateConnectionButtonVisibilty_();
-
-    $('web-proxy-auto-discovery').hidden = true;
-
-    detailsPage.deviceConnected = data.deviceConnected;
+    // TODO(stevenjb): Some of the setup below should be moved to
+    // updateDetails_() so that updates are reflected in the UI.
 
     // Only show proxy for remembered networks.
     var remembered = onc.getSource() != 'None';
     if (remembered) {
-      detailsPage.showProxy = true;
+      detailsPage.showProxy_ = true;
+      // Inform Chrome which network to use for proxy configuration.
       chrome.send('selectNetwork', [detailsPage.servicePath_]);
     } else {
-      detailsPage.showProxy = false;
+      detailsPage.showProxy_ = false;
     }
 
-    var connectionStateString = onc.getTranslatedValue('ConnectionState');
-    $('connection-state').textContent = connectionStateString;
+    $('web-proxy-auto-discovery').hidden = true;
+
     var restricted = onc.getActiveValue('RestrictedConnectivity');
     var restrictedString = loadTimeData.getString(
         restricted ? 'restrictedYes' : 'restrictedNo');
 
     var inetAddress = {};
     var inetNetmask = {};
     var inetGateway = {};
 
     var inetNameServersString;
 
     var ipconfigList = onc.getActiveValue('IPConfigs');
     if (Array.isArray(ipconfigList)) {
       for (var i = 0; i < ipconfigList.length; ++i) {
         var ipconfig = ipconfigList[i];
         var ipType = ipconfig['Type'];
         if (ipType != 'IPv4') {
           // TODO(stevenjb): Handle IPv6 properties.
           continue;
         }
         var address = ipconfig['IPAddress'];
         inetAddress.automatic = address;
         inetAddress.value = address;
-        var netmask = PrefixLengthToNetmask(ipconfig['RoutingPrefix']);
+        var netmask = prefixLengthToNetmask(ipconfig['RoutingPrefix']);
         inetNetmask.automatic = netmask;
         inetNetmask.value = netmask;
         var gateway = ipconfig['Gateway'];
         inetGateway.automatic = gateway;
         inetGateway.value = gateway;
         if ('WebProxyAutoDiscoveryUrl' in ipconfig) {
           $('web-proxy-auto-discovery').hidden = false;
           $('web-proxy-auto-discovery-url').value =
               ipconfig['WebProxyAutoDiscoveryUrl'];
         }
         if ('NameServers' in ipconfig) {
           var inetNameServers = ipconfig['NameServers'];
           inetNameServers = inetNameServers.sort();
           inetNameServersString = inetNameServers.join(',');
         }
         break;  // Use the first IPv4 entry.
       }
     }
 
     // Override the "automatic" values with the real saved DHCP values,
     // if they are set.
     var savedNameServersString;
     var savedIpAddress = onc.getActiveValue('SavedIPConfig.IPAddress');
     if (savedIpAddress != undefined) {
       inetAddress.automatic = savedIpAddress;
       inetAddress.value = savedIpAddress;
     }
     var savedPrefix = onc.getActiveValue('SavedIPConfig.RoutingPrefix');
     if (savedPrefix != undefined) {
-      var savedNetmask = PrefixLengthToNetmask(savedPrefix);
+      var savedNetmask = prefixLengthToNetmask(savedPrefix);
       inetNetmask.automatic = savedNetmask;
       inetNetmask.value = savedNetmask;
     }
     var savedGateway = onc.getActiveValue('SavedIPConfig.Gateway');
     if (savedGateway != undefined) {
       inetGateway.automatic = savedGateway;
       inetGateway.value = savedGateway;
     }
     var savedNameServers = onc.getActiveValue('SavedIPConfig.NameServers');
     if (savedNameServers) {
       savedNameServers = savedNameServers.sort();
       savedNameServersString = savedNameServers.join(',');
     }
 
     var ipAutoConfig = 'automatic';
 
     var staticNameServersString;
     var staticIpAddress = onc.getActiveValue('StaticIPConfig.IPAddress');
     if (staticIpAddress != undefined) {
       ipAutoConfig = 'user';
       inetAddress.user = staticIpAddress;
       inetAddress.value = staticIpAddress;
     }
     var staticPrefix = onc.getActiveValue('StaticIPConfig.RoutingPrefix');
     if (staticPrefix != undefined) {
-      var staticNetmask = PrefixLengthToNetmask(staticPrefix);
+      var staticNetmask = prefixLengthToNetmask(staticPrefix);
       inetNetmask.user = staticNetmask;
       inetNetmask.value = staticNetmask;
     }
     var staticGateway = onc.getActiveValue('StaticIPConfig.Gateway');
     if (staticGateway != undefined) {
       inetGateway.user = staticGateway;
       inetGateway.value = staticGateway;
     }
     var staticNameServers = onc.getActiveValue('StaticIPConfig.NameServers');
     if (staticNameServers) {
@@ skipping 69 matching lines @@
     var signalStrength;
     if (type == 'WiFi' || type == 'Wimax')
       signalStrength = onc.getActiveValue(type + '.SignalStrength');
     if (!signalStrength)
       signalStrength = 0;
     var strengthFormat = loadTimeData.getString('inetSignalStrengthFormat');
     var strengthString = strengthFormat.replace('$1', signalStrength);
 
     if (type == 'WiFi') {
       OptionsPage.showTab($('wifi-network-nav-tab'));
-      detailsPage.gsm = false;
-      $('wifi-connection-state').textContent = connectionStateString;
       $('wifi-restricted-connectivity').textContent = restrictedString;
       var ssid = onc.getActiveValue('WiFi.SSID');
       $('wifi-ssid').textContent = ssid ? ssid : networkName;
       setOrHideParent('wifi-bssid', onc.getActiveValue('WiFi.BSSID'));
       var security = onc.getWiFiSecurity();
       if (security == 'None')
         security = undefined;
       setOrHideParent('wifi-security', security);
       // Frequency is in MHz.
       var frequency = onc.getActiveValue('WiFi.Frequency');
       if (!frequency)
         frequency = 0;
       var frequencyFormat = loadTimeData.getString('inetFrequencyFormat');
       frequencyFormat = frequencyFormat.replace('$1', frequency);
       $('wifi-frequency').textContent = frequencyFormat;
       $('wifi-signal-strength').textContent = strengthString;
       setOrHideParent('wifi-hardware-address',
                       onc.getActiveValue('MacAddress'));
       var priority = onc.getActiveValue('Priority');
       $('prefer-network-wifi').checked = priority > 0;
       $('prefer-network-wifi').disabled = !remembered;
       $('auto-connect-network-wifi').checked =
           onc.getActiveValue('AutoConnect');
       $('auto-connect-network-wifi').disabled = !remembered;
     } else if (type == 'Wimax') {
       OptionsPage.showTab($('wimax-network-nav-tab'));
-      detailsPage.gsm = false;
-      $('wimax-connection-state').textContent = connectionStateString;
       $('wimax-restricted-connectivity').textContent = restrictedString;
       $('auto-connect-network-wimax').checked =
           onc.getActiveValue('AutoConnect');
       $('auto-connect-network-wimax').disabled = !remembered;
       var identity = onc.getActiveValue('Wimax.EAP.Identity');
       setOrHideParent('wimax-eap-identity', identity);
       $('wimax-signal-strength').textContent = strengthString;
     } else if (type == 'Cellular') {
       OptionsPage.showTab($('cellular-conn-nav-tab'));
       if (data.showCarrierSelect && data.currentCarrierIndex != -1) {
         var carrierSelector = $('select-carrier');
         carrierSelector.onchange = DetailsInternetPage.handleCarrierChanged;
         carrierSelector.options.length = 0;
         for (var i = 0; i < data.carriers.length; ++i) {
           var option = document.createElement('option');
           option.textContent = data.carriers[i];
           carrierSelector.add(option);
         }
         carrierSelector.selectedIndex = data.currentCarrierIndex;
       } else {
         $('service-name').textContent = networkName;
       }
 
       $('network-technology').textContent =
           onc.getActiveValue('Cellular.NetworkTechnology');
-      $('activation-state').textContent =
-          onc.getTranslatedValue('Cellular.ActivationState');
       $('roaming-state').textContent =
           onc.getTranslatedValue('Cellular.RoamingState');
       $('cellular-restricted-connectivity').textContent = restrictedString;
       $('error-state').textContent = data.errorMessage;
       $('manufacturer').textContent =
           onc.getActiveValue('Cellular.Manufacturer');
       $('model-id').textContent = onc.getActiveValue('Cellular.ModelID');
       $('firmware-revision').textContent =
           onc.getActiveValue('Cellular.FirmwareRevision');
       $('hardware-revision').textContent =
@@ skipping 18 matching lines @@
       updateHidden('#details-internet-page .gsm-only', false);
       updateHidden('#details-internet-page .cdma-only', false);
 
       // Show IMEI/ESN/MEID/MIN/PRL only if they are available.
       setOrHideParent('esn', onc.getActiveValue('Cellular.ESN'));
       setOrHideParent('imei', onc.getActiveValue('Cellular.IMEI'));
       setOrHideParent('meid', onc.getActiveValue('Cellular.MEID'));
       setOrHideParent('min', onc.getActiveValue('Cellular.MIN'));
       setOrHideParent('prl-version', onc.getActiveValue('Cellular.PRLVersion'));
 
-      var family = onc.getActiveValue('Cellular.Family');
-      detailsPage.gsm = family == 'GSM';
-      if (detailsPage.gsm) {
+      if (onc.getActiveValue('Cellular.Family') == 'GSM') {
         $('iccid').textContent = onc.getActiveValue('Cellular.ICCID');
         $('imsi').textContent = onc.getActiveValue('Cellular.IMSI');
         detailsPage.initializeApnList_(onc);
-        var lockEnabled =
-            onc.getActiveValue('Cellular.SIMLockStatus.LockEnabled');
-        $('sim-card-lock-enabled').checked = lockEnabled;
-        $('change-pin').hidden = !lockEnabled;
       }
       $('auto-connect-network-cellular').checked =
           onc.getActiveValue('AutoConnect');
       $('auto-connect-network-cellular').disabled = false;
-
-      $('view-account-details').hidden = !data.showViewAccountButton;
-      $('activate-details').hidden = !data.showActivateButton;
-      if (data.showActivateButton)
-        $('details-internet-login').hidden = true;
     } else if (type == 'VPN') {
       OptionsPage.showTab($('vpn-nav-tab'));
-      detailsPage.gsm = false;
       $('inet-service-name').textContent = networkName;
       $('inet-provider-type').textContent =
           onc.getTranslatedValue('VPN.Type');
       var providerType = onc.getActiveValue('VPN.Type');
       var providerKey = 'VPN.' + providerType;
       $('inet-username').textContent =
           onc.getActiveValue(providerKey + '.Username');
       var inetServerHostname = $('inet-server-hostname');
       inetServerHostname.value = onc.getActiveValue('VPN.Host');
       inetServerHostname.resetHandler = function() {
@@ skipping 42 matching lines @@
 
     // Don't show page name in address bar and in history to prevent people
     // navigate here by hand and solve issue with page session restore.
     PageManager.showPageByName('detailsInternetPage', false);
   };
 
   return {
     DetailsInternetPage: DetailsInternetPage
   };
 });