MD Settings: Internet: Clean up SIM info and dialog

chrome/browser/resources/settings/internet_page/network_siminfo.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.
 
 /**
- * @fileoverview Polymer element for displaying and modifying a list of cellular
- * access points.
+ * @fileoverview Polymer element for displaying and modifying cellular sim info.
  */
 (function() {
 
 /** @enum {string} */
 var ErrorType = {
   NONE: 'none',
   INCORRECT_PIN: 'incorrect-pin',
   INCORRECT_PUK: 'incorrect-puk',
   MISMATCHED_PIN: 'mismatched-pin',
   INVALID_PIN: 'invalid-pin',
   INVALID_PUK: 'invalid-puk'
 };
 
 var PIN_MIN_LENGTH = 4;
 var PUK_MIN_LENGTH = 8;
 
 Polymer({
   is: 'network-siminfo',
 
   properties: {
     /**
      * The network properties associated with the element.
      * @type {!CrOnc.NetworkProperties|undefined}
      */
     networkProperties: {
       type: Object,
-      observer: 'networkPropertiesChanged_'
+      observer: 'networkPropertiesChanged_',
     },
 
     /** Set to true when a PUK is required to unlock the SIM. */
     pukRequired: {
       type: Boolean,
       value: false,
-      observer: 'pukRequiredChanged_'
+      observer: 'pukRequiredChanged_',
     },
 
     /**
      * Set to an ErrorType value after an incorrect PIN or PUK entry.
      * @type {ErrorType}
      */
     error: {
       type: Object,
-      value: ErrorType.NONE
+      value: ErrorType.NONE,
     },
 
     /**
      * Interface for networkingPrivate calls, passed from internet_page.
      * @type {NetworkingPrivate}
      */
     networkingPrivate: {
       type: Object,
     },
   },
@@ skipping 71 matching lines @@
    */
   sendEnterPin_: function(event) {
     var guid = this.networkProperties && this.networkProperties.GUID;
     if (!guid)
       return;
 
     var pin = this.$.enterPin.value;
     if (!this.validatePin_(pin))
       return;
 
-    var simState = /** @type {!CrOnc.CellularSimState} */({
+    var simState = /** @type {!CrOnc.CellularSimState} */ ({
       currentPin: pin,
-      requirePin: this.sendSimLockEnabled_
+      requirePin: this.sendSimLockEnabled_,
     });
     this.networkingPrivate.setCellularSimState(guid, simState, function() {
       if (chrome.runtime.lastError) {
         this.error = ErrorType.INCORRECT_PIN;
       } else {
         this.error = ErrorType.NONE;
         this.$.enterPinDialog.close();
       }
     }.bind(this));
   },
@@ skipping 29 matching lines @@
    */
   sendChangePin_: function(event) {
     var guid = this.networkProperties && this.networkProperties.GUID;
     if (!guid)
       return;
 
     var newPin = this.$.changePinNew1.value;
     if (!this.validatePin_(newPin, this.$.changePinNew2.value))
       return;
 
-    var simState = /** @type {!CrOnc.CellularSimState} */({
+    var simState = /** @type {!CrOnc.CellularSimState} */ ({
       requirePin: true,
       currentPin: this.$.changePinOld.value,
       newPin: newPin
     });
     this.networkingPrivate.setCellularSimState(guid, simState, function() {
       if (chrome.runtime.lastError) {
         this.error = ErrorType.INCORRECT_PIN;
       } else {
         this.error = ErrorType.NONE;
         this.$.changePinDialog.close();
@@ skipping 81 matching lines @@
       return;
     var pin = this.$.unlockPin1.value;
     if (!this.validatePin_(pin, this.$.unlockPin2.value))
       return;
 
     this.networkingPrivate.unlockCellularSim(guid, pin, puk, function() {
       if (chrome.runtime.lastError) {
         this.error = ErrorType.INCORRECT_PUK;
       } else {
         this.error = ErrorType.NONE;
-        this.$.unlockSimDialog.close();
+        this.$.unlockPukDialog.close();
       }
     }.bind(this));
   },
 
   /**
    * @param {!CrOnc.NetworkProperties|undefined} networkProperties
-   * @return {boolean} True if the Cellular SIM is locked.
+   * @return {boolean}
    * @private
    */
-  isSimLocked_: function(networkProperties) {
-    return !!networkProperties && CrOnc.isSimLocked(networkProperties);
+  showSimLocked_: function(networkProperties) {
+    if (!networkProperties || !networkProperties.Cellular ||
+        !networkProperties.Cellular.SIMPresent) {
+      return false;
+    }
+    return CrOnc.isSimLocked(networkProperties);
   },
 
   /**
    * @param {!CrOnc.NetworkProperties|undefined} networkProperties
-   * @return {string} The message for the number of retries left.
+   * @return {boolean}
    * @private
    */
-  getRetriesLeftMsg_: function(networkProperties) {
-    var retriesLeft =
-        this.get('Cellular.SIMLockStatus.RetriesLeft', networkProperties) || 0;
-    // TODO(stevenjb): Localize
-    return 'Retries left: ' + retriesLeft.toString();
+  showSimUnlocked_: function(networkProperties) {
+    if (!networkProperties || !networkProperties.Cellular ||
+        !networkProperties.Cellular.SIMPresent) {
+      return false;
+    }
+    return !CrOnc.isSimLocked(networkProperties);
   },
 
   /**
-   * @param {string} error
-   * @return {boolean} True if an error message should be shown for |error|.
+   * @return {string} The error message to display for |error|.
    * @private
    */
-  showError_: function(error) {
-    return !!error && error != ErrorType.NONE;
+  getErrorMsg_: function(error, networkProperties) {

[dschuyler, 2016/07/28 22:12:16]

missing @param.
(may need to add file to compiled_resources.gyp).

[stevenjb, 2016/07/29 17:48:34]

I am going to remove networkProperties from all of these since it shadows a
declared property to be consistent with other internet code (as we discussed
offline).

+    if (error == ErrorType.NONE)
+      return '';
+    // TODO(stevenjb_: Translate
+    var msg;
+    if (error == ErrorType.INCORRECT_PIN)
+      msg = 'Incorrect PIN.';
+    else if (error == ErrorType.INCORRECT_PUK)
+      msg = 'Incorrect PUK.';
+    else if (error == ErrorType.MISMATCHED_PIN)
+      msg = 'PIN values do not match.';
+    else if (error == ErrorType.INVALID_PIN)
+      msg = 'Invalid PIN.';
+    else if (error == ErrorType.INVALID_PUK)
+      msg = 'Invalid PUK.';
+    else
+      return 'UNKNOWN ERROR';
+    var retriesLeft =
+        this.get('Cellular.SIMLockStatus.RetriesLeft', networkProperties) || 0;
+    msg += ' Retries left: ' + retriesLeft.toString();
+    return msg;
   },
 
   /**
-   * @param {string} error
-   * @return {string} The error message to display for |error|.
-   * @private
-   */
-  getErrorMsg_: function(error) {
-    // TODO(stevenjb_: Translate
-    if (error == ErrorType.INCORRECT_PIN)
-      return 'Incorrect PIN.';
-    if (error == ErrorType.INCORRECT_PUK)
-      return 'Incorrect PUK.';
-    if (error == ErrorType.MISMATCHED_PIN)
-      return 'PIN values do not match.';
-    if (error == ErrorType.INVALID_PIN)
-      return 'Invalid PIN.';
-    if (error == ErrorType.INVALID_PUK)
-      return 'Invalid PUK.';
-    return '';
-  },
-
-  /**
    * Checks whether |pin1| is of the proper length and if opt_pin2 is not
    * undefined, whether pin1 and opt_pin2 match. On any failure, sets
    * |this.error| and returns false.
    * @param {string} pin1
    * @param {string=} opt_pin2
    * @return {boolean} True if the pins match and are of minimum length.
    * @private
    */
   validatePin_: function(pin1, opt_pin2) {
     if (pin1.length < PIN_MIN_LENGTH) {
@@ skipping 16 matching lines @@
    */
   validatePuk_: function(puk) {
     if (puk.length < PUK_MIN_LENGTH) {
       this.error = ErrorType.INVALID_PUK;
       return false;
     }
     return true;
   }
 });
 })();