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

Commit 6c6e77ed authored by David Su's avatar David Su
Browse files

Rename removeDoubleQuotes to sanitizeSsid 

Bug: 145745815
Test: compiles
Change-Id: Ic2fbb78b30d2c64d584cd94a79b2ed7e5e234440
parent 150a7f0a

src/com/android/settings/wifi/NetworkRequestDialogActivity.java

+4 −4
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ public class NetworkRequestDialogActivity extends FragmentActivity implements 
                mMatchedConfig = WifiUtils.getWifiConfig(

                    null /* accesspoint */, scanResults.get(0), null /* password */);

                showSingleSsidRequestDialog(

                    WifiInfo.removeDoubleQuotes(mMatchedConfig.SSID), false /* isTryAgain */);

                        WifiInfo.sanitizeSsid(mMatchedConfig.SSID), false /* isTryAgain */);

            }

            return;

        }
@@ -207,8 +207,8 @@ public class NetworkRequestDialogActivity extends FragmentActivity implements 
    @Override

    public void onUserSelectionConnectSuccess(WifiConfiguration wificonfiguration) {

        if (!isFinishing()) {

            Toast.makeText(this, R.string.network_connection_connect_successful,

                Toast.LENGTH_SHORT).show();

            Toast.makeText(this, R.string.network_connection_connect_successful, Toast.LENGTH_SHORT)

                    .show();

            setResult(RESULT_OK);

            finish();

        }
@@ -218,7 +218,7 @@ public class NetworkRequestDialogActivity extends FragmentActivity implements 
    public void onUserSelectionConnectFailure(WifiConfiguration wificonfiguration) {

        if (mIsSpecifiedSsid) {

            showSingleSsidRequestDialog(

                WifiInfo.removeDoubleQuotes(mMatchedConfig.SSID), true /* isTryAgain */);

                    WifiInfo.sanitizeSsid(mMatchedConfig.SSID), true /* isTryAgain */);

            return;

        }

src/com/android/settings/wifi/WifiNoInternetDialog.java

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ public final class WifiNoInternetDialog extends AlertActivity implements 
        }

        mNetworkName = nc.getSSID();

        if (mNetworkName != null) {

            mNetworkName = WifiInfo.removeDoubleQuotes(mNetworkName);

            mNetworkName = WifiInfo.sanitizeSsid(mNetworkName);

        }



        createDialog();

src/com/android/settings/wifi/WifiSummaryUpdater.java

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ public final class WifiSummaryUpdater extends SummaryUpdater { 
        if (!mWifiTracker.connected) {

            return mContext.getString(R.string.disconnected);

        }

        String ssid = WifiInfo.removeDoubleQuotes(mWifiTracker.ssid);

        String ssid = WifiInfo.sanitizeSsid(mWifiTracker.ssid);

        if (TextUtils.isEmpty(mWifiTracker.statusLabel)) {

            return ssid;

        }

src/com/android/settings/wifi/slice/ContextualWifiSlice.java

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ public class ContextualWifiSlice extends WifiSlice { 
        if (mWifiManager.getWifiState() != WifiManager.WIFI_STATE_ENABLED) {

            return WifiManager.UNKNOWN_SSID;

        }

        return WifiInfo.removeDoubleQuotes(mWifiManager.getConnectionInfo().getSSID());

        return WifiInfo.sanitizeSsid(mWifiManager.getConnectionInfo().getSSID());

    }



    private boolean hasInternetAccess() {

src/com/android/settings/wifi/slice/WifiScanWorker.java

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ public class WifiScanWorker extends SliceBackgroundWorker<AccessPoint> implement 
    }



    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);

    }