Ignore CRLF strings in display SSIDs to avoid display errors

- Keep user-entered SSIDs in Wi-Fi Configuration

- Ignore CRLF strings in display SSIDs only

Bug: 224545390
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest

Change-Id: Ifc081f9c5c02b2d70412f296688b88e44e893add
This commit is contained in:
Weng Su
2022-07-05 03:16:08 +08:00
parent 2f79c879cc
commit 08adf4c2ed
2 changed files with 38 additions and 1 deletions

View File

@@ -455,6 +455,36 @@ public class AddAppNetworksFragmentTest {
AddAppNetworksFragment.MESSAGE_SHOW_SAVE_FAILED)).isTrue();
}
@Test
public void uiConfigurationItem_putCrToDisplayedSsid_shouldRemoveCr() {
String testSsid = "\r" + FAKE_NEW_WPA_SSID + "\r";
AddAppNetworksFragment.UiConfigurationItem item =
new AddAppNetworksFragment.UiConfigurationItem(testSsid, null, 0, 0);
assertThat(item.mDisplayedSsid).isEqualTo(FAKE_NEW_WPA_SSID);
}
@Test
public void uiConfigurationItem_putLfToDisplayedSsid_shouldRemoveLf() {
String testSsid = "\n" + FAKE_NEW_WPA_SSID + "\n";
AddAppNetworksFragment.UiConfigurationItem item =
new AddAppNetworksFragment.UiConfigurationItem(testSsid, null, 0, 0);
assertThat(item.mDisplayedSsid).isEqualTo(FAKE_NEW_WPA_SSID);
}
@Test
public void uiConfigurationItem_putCrLfToDisplayedSsid_shouldRemoveCrLf() {
String testSsid = "\r\n" + FAKE_NEW_WPA_SSID + "\r\n";
AddAppNetworksFragment.UiConfigurationItem item =
new AddAppNetworksFragment.UiConfigurationItem(testSsid, null, 0, 0);
assertThat(item.mDisplayedSsid).isEqualTo(FAKE_NEW_WPA_SSID);
}
private void setUpOneScannedNetworkWithScanedLevel4() {
final ArrayList list = new ArrayList<>();
list.add(mWifiEntry);