Updated on 2026-08-14

2023-01-13 20:21:38 +04:00 · 2023-01-13 20:21:38 +04:00 · 76f955568e
commit 76f955568e
parent b9083752c6
18 changed files with 134 additions and 92 deletions
--- a/app/src/main/java/com/tangem/tap/TapApplication.kt
+++ b/app/src/main/java/com/tangem/tap/TapApplication.kt
@ -10,15 +10,13 @@ import com.tangem.LogFormat
 import com.tangem.blockchain.common.BlockchainSdkConfig
 import com.tangem.blockchain.common.WalletManagerFactory
 import com.tangem.blockchain.network.BlockchainSdkRetrofitBuilder
-import com.tangem.common.json.MoshiJsonConverter
-import com.tangem.datasource.api.common.BigDecimalAdapter
+import com.tangem.core.analytics.Analytics
 import com.tangem.datasource.api.common.MoshiConverter
 import com.tangem.domain.DomainLayer
 import com.tangem.domain.common.LogConfig
 import com.tangem.tap.common.AndroidAssetReader
 import com.tangem.tap.common.AssetReader
 import com.tangem.tap.common.IntentHandler
-import com.tangem.core.analytics.Analytics
 import com.tangem.tap.common.analytics.AnalyticsFactory
 import com.tangem.tap.common.analytics.api.AnalyticsHandlerBuilder
 import com.tangem.tap.common.analytics.filters.BasicSignInFilter
@ -52,7 +50,6 @@ import com.tangem.tap.domain.walletStores.repository.WalletStoresRepository
 import com.tangem.tap.domain.walletStores.repository.di.provideDefaultImplementation
 import com.tangem.tap.domain.walletconnect.WalletConnectRepository
 import com.tangem.tap.network.NetworkConnectivity
-import com.tangem.tap.persistence.CardBalanceStateAdapter
 import com.tangem.tap.persistence.PreferencesStorage
 import com.tangem.tap.proxy.AppStateHolder
 import com.tangem.wallet.BuildConfig
@ -137,14 +134,13 @@ class TapApplication : Application(), ImageLoaderFactory {
        activityResultCaller = foregroundActivityObserver
        registerActivityLifecycleCallbacks(foregroundActivityObserver.callbacks)

-        initMoshiConverter()
        DomainLayer.init()
        NetworkConnectivity.createInstance(store, this)
        preferencesStorage = PreferencesStorage(this)
        walletConnectRepository = WalletConnectRepository(this)

        assetReader = AndroidAssetReader(this)
-        val configLoader = FeaturesLocalLoader(assetReader, MoshiConverter.INSTANCE.moshi)
+        val configLoader = FeaturesLocalLoader(assetReader, MoshiConverter.sdkMoshi)
        initConfigManager(configLoader, ::initWithConfigDependency)
        initWarningMessagesManager()

@ -159,18 +155,6 @@ class TapApplication : Application(), ImageLoaderFactory {
        appStateHolder.walletStoresManager = walletStoresManager
    }

-    //todo refactor: move to datasource and provide via DI
-    private fun initMoshiConverter() {
-        fun appAdapters(): List<Any> = listOf(
-            BigDecimalAdapter(),
-            CardBalanceStateAdapter(),
-        )
-        MoshiConverter.reInitInstance(
-            adapters = appAdapters() + MoshiJsonConverter.getTangemSdkAdapters(),
-            typedAdapters = MoshiJsonConverter.getTangemSdkTypedAdapters(),
-        )
-    }
-
    override fun newImageLoader(): ImageLoader {
        return createCoilImageLoader(
            context = this,
@ -207,7 +191,7 @@ class TapApplication : Application(), ImageLoaderFactory {
            config = config,
            isDebug = BuildConfig.DEBUG,
            logConfig = LogConfig.analyticsHandlers,
-            jsonConverter = MoshiConverter.INSTANCE,
+            jsonConverter = MoshiConverter.sdkMoshiConverter,
        )
        factory.build(Analytics, buildData)
    }
--- a/app/src/main/java/com/tangem/tap/domain/tokens/LoadAvailableCoinsService.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tokens/LoadAvailableCoinsService.kt
@ -1,7 +1,6 @@
 package com.tangem.tap.domain.tokens

 import com.squareup.moshi.JsonAdapter
-import com.squareup.moshi.Moshi
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.common.services.Result
 import com.tangem.datasource.api.common.MoshiConverter
@ -17,9 +16,8 @@ class LoadAvailableCoinsService(
    private val dispatchers: CoroutineDispatcherProvider,
    private val assetReader: AssetReader,
 ) {
-    private val moshi: Moshi by lazy { MoshiConverter.defaultMoshi() }
    private val currenciesAdapter: JsonAdapter<CurrenciesFromJson> =
-        moshi.adapter(CurrenciesFromJson::class.java)
+        MoshiConverter.networkMoshi.adapter(CurrenciesFromJson::class.java)

    suspend fun getSupportedTokens(
        isTestNet: Boolean = false,
--- a/app/src/main/java/com/tangem/tap/domain/tokens/OldUserTokensRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tokens/OldUserTokensRepository.kt
@ -20,7 +20,7 @@ class OldUserTokensRepository(
    private val tangemTechApi: TangemTechApi,
    private val dispatchers: CoroutineDispatcherProvider,
 ) {
-    private val moshi = MoshiConverter.defaultMoshi()
+    private val moshi = MoshiConverter.networkMoshi
    private val blockchainsAdapter: JsonAdapter<List<Blockchain>> = moshi.adapter(
        Types.newParameterizedType(List::class.java, Blockchain::class.java),
    )
--- a/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensStorageService.kt
+++ b/app/src/main/java/com/tangem/tap/domain/tokens/UserTokensStorageService.kt
@ -13,9 +13,8 @@ class UserTokensStorageService(
    private val oldUserTokensRepository: OldUserTokensRepository,
    private val fileReader: FileReader,
 ) {
-    private val moshi = MoshiConverter.defaultMoshi()
    private val userTokensAdapter: JsonAdapter<UserTokensResponse> =
-        moshi.adapter(UserTokensResponse::class.java)
+        MoshiConverter.networkMoshi.adapter(UserTokensResponse::class.java)

    fun getUserTokens(userId: String): List<Currency>? {
        return try {
--- a/app/src/main/java/com/tangem/tap/domain/twins/TwinCardsManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/twins/TwinCardsManager.kt
@ -83,7 +83,7 @@ class TwinCardsManager(
        }

        private fun getAdapter(): JsonAdapter<List<Issuer>> {
-            return MoshiConverter.defaultMoshi().adapter(
+            return MoshiConverter.sdkMoshi.adapter(
                Types.newParameterizedType(List::class.java, Issuer::class.java),
            )
        }
--- a/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectRepository.kt
@ -16,8 +16,7 @@ import timber.log.Timber
 import java.nio.charset.Charset

 class WalletConnectRepository(val context: Application) {
-    private val moshi = MoshiConverter.defaultMoshi()
-    private val walletConnectAdapter: JsonAdapter<List<SessionDao>> = moshi.adapter(
+    private val walletConnectAdapter: JsonAdapter<List<SessionDao>> = MoshiConverter.sdkMoshi.adapter(
        Types.newParameterizedType(List::class.java, SessionDao::class.java),
    )

--- a/app/src/main/java/com/tangem/tap/persistence/CardBalanceStateAdapter.kt
+++ b/app/src/main/java/com/tangem/tap/persistence/CardBalanceStateAdapter.kt
@ -0,0 +1,20 @@
+package com.tangem.tap.persistence
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.ToJson
+import com.tangem.tap.common.analytics.events.AnalyticsParam
+
+class CardBalanceStateAdapter {
+
+    @ToJson
+    fun toJson(src: AnalyticsParam.CardBalanceState): String = src.value
+
+    @FromJson
+    fun fromJson(json: String): AnalyticsParam.CardBalanceState {
+        return when (json) {
+            AnalyticsParam.CardBalanceState.Empty.value -> AnalyticsParam.CardBalanceState.Empty
+            AnalyticsParam.CardBalanceState.Full.value -> AnalyticsParam.CardBalanceState.Full
+            else -> throw IllegalArgumentException()
+        }
+    }
+}
--- a/app/src/main/java/com/tangem/tap/persistence/PreferencesStorage.kt
+++ b/app/src/main/java/com/tangem/tap/persistence/PreferencesStorage.kt
@ -4,29 +4,35 @@ import android.app.Application
 import android.content.Context
 import android.content.SharedPreferences
 import androidx.core.content.edit
-import com.tangem.datasource.api.common.MoshiConverter
+import com.tangem.common.json.MoshiJsonConverter
+import com.tangem.datasource.api.common.BigDecimalAdapter
 import java.util.*

 class PreferencesStorage(applicationContext: Application) {

-    private val preferences: SharedPreferences =
-        applicationContext.getSharedPreferences(PREFERENCES_NAME, Context.MODE_PRIVATE)
-
    val appRatingLaunchObserver: AppRatingLaunchObserver
    val usedCardsPrefStorage: UsedCardsPrefStorage
    val fiatCurrenciesPrefStorage: FiatCurrenciesPrefStorage
    val disclaimerPrefStorage: DisclaimerPrefStorage
    val toppedUpWalletStorage: ToppedUpWalletStorage

+    private val preferences: SharedPreferences =
+        applicationContext.getSharedPreferences(PREFERENCES_NAME, Context.MODE_PRIVATE)
+
+    private val moshiConverter = MoshiJsonConverter(
+        adapters = listOf(BigDecimalAdapter(), CardBalanceStateAdapter()) + MoshiJsonConverter.getTangemSdkAdapters(),
+        typedAdapters = MoshiJsonConverter.getTangemSdkTypedAdapters(),
+    )
+
    init {
        incrementLaunchCounter()
        appRatingLaunchObserver = AppRatingLaunchObserver(preferences, getCountOfLaunches())
-        usedCardsPrefStorage = UsedCardsPrefStorage(preferences, MoshiConverter.INSTANCE)
+        usedCardsPrefStorage = UsedCardsPrefStorage(preferences, moshiConverter)
        usedCardsPrefStorage.migrate()
-        fiatCurrenciesPrefStorage = FiatCurrenciesPrefStorage(preferences, MoshiConverter.INSTANCE)
+        fiatCurrenciesPrefStorage = FiatCurrenciesPrefStorage(preferences, moshiConverter)
        fiatCurrenciesPrefStorage.migrate()
        disclaimerPrefStorage = DisclaimerPrefStorage(preferences)
-        toppedUpWalletStorage = ToppedUpWalletStorage(preferences, MoshiConverter.INSTANCE)
+        toppedUpWalletStorage = ToppedUpWalletStorage(preferences, moshiConverter)
    }

    var chatFirstLaunchTime: Long?
--- a/app/src/main/java/com/tangem/tap/persistence/ToppedUpWalletStorage.kt
+++ b/app/src/main/java/com/tangem/tap/persistence/ToppedUpWalletStorage.kt
@ -2,10 +2,7 @@ package com.tangem.tap.persistence

 import android.content.SharedPreferences
 import androidx.core.content.edit
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.ToJson
 import com.tangem.common.json.MoshiJsonConverter
-import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.filters.BasicTopUpFilter
 import timber.log.Timber

@ -59,18 +56,4 @@ class ToppedUpWalletStorage(
    companion object {
        private const val KEY = "userWalletsInfo"
    }
-}
-
-class CardBalanceStateAdapter {
-    @ToJson
-    fun toJson(src: AnalyticsParam.CardBalanceState): String = src.value
-
-    @FromJson
-    fun fromJson(json: String): AnalyticsParam.CardBalanceState {
-        return when (json) {
-            AnalyticsParam.CardBalanceState.Empty.value -> AnalyticsParam.CardBalanceState.Empty
-            AnalyticsParam.CardBalanceState.Full.value -> AnalyticsParam.CardBalanceState.Full
-            else -> throw IllegalArgumentException()
-        }
-    }
 }