Refactor SimStatusDialogRepository

- Move data logic into repository for better testing - Check carrier config first, if not shows some items, we don't need to load data - Tests in SimStatusDialogControllerTest will be fixed in later cls Bug: 337417520 Test: manual - on SIM status Test: unit test Change-Id: Ia0c32882f0b35ec9154b3da58ac6a7b98c879efc
2024-05-27 18:24:52 +08:00
parent 659e512b1c
commit 3b925a0cfe
5 changed files with 113 additions and 64 deletions
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -227,7 +227,6 @@ public class SimStatusDialogController implements DefaultLifecycleObserver {
        updateNetworkType();
        updateRoamingStatus(serviceState);
        updateIccidNumber();
-        updateImsRegistrationState();
    }

    /**
@@ -257,7 +256,7 @@ public class SimStatusDialogController implements DefaultLifecycleObserver {
                .registerTelephonyCallback(mContext.getMainExecutor(), mTelephonyCallback);
        mSubscriptionManager.addOnSubscriptionsChangedListener(
                mContext.getMainExecutor(), mOnSubscriptionsChangedListener);
-        collectImsRegistered(owner);
+        collectSimStatusDialogInfo(owner);

        if (mShowLatestAreaInfo) {
            updateAreaInfoText();
@@ -581,39 +580,20 @@ public class SimStatusDialogController implements DefaultLifecycleObserver {
        }
    }

-    private boolean isImsRegistrationStateShowUp() {
-        if (mSubscriptionInfo == null) {
-            return false;
-        }
-        final int subscriptionId = mSubscriptionInfo.getSubscriptionId();
-        final PersistableBundle carrierConfig =
-                mCarrierConfigManager.getConfigForSubId(subscriptionId);
-        return carrierConfig == null ? false :
-                carrierConfig.getBoolean(
-                        CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL);
+    private void updateImsRegistrationState(@Nullable Boolean imsRegistered) {
+        boolean isVisible = imsRegistered != null;
+        mDialog.setSettingVisibility(IMS_REGISTRATION_STATE_LABEL_ID, isVisible);
+        mDialog.setSettingVisibility(IMS_REGISTRATION_STATE_VALUE_ID, isVisible);
+        int stringId = Boolean.TRUE.equals(imsRegistered)
+                ? com.android.settingslib.R.string.ims_reg_status_registered
+                : com.android.settingslib.R.string.ims_reg_status_not_registered;
+        mDialog.setText(IMS_REGISTRATION_STATE_VALUE_ID, mRes.getString(stringId));
    }

-    private void updateImsRegistrationState() {
-        if (isImsRegistrationStateShowUp()) {
-            return;
-        }
-        mDialog.removeSettingFromScreen(IMS_REGISTRATION_STATE_LABEL_ID);
-        mDialog.removeSettingFromScreen(IMS_REGISTRATION_STATE_VALUE_ID);
-    }
-
-    private void collectImsRegistered(@NonNull LifecycleOwner owner) {
-        if (!isImsRegistrationStateShowUp()) {
-            return;
-        }
-        new ImsRegistrationStateController(mContext).collectImsRegistered(
-                owner, mSlotIndex, (Boolean imsRegistered) -> {
-                    if (imsRegistered) {
-                        mDialog.setText(IMS_REGISTRATION_STATE_VALUE_ID, mRes.getString(
-                                com.android.settingslib.R.string.ims_reg_status_registered));
-                    } else {
-                        mDialog.setText(IMS_REGISTRATION_STATE_VALUE_ID, mRes.getString(
-                                com.android.settingslib.R.string.ims_reg_status_not_registered));
-                    }
+    private void collectSimStatusDialogInfo(@NonNull LifecycleOwner owner) {
+        new SimStatusDialogRepository(mContext).collectSimStatusDialogInfo(
+                owner, mSlotIndex, (simStatusDialogInfo) -> {
+                    updateImsRegistrationState(simStatusDialogInfo.getImsRegistered());
                    return Unit.INSTANCE;
                }
        );
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogFragment.java
@@ -91,6 +91,13 @@ public class SimStatusDialogFragment extends InstrumentedDialogFragment {
        super.onDestroy();
    }

+    public void setSettingVisibility(int viewId, boolean isVisible) {
+        final View view = mRootView.findViewById(viewId);
+        if (view != null) {
+            view.setVisibility(isVisible ? View.VISIBLE : View.GONE);
+        }
+    }
+
    public void removeSettingFromScreen(int viewId) {
        final View view = mRootView.findViewById(viewId);
        if (view != null) {
--- a/src/com/android/settings/deviceinfo/simstatus/ImsRegistrationStateController.kt
+++ b/src/com/android/settings/deviceinfo/simstatus/ImsRegistrationStateController.kt
@@ -17,6 +17,7 @@
 package com.android.settings.deviceinfo.simstatus

 import android.content.Context
+import android.telephony.CarrierConfigManager
 import android.telephony.SubscriptionManager
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
@@ -25,44 +26,82 @@ import androidx.lifecycle.repeatOnLifecycle
 import com.android.settings.network.telephony.SimSlotRepository
 import com.android.settings.network.telephony.ims.ImsMmTelRepository
 import com.android.settings.network.telephony.ims.ImsMmTelRepositoryImpl
+import com.android.settings.network.telephony.safeGetConfig
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.conflate
 import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.launch

@OptIn(ExperimentalCoroutinesApi::class)
-class ImsRegistrationStateController @JvmOverloads constructor(
+class SimStatusDialogRepository @JvmOverloads constructor(
    private val context: Context,
    private val simSlotRepository: SimSlotRepository = SimSlotRepository(context),
    private val imsMmTelRepositoryFactory: (subId: Int) -> ImsMmTelRepository = { subId ->
        ImsMmTelRepositoryImpl(context, subId)
    },
 ) {
-    fun collectImsRegistered(
+    private val carrierConfigManager = context.getSystemService(CarrierConfigManager::class.java)!!
+
+    data class SimStatusDialogInfo(
+        val imsRegistered: Boolean? = null,
+    )
+
+    private data class SimStatusDialogVisibility(
+        val imsRegisteredShowUp: Boolean,
+    )
+
+    fun collectSimStatusDialogInfo(
        lifecycleOwner: LifecycleOwner,
        simSlotIndex: Int,
-        action: (imsRegistered: Boolean) -> Unit,
+        action: (info: SimStatusDialogInfo) -> Unit,
    ) {
        lifecycleOwner.lifecycleScope.launch {
            lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
-                imsRegisteredFlow(simSlotIndex).collect(action)
+                simStatusDialogInfoBySlotFlow(simSlotIndex).collect(action)
            }
        }
    }

-    private fun imsRegisteredFlow(simSlotIndex: Int): Flow<Boolean> =
+    private fun simStatusDialogInfoBySlotFlow(simSlotIndex: Int): Flow<SimStatusDialogInfo> =
        simSlotRepository.subIdInSimSlotFlow(simSlotIndex)
            .flatMapLatest { subId ->
                if (SubscriptionManager.isValidSubscriptionId(subId)) {
-                    imsMmTelRepositoryFactory(subId).imsRegisteredFlow()
+                    simStatusDialogInfoFlow(subId)
                } else {
-                    flowOf(false)
+                    flowOf(SimStatusDialogInfo())
                }
            }
            .conflate()
            .flowOn(Dispatchers.Default)
+
+    private fun simStatusDialogInfoFlow(subId: Int): Flow<SimStatusDialogInfo> =
+        showUpFlow(subId).flatMapLatest { visibility ->
+            combine(
+                if (visibility.imsRegisteredShowUp) {
+                    imsMmTelRepositoryFactory(subId).imsRegisteredFlow()
+                } else flowOf(null),
+            ) { (imsRegistered) ->
+                SimStatusDialogInfo(imsRegistered = imsRegistered)
+            }
+        }
+
+    private fun showUpFlow(subId: Int) = flow {
+        val config = carrierConfigManager.safeGetConfig(
+            keys = listOf(CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL),
+            subId = subId,
+        )
+        emit(
+            SimStatusDialogVisibility(
+                imsRegisteredShowUp = config.getBoolean(
+                    CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL
+                ),
+            )
+        )
+    }
 }
--- a/tests/spa_unit/src/com/android/settings/deviceinfo/simstatus/ImsRegistrationStateControllerTest.kt
+++ b/tests/spa_unit/src/com/android/settings/deviceinfo/simstatus/ImsRegistrationStateControllerTest.kt
@@ -17,9 +17,12 @@
 package com.android.settings.deviceinfo.simstatus

 import android.content.Context
+import android.os.PersistableBundle
+import android.telephony.CarrierConfigManager
 import androidx.lifecycle.testing.TestLifecycleOwner
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.settings.deviceinfo.simstatus.SimStatusDialogRepository.SimStatusDialogInfo
 import com.android.settings.network.telephony.SimSlotRepository
 import com.android.settings.network.telephony.ims.ImsMmTelRepository
 import com.google.common.truth.Truth.assertThat
@@ -30,11 +33,27 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
+import org.mockito.kotlin.spy

@RunWith(AndroidJUnit4::class)
-class ImsRegistrationStateControllerTest {
+class SimStatusDialogRepositoryTest {

-    private val context: Context = ApplicationProvider.getApplicationContext()
+    private val carrierConfig = PersistableBundle().apply {
+        putBoolean(CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL, true)
+    }
+
+    private val mockCarrierConfigManager = mock<CarrierConfigManager> {
+        on {
+            getConfigForSubId(
+                SUB_ID,
+                CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL,
+            )
+        } doReturn carrierConfig
+    }
+
+    private val context: Context = spy(ApplicationProvider.getApplicationContext()) {
+        on { getSystemService(CarrierConfigManager::class.java) } doReturn mockCarrierConfigManager
+    }

    private val mockSimSlotRepository = mock<SimSlotRepository> {
        on { subIdInSimSlotFlow(SIM_SLOT_INDEX) } doReturn flowOf(SUB_ID)
@@ -44,7 +63,7 @@ class ImsRegistrationStateControllerTest {
        on { imsRegisteredFlow() } doReturn flowOf(true)
    }

-    private val controller = ImsRegistrationStateController(
+    private val controller = SimStatusDialogRepository(
        context = context,
        simSlotRepository = mockSimSlotRepository,
        imsMmTelRepositoryFactory = { subId ->
@@ -54,15 +73,28 @@ class ImsRegistrationStateControllerTest {
    )

    @Test
-    fun collectImsRegistered() = runBlocking {
-        var imsRegistered = false
+    fun collectSimStatusDialogInfo() = runBlocking {
+        var simStatusDialogInfo = SimStatusDialogInfo()

-        controller.collectImsRegistered(TestLifecycleOwner(), SIM_SLOT_INDEX) {
-            imsRegistered = it
+        controller.collectSimStatusDialogInfo(TestLifecycleOwner(), SIM_SLOT_INDEX) {
+            simStatusDialogInfo = it
        }
        delay(100)

-        assertThat(imsRegistered).isTrue()
+        assertThat(simStatusDialogInfo).isEqualTo(SimStatusDialogInfo(imsRegistered = true))
+    }
+
+    @Test
+    fun collectSimStatusDialogInfo_doNotShowImsRegistration() = runBlocking {
+        carrierConfig.putBoolean(CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL, false)
+        var simStatusDialogInfo = SimStatusDialogInfo()
+
+        controller.collectSimStatusDialogInfo(TestLifecycleOwner(), SIM_SLOT_INDEX) {
+            simStatusDialogInfo = it
+        }
+        delay(100)
+
+        assertThat(simStatusDialogInfo.imsRegistered).isNull()
    }

    private companion object {
--- a/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
+++ b/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
@@ -36,7 +36,6 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -394,8 +393,6 @@ public class SimStatusDialogControllerTest {
    @Test
    @Ignore
    public void initialize_imsRegistered_shouldSetImsRegistrationStateSummaryToRegisterd() {
-        mPersistableBundle.putBoolean(
-                CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL, true);
        when(mTelephonyManager.isImsRegistered(anyInt())).thenReturn(true);

        mController.initialize();
@@ -407,8 +404,6 @@ public class SimStatusDialogControllerTest {
    @Test
    @Ignore
    public void initialize_imsNotRegistered_shouldSetImsRegistrationStateSummaryToNotRegisterd() {
-        mPersistableBundle.putBoolean(
-                CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL, true);
        when(mTelephonyManager.isImsRegistered(anyInt())).thenReturn(false);

        mController.initialize();
@@ -418,24 +413,20 @@ public class SimStatusDialogControllerTest {
    }

    @Test
-    public void initialize_showImsRegistration_shouldNotRemoveImsRegistrationStateSetting() {
-        mPersistableBundle.putBoolean(
-                CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL, true);
-
+    @Ignore("b/337417520")
+    public void initialize_showImsRegistration_shouldShowImsRegistrationStateSetting() {
        mController.initialize();

-        verify(mDialog, never()).removeSettingFromScreen(IMS_REGISTRATION_STATE_VALUE_ID);
+        verify(mDialog).setSettingVisibility(IMS_REGISTRATION_STATE_VALUE_ID, true);
    }

    @Test
-    public void initialize_doNotShowImsRegistration_shouldRemoveImsRegistrationStateSetting() {
-        mPersistableBundle.putBoolean(
-                CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL, false);
-
+    @Ignore("b/337417520")
+    public void initialize_doNotShowImsRegistration_shouldHideImsRegistrationStateSetting() {
        mController.initialize();

-        verify(mDialog).removeSettingFromScreen(IMS_REGISTRATION_STATE_LABEL_ID);
-        verify(mDialog).removeSettingFromScreen(IMS_REGISTRATION_STATE_VALUE_ID);
+        verify(mDialog).setSettingVisibility(IMS_REGISTRATION_STATE_LABEL_ID, false);
+        verify(mDialog).setSettingVisibility(IMS_REGISTRATION_STATE_VALUE_ID, false);
    }

    @Test