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

am f3373c99: No quotes for password

Browse Source 
Merge commit 'f3373c99493878f4689a9d4865323c18a2065c3b' into froyo-plus-aosp

* commit 'f3373c99493878f4689a9d4865323c18a2065c3b':
  No quotes for password
This commit is contained in:
Irfan Sheriff
2010-05-26 13:04:05 -07:00
committed by Android Git Automerger
parent 4811287623 f3373c9949
commit c1a587c9e9
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;