From 24ef5cab746b8e030cbf850b4a4662d84e16e688 Mon Sep 17 00:00:00 2001 From: Norbel AMBANUMBEN Date: Mon, 18 Nov 2024 15:18:03 +0100 Subject: [PATCH] chore: update dependencies --- .../ooni/probe/data/models/InstalledTestDescriptorModel.kt | 6 +++--- .../src/commonMain/kotlin/org/ooni/probe/di/Dependencies.kt | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/composeApp/src/commonMain/kotlin/org/ooni/probe/data/models/InstalledTestDescriptorModel.kt b/composeApp/src/commonMain/kotlin/org/ooni/probe/data/models/InstalledTestDescriptorModel.kt index f6532c036..8ff87e750 100644 --- a/composeApp/src/commonMain/kotlin/org/ooni/probe/data/models/InstalledTestDescriptorModel.kt +++ b/composeApp/src/commonMain/kotlin/org/ooni/probe/data/models/InstalledTestDescriptorModel.kt @@ -61,7 +61,7 @@ data class InstalledTestDescriptorModel( val isDefaultTestDescriptor get() = id.value in 10470..10474 // TODO(aanorbel): switch to OONI reserved namespace val key get() = if (isDefaultTestDescriptor) { - when(id.value) { + when (id.value) { 10470L -> "websites" 10471L -> "instant_messaging" 10472L -> "circumvention" @@ -100,7 +100,7 @@ fun InstalledTestDescriptorModel.toDescriptor(updateStatus: UpdateStatus = Updat icon = icon?.let(InstalledDescriptorIcons::getIconFromValue), color = color?.hexToColor(), animation = icon?.let { determineAnimation(it) } ?: animation?.let(Animation::fromFileName), - dataUsage = { if (isDefaultTestDescriptor) stringResource(getDataUsage()) else null }, + dataUsage = { if (isDefaultTestDescriptor) stringResource(getDataUsage()) else null }, expirationDate = expirationDate, netTests = netTests.orEmpty(), source = Descriptor.Source.Installed(this), @@ -108,7 +108,7 @@ fun InstalledTestDescriptorModel.toDescriptor(updateStatus: UpdateStatus = Updat ) fun InstalledTestDescriptorModel.getDataUsage(): StringResource { - return when(this.key) { + return when (this.key) { "websites" -> Res.string.websites_datausage "instant_messaging" -> Res.string.small_datausage "circumvention" -> Res.string.small_datausage diff --git a/composeApp/src/commonMain/kotlin/org/ooni/probe/di/Dependencies.kt b/composeApp/src/commonMain/kotlin/org/ooni/probe/di/Dependencies.kt index 80d1e277d..2c103d20f 100644 --- a/composeApp/src/commonMain/kotlin/org/ooni/probe/di/Dependencies.kt +++ b/composeApp/src/commonMain/kotlin/org/ooni/probe/di/Dependencies.kt @@ -57,7 +57,6 @@ import org.ooni.probe.domain.FinishInProgressData import org.ooni.probe.domain.GetAutoRunSettings import org.ooni.probe.domain.GetAutoRunSpecification import org.ooni.probe.domain.GetBootstrapTestDescriptors -import org.ooni.probe.domain.GetDefaultTestDescriptors import org.ooni.probe.domain.GetEnginePreferences import org.ooni.probe.domain.GetFirstRun import org.ooni.probe.domain.GetProxySettings @@ -248,7 +247,6 @@ class Dependencies( private val getBootstrapTestDescriptors by lazy { GetBootstrapTestDescriptors(readAssetFile, json, backgroundContext) } - private val getDefaultTestDescriptors by lazy { GetDefaultTestDescriptors() } private val getProxySettings by lazy { GetProxySettings(preferenceRepository) } private val getEnginePreferences by lazy { GetEnginePreferences( @@ -291,7 +289,7 @@ class Dependencies( @VisibleForTesting val getTestDescriptors by lazy { GetTestDescriptors( - getDefaultTestDescriptors = getDefaultTestDescriptors::invoke, + getDefaultTestDescriptors = { emptyList() }, listInstalledTestDescriptors = testDescriptorRepository::list, descriptorUpdates = getDescriptorUpdate::observeAvailableUpdatesState, )