diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-05-26 13:05:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-26 13:05:42 -0700 |
| commit | 9be3624f7718f83b9489c9a497557f2d9632a48c (patch) | |
| tree | 4141b1ffa9dc680b044b7e2323127ac90ac94e43 | |
| parent | d432bf76de6f7284187040de30ad6af2d6d765da (diff) | |
| parent | c1a587c9e980d9e341c0b966f1b4014d5c522078 (diff) | |
| download | packages_apps_Settings-9be3624f7718f83b9489c9a497557f2d9632a48c.zip packages_apps_Settings-9be3624f7718f83b9489c9a497557f2d9632a48c.tar.gz packages_apps_Settings-9be3624f7718f83b9489c9a497557f2d9632a48c.tar.bz2 | |
am c1a587c9: am f3373c99: No quotes for password
Merge commit 'c1a587c9e980d9e341c0b966f1b4014d5c522078' into kraken
* commit 'c1a587c9e980d9e341c0b966f1b4014d5c522078':
No quotes for password
| -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; |