Merge pull request #32287 from mozilla-b2g/revert-31413-bug-1170236

Revert "Bug 1170236 - Get correct key management r=gasolin"
mozilla-b2g · Oct 7, 2015 · 0e82f06 · 0e82f06
2 parents 16ec102 + 7d32d64
commit 0e82f06
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 21 deletions.
diff --git a/apps/settings/js/modules/wifi_utils.js b/apps/settings/js/modules/wifi_utils.js
@@ -174,6 +174,7 @@ define(function(require) {
      * @param {Object} network
      */
     initializeAuthFields: function(panel, network) {
+      var key = WifiHelper.getKeyManagement(network);
       var ssid = panel.querySelector('input[name=ssid]');
       var identity = panel.querySelector('input[name=identity]');
       var password = panel.querySelector('input[name=password]');
@@ -196,14 +197,20 @@ define(function(require) {
       };
 
       var checkPassword = function() {
-        var key = WifiHelper.getKeyManagement(network);
+        var isSSIDInvalid = function() {
+          if (ssid) {
+            return (ssid.value.length === 0);
+          } else {
+            return false;
+          }
+        };
+
         submitButton.disabled =
           !WifiHelper.isValidInput(key, password.value, identity.value,
-            eap.value) || !WifiHelper.isSSIDValid(ssid.value);
+            eap.value) || isSSIDInvalid();
       };
 
       eap.onchange = function() {
-        var key = WifiHelper.getKeyManagement(network);
         checkPassword();
         WifiUtils.changeDisplay(panel, key);
       };

diff --git a/apps/settings/js/panels/wifi_join_hidden/panel.js b/apps/settings/js/panels/wifi_join_hidden/panel.js
@@ -65,8 +65,7 @@ define(function(require) {
 
         elements.panel.dataset.security = key;
         elements.submitButton.disabled =
-          !WifiHelper.isValidInput(key, password, identity, eap) ||
-          !WifiHelper.isSSIDValid(elements.ssid.value);
+          !WifiHelper.isValidInput(key, password, identity, eap);
 
         WifiHelper.setSecurity(network, [key]);
         WifiUtils.changeDisplay(elements.panel, key);

diff --git a/apps/sharedtest/test/unit/wifi_helper_test.js b/apps/sharedtest/test/unit/wifi_helper_test.js
@@ -156,18 +156,6 @@ suite('WifiHelper', function() {
     });
   });
 
-  suite('> isSSIDValid()', function() {
-    test('SSID is valid', function() {
-      assert.isTrue(WifiHelper.isSSIDValid('ssid'));
-    });
-
-    test('SSID is invalid', function() {
-      assert.isFalse(WifiHelper.isSSIDValid());
-      assert.isFalse(WifiHelper.isSSIDValid(''));
-      assert.isFalse(WifiHelper.isSSIDValid(null));
-    });
-  });
-
   suite('> getAvailableAndKnownNetworks()', function() {
     var originalMozWifiManager;
     var triggerCallback = function triggerCallback(which, successOrError) {

diff --git a/shared/js/wifi_helper.js b/shared/js/wifi_helper.js
@@ -150,10 +150,6 @@ var WifiHelper = {
     return true;
   },
 
-  isSSIDValid: function(ssid) {
-    return !!ssid && ssid.length > 0;
-  },
-
   isWpsAvailable: function(network) {
     var capabilities = this.getCapabilities(network);
     for (var i = 0; i < capabilities.length; i++) {