MD Settings: Network: SIM unlock: Fix focus and cancel

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 cellular sim info.
  */
 (function() {
 
 /** @enum {string} */
@@ skipping 22 matching lines @@
       observer: 'networkPropertiesChanged_',
     },
 
     /**
      * Interface for networkingPrivate calls, passed from internet_page.
      * @type {NetworkingPrivate}
      */
     networkingPrivate: Object,
 
     /**
+     * Reflects networkProperties.Cellular.SIMLockStatus.LockEnabled for the
+     * toggle button.
+     * @private
+     */
+    lockEnabled_: {
+      type: Boolean,
+      value: false,
+    },
+
+    /**
      * Set to true when a PUK is required to unlock the SIM.
      * @private
      */
     pukRequired_: {
       type: Boolean,
       value: false,
       observer: 'pukRequiredChanged_',
     },
 
     /**
      * Set to an ErrorType value after an incorrect PIN or PUK entry.
      * @private {ErrorType}
      */
     error_: {
       type: Object,
       value: ErrorType.NONE,
     },
   },
 
   sendSimLockEnabled_: false,
 
   networkPropertiesChanged_: function() {

[dpapad, 2017/04/17 17:57:17]

@private missing here and at |pukRequiredChanged_| below.

[stevenjb, 2017/04/17 18:08:34]

Done.

     if (!this.networkProperties || !this.networkProperties.Cellular)
       return;
     var simLockStatus = this.networkProperties.Cellular.SIMLockStatus;
     this.pukRequired_ =
         !!simLockStatus && simLockStatus.LockType == CrOnc.LockType.PUK;
+    this.lockEnabled_ = simLockStatus.LockEnabled;
   },
 
   pukRequiredChanged_: function() {
     if (this.$.unlockPukDialog.open) {
       if (this.pukRequired_)
         this.$.unlockPuk.focus();
       else
         this.$.unlockPukDialog.close();
       return;
     }
@@ skipping 25 matching lines @@
   /**
    * Opens the pin dialog when the sim lock enabled state changes.
    * @param {Event} event
    * @private
    */
   onSimLockEnabledChange_: function(event) {
     if (!this.networkProperties || !this.networkProperties.Cellular)
       return;
     this.sendSimLockEnabled_ = event.target.checked;
     this.error_ = ErrorType.NONE;
+    this.$.enterPin.value = '';
     this.$.enterPinDialog.showModal();
-    this.$.enterPin.value = '';
+    this.$.enterPin.focus();

[dpapad, 2017/04/17 17:57:17]

Can we use the |autofocus| attribute instead? See example at
https://cs.chromium.org/chromium/src/chrome/browser/resources/settings/on_sta...

Same question for other focus() calls below.

[stevenjb, 2017/04/17 18:08:34]

Ah, yes, indeed we can. Done.

   },
 
   /**
    * Sends the PIN value from the Enter PIN dialog.
    * @param {Event} event
    * @private
    */
   sendEnterPin_: function(event) {
     var guid = (this.networkProperties && this.networkProperties.GUID) || '';
     var pin = this.$.enterPin.value;
-    if (!this.validatePin_(pin))
+    if (!this.validatePin_(pin)) {
+      this.onEnterPinDialogCancel_();
       return;
-
+    }
     var simState = /** @type {!CrOnc.CellularSimState} */ ({
       currentPin: pin,
       requirePin: this.sendSimLockEnabled_,
     });
     this.networkingPrivate.setCellularSimState(guid, simState, function() {
       if (chrome.runtime.lastError) {
         this.error_ = ErrorType.INCORRECT_PIN;
         this.$.enterPin.inputElement.select();
       } else {
         this.error_ = ErrorType.NONE;
         this.$.enterPinDialog.close();
       }
     }.bind(this));
   },
 
   /**
    * Opens the Change PIN dialog.
    * @param {!Event} event
    * @private
    */
   onChangePinTap_: function(event) {
     if (!this.networkProperties || !this.networkProperties.Cellular)
       return;
     event.preventDefault();
     this.error_ = ErrorType.NONE;
-    this.$.changePinDialog.showModal();
     this.$.changePinOld.value = '';
     this.$.changePinNew1.value = '';
     this.$.changePinNew2.value = '';
+    this.$.changePinDialog.showModal();
+    this.$.changePinOld.focus();
   },
 
   /**
    * Sends the old and new PIN values from the Change PIN dialog.
    * @param {Event} event
    * @private
    */
   sendChangePin_: function(event) {
     var guid = (this.networkProperties && this.networkProperties.GUID) || '';
     var newPin = this.$.changePinNew1.value;
@@ skipping 17 matching lines @@
   },
 
   /**
    * Opens the Unlock PIN dialog.
    * @param {!Event} event
    * @private
    */
   onUnlockPinTap_: function(event) {
     event.preventDefault();
     this.error_ = ErrorType.NONE;
+    this.$.unlockPin.value = '';
     this.$.unlockPinDialog.showModal();
-    this.$.unlockPin.value = '';
+    this.$.unlockPin.focus();
   },
 
   /**
    * Sends the PIN value from the Unlock PIN dialog.
    * @param {Event} event
    * @private
    */
   sendUnlockPin_: function(event) {
     var guid = (this.networkProperties && this.networkProperties.GUID) || '';
     var pin = this.$.unlockPin.value;
@@ skipping 11 matching lines @@
     }.bind(this));
   },
 
   /** @private */
   showUnlockPukDialog_: function() {
     this.error_ = ErrorType.NONE;
     this.$.unlockPuk.value = '';
     this.$.unlockPin1.value = '';
     this.$.unlockPin2.value = '';
     this.$.unlockPukDialog.showModal();
+    this.$.unlockPuk.focus();
   },
 
   /**
    * Sends the PUK value and new PIN value from the Unblock PUK dialog.
    * @param {Event} event
    * @private
    */
   sendUnlockPuk_: function(event) {
     var guid = (this.networkProperties && this.networkProperties.GUID) || '';
     var puk = this.$.unlockPuk.value;
@@ skipping 94 matching lines @@
    */
   validatePuk_: function(puk) {
     if (puk.length < PUK_MIN_LENGTH) {
       this.error_ = ErrorType.INVALID_PUK;
       return false;
     }
     return true;
   },
 
   /** @private */
-  onEnterPinDialogClosed_: function() {
+  onEnterPinDialogCancel_: function() {
+    this.lockEnabled_ =
+        this.networkProperties.Cellular.SIMLockStatus.LockEnabled;
+  },
+
+  /** @private */
+  onEnterPinDialogClose_: function() {
     this.$$('#simLockButton').focus();
   },
 
   /** @private */
   onChangePinDialogClose_: function() {
     this.$$('#changePinButton').focus();
   },
 
   /** @private */
   onUnlockPinDialogClose_: function() {
     this.$$('#unlockPinButton').focus();
   },
 });
 })();