GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2024-10-30 15:07:29 +04:00
parent 3723229539
commit c6e06b1eb9
61 changed files with 132 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle.kts
View file

@ -81,7 +81,7 @@ dependencies {
implementation(projects.core.analytics)
implementation(projects.core.analytics.models)
implementation(projects.core.navigation)
implementation(projects.core.toggles)
implementation(projects.core.configToggles)
implementation(projects.core.res)
implementation(projects.core.ui)
implementation(projects.core.datasource)

4
app/src/main/java/com/tangem/tap/ApplicationEntryPoint.kt
View file

@ -5,10 +5,10 @@ import com.tangem.blockchainsdk.BlockchainSDKFactory
import com.tangem.blockchainsdk.signer.TransactionSignerFactory
import com.tangem.common.routing.AppRouter
import com.tangem.core.analytics.filter.OneTimeEventFilter
import com.tangem.core.configtoggle.blockchain.ExcludedBlockchainsManager
import com.tangem.core.configtoggle.feature.FeatureTogglesManager
import com.tangem.core.navigation.share.ShareManager
import com.tangem.core.navigation.url.UrlOpener
import com.tangem.core.toggle.blockchain.ExcludedBlockchainsManager
import com.tangem.core.toggle.feature.FeatureTogglesManager
import com.tangem.datasource.connection.NetworkConnectionManager
import com.tangem.datasource.local.config.environment.EnvironmentConfigStorage
import com.tangem.datasource.local.config.issuers.IssuersConfigStorage

4
app/src/main/java/com/tangem/tap/TangemApplication.kt
View file

@ -17,8 +17,8 @@ import com.tangem.core.analytics.models.AnalyticsEvent
import com.tangem.core.analytics.models.AnalyticsParam
import com.tangem.core.analytics.models.Basic
import com.tangem.core.analytics.models.Basic.TransactionSent.WalletForm
import com.tangem.core.toggle.blockchain.ExcludedBlockchainsManager
import com.tangem.core.toggle.feature.FeatureTogglesManager
import com.tangem.core.configtoggle.blockchain.ExcludedBlockchainsManager
import com.tangem.core.configtoggle.feature.FeatureTogglesManager
import com.tangem.datasource.api.common.MoshiConverter
import com.tangem.datasource.api.common.createNetworkLoggingInterceptor
import com.tangem.datasource.connection.NetworkConnectionManager

2
app/src/main/java/com/tangem/tap/di/domain/CardLegacyDomainModule.kt
View file

@ -1,6 +1,6 @@
package com.tangem.tap.di.domain
import com.tangem.core.toggle.feature.FeatureTogglesManager
import com.tangem.core.configtoggle.feature.FeatureTogglesManager
import com.tangem.domain.card.ScanCardProcessor
import com.tangem.domain.wallets.legacy.UserWalletsListManager
import com.tangem.domain.wallets.usecase.GenerateWalletNameUseCase

2
app/src/main/java/com/tangem/tap/domain/scanCard/CardScanningFeatureToggles.kt
View file

@ -1,6 +1,6 @@
package com.tangem.tap.domain.scanCard
import com.tangem.core.toggle.feature.FeatureTogglesManager
import com.tangem.core.configtoggle.feature.FeatureTogglesManager
/**
* Add custom token feature toggles

2
app/src/main/java/com/tangem/tap/domain/walletconnect2/di/WalletConnectInteractorModule.kt
View file

@ -3,7 +3,7 @@ package com.tangem.tap.domain.walletconnect2.di
import android.app.Application
import com.squareup.moshi.Moshi
import com.tangem.core.analytics.api.AnalyticsEventHandler
import com.tangem.core.toggle.feature.FeatureTogglesManager
import com.tangem.core.configtoggle.feature.FeatureTogglesManager
import com.tangem.datasource.di.SdkMoshi
import com.tangem.datasource.files.FileReader
import com.tangem.domain.tokens.repository.CurrenciesRepository

2
app/src/main/java/com/tangem/tap/domain/walletconnect2/toggles/WalletConnectFeatureToggles.kt
View file

@ -1,6 +1,6 @@
package com.tangem.tap.domain.walletconnect2.toggles
import com.tangem.core.toggle.feature.FeatureTogglesManager
import com.tangem.core.configtoggle.feature.FeatureTogglesManager
internal class WalletConnectFeatureToggles(
private val featureTogglesManager: FeatureTogglesManager,

2
app/src/main/java/com/tangem/tap/features/home/featuretoggles/HomeFeatureToggles.kt
View file

@ -1,6 +1,6 @@
package com.tangem.tap.features.home.featuretoggles
import com.tangem.core.toggle.feature.FeatureTogglesManager
import com.tangem.core.configtoggle.feature.FeatureTogglesManager
import javax.inject.Inject
class HomeFeatureToggles @Inject constructor(

0
core/toggles/.gitignore → core/config-toggles/.gitignore vendored
View file

2
core/toggles/build.gradle.kts → core/config-toggles/build.gradle.kts
View file

@ -7,7 +7,7 @@ plugins {
}
android {
namespace = "com.tangem.core.toggles"
namespace = "com.tangem.core.configtoggle"
}
dependencies {

0
core/toggles/src/main/assets/configs/excluded_blockchains_config.json → core/config-toggles/src/main/assets/configs/excluded_blockchains_config.json
View file

2
core/toggles/src/main/kotlin/com/tangem/core/toggle/blockchain/ExcludedBlockchainsManager.kt → core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/blockchain/ExcludedBlockchainsManager.kt
View file

@ -1,4 +1,4 @@
package com.tangem.core.toggle.blockchain
package com.tangem.core.configtoggle.blockchain
interface ExcludedBlockchainsManager {

2
core/toggles/src/main/kotlin/com/tangem/core/toggle/blockchain/MutableExcludedBlockchainsManager.kt → core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/blockchain/MutableExcludedBlockchainsManager.kt
View file

@ -1,4 +1,4 @@
package com.tangem.core.toggle.blockchain
package com.tangem.core.configtoggle.blockchain
interface MutableExcludedBlockchainsManager : ExcludedBlockchainsManager {

19
core/toggles/src/main/kotlin/com/tangem/core/toggle/blockchain/impl/DefaultExcludedBlockchainsManager.kt → core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/blockchain/impl/DefaultExcludedBlockchainsManager.kt
View file

@ -1,13 +1,13 @@
package com.tangem.core.toggle.blockchain.impl
package com.tangem.core.configtoggle.blockchain.impl
import com.tangem.core.toggle.blockchain.MutableExcludedBlockchainsManager
import com.tangem.core.toggle.storage.TogglesStorage
import com.tangem.core.toggle.utils.associateToggles
import com.tangem.core.toggle.version.VersionProvider
import com.tangem.core.configtoggle.blockchain.MutableExcludedBlockchainsManager
import com.tangem.core.configtoggle.storage.TogglesStorage
import com.tangem.core.configtoggle.utils.associateToggles
import com.tangem.core.configtoggle.version.VersionProvider
import com.tangem.datasource.local.preferences.AppPreferencesStore
import com.tangem.datasource.local.preferences.PreferencesKeys
import com.tangem.datasource.local.preferences.utils.getObjectSetSync
import com.tangem.datasource.local.preferences.utils.storeObjectSet
import com.tangem.datasource.local.preferences.utils.getSyncOrDefault
import com.tangem.datasource.local.preferences.utils.store
internal class DefaultExcludedBlockchainsManager(
private val localTogglesStorage: TogglesStorage,
@ -30,8 +30,9 @@ internal class DefaultExcludedBlockchainsManager(
override suspend fun init() {
localTogglesStorage.populate(path = "configs/excluded_blockchains_config")
val storedExcludedBlockchainsIds = appPreferencesStore.getObjectSetSync<String>(
val storedExcludedBlockchainsIds = appPreferencesStore.getSyncOrDefault(
key = PreferencesKeys.EXCLUDED_BLOCKCHAINS_KEY,
default = emptySet(),
)
localExcludedBlockchainsIds = localTogglesStorage.toggles
@ -65,7 +66,7 @@ internal class DefaultExcludedBlockchainsManager(
}
private suspend fun storeCurrent() {
appPreferencesStore.storeObjectSet(
appPreferencesStore.store(
PreferencesKeys.EXCLUDED_BLOCKCHAINS_KEY,
currentExcludedBlockchainsIds,
)

14
core/toggles/src/main/kotlin/com/tangem/core/toggle/di/ExcludedBlockchainsManagerModule.kt → core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/di/ExcludedBlockchainsManagerModule.kt
View file

@ -1,12 +1,12 @@
package com.tangem.core.toggle.di
package com.tangem.core.configtoggle.di
import android.content.Context
import com.tangem.core.toggle.blockchain.ExcludedBlockchainsManager
import com.tangem.core.toggle.blockchain.MutableExcludedBlockchainsManager
import com.tangem.core.toggle.blockchain.impl.DefaultExcludedBlockchainsManager
import com.tangem.core.toggle.storage.LocalTogglesStorage
import com.tangem.core.toggle.version.DefaultVersionProvider
import com.tangem.core.toggles.BuildConfig
import com.tangem.core.configtoggle.BuildConfig
import com.tangem.core.configtoggle.blockchain.ExcludedBlockchainsManager
import com.tangem.core.configtoggle.blockchain.MutableExcludedBlockchainsManager
import com.tangem.core.configtoggle.blockchain.impl.DefaultExcludedBlockchainsManager
import com.tangem.core.configtoggle.storage.LocalTogglesStorage
import com.tangem.core.configtoggle.version.DefaultVersionProvider
import com.tangem.datasource.asset.loader.AssetLoader
import com.tangem.datasource.local.preferences.AppPreferencesStore
import dagger.Module

14
core/toggles/src/main/kotlin/com/tangem/core/toggle/di/FeatureTogglesManagerModule.kt → core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/di/FeatureTogglesManagerModule.kt
View file

@ -1,12 +1,12 @@
package com.tangem.core.toggle.di
package com.tangem.core.configtoggle.di
import android.content.Context
import com.tangem.core.toggle.feature.FeatureTogglesManager
import com.tangem.core.toggle.feature.impl.DevFeatureTogglesManager
import com.tangem.core.toggle.feature.impl.ProdFeatureTogglesManager
import com.tangem.core.toggle.storage.LocalTogglesStorage
import com.tangem.core.toggle.version.DefaultVersionProvider
import com.tangem.core.toggles.BuildConfig
import com.tangem.core.configtoggle.BuildConfig
import com.tangem.core.configtoggle.feature.FeatureTogglesManager
import com.tangem.core.configtoggle.feature.impl.DevFeatureTogglesManager
import com.tangem.core.configtoggle.feature.impl.ProdFeatureTogglesManager
import com.tangem.core.configtoggle.storage.LocalTogglesStorage
import com.tangem.core.configtoggle.version.DefaultVersionProvider
import com.tangem.datasource.asset.loader.AssetLoader
import com.tangem.datasource.local.preferences.AppPreferencesStore
import dagger.Module

2
core/toggles/src/main/kotlin/com/tangem/core/toggle/feature/FeatureTogglesManager.kt → core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/feature/FeatureTogglesManager.kt
View file

@ -1,4 +1,4 @@
package com.tangem.core.toggle.feature
package com.tangem.core.configtoggle.feature
/**
* Component for getting information about the availability of feature toggles

2
core/toggles/src/main/kotlin/com/tangem/core/toggle/feature/MutableFeatureTogglesManager.kt → core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/feature/MutableFeatureTogglesManager.kt
View file

@ -1,4 +1,4 @@
package com.tangem.core.toggle.feature
package com.tangem.core.configtoggle.feature
/**
* Component for change information about the availability of feature toggles

10
core/toggles/src/main/kotlin/com/tangem/core/toggle/feature/impl/DevFeatureTogglesManager.kt → core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/feature/impl/DevFeatureTogglesManager.kt
View file

@ -1,10 +1,10 @@
package com.tangem.core.toggle.feature.impl
package com.tangem.core.configtoggle.feature.impl
import androidx.annotation.VisibleForTesting
import com.tangem.core.toggle.feature.MutableFeatureTogglesManager
import com.tangem.core.toggle.storage.TogglesStorage
import com.tangem.core.toggle.utils.associateToggles
import com.tangem.core.toggle.version.VersionProvider
import com.tangem.core.configtoggle.feature.MutableFeatureTogglesManager
import com.tangem.core.configtoggle.storage.TogglesStorage
import com.tangem.core.configtoggle.utils.associateToggles
import com.tangem.core.configtoggle.version.VersionProvider
import com.tangem.datasource.local.preferences.AppPreferencesStore
import com.tangem.datasource.local.preferences.PreferencesKeys
import com.tangem.datasource.local.preferences.utils.getObjectSyncOrNull

2
core/toggles/src/main/kotlin/com/tangem/core/toggle/feature/impl/FeatureTogglesConstants.kt → core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/feature/impl/FeatureTogglesConstants.kt
View file

@ -1,4 +1,4 @@
package com.tangem.core.toggle.feature.impl
package com.tangem.core.configtoggle.feature.impl
internal object FeatureTogglesConstants {

10
core/toggles/src/main/kotlin/com/tangem/core/toggle/feature/impl/ProdFeatureTogglesManager.kt → core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/feature/impl/ProdFeatureTogglesManager.kt
View file

@ -1,10 +1,10 @@
package com.tangem.core.toggle.feature.impl
package com.tangem.core.configtoggle.feature.impl
import androidx.annotation.VisibleForTesting
import com.tangem.core.toggle.feature.FeatureTogglesManager
import com.tangem.core.toggle.storage.TogglesStorage
import com.tangem.core.toggle.utils.associateToggles
import com.tangem.core.toggle.version.VersionProvider
import com.tangem.core.configtoggle.feature.FeatureTogglesManager
import com.tangem.core.configtoggle.storage.TogglesStorage
import com.tangem.core.configtoggle.utils.associateToggles
import com.tangem.core.configtoggle.version.VersionProvider
import kotlin.properties.Delegates
/**

6
core/toggles/src/main/kotlin/com/tangem/core/toggle/storage/Toggle.kt → core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/storage/ConfigToggle.kt
View file

@ -1,4 +1,4 @@
package com.tangem.core.toggle.storage
package com.tangem.core.configtoggle.storage
import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
@ -7,14 +7,14 @@ import com.squareup.moshi.JsonClass
* Data model with information about config toggle
*
* @property name toggle name
* @property version version number in which the feature will be included
* @property version version in which the toggle will be enabled
*
* IMPORTANT: if the version is "undefined", it means that toggle is disabled!
*
[REDACTED_AUTHOR]
*/
@JsonClass(generateAdapter = true)
internal data class Toggle(
internal data class ConfigToggle(
@Json(name = "name") val name: String,
@Json(name = "version") val version: String,
)

6
core/toggles/src/main/kotlin/com/tangem/core/toggle/storage/LocalTogglesStorage.kt → core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/storage/LocalTogglesStorage.kt
View file

@ -1,4 +1,4 @@
package com.tangem.core.toggle.storage
package com.tangem.core.configtoggle.storage
import com.tangem.datasource.asset.loader.AssetLoader
import kotlin.properties.Delegates
@ -15,10 +15,10 @@ internal class LocalTogglesStorage(
private val assetLoader: AssetLoader,
) : TogglesStorage {
override var toggles: List<Toggle> by Delegates.notNull()
override var toggles: List<ConfigToggle> by Delegates.notNull()
private set
override suspend fun populate(path: String) {
toggles = assetLoader.loadList<Toggle>(path)
toggles = assetLoader.loadList<ConfigToggle>(path)
}
}

4
core/toggles/src/main/kotlin/com/tangem/core/toggle/storage/TogglesStorage.kt → core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/storage/TogglesStorage.kt
View file

@ -1,4 +1,4 @@
package com.tangem.core.toggle.storage
package com.tangem.core.configtoggle.storage
/**
* Component that initializes and stores a list of feature toggles
@ -8,7 +8,7 @@ package com.tangem.core.toggle.storage
internal interface TogglesStorage {
/** List of feature toggles */
val toggles: List<Toggle>
val toggles: List<ConfigToggle>
/** Populate the storage with toggles */
suspend fun populate(path: String)

13
core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/utils/CollectionExt.kt Normal file
View file

@ -0,0 +1,13 @@
package com.tangem.core.configtoggle.utils
import com.tangem.core.configtoggle.storage.ConfigToggle
import com.tangem.core.configtoggle.version.VersionAvailabilityContract
internal fun List<ConfigToggle>.associateToggles(currentVersion: String): Map<String, Boolean> {
return associate { localToggle ->
Pair(
first = localToggle.name,
second = VersionAvailabilityContract(currentVersion, localToggle.version),
)
}
}

2
core/toggles/src/main/kotlin/com/tangem/core/toggle/version/DefaultVersionProvider.kt → core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/version/DefaultVersionProvider.kt
View file

@ -1,4 +1,4 @@
package com.tangem.core.toggle.version
package com.tangem.core.configtoggle.version
import android.content.Context
import android.content.pm.PackageManager

2
core/toggles/src/main/kotlin/com/tangem/core/toggle/version/Version.kt → core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/version/Version.kt
View file

@ -1,4 +1,4 @@
package com.tangem.core.toggle.version
package com.tangem.core.configtoggle.version
import androidx.annotation.VisibleForTesting
import timber.log.Timber

2
core/toggles/src/main/kotlin/com/tangem/core/toggle/version/VersionAvailabilityContract.kt → core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/version/VersionAvailabilityContract.kt
View file

@ -1,4 +1,4 @@
package com.tangem.core.toggle.version
package com.tangem.core.configtoggle.version
/**
* Version contract to evaluate availability of feature toggle

2
core/toggles/src/main/kotlin/com/tangem/core/toggle/version/VersionProvider.kt → core/config-toggles/src/main/kotlin/com/tangem/core/configtoggle/version/VersionProvider.kt
View file

@ -1,4 +1,4 @@
package com.tangem.core.toggle.version
package com.tangem.core.configtoggle.version
/** Application version provider */
internal interface VersionProvider {

4
core/toggles/src/test/kotlin/com/tangem/core/toggle/contract/VersionAvailabilityContractTest.kt → core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/contract/VersionAvailabilityContractTest.kt
View file

@ -1,7 +1,7 @@
package com.tangem.core.toggle.contract
package com.tangem.core.configtoggle.contract
import com.google.common.truth.Truth
import com.tangem.core.toggle.version.VersionAvailabilityContract
import com.tangem.core.configtoggle.version.VersionAvailabilityContract
import org.junit.Test
/**

4
core/toggles/src/test/kotlin/com/tangem/core/toggle/contract/VersionTest.kt → core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/contract/VersionTest.kt
View file

@ -1,7 +1,7 @@
package com.tangem.core.toggle.contract
package com.tangem.core.configtoggle.contract
import com.google.common.truth.Truth
import com.tangem.core.toggle.version.Version
import com.tangem.core.configtoggle.version.Version
import org.junit.Test
/**

18
core/toggles/src/test/kotlin/com/tangem/core/toggle/manager/DevTogglesManagerTest.kt → core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/manager/DevTogglesManagerTest.kt
View file

@ -1,13 +1,13 @@
package com.tangem.core.toggle.manager
package com.tangem.core.configtoggle.manager
import android.annotation.SuppressLint
import com.google.common.truth.Truth
import com.tangem.core.toggle.feature.impl.DevFeatureTogglesManager
import com.tangem.core.toggle.feature.impl.FeatureTogglesConstants
import com.tangem.core.toggle.storage.Toggle
import com.tangem.core.toggle.storage.TogglesStorage
import com.tangem.core.toggle.utils.associateToggles
import com.tangem.core.toggle.version.VersionProvider
import com.tangem.core.configtoggle.feature.impl.DevFeatureTogglesManager
import com.tangem.core.configtoggle.feature.impl.FeatureTogglesConstants
import com.tangem.core.configtoggle.storage.ConfigToggle
import com.tangem.core.configtoggle.storage.TogglesStorage
import com.tangem.core.configtoggle.utils.associateToggles
import com.tangem.core.configtoggle.version.VersionProvider
import com.tangem.datasource.local.preferences.AppPreferencesStore
import com.tangem.datasource.local.preferences.PreferencesKeys
import com.tangem.datasource.local.preferences.utils.getObjectSyncOrNull
@ -224,8 +224,8 @@ internal class DevTogglesManagerTest {
)
val localFeatureToggles = listOf(
Toggle(name = "INACTIVE_TEST_FEATURE_ENABLED", version = "undefined"),
Toggle(name = "ACTIVE2_TEST_FEATURE_ENABLED", version = "1.0.0"),
ConfigToggle(name = "INACTIVE_TEST_FEATURE_ENABLED", version = "undefined"),
ConfigToggle(name = "ACTIVE2_TEST_FEATURE_ENABLED", version = "1.0.0"),
)
}
}

18
core/toggles/src/test/kotlin/com/tangem/core/toggle/manager/ProdTogglesManagerTest.kt → core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/manager/ProdTogglesManagerTest.kt
View file

@ -1,13 +1,13 @@
package com.tangem.core.toggle.manager
package com.tangem.core.configtoggle.manager
import android.content.pm.PackageManager
import com.google.common.truth.Truth
import com.tangem.core.toggle.feature.impl.FeatureTogglesConstants
import com.tangem.core.toggle.feature.impl.ProdFeatureTogglesManager
import com.tangem.core.toggle.storage.Toggle
import com.tangem.core.toggle.storage.TogglesStorage
import com.tangem.core.toggle.utils.associateToggles
import com.tangem.core.toggle.version.VersionProvider
import com.tangem.core.configtoggle.feature.impl.FeatureTogglesConstants
import com.tangem.core.configtoggle.feature.impl.ProdFeatureTogglesManager
import com.tangem.core.configtoggle.storage.ConfigToggle
import com.tangem.core.configtoggle.storage.TogglesStorage
import com.tangem.core.configtoggle.utils.associateToggles
import com.tangem.core.configtoggle.version.VersionProvider
import io.mockk.*
import kotlinx.coroutines.test.runTest
import org.junit.Test
@ -124,8 +124,8 @@ internal class ProdTogglesManagerTest {
private companion object {
val localFeatureToggles = listOf(
Toggle(name = "INACTIVE_TEST_FEATURE_ENABLED", version = "undefined"),
Toggle(name = "ACTIVE2_TEST_FEATURE_ENABLED", version = "1.0.0"),
ConfigToggle(name = "INACTIVE_TEST_FEATURE_ENABLED", version = "undefined"),
ConfigToggle(name = "ACTIVE2_TEST_FEATURE_ENABLED", version = "1.0.0"),
)
val disabledFeatureToggles = mapOf(

18
core/toggles/src/test/kotlin/com/tangem/core/toggle/storage/LocalTogglesStorageTest.kt → core/config-toggles/src/test/kotlin/com/tangem/core/configtoggle/storage/LocalTogglesStorageTest.kt
View file

@ -1,11 +1,11 @@
package com.tangem.core.toggle.storage
package com.tangem.core.configtoggle.storage
import android.annotation.SuppressLint
import com.google.common.truth.Truth
import com.squareup.moshi.JsonAdapter
import com.squareup.moshi.Moshi
import com.squareup.moshi.Types
import com.tangem.core.toggle.feature.impl.FeatureTogglesConstants
import com.tangem.core.configtoggle.feature.impl.FeatureTogglesConstants
import com.tangem.datasource.asset.loader.AssetLoader
import com.tangem.datasource.asset.reader.AssetReader
import io.mockk.*
@ -21,7 +21,7 @@ internal class LocalTogglesStorageTest {
private val assetReader = mockk<AssetReader>()
private val moshi = mockk<Moshi>()
private val jsonAdapter = mockk<JsonAdapter<List<Toggle>>>()
private val jsonAdapter = mockk<JsonAdapter<List<ConfigToggle>>>()
// Impossible to mockk AssetLoader because it implement inline functions
private val assetLoader = AssetLoader(assetReader = assetReader, moshi = moshi)
@ -57,7 +57,7 @@ internal class LocalTogglesStorageTest {
jsonAdapter.fromJson(json)
}
Truth.assertThat(storage.toggles).containsExactlyElementsIn(emptyList<Toggle>())
Truth.assertThat(storage.toggles).containsExactlyElementsIn(emptyList<ConfigToggle>())
}
@Test
@ -69,14 +69,14 @@ internal class LocalTogglesStorageTest {
coVerifyOrder { assetReader.read(CONFIG_FILE_NAME) }
verifyAll(inverse = true) { jsonAdapter.fromJson(any<String>()) }
Truth.assertThat(storage.toggles).containsExactlyElementsIn(emptyList<Toggle>())
Truth.assertThat(storage.toggles).containsExactlyElementsIn(emptyList<ConfigToggle>())
}
private fun everyReadingJson() = coEvery { assetReader.read(CONFIG_FILE_NAME) }
private fun everyCreatingMoshiAdapter() = every {
val types = Types.newParameterizedType(List::class.java, Toggle::class.java)
moshi.adapter<List<Toggle>>(types)
val types = Types.newParameterizedType(List::class.java, ConfigToggle::class.java)
moshi.adapter<List<ConfigToggle>>(types)
}
private fun everyMappingJson() = every { jsonAdapter.fromJson(json) }
@ -98,8 +98,8 @@ internal class LocalTogglesStorageTest {
""".trimIndent()
val featureToggles = listOf(
Toggle(name = "INACTIVE_TEST_FEATURE_ENABLED", version = "undefined"),
Toggle(name = "ACTIVE2_TEST_FEATURE_ENABLED", version = "1.0.0"),
ConfigToggle(name = "INACTIVE_TEST_FEATURE_ENABLED", version = "undefined"),
ConfigToggle(name = "ACTIVE2_TEST_FEATURE_ENABLED", version = "1.0.0"),
)
}
}

2
core/datasource/src/main/java/com/tangem/datasource/local/preferences/PreferencesKeys.kt
View file

@ -55,7 +55,7 @@ object PreferencesKeys {
val FEATURE_TOGGLES_KEY by lazy { stringPreferencesKey(name = "featureToggles") }
val EXCLUDED_BLOCKCHAINS_KEY by lazy { stringPreferencesKey(name = "excludedBlockchains") }
val EXCLUDED_BLOCKCHAINS_KEY by lazy { stringSetPreferencesKey(name = "excludedBlockchains") }
val WAS_TWINS_ONBOARDING_SHOWN by lazy { booleanPreferencesKey(name = "twinsOnboardingShown") }

6
core/datasource/src/main/java/com/tangem/datasource/local/preferences/utils/AppPreferencesStoreExt.kt
View file

@ -98,12 +98,6 @@ suspend inline fun <reified T> AppPreferencesStore.storeObjectList(key: Preferen
edit { it[key] = adapter.toJson(value) }
}
/** Store set of data [value] by string [key] */
suspend inline fun <reified T> AppPreferencesStore.storeObjectSet(key: Preferences.Key<String>, value: Set<T>) {
val adapter = moshi.adapter<Set<T>>(Types.newParameterizedType(Set::class.java, T::class.java))
edit { it[key] = adapter.toJson(value) }
}
/** Get flow of list of data [T] by string [key]. If data is not found, it returns `null` */
inline fun <reified T> AppPreferencesStore.getObjectList(key: Preferences.Key<String>): Flow<List<T>?> {
val adapter = moshi.adapter<List<T>>(Types.newParameterizedType(List::class.java, T::class.java))

13
core/toggles/src/main/kotlin/com/tangem/core/toggle/utils/CollectionExt.kt
View file

@ -1,13 +0,0 @@
package com.tangem.core.toggle.utils
import com.tangem.core.toggle.storage.Toggle
import com.tangem.core.toggle.version.VersionAvailabilityContract
internal fun List<Toggle>.associateToggles(currentVersion: String): Map<String, Boolean> {
return associate { localToggle ->
Pair(
first = localToggle.name,
second = VersionAvailabilityContract(currentVersion, localToggle.version),
)
}
}

2
features/details/impl/build.gradle.kts
View file

@ -21,7 +21,7 @@ dependencies {
/* Project - Core */
implementation(projects.core.decompose)
implementation(projects.core.ui)
implementation(projects.core.toggles)
implementation(projects.core.configToggles)
implementation(projects.core.navigation)
implementation(projects.core.analytics)
implementation(projects.core.analytics.models)

2
features/disclaimer/impl/build.gradle.kts
View file

@ -28,7 +28,7 @@ dependencies {
/** Core modules */
implementation(projects.core.ui)
implementation(projects.core.utils)
implementation(projects.core.toggles)
implementation(projects.core.configToggles)
implementation(projects.core.navigation)
implementation(projects.core.decompose)
implementation(projects.common.routing)

2
features/manage-tokens/impl/build.gradle.kts
View file

@ -19,7 +19,7 @@ dependencies {
implementation(projects.core.decompose)
implementation(projects.core.ui)
implementation(projects.common.routing)
implementation(projects.core.toggles)
implementation(projects.core.configToggles)
implementation(projects.core.analytics)
/* Project - Domain */

2
features/markets/impl/build.gradle.kts
View file

@ -63,7 +63,7 @@ dependencies {
/* Core */
implementation(projects.core.decompose)
implementation(projects.core.ui)
implementation(projects.core.toggles)
implementation(projects.core.configToggles)
implementation(projects.core.analytics)
implementation(projects.core.analytics.models)

2
features/onboarding-v2/impl/build.gradle.kts
View file

@ -16,7 +16,7 @@ dependencies {
implementation(projects.features.onboardingV2.api)
/** Core modules */
implementation(projects.core.toggles)
implementation(projects.core.configToggles)
implementation(projects.core.analytics)
implementation(projects.core.analytics.models)
implementation(projects.core.utils)

2
features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/DefaultOnboardingV2FeatureToggles.kt
View file

@ -1,6 +1,6 @@
package com.tangem.features.onboarding.v2
import com.tangem.core.toggle.feature.FeatureTogglesManager
import com.tangem.core.configtoggle.feature.FeatureTogglesManager
import javax.inject.Inject
internal class DefaultOnboardingV2FeatureToggles @Inject constructor(

2
features/onboarding/build.gradle.kts
View file

@ -15,7 +15,7 @@ dependencies {
/** Core modules */
implementation(project(":common"))
implementation(project(":domain:models"))
implementation(project(":core:toggles"))
implementation(project(":core:config-toggles"))
implementation(project(":core:datasource"))
implementation(project(":core:analytics"))
implementation(projects.core.analytics.models)

2
features/onramp/impl/build.gradle.kts
View file

@ -21,7 +21,7 @@ dependencies {
/** Project - Core */
implementation(projects.core.decompose)
implementation(projects.core.ui)
implementation(projects.core.toggles)
implementation(projects.core.configToggles)
implementation(projects.core.navigation)
/** Project - Common */

2
features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/DefaultOnrampFeatureToggles.kt
View file

@ -1,6 +1,6 @@
package com.tangem.features.onramp
import com.tangem.core.toggle.feature.FeatureTogglesManager
import com.tangem.core.configtoggle.feature.FeatureTogglesManager
internal class DefaultOnrampFeatureToggles(
private val featureTogglesManager: FeatureTogglesManager,

4
features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/OnrampFeatureModule.kt
View file

@ -1,8 +1,6 @@
package com.tangem.features.onramp
import com.tangem.core.toggle.feature.FeatureTogglesManager
import com.tangem.features.onramp.DefaultOnrampFeatureToggles
import com.tangem.features.onramp.OnrampFeatureToggles
import com.tangem.core.configtoggle.feature.FeatureTogglesManager
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn

2
features/push-notifications/impl/build.gradle.kts
View file

@ -27,7 +27,7 @@ dependencies {
/** Core modules */
implementation(projects.core.ui)
implementation(projects.core.toggles)
implementation(projects.core.configToggles)
implementation(projects.core.navigation)
implementation(projects.core.analytics)
implementation(projects.core.analytics.models)

2
features/send/impl/build.gradle.kts
View file

@ -43,7 +43,7 @@ dependencies {
implementation(deps.tangem.blockchain)
/** Core modules */
implementation(projects.core.toggles)
implementation(projects.core.configToggles)
implementation(projects.core.ui)
implementation(projects.core.utils)
implementation(projects.core.navigation)

2
features/staking/impl/build.gradle.kts
View file

@ -40,7 +40,7 @@ dependencies {
implementation(deps.tangem.blockchain)
/** Core modules */
implementation(projects.core.toggles)
implementation(projects.core.configToggles)
implementation(projects.core.ui)
implementation(projects.core.utils)
implementation(projects.core.navigation)

2
features/swap/presentation/build.gradle.kts
View file

@ -15,7 +15,7 @@ dependencies {
/** Core modules */
implementation(projects.core.analytics)
implementation(projects.core.analytics.models)
implementation(projects.core.toggles)
implementation(projects.core.configToggles)
implementation(projects.core.navigation)
implementation(projects.core.utils)
implementation(projects.core.ui)

2
features/tester/impl/build.gradle.kts
View file

@ -39,7 +39,7 @@ dependencies {
/** Core modules */
implementation(projects.core.datasource)
implementation(projects.core.toggles)
implementation(projects.core.configToggles)
implementation(projects.core.ui)
implementation(projects.core.utils)
implementation(projects.core.navigation)

4
features/tester/impl/src/main/java/com/tangem/feature/tester/presentation/featuretoggles/viewmodels/FeatureTogglesViewModel.kt
View file

@ -5,9 +5,9 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.tangem.core.configtoggle.feature.FeatureTogglesManager
import com.tangem.core.configtoggle.feature.MutableFeatureTogglesManager
import com.tangem.core.navigation.finisher.AppFinisher
import com.tangem.core.toggle.feature.FeatureTogglesManager
import com.tangem.core.toggle.feature.MutableFeatureTogglesManager
import com.tangem.feature.tester.presentation.featuretoggles.models.TesterFeatureToggle
import com.tangem.feature.tester.presentation.featuretoggles.state.FeatureTogglesContentState
import com.tangem.feature.tester.presentation.navigation.InnerTesterRouter

2
features/tokendetails/impl/build.gradle.kts
View file

@ -54,7 +54,7 @@ dependencies {
implementation(projects.core.datasource)
implementation(projects.core.deepLinks)
implementation(projects.core.deepLinks.global)
implementation(projects.core.toggles)
implementation(projects.core.configToggles)
implementation(projects.core.decompose)
implementation(projects.common.ui)

2
features/wallet-settings/impl/build.gradle.kts
View file

@ -20,7 +20,7 @@ dependencies {
/* Project - Core */
implementation(projects.core.decompose)
implementation(projects.core.ui)
implementation(projects.core.toggles)
implementation(projects.core.configToggles)
implementation(projects.core.navigation)
implementation(projects.core.analytics)
implementation(projects.core.analytics.models)

2
features/wallet/impl/build.gradle.kts
View file

@ -46,7 +46,7 @@ dependencies {
kapt(deps.hilt.kapt)
/** Core modules */
implementation(projects.core.toggles)
implementation(projects.core.configToggles)
implementation(projects.core.navigation)
implementation(projects.core.ui)
implementation(projects.core.utils)

2
features/wallet/impl/src/main/java/com/tangem/feature/wallet/featuretoggles/DefaultWalletFeatureToggles.kt
View file

@ -1,6 +1,6 @@
package com.tangem.feature.wallet.featuretoggles
import com.tangem.core.toggle.feature.FeatureTogglesManager
import com.tangem.core.configtoggle.feature.FeatureTogglesManager
import com.tangem.features.wallet.featuretoggles.WalletFeatureToggles
import javax.inject.Inject

2
libs/blockchain-sdk/build.gradle.kts
View file

@ -13,7 +13,7 @@ dependencies {
// region Core modules
implementation(projects.core.datasource)
implementation(projects.core.toggles)
implementation(projects.core.configToggles)
implementation(projects.core.utils)
// endregion

2
libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/di/BlockchainSDKFactoryModule.kt
View file

@ -9,7 +9,7 @@ import com.tangem.blockchainsdk.datastorage.DefaultBlockchainDataStorage
import com.tangem.blockchainsdk.featuretoggles.DefaultBlockchainSDKFeatureToggles
import com.tangem.blockchainsdk.loader.BlockchainProvidersResponseLoader
import com.tangem.blockchainsdk.store.DefaultRuntimeStore
import com.tangem.core.toggle.feature.FeatureTogglesManager
import com.tangem.core.configtoggle.feature.FeatureTogglesManager
import com.tangem.datasource.api.tangemTech.TangemTechApi
import com.tangem.datasource.local.config.environment.EnvironmentConfigStorage
import com.tangem.datasource.local.preferences.AppPreferencesStore

2
libs/blockchain-sdk/src/main/java/com/tangem/blockchainsdk/featuretoggles/DefaultBlockchainSDKFeatureToggles.kt
View file

@ -1,6 +1,6 @@
package com.tangem.blockchainsdk.featuretoggles
import com.tangem.core.toggle.feature.FeatureTogglesManager
import com.tangem.core.configtoggle.feature.FeatureTogglesManager
internal class DefaultBlockchainSDKFeatureToggles(
private val featureTogglesManager: FeatureTogglesManager,

2
settings.gradle.kts
View file

@ -127,7 +127,7 @@ include(":common:routing")
include(":core:analytics")
include(":core:analytics:models")
include(":core:datasource")
include(":core:toggles")
include(":core:config-toggles")
include(":core:navigation")
include(":core:res")
include(":core:ui")