PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No quotes for password

Browse Source 
Putting quotes for password in soft AP is not useful.
It simplifies processing in framework.

Bug: 2708960
Change-Id: If44aeb336732aa8089d3e401b546ebf9b3cbd25a
This commit is contained in:
Irfan Sheriff
2010-05-24 14:57:45 -07:00
parent f9762a2c39
commit f3373c9949
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/wifi/WifiApDialog.java
View File

@@ -78,7 +78,7 @@ class WifiApDialog extends AlertDialog implements View.OnClickListener,
* This is not the case on the client side. We need to * This is not the case on the client side. We need to
* make things consistent and clean it up * make things consistent and clean it up
*/ */
config.SSID = mSsid.getText().toString().replaceAll("\"",""); config.SSID = mSsid.getText().toString();
switch (mSecurityType) { switch (mSecurityType) {
case AccessPoint.SECURITY_NONE: case AccessPoint.SECURITY_NONE:
@@ -90,11 +90,7 @@ class WifiApDialog extends AlertDialog implements View.OnClickListener,
config.allowedAuthAlgorithms.set(AuthAlgorithm.OPEN); config.allowedAuthAlgorithms.set(AuthAlgorithm.OPEN);
if (mPassword.length() != 0) { if (mPassword.length() != 0) {
String password = mPassword.getText().toString(); String password = mPassword.getText().toString();
if (password.matches("[0-9A-Fa-f]{64}")) { config.preSharedKey = password;
config.preSharedKey = password;
} else {
config.preSharedKey = '"' + password + '"';
}
} }
return config; return config;
} }
@@ -128,9 +124,6 @@ class WifiApDialog extends AlertDialog implements View.OnClickListener,
break; break;
case AccessPoint.SECURITY_PSK: case AccessPoint.SECURITY_PSK:
String str = mWifiConfig.preSharedKey; String str = mWifiConfig.preSharedKey;
if (!str.matches("[0-9A-Fa-f]{64}")) {
str = str.substring(1,str.length()-1);
}
mPassword.setText(str); mPassword.setText(str);
mSecurity.setSelection(WPA_INDEX); mSecurity.setSelection(WPA_INDEX);
break; break;