From f3373c99493878f4689a9d4865323c18a2065c3b Mon Sep 17 00:00:00 2001 From: Irfan Sheriff Date: Mon, 24 May 2010 14:57:45 -0700 Subject: 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 | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src') 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; -- cgit v1.1