Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 042c6377 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Wi-Fi] Enhance summary string for a open/enhanced open Wi-Fi access point"

parents b43fe24a a27e3433

packages/SettingsLib/res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ 
    <string name="wifi_security_short_sae" translatable="false">WPA3</string>

    <!-- Do not translate.  Concise terminology for wifi with WPA2/WPA3 transition security -->

    <string name="wifi_security_short_psk_sae" translatable="false">WPA2/WPA3</string>

    <!-- Do not translate.  Concise terminology for Wi-Fi with None/OWE transition mode security -->

    <string name="wifi_security_short_none_owe" translatable="false">None/OWE</string>

    <!-- Do not translate.  Concise terminology for wifi with OWE security -->

    <string name="wifi_security_short_owe" translatable="false">OWE</string>

    <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP Suite-B-192 security -->
@@ -70,6 +72,8 @@ 
    <string name="wifi_security_sae" translatable="false">WPA3-Personal</string>

    <!-- Do not translate.  Terminology for wifi with WPA2/WPA3 Transition mode security -->

    <string name="wifi_security_psk_sae" translatable="false">WPA2/WPA3-Personal</string>

    <!-- Do not translate.  Terminology for Wi-Fi with None/OWE transition mode security -->

    <string name="wifi_security_none_owe" translatable="false">None/Enhanced Open</string>

    <!-- Do not translate.  Terminology for wifi with OWE security -->

    <string name="wifi_security_owe" translatable="false">Enhanced Open</string>

    <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP Suite-B-192 security -->

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

+4 −0
Original line number Diff line number Diff line
@@ -1004,6 +1004,10 @@ public class AccessPoint implements Comparable<AccessPoint> { 
            return concise ? context.getString(R.string.wifi_security_short_psk_sae) :

                    context.getString(R.string.wifi_security_psk_sae);

        }

        if (mIsOweTransitionMode) {

            return concise ? context.getString(R.string.wifi_security_short_none_owe) :

                    context.getString(R.string.wifi_security_none_owe);

        }



        switch(security) {

            case SECURITY_EAP:

packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java

+21 −0
Original line number Diff line number Diff line
@@ -1683,6 +1683,18 @@ public class AccessPointTest { 
        assertThat(pskSaeTransitionModeAp.matches(saeScanResult)).isFalse();

    }



    @Test

    public void testGetSecurityString_oweTransitionMode_shouldReturnCorrectly() {

        when(mMockContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mMockWifiManager);

        when(mMockWifiManager.isEnhancedOpenSupported()).thenReturn(true);

        AccessPoint oweTransitionModeAp = getOweTransitionModeAp();



        assertThat(oweTransitionModeAp.getSecurityString(true /* concise */))

                .isEqualTo(mContext.getString(R.string.wifi_security_short_none_owe));

        assertThat(oweTransitionModeAp.getSecurityString(false /* concise */))

                .isEqualTo(mContext.getString(R.string.wifi_security_none_owe));

    }



    private AccessPoint getPskSaeTransitionModeAp() {

        ScanResult scanResult = createScanResult(AccessPoint.removeDoubleQuotes(TEST_SSID),

                TEST_BSSID, DEFAULT_RSSI);
@@ -1692,4 +1704,13 @@ public class AccessPointTest { 
                .setScanResults(new ArrayList<ScanResult>(Arrays.asList(scanResult)))

                .build();

    }



    private AccessPoint getOweTransitionModeAp() {

        ScanResult scanResult = createScanResult(AccessPoint.removeDoubleQuotes(TEST_SSID),

                TEST_BSSID, DEFAULT_RSSI);

        scanResult.capabilities = "[OWE_TRANSITION]";

        return new TestAccessPointBuilder(mContext)

                .setScanResults(new ArrayList<ScanResult>(Arrays.asList(scanResult)))

                .build();

    }

}