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

Commit 0401d1e2 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[SB][Wifi] Rename WifiRepositoryViaTrackerLib to WifiRepositoryImpl. 

Now that we only have one wifi repo implementation, we should just name
it WifiRepositoryImpl.

Note: This also merges the wifi table logs into a single table. Seems
like they were accidentally split before, where the
WifiTrackerLibTableLog only had the new repo values and WifiTableLog had
the old repo values but the new interactor and view model values.

Test: wifi icon still works
Test: atest WifiRepositoryImplTest
Flag: NONE (rename)
Fixes: 292533677
Change-Id: If888f060018bd0e32992a4ced3f37f87a453f640
parent 7a0c941d

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/FakeWifiRepository.kt

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package com.android.systemui.statusbar.pipeline.wifi.data.repository



import com.android.systemui.statusbar.pipeline.shared.data.model.DataActivityModel

import com.android.systemui.statusbar.pipeline.wifi.data.repository.prod.WifiRepositoryViaTrackerLib.Companion.ACTIVITY_DEFAULT

import com.android.systemui.statusbar.pipeline.wifi.data.repository.prod.WifiRepositoryImpl.Companion.ACTIVITY_DEFAULT

import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel

import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiScanEntry

import kotlinx.coroutines.flow.MutableStateFlow

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/WifiRepositorySwitcherTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import com.android.systemui.statusbar.connectivity.WifiPickerTrackerFactory 
import com.android.systemui.statusbar.pipeline.wifi.data.repository.demo.DemoModeWifiDataSource

import com.android.systemui.statusbar.pipeline.wifi.data.repository.demo.DemoWifiRepository

import com.android.systemui.statusbar.pipeline.wifi.data.repository.demo.model.FakeWifiEventModel

import com.android.systemui.statusbar.pipeline.wifi.data.repository.prod.WifiRepositoryViaTrackerLib

import com.android.systemui.statusbar.pipeline.wifi.data.repository.prod.WifiRepositoryImpl

import com.android.systemui.util.concurrency.FakeExecutor

import com.android.systemui.util.mockito.any

import com.android.systemui.util.mockito.kotlinArgumentCaptor
@@ -59,7 +59,7 @@ import org.mockito.MockitoAnnotations 
@RunWith(AndroidJUnit4::class)

class WifiRepositorySwitcherTest : SysuiTestCase() {

    private lateinit var underTest: WifiRepositorySwitcher

    private lateinit var realImpl: WifiRepositoryViaTrackerLib

    private lateinit var realImpl: WifiRepositoryImpl

    private lateinit var demoImpl: DemoWifiRepository



    @Mock private lateinit var demoModeController: DemoModeController
@@ -92,7 +92,7 @@ class WifiRepositorySwitcherTest : SysuiTestCase() { 
        whenever(wifiPickerTrackerFactory.create(any(), any(), any())).thenReturn(wifiPickerTracker)



        realImpl =

            WifiRepositoryViaTrackerLib(

            WifiRepositoryImpl(

                featureFlags,

                testScope.backgroundScope,

                mainExecutor,

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt

+6 −14
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ import com.android.systemui.statusbar.pipeline.wifi.data.repository.RealWifiRepo 
import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepository

import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepositorySwitcher

import com.android.systemui.statusbar.pipeline.wifi.data.repository.prod.DisabledWifiRepository

import com.android.systemui.statusbar.pipeline.wifi.data.repository.prod.WifiRepositoryViaTrackerLib

import com.android.systemui.statusbar.pipeline.wifi.data.repository.prod.WifiRepositoryImpl

import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractor

import com.android.systemui.statusbar.pipeline.wifi.domain.interactor.WifiInteractorImpl

import com.android.systemui.statusbar.policy.data.repository.UserSetupRepository
@@ -133,14 +133,14 @@ abstract class StatusBarPipelineModule { 
        fun provideRealWifiRepository(

            wifiManager: WifiManager?,

            disabledWifiRepository: DisabledWifiRepository,

            wifiRepositoryFromTrackerLibFactory: WifiRepositoryViaTrackerLib.Factory,

            wifiRepositoryImplFactory: WifiRepositoryImpl.Factory,

        ): RealWifiRepository {

            // If we have a null [WifiManager], then the wifi repository should be permanently

            // disabled.

            return if (wifiManager == null) {

                disabledWifiRepository

            } else {

                wifiRepositoryFromTrackerLibFactory.create(wifiManager)

                wifiRepositoryImplFactory.create(wifiManager)

            }

        }
@@ -157,10 +157,9 @@ abstract class StatusBarPipelineModule { 


        @Provides

        @SysUISingleton

        @WifiTrackerLibInputLog

        fun provideWifiTrackerLibInputLogBuffer(factory: LogBufferFactory): LogBuffer {

            // WifiTrackerLib is pretty noisy, so give it more room than WifiInputLog.

            return factory.create("WifiTrackerLibInputLog", 200)

        @WifiInputLog

        fun provideWifiLogBuffer(factory: LogBufferFactory): LogBuffer {

            return factory.create("WifiInputLog", 200)

        }



        @Provides
@@ -170,13 +169,6 @@ abstract class StatusBarPipelineModule { 
            return factory.create("WifiTableLog", 100)

        }



        @Provides

        @SysUISingleton

        @WifiTrackerLibTableLog

        fun provideWifiTrackerLibTableLogBuffer(factory: TableLogBufferFactory): TableLogBuffer {

            return factory.create("WifiTrackerLibTableLog", 100)

        }



        @Provides

        @SysUISingleton

        @AirplaneTableLog

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/WifiTrackerLibInputLog.kt→packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/WifiInputLog.kt

+5 −5
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ package com.android.systemui.statusbar.pipeline.dagger 


import javax.inject.Qualifier



/** Wifi logs for inputs into [WifiRepositoryViaTrackerLib]. */

@Qualifier

@MustBeDocumented

@kotlin.annotation.Retention(AnnotationRetention.RUNTIME)

annotation class WifiTrackerLibInputLog
 
/**

 * Wifi logs for inputs into

 * [com.android.systemui.statusbar.pipeline.wifi.data.repository.prod.WifiRepositoryImpl].

 */

@Qualifier @MustBeDocumented @Retention(AnnotationRetention.RUNTIME) annotation class WifiInputLog

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/WifiTrackerLibTableLog.kt

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.statusbar.pipeline.dagger



import javax.inject.Qualifier



/** Wifi logs from [WifiRepositoryViaTrackerLib] in table format. */

@Qualifier

@MustBeDocumented

@Retention(AnnotationRetention.RUNTIME)

annotation class WifiTrackerLibTableLog