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

Commit ae8b2ea9 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[SB][Wifi] Remove unused networkId from WifiNetworkModel classes. 

The network ID is no longer used anywhere now that we've moved to
WifiTrackerLib, so this CL removes it from WifiNetworkModel.Active and
WifiNetworkModel.CarrierMerged.

Bug: 292534484
Flag: EXEMPT refactor
Test: atest WifiRepositoryImplTest WifiInteractorImplTest
Test: smoke test of the wifi icon and Internet tile
Change-Id: I0261a9883d5baec2c5e797b42f9bb36e91ff2b92
parent f33f1b91

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/internet/domain/interactor/InternetTileDataInteractorTest.kt

+0 −3
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ class InternetTileDataInteractorTest : SysuiTestCase() { 


            val networkModel =

                WifiNetworkModel.Active(

                    networkId = 1,

                    level = 4,

                    ssid = "test ssid",

                )
@@ -221,7 +220,6 @@ class InternetTileDataInteractorTest : SysuiTestCase() { 


            val networkModel =

                WifiNetworkModel.Active(

                    networkId = 1,

                    level = 4,

                    ssid = "test ssid",

                    hotspotDeviceType = WifiNetworkModel.HotspotDeviceType.NONE,
@@ -546,7 +544,6 @@ class InternetTileDataInteractorTest : SysuiTestCase() { 
    private fun setWifiNetworkWithHotspot(hotspot: WifiNetworkModel.HotspotDeviceType) {

        val networkModel =

            WifiNetworkModel.Active(

                networkId = 1,

                level = 4,

                ssid = "test ssid",

                hotspotDeviceType = hotspot,

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/wifi/domain/interactor/WifiInteractorImplTest.kt

+1 −6
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ class WifiInteractorImplTest : SysuiTestCase() { 
    fun ssid_carrierMergedNetwork_outputsNull() =

        testScope.runTest {

            wifiRepository.setWifiNetwork(

                WifiNetworkModel.CarrierMerged(networkId = 1, subscriptionId = 2, level = 1)

                WifiNetworkModel.CarrierMerged(subscriptionId = 2, level = 1)

            )



            var latest: String? = "default"
@@ -110,7 +110,6 @@ class WifiInteractorImplTest : SysuiTestCase() { 
        testScope.runTest {

            wifiRepository.setWifiNetwork(

                WifiNetworkModel.Active(

                    networkId = 1,

                    level = 1,

                    ssid = WifiManager.UNKNOWN_SSID,

                )
@@ -130,7 +129,6 @@ class WifiInteractorImplTest : SysuiTestCase() { 
        testScope.runTest {

            wifiRepository.setWifiNetwork(

                WifiNetworkModel.Active(

                    networkId = 1,

                    level = 1,

                    ssid = "MyAwesomeWifiNetwork",

                )
@@ -192,7 +190,6 @@ class WifiInteractorImplTest : SysuiTestCase() { 
        testScope.runTest {

            val wifiNetwork =

                WifiNetworkModel.Active(

                    networkId = 45,

                    isValidated = true,

                    level = 3,

                    ssid = "AB",
@@ -303,7 +300,6 @@ class WifiInteractorImplTest : SysuiTestCase() { 
            wifiRepository.setWifiNetwork(

                WifiNetworkModel.Active(

                    ssid = "ssid 2",

                    networkId = 1,

                    level = 2,

                )

            )
@@ -324,7 +320,6 @@ class WifiInteractorImplTest : SysuiTestCase() { 
            wifiRepository.setWifiNetwork(

                WifiNetworkModel.Active(

                    ssid = "ssid 2",

                    networkId = 1,

                    level = 2,

                )

            )

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/wifi/ui/viewmodel/WifiViewModelTest.kt

+4 −13
Original line number Diff line number Diff line
@@ -113,9 +113,7 @@ class WifiViewModelTest : SysuiTestCase() { 
            val latestKeyguard by collectLastValue(keyguard.wifiIcon)

            val latestQs by collectLastValue(qs.wifiIcon)



            wifiRepository.setWifiNetwork(

                WifiNetworkModel.Active(NETWORK_ID, isValidated = true, level = 1)

            )

            wifiRepository.setWifiNetwork(WifiNetworkModel.Active(isValidated = true, level = 1))



            assertThat(latestHome).isInstanceOf(WifiIcon.Visible::class.java)

            assertThat(latestHome).isEqualTo(latestKeyguard)
@@ -130,7 +128,6 @@ class WifiViewModelTest : SysuiTestCase() { 
            // Even WHEN the network has a valid hotspot type

            wifiRepository.setWifiNetwork(

                WifiNetworkModel.Active(

                    NETWORK_ID,

                    isValidated = true,

                    level = 1,

                    hotspotDeviceType = WifiNetworkModel.HotspotDeviceType.LAPTOP,
@@ -192,9 +189,7 @@ class WifiViewModelTest : SysuiTestCase() { 
            whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)

            createAndSetViewModel()



            wifiRepository.setWifiNetwork(

                WifiNetworkModel.Active(NETWORK_ID, ssid = null, level = 1)

            )

            wifiRepository.setWifiNetwork(WifiNetworkModel.Active(ssid = null, level = 1))



            val activityIn by collectLastValue(underTest.isActivityInViewVisible)

            val activityOut by collectLastValue(underTest.isActivityOutViewVisible)
@@ -217,9 +212,7 @@ class WifiViewModelTest : SysuiTestCase() { 
            whenever(connectivityConstants.shouldShowActivityConfig).thenReturn(true)

            createAndSetViewModel()



            wifiRepository.setWifiNetwork(

                WifiNetworkModel.Active(NETWORK_ID, ssid = null, level = 1)

            )

            wifiRepository.setWifiNetwork(WifiNetworkModel.Active(ssid = null, level = 1))



            val activityIn by collectLastValue(underTest.isActivityInViewVisible)

            val activityOut by collectLastValue(underTest.isActivityOutViewVisible)
@@ -468,8 +461,6 @@ class WifiViewModelTest : SysuiTestCase() { 
    }



    companion object {

        private const val NETWORK_ID = 2

        private val ACTIVE_VALID_WIFI_NETWORK =

            WifiNetworkModel.Active(NETWORK_ID, ssid = "AB", level = 1)

        private val ACTIVE_VALID_WIFI_NETWORK = WifiNetworkModel.Active(ssid = "AB", level = 1)

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/demo/DemoWifiRepository.kt

+0 −3
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ constructor( 


    private fun FakeWifiEventModel.Wifi.toWifiNetworkModel(): WifiNetworkModel =

        WifiNetworkModel.Active(

            networkId = DEMO_NET_ID,

            isValidated = validated ?: true,

            level = level ?: 0,

            ssid = ssid ?: DEMO_NET_SSID,
@@ -110,14 +109,12 @@ constructor( 


    private fun FakeWifiEventModel.CarrierMerged.toCarrierMergedModel(): WifiNetworkModel =

        WifiNetworkModel.CarrierMerged(

            networkId = DEMO_NET_ID,

            subscriptionId = subscriptionId,

            level = level,

            numberOfLevels = numberOfLevels,

        )



    companion object {

        private const val DEMO_NET_ID = 1234

        private const val DEMO_NET_SSID = "Demo SSID"

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt

+0 −16
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ constructor( 
            WifiNetworkModel.Invalid(CARRIER_MERGED_INVALID_SUB_ID_REASON)

        } else {

            WifiNetworkModel.CarrierMerged(

                networkId = NETWORK_ID,

                subscriptionId = this.subscriptionId,

                level = this.level,

                // WifiManager APIs to calculate the signal level start from 0, so
@@ -295,7 +294,6 @@ constructor( 
            }



        return WifiNetworkModel.Active(

            networkId = NETWORK_ID,

            isValidated = this.hasInternetAccess(),

            level = currentLevel,

            ssid = this.title,
@@ -442,19 +440,5 @@ constructor( 
        val ACTIVITY_DEFAULT = DataActivityModel(hasActivityIn = false, hasActivityOut = false)



        private const val TAG = "WifiTrackerLibInputLog"



        /**

         * [WifiNetworkModel.Active.networkId] is only used at the repository layer. It's used by

         * [WifiRepositoryImpl], which tracks the ID in order to correctly apply the framework

         * callbacks within the repository.

         *

         * Since this class does not need to manually apply framework callbacks and since the

         * network ID is not used beyond the repository, it's safe to use an invalid ID in this

         * repository.

         *

         * The [WifiNetworkModel.Active.networkId] field should be deleted once we've fully migrated

         * to [WifiRepositoryImpl].

         */

        private const val NETWORK_ID = -1

    }

}