diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-05-26 13:04:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-26 13:04:05 -0700 |
| commit | c1a587c9e980d9e341c0b966f1b4014d5c522078 (patch) | |
| tree | 6b8efa4878549444db696c0437d46ef04c1c5fbb /src | |
| parent | 4811287623e6cbd9a3584828087ea414454dbfc5 (diff) | |
| parent | f3373c99493878f4689a9d4865323c18a2065c3b (diff) | |
| download | packages_apps_Settings-c1a587c9e980d9e341c0b966f1b4014d5c522078.zip packages_apps_Settings-c1a587c9e980d9e341c0b966f1b4014d5c522078.tar.gz packages_apps_Settings-c1a587c9e980d9e341c0b966f1b4014d5c522078.tar.bz2 | |
am f3373c99: No quotes for password
Merge commit 'f3373c99493878f4689a9d4865323c18a2065c3b' into froyo-plus-aosp
* commit 'f3373c99493878f4689a9d4865323c18a2065c3b':
No quotes for password
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/wifi/WifiApDialog.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/com/android/settings/wifi/WifiApDialog.java b/src/com/android/settings/wifi/WifiApDialog.java index b7ca4fc..43289d2 100644 --- a/src/com/android/settings/wifi/WifiApDialog.java +++ b/src/com/android/settings/wifi/WifiApDialog.java @@ -78,7 +78,7 @@ class WifiApDialog extends AlertDialog implements View.OnClickListener, * This is not the case on the client side. We need to * make things consistent and clean it up */ - config.SSID = mSsid.getText().toString().replaceAll("\"",""); + config.SSID = mSsid.getText().toString(); switch (mSecurityType) { case AccessPoint.SECURITY_NONE: @@ -90,11 +90,7 @@ class WifiApDialog extends AlertDialog implements View.OnClickListener, config.allowedAuthAlgorithms.set(AuthAlgorithm.OPEN); if (mPassword.length() != 0) { String password = mPassword.getText().toString(); - if (password.matches("[0-9A-Fa-f]{64}")) { - config.preSharedKey = password; - } else { - config.preSharedKey = '"' + password + '"'; - } + config.preSharedKey = password; } return config; } @@ -128,9 +124,6 @@ class WifiApDialog extends AlertDialog implements View.OnClickListener, break; case AccessPoint.SECURITY_PSK: String str = mWifiConfig.preSharedKey; - if (!str.matches("[0-9A-Fa-f]{64}")) { - str = str.substring(1,str.length()-1); - } mPassword.setText(str); mSecurity.setSelection(WPA_INDEX); break; |