Autojoin new unsecured networks without dialog

Unsaved, open wifi networks will connect on single click
without opening the connect dialog box

Change-Id: I71da155aa8b711309f0ed7eca4bd22a254db28c5
This commit is contained in:
Isaac Levy
2011-08-22 21:09:12 -07:00
parent 78545348fd
commit 22d441acdb
2 changed files with 27 additions and 6 deletions

View File

@@ -353,11 +353,9 @@ public class WifiSettings extends SettingsPreferenceFragment
mWifiManager.connectNetwork(mSelectedAccessPoint.networkId);
}
} else if (mSelectedAccessPoint.security == AccessPoint.SECURITY_NONE) {
// Shortcut for open networks.
WifiConfiguration config = new WifiConfiguration();
config.SSID = AccessPoint.convertToQuotedString(mSelectedAccessPoint.ssid);
config.allowedKeyManagement.set(KeyMgmt.NONE);
mWifiManager.connectNetwork(config);
/** Bypass dialog for unsecured networks */
mSelectedAccessPoint.generateOpenNetworkConfig();
mWifiManager.connectNetwork(mSelectedAccessPoint.getConfig());
} else {
showConfigUi(mSelectedAccessPoint, true);
}
@@ -379,7 +377,14 @@ public class WifiSettings extends SettingsPreferenceFragment
public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
if (preference instanceof AccessPoint) {
mSelectedAccessPoint = (AccessPoint) preference;
showConfigUi(mSelectedAccessPoint, false);
/** Bypass dialog for unsecured, unsaved networks */
if (mSelectedAccessPoint.security == AccessPoint.SECURITY_NONE &&
mSelectedAccessPoint.networkId == INVALID_NETWORK_ID) {
mSelectedAccessPoint.generateOpenNetworkConfig();
mWifiManager.connectNetwork(mSelectedAccessPoint.getConfig());
} else {
showConfigUi(mSelectedAccessPoint, false);
}
} else {
return super.onPreferenceTreeClick(screen, preference);
}
@@ -623,6 +628,7 @@ public class WifiSettings extends SettingsPreferenceFragment
}
void forceScan() {
removeMessages(0);
sendEmptyMessage(0);
}