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

am 75a43c60: am cd8f068e: Merge "Fix crash for tether with quotes in SSID" into froyo

Browse Source 
Merge commit '75a43c605449e72074fc55576c8e712ff12906db' into kraken

* commit '75a43c605449e72074fc55576c8e712ff12906db':
  Fix crash for tether with quotes in SSID
This commit is contained in:
Irfan Sheriff
2010-05-17 14:05:00 -07:00
committed by Android Git Automerger
parent 2f3f3bda46 75a43c6054
commit d3c3052751
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/wifi/WifiApDialog.java
View File

@@ -72,7 +72,13 @@ class WifiApDialog extends AlertDialog implements View.OnClickListener,
WifiConfiguration config = new WifiConfiguration(); WifiConfiguration config = new WifiConfiguration();
config.SSID = AccessPoint.convertToQuotedString(mSsid.getText().toString()); /**
* TODO: SSID in WifiConfiguration for soft ap
* is being stored as a raw string without quotes.
* 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("\"","");
switch (mSecurityType) { switch (mSecurityType) {
case AccessPoint.SECURITY_NONE: case AccessPoint.SECURITY_NONE:
@@ -115,7 +121,7 @@ class WifiApDialog extends AlertDialog implements View.OnClickListener,
context.getString(R.string.wifi_cancel), mListener); context.getString(R.string.wifi_cancel), mListener);
if (mWifiConfig != null) { if (mWifiConfig != null) {
mSsid.setText(AccessPoint.removeDoubleQuotes(mWifiConfig.SSID)); mSsid.setText(mWifiConfig.SSID);
switch (mSecurityType) { switch (mSecurityType) {
case AccessPoint.SECURITY_NONE: case AccessPoint.SECURITY_NONE:
mSecurity.setSelection(OPEN_INDEX); mSecurity.setSelection(OPEN_INDEX);

3
src/com/android/settings/wifi/WifiApEnabler.java
View File

@@ -153,8 +153,7 @@ public class WifiApEnabler implements Preference.OnPreferenceChangeListener {
com.android.internal.R.string.wifi_tether_configure_ssid_default); com.android.internal.R.string.wifi_tether_configure_ssid_default);
mCheckBox.setSummary(String.format( mCheckBox.setSummary(String.format(
mContext.getString(R.string.wifi_tether_enabled_subtext), mContext.getString(R.string.wifi_tether_enabled_subtext),
(wifiConfig == null) ? s : AccessPoint.removeDoubleQuotes( (wifiConfig == null) ? s : wifiConfig.SSID));
wifiConfig.SSID)));
} }
private void updateTetherState(Object[] available, Object[] tethered, Object[] errored) { private void updateTetherState(Object[] available, Object[] tethered, Object[] errored) {

4
src/com/android/settings/wifi/WifiApSettings.java
View File

@@ -81,7 +81,7 @@ public class WifiApSettings extends PreferenceActivity
s, mSecurityType[OPEN_INDEX])); s, mSecurityType[OPEN_INDEX]));
} else { } else {
mCreateNetwork.setSummary(String.format(getString(CONFIG_SUBTEXT), mCreateNetwork.setSummary(String.format(getString(CONFIG_SUBTEXT),
AccessPoint.removeDoubleQuotes(mWifiConfig.SSID), mWifiConfig.SSID,
mWifiConfig.allowedKeyManagement.get(KeyMgmt.WPA_PSK) ? mWifiConfig.allowedKeyManagement.get(KeyMgmt.WPA_PSK) ?
mSecurityType[WPA_INDEX] : mSecurityType[OPEN_INDEX])); mSecurityType[WPA_INDEX] : mSecurityType[OPEN_INDEX]));
} }
@@ -123,7 +123,7 @@ public class WifiApSettings extends PreferenceActivity
if(mWifiConfig != null) { if(mWifiConfig != null) {
mWifiManager.setWifiApEnabled(mWifiConfig, true); mWifiManager.setWifiApEnabled(mWifiConfig, true);
mCreateNetwork.setSummary(String.format(getString(CONFIG_SUBTEXT), mCreateNetwork.setSummary(String.format(getString(CONFIG_SUBTEXT),
AccessPoint.removeDoubleQuotes(mWifiConfig.SSID), mWifiConfig.SSID,
mWifiConfig.allowedKeyManagement.get(KeyMgmt.WPA_PSK) ? mWifiConfig.allowedKeyManagement.get(KeyMgmt.WPA_PSK) ?
mSecurityType[WPA_INDEX] : mSecurityType[OPEN_INDEX])); mSecurityType[WPA_INDEX] : mSecurityType[OPEN_INDEX]));
/** /**