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

Merge "Rename removeDoubleQuotes to sanitizeSsid"

Browse Source
This commit is contained in:
David Su
2020-01-30 18:16:57 +00:00
committed by Android (Google) Code Review
parent 5676b6fe36 6c6e77ed32
commit eb21975e89
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/wifi/NetworkRequestDialogActivity.java
View File

@@ -196,7 +196,7 @@ public class NetworkRequestDialogActivity extends FragmentActivity implements
mMatchedConfig = WifiUtils.getWifiConfig( mMatchedConfig = WifiUtils.getWifiConfig(
null /* accesspoint */, scanResults.get(0), null /* password */); null /* accesspoint */, scanResults.get(0), null /* password */);
showSingleSsidRequestDialog( showSingleSsidRequestDialog(
WifiInfo.removeDoubleQuotes(mMatchedConfig.SSID), false /* isTryAgain */); WifiInfo.sanitizeSsid(mMatchedConfig.SSID), false /* isTryAgain */);
} }
return; return;
} }
@@ -207,8 +207,8 @@ public class NetworkRequestDialogActivity extends FragmentActivity implements
@Override @Override
public void onUserSelectionConnectSuccess(WifiConfiguration wificonfiguration) { public void onUserSelectionConnectSuccess(WifiConfiguration wificonfiguration) {
if (!isFinishing()) { if (!isFinishing()) {
Toast.makeText(this, R.string.network_connection_connect_successful, Toast.makeText(this, R.string.network_connection_connect_successful, Toast.LENGTH_SHORT)
Toast.LENGTH_SHORT).show(); .show();
setResult(RESULT_OK); setResult(RESULT_OK);
finish(); finish();
} }
@@ -218,7 +218,7 @@ public class NetworkRequestDialogActivity extends FragmentActivity implements
public void onUserSelectionConnectFailure(WifiConfiguration wificonfiguration) { public void onUserSelectionConnectFailure(WifiConfiguration wificonfiguration) {
if (mIsSpecifiedSsid) { if (mIsSpecifiedSsid) {
showSingleSsidRequestDialog( showSingleSsidRequestDialog(
WifiInfo.removeDoubleQuotes(mMatchedConfig.SSID), true /* isTryAgain */); WifiInfo.sanitizeSsid(mMatchedConfig.SSID), true /* isTryAgain */);
return; return;
} }

2
src/com/android/settings/wifi/WifiNoInternetDialog.java
View File

@@ -119,7 +119,7 @@ public final class WifiNoInternetDialog extends AlertActivity implements
} }
mNetworkName = nc.getSSID(); mNetworkName = nc.getSSID();
if (mNetworkName != null) { if (mNetworkName != null) {
mNetworkName = WifiInfo.removeDoubleQuotes(mNetworkName); mNetworkName = WifiInfo.sanitizeSsid(mNetworkName);
} }
createDialog(); createDialog();

2
src/com/android/settings/wifi/WifiSummaryUpdater.java
View File

@@ -90,7 +90,7 @@ public final class WifiSummaryUpdater extends SummaryUpdater {
if (!mWifiTracker.connected) { if (!mWifiTracker.connected) {
return mContext.getString(R.string.disconnected); return mContext.getString(R.string.disconnected);
} }
String ssid = WifiInfo.removeDoubleQuotes(mWifiTracker.ssid); String ssid = WifiInfo.sanitizeSsid(mWifiTracker.ssid);
if (TextUtils.isEmpty(mWifiTracker.statusLabel)) { if (TextUtils.isEmpty(mWifiTracker.statusLabel)) {
return ssid; return ssid;
} }

2
src/com/android/settings/wifi/slice/ContextualWifiSlice.java
View File

@@ -148,7 +148,7 @@ public class ContextualWifiSlice extends WifiSlice {
if (mWifiManager.getWifiState() != WifiManager.WIFI_STATE_ENABLED) { if (mWifiManager.getWifiState() != WifiManager.WIFI_STATE_ENABLED) {
return WifiManager.UNKNOWN_SSID; return WifiManager.UNKNOWN_SSID;
} }
return WifiInfo.removeDoubleQuotes(mWifiManager.getConnectionInfo().getSSID()); return WifiInfo.sanitizeSsid(mWifiManager.getConnectionInfo().getSSID());
} }
private boolean hasInternetAccess() { private boolean hasInternetAccess() {

2
src/com/android/settings/wifi/slice/WifiScanWorker.java
View File

@@ -158,7 +158,7 @@ public class WifiScanWorker extends SliceBackgroundWorker<AccessPoint> implement
} }
static boolean isWifiClicked(WifiInfo info) { static boolean isWifiClicked(WifiInfo info) {
final String ssid = WifiInfo.removeDoubleQuotes(info.getSSID()); final String ssid = WifiInfo.sanitizeSsid(info.getSSID());
return !TextUtils.isEmpty(ssid) && TextUtils.equals(ssid, sClickedWifiSsid); return !TextUtils.isEmpty(ssid) && TextUtils.equals(ssid, sClickedWifiSsid);
} }