Bug 1133665 - [Flame][Wifi] The SSID that has set to be binded with MAC address is not hightlighted when user taps it. r=hchang

--HG--
extra : histedit_source : 945b7a99bee197fc1b8e813659fa142f8ced0de3
This commit is contained in:
Vincent Chang 2015-03-25 17:45:59 +08:00
parent 20a12fcc38
commit a5ac295af9

View File

@ -850,6 +850,16 @@ var WifiManager = (function() {
if (eventData.indexOf("CTRL-EVENT-EAP") === 0) {
return handleWpaEapEvents(event);
}
if (eventData.indexOf("CTRL-EVENT-ASSOC-REJECT") === 0) {
debug("CTRL-EVENT-ASSOC-REJECT: network error");
notify("passwordmaybeincorrect");
if (manager.authenticationFailuresCount > MAX_RETRIES_ON_AUTHENTICATION_FAILURE) {
manager.authenticationFailuresCount = 0;
debug("CTRL-EVENT-ASSOC-REJECT: disconnect network");
notify("disconnected", {connectionInfo: manager.connectionInfo});
}
return true;
}
if (eventData.indexOf("WPS-TIMEOUT") === 0) {
notifyStateChange({ state: "WPS_TIMEOUT", BSSID: null, id: -1 });
return true;
@ -2162,7 +2172,10 @@ function WifiWorker() {
ssid: quote(WifiManager.connectionInfo.ssid),
mode: MODE_ESS,
frequency: 0};
self._fireEvent("onconnecting", { network: netToDOM(self.currentNetwork) });
WifiManager.getNetworkConfiguration(self.currentNetwork, function (){
// Notify again because we get complete network information.
self._fireEvent("onconnecting", { network: netToDOM(self.currentNetwork) });
});
break;
case "ASSOCIATED":
// set to full power mode when ready to do 4 way handsharke.