Fix countries missing in onboarding after in-app reset (EXPOSUREAPP-4203) (#1849)

* Remove the extra flow that would cache the countries. The app config itself is cached already.
When accessing the countrylist they will be mapped from the latest available app config.

* Undo name shortening.

Co-authored-by: Ralf Gehrer <ralfgehrer@users.noreply.github.com>

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/storage/interoperability/InteroperabilityRepository.kt

 package de.rki.coronawarnapp.storage.interoperability
 
-import android.text.TextUtils
-import androidx.lifecycle.asLiveData
 import de.rki.coronawarnapp.appconfig.AppConfigProvider
 import de.rki.coronawarnapp.storage.LocalData
 import de.rki.coronawarnapp.ui.Country
-import de.rki.coronawarnapp.util.coroutine.AppScope
-import de.rki.coronawarnapp.util.coroutine.DefaultDispatcherProvider
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
 import timber.log.Timber
 import java.util.Locale
 import javax.inject.Inject
@@ -18,26 +12,13 @@ import javax.inject.Singleton
 
 @Singleton
 class InteroperabilityRepository @Inject constructor(
-    private val appConfigProvider: AppConfigProvider,
-    @AppScope private val appScope: CoroutineScope,
-    private val dispatcherProvider: DefaultDispatcherProvider
+    private val appConfigProvider: AppConfigProvider
 ) {
 
-    private val countryListFlowInternal = MutableStateFlow(listOf<Country>())
-    val countryListFlow: Flow<List<Country>> = countryListFlowInternal
-
-    @Deprecated("Use  countryListFlow")
-    val countryList = countryListFlow.asLiveData()
-
-    init {
-        getAllCountries()
-    }
-
-    fun getAllCountries() {
-        // TODO Make this reactive, the AppConfigProvider should refresh itself on network changes.
-        appScope.launch(context = dispatcherProvider.IO) {
+    val countryList = appConfigProvider.currentConfig
+        .map {
             try {
-                val countries = appConfigProvider.getAppConfig()
+                appConfigProvider.getAppConfig()
                     .supportedCountries
                     .mapNotNull { rawCode ->
                         val countryCode = rawCode.toLowerCase(Locale.ROOT)
@@ -46,17 +27,15 @@ class InteroperabilityRepository @Inject constructor(
                         if (mappedCountry == null) Timber.e("Unknown countrycode: %s", rawCode)
                         mappedCountry
                     }
-                countryListFlowInternal.value = countries
-                Timber.d("Country list: ${TextUtils.join(System.lineSeparator(), countries)}")
             } catch (e: Exception) {
-                Timber.e(e)
-                countryListFlowInternal.value = emptyList()
+                Timber.e(e, "Failed to map country list.")
+                emptyList()
             }
         }
-    }
+        .onEach { Timber.d("Country list: %s", it.joinToString(",")) }
 
-    fun clear() {
-        countryListFlowInternal.value = emptyList()
+    suspend fun refreshCountries() {
+        appConfigProvider.getAppConfig()
     }
 
     fun saveInteroperabilityUsed() {

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragment.kt

@@ -29,7 +29,7 @@ class InteroperabilityConfigurationFragment :
     private var isNetworkCallbackRegistered = false
     private val networkCallback = object : ConnectivityHelper.NetworkCallback() {
         override fun onNetworkAvailable() {
-            vm.getAllCountries()
+            vm.refreshCountries()
         }
 
         override fun onNetworkUnavailable() {

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragmentViewModel.kt

 package de.rki.coronawarnapp.ui.interoperability
 
+import androidx.lifecycle.asLiveData
 import com.squareup.inject.assisted.AssistedInject
 import de.rki.coronawarnapp.storage.interoperability.InteroperabilityRepository
+import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
 import de.rki.coronawarnapp.util.ui.SingleLiveEvent
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
 import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
 
 class InteroperabilityConfigurationFragmentViewModel @AssistedInject constructor(
-    private val interoperabilityRepository: InteroperabilityRepository
-) : CWAViewModel() {
+    private val interoperabilityRepository: InteroperabilityRepository,
+    dispatcherProvider: DispatcherProvider
+) : CWAViewModel(dispatcherProvider = dispatcherProvider) {
 
     val countryList = interoperabilityRepository.countryList
+        .asLiveData(context = dispatcherProvider.Default)
     val navigateBack = SingleLiveEvent<Boolean>()
 
     fun onBackPressed() {
@@ -21,8 +25,10 @@ class InteroperabilityConfigurationFragmentViewModel @AssistedInject constructor
         interoperabilityRepository.saveInteroperabilityUsed()
     }
 
-    fun getAllCountries() {
-        interoperabilityRepository.getAllCountries()
+    fun refreshCountries() {
+        launch {
+            interoperabilityRepository.refreshCountries()
+        }
     }
 
     @AssistedInject.Factory

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingDeltaInteroperabilityFragmentViewModel.kt

 package de.rki.coronawarnapp.ui.onboarding
 
+import androidx.lifecycle.asLiveData
 import com.squareup.inject.assisted.AssistedInject
 import de.rki.coronawarnapp.storage.interoperability.InteroperabilityRepository
+import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
 import de.rki.coronawarnapp.util.ui.SingleLiveEvent
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
 import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
 
 class OnboardingDeltaInteroperabilityFragmentViewModel @AssistedInject constructor(
-    private val interoperabilityRepository: InteroperabilityRepository
-) : CWAViewModel() {
+    private val interopRepo: InteroperabilityRepository,
+    dispatcherProvider: DispatcherProvider
+) : CWAViewModel(dispatcherProvider = dispatcherProvider) {
 
-    val countryList = interoperabilityRepository.countryList
+    val countryList = interopRepo.countryList.asLiveData(context = dispatcherProvider.Default)
     val navigateBack = SingleLiveEvent<Boolean>()
 
     fun onBackPressed() {
@@ -18,7 +21,7 @@ class OnboardingDeltaInteroperabilityFragmentViewModel @AssistedInject construct
     }
 
     fun saveInteroperabilityUsed() {
-        interoperabilityRepository.saveInteroperabilityUsed()
+        interopRepo.saveInteroperabilityUsed()
     }
 
     @AssistedInject.Factory

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/onboarding/OnboardingTracingFragmentViewModel.kt

 package de.rki.coronawarnapp.ui.onboarding
 
+import androidx.lifecycle.asLiveData
 import com.squareup.inject.assisted.AssistedInject
 import de.rki.coronawarnapp.exception.ExceptionCategory
 import de.rki.coronawarnapp.exception.reporting.report
@@ -7,14 +8,17 @@ import de.rki.coronawarnapp.nearby.InternalExposureNotificationClient
 import de.rki.coronawarnapp.storage.LocalData
 import de.rki.coronawarnapp.storage.interoperability.InteroperabilityRepository
 import de.rki.coronawarnapp.ui.SingleLiveEvent
+import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
 import de.rki.coronawarnapp.util.viewmodel.SimpleCWAViewModelFactory
 
 class OnboardingTracingFragmentViewModel @AssistedInject constructor(
-    private val interoperabilityRepository: InteroperabilityRepository
-) : CWAViewModel() {
+    private val interoperabilityRepository: InteroperabilityRepository,
+    dispatcherProvider: DispatcherProvider
+) : CWAViewModel(dispatcherProvider = dispatcherProvider) {
 
     val countryList = interoperabilityRepository.countryList
+        .asLiveData(context = dispatcherProvider.Default)
     val routeToScreen: SingleLiveEvent<OnboardingNavigationEvents> = SingleLiveEvent()
 
     fun saveInteroperabilityUsed() {

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/submission/warnothers/SubmissionResultPositiveOtherWarningViewModel.kt

@@ -16,10 +16,10 @@ import de.rki.coronawarnapp.task.TaskController
 import de.rki.coronawarnapp.task.common.DefaultTaskRequest
 import de.rki.coronawarnapp.ui.submission.viewmodel.SubmissionNavigationEvents
 import de.rki.coronawarnapp.util.coroutine.DispatcherProvider
+import de.rki.coronawarnapp.util.flow.combine
 import de.rki.coronawarnapp.util.ui.SingleLiveEvent
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModel
 import de.rki.coronawarnapp.util.viewmodel.CWAViewModelFactory
-import kotlinx.coroutines.flow.combineTransform
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
@@ -47,14 +47,14 @@ class SubmissionResultPositiveOtherWarningViewModel @AssistedInject constructor(
             }
         }
 
-    val uiState = combineTransform(
+    val uiState = combine(
         currentSubmission,
-        interoperabilityRepository.countryListFlow
+        interoperabilityRepository.countryList
     ) { state, countries ->
         WarnOthersState(
             submitTaskState = state,
             countryList = countries
-        ).also { emit(it) }
+        )
     }.asLiveData(context = dispatcherProvider.Default)
 
     val submissionError = SingleLiveEvent<Throwable>()

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/DataReset.kt

@@ -72,7 +72,6 @@ class DataReset @Inject constructor(
         SubmissionRepository.reset()
         keyCacheRepository.clear()
         appConfigProvider.clear()
-        interoperabilityRepository.clear()
         exposureDetectionTracker.clear()
         downloadDiagnosisKeysSettings.clear()
         riskLevelStorage.clear()

Corona-Warn-App/src/test/java/de/rki/coronawarnapp/ui/interoperability/InteroperabilityConfigurationFragmentViewModelTest.kt

 package de.rki.coronawarnapp.ui.interoperability
 
-import androidx.lifecycle.MutableLiveData
 import de.rki.coronawarnapp.storage.interoperability.InteroperabilityRepository
 import de.rki.coronawarnapp.ui.Country
 import io.kotest.matchers.shouldBe
 import io.mockk.MockKAnnotations
-import io.mockk.Runs
+import io.mockk.coVerify
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
-import io.mockk.just
 import io.mockk.verify
+import kotlinx.coroutines.flow.flowOf
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
+import testhelpers.TestDispatcherProvider
 import testhelpers.extensions.InstantExecutorExtension
 import testhelpers.extensions.getOrAwaitValue
 
@@ -25,28 +25,27 @@ class InteroperabilityConfigurationFragmentViewModelTest {
     fun setupFreshViewModel() {
         MockKAnnotations.init(this)
 
-        every { interoperabilityRepository.countryList } returns MutableLiveData(
-            Country.values().toList()
-        )
-        every { interoperabilityRepository.getAllCountries() } just Runs
+        every { interoperabilityRepository.countryList } returns flowOf(Country.values().toList())
     }
 
     private fun createViewModel() =
-        InteroperabilityConfigurationFragmentViewModel(interoperabilityRepository)
+        InteroperabilityConfigurationFragmentViewModel(interoperabilityRepository, TestDispatcherProvider)
 
     @Test
     fun `viewmodel returns interop repo countryList`() {
         val vm = createViewModel()
 
         vm.countryList.getOrAwaitValue() shouldBe Country.values().toList()
+
+        verify { interoperabilityRepository.countryList }
     }
 
     @Test
-    fun testFetchCountryList() {
+    fun `forced countrylist refresh via app config`() {
         val vm = createViewModel()
-        verify(exactly = 0) { interoperabilityRepository.getAllCountries() }
-        vm.getAllCountries()
-        verify(exactly = 1) { interoperabilityRepository.getAllCountries() }
+        coVerify(exactly = 0) { interoperabilityRepository.refreshCountries() }
+        vm.refreshCountries()
+        coVerify(exactly = 1) { interoperabilityRepository.refreshCountries() }
     }
 
     @Test