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

Commit 98d06bd9 authored by Quang Luong's avatar Quang Luong
Browse files

Removed SSID from connected Passpoint network summary 

Special case for connected Passpoint network summary has been removed.
Text should now display "Connected" instead of "<SSID> by <ProviderName>

Bug: 118705403
Test: manual, build and visual check
Change-Id: I458ea3df35fc942b9f920213ef5310d00ffe1747
parent b39aaa49

packages/SettingsLib/res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -101,8 +101,6 @@ 
    <string name="connected_via_passpoint">Connected via %1$s</string>

    <!-- Status message of Wi-Fi when it is connected by a app (via suggestion or network request). [CHAR LIMIT=NONE] -->

    <string name="connected_via_app">Connected via <xliff:g id="name" example="Wifi App">%1$s</xliff:g></string>

    <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->

    <string name="ssid_by_passpoint_provider"><xliff:g id="ssid" example="Cafe Wifi">%1$s</xliff:g> by <xliff:g id="passpointProvider" example="Passpoint Provider">%2$s</xliff:g></string>

    <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->

    <string name="available_via_passpoint">Available via %1$s</string>

    <!-- Status message of OSU Provider network when not connected. [CHAR LIMIT=NONE] -->

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

+6 −23
Original line number Diff line number Diff line
@@ -899,8 +899,9 @@ public class AccessPoint implements Comparable<AccessPoint> { 
        } else if (isActive()) {

            if (isPasspoint()) {

                // This is the active connection on passpoint

                summary.append(getSummary(mContext, ssid, getDetailedState(),

                        false, null, mConfig.providerFriendlyName));

                summary.append(getSummary(mContext, /* ssid */ null, getDetailedState(),

                        /* isEphemeral */ false,

                        /* suggestionOrSpecifierPackageName */ null));

            } else if (mConfig != null && getDetailedState() == DetailedState.CONNECTED

                    && mIsCarrierAp) {

                // This is the active connection on a carrier AP
@@ -908,7 +909,7 @@ public class AccessPoint implements Comparable<AccessPoint> { 
                        mCarrierName));

            } else {

                // This is the active connection on non-passpoint network

                summary.append(getSummary(mContext, getDetailedState(),

                summary.append(getSummary(mContext, /* ssid */ null, getDetailedState(),

                        mInfo != null && mInfo.isEphemeral(),

                        mInfo != null ? mInfo.getNetworkSuggestionOrSpecifierPackageName() : null));

            }
@@ -1340,14 +1341,9 @@ public class AccessPoint implements Comparable<AccessPoint> { 
    }



    public static String getSummary(Context context, String ssid, DetailedState state,

            boolean isEphemeral, String suggestionOrSpecifierPackageName,

            String passpointProvider) {

            boolean isEphemeral, String suggestionOrSpecifierPackageName) {

        if (state == DetailedState.CONNECTED) {

            if (!TextUtils.isEmpty(passpointProvider)) {

                // Special case for connected + passpoint networks.

                String format = context.getString(R.string.ssid_by_passpoint_provider);

                return String.format(format, ssid, passpointProvider);

            } else if (isEphemeral && !TextUtils.isEmpty(suggestionOrSpecifierPackageName)) {

            if (isEphemeral && !TextUtils.isEmpty(suggestionOrSpecifierPackageName)) {

                CharSequence appLabel =

                        getAppLabel(suggestionOrSpecifierPackageName, context.getPackageManager());

                return context.getString(R.string.connected_via_app, appLabel);
@@ -1401,19 +1397,6 @@ public class AccessPoint implements Comparable<AccessPoint> { 
        return String.format(formats[index], ssid);

    }



    public static String getSummary(Context context, DetailedState state, boolean isEphemeral,

                                    String suggestionOrSpecifierPackageName) {

        return getSummary(context, null, state, isEphemeral, suggestionOrSpecifierPackageName,

                null);

    }



    public static String getSummary(Context context, DetailedState state, boolean isEphemeral,

                                    String suggestionOrSpecifierPackageName,

                                    String passpointProvider) {

        return getSummary(context, null, state, false, suggestionOrSpecifierPackageName,

                passpointProvider);

    }



    public static String convertToQuotedString(String string) {

        return "\"" + string + "\"";

    }