packages/apps/Settings
| Revision | f3373c99493878f4689a9d4865323c18a2065c3b (tree) |
|---|---|
| Time | 2010-05-27 04:53:24 |
| Author | Irfan Sheriff <isheriff@goog...> |
| Commiter | Irfan Sheriff |
No quotes for password
Putting quotes for password in soft AP is not useful.
It simplifies processing in framework.
Bug: 2708960
Change-Id: If44aeb336732aa8089d3e401b546ebf9b3cbd25a
src/com/android/settings/wifi/WifiApDialog.java (diff)| @@ -78,7 +78,7 @@ class WifiApDialog extends AlertDialog implements View.OnClickListener, | ||
| 78 | 78 | * This is not the case on the client side. We need to |
| 79 | 79 | * make things consistent and clean it up |
| 80 | 80 | */ |
| 81 | - config.SSID = mSsid.getText().toString().replaceAll("\"",""); | |
| 81 | + config.SSID = mSsid.getText().toString(); | |
| 82 | 82 | |
| 83 | 83 | switch (mSecurityType) { |
| 84 | 84 | case AccessPoint.SECURITY_NONE: |
| @@ -90,11 +90,7 @@ class WifiApDialog extends AlertDialog implements View.OnClickListener, | ||
| 90 | 90 | config.allowedAuthAlgorithms.set(AuthAlgorithm.OPEN); |
| 91 | 91 | if (mPassword.length() != 0) { |
| 92 | 92 | String password = mPassword.getText().toString(); |
| 93 | - if (password.matches("[0-9A-Fa-f]{64}")) { | |
| 94 | - config.preSharedKey = password; | |
| 95 | - } else { | |
| 96 | - config.preSharedKey = '"' + password + '"'; | |
| 97 | - } | |
| 93 | + config.preSharedKey = password; | |
| 98 | 94 | } |
| 99 | 95 | return config; |
| 100 | 96 | } |
| @@ -128,9 +124,6 @@ class WifiApDialog extends AlertDialog implements View.OnClickListener, | ||
| 128 | 124 | break; |
| 129 | 125 | case AccessPoint.SECURITY_PSK: |
| 130 | 126 | String str = mWifiConfig.preSharedKey; |
| 131 | - if (!str.matches("[0-9A-Fa-f]{64}")) { | |
| 132 | - str = str.substring(1,str.length()-1); | |
| 133 | - } | |
| 134 | 127 | mPassword.setText(str); |
| 135 | 128 | mSecurity.setSelection(WPA_INDEX); |
| 136 | 129 | break; |
Fork