From 00e8689adaf079e004ff80e0105300972e4e8381 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 25 Oct 2022 20:41:41 +0500 Subject: [PATCH] Updated on 2026-08-14 --- .../saltPay/SaltPayActivationManager.kt | 15 +--- .../saltPay/redux/OnboardingSaltPayState.kt | 5 -- .../tap/persistence/PreferencesStorage.kt | 2 - .../SaltPayActivationPrefStorage.kt | 82 ------------------- 4 files changed, 1 insertion(+), 103 deletions(-) delete mode 100644 app/src/main/java/com/tangem/tap/persistence/SaltPayActivationPrefStorage.kt diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/SaltPayActivationManager.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/SaltPayActivationManager.kt index d7e5ff80f7..9080c00383 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/SaltPayActivationManager.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/SaltPayActivationManager.kt @@ -21,7 +21,6 @@ import com.tangem.tap.common.extensions.safeUpdate import com.tangem.tap.domain.getFirstToken import com.tangem.tap.domain.tokens.UserWalletId import com.tangem.tap.features.onboarding.products.wallet.saltPay.message.SaltPayActivationError -import com.tangem.tap.persistence.SaltPayActivationStorage import java.math.BigDecimal /** @@ -34,7 +33,6 @@ class SaltPayActivationManager( private val kycProvider: KYCProvider, private val paymentologyService: PaymentologyApiService, private val gnosisRegistrator: GnosisRegistrator, - private val registrationStorage: SaltPayActivationStorage, ) { val kycUrlProvider = KYCUrlProvider(walletPublicKey, kycProvider) @@ -43,10 +41,6 @@ class SaltPayActivationManager( private val spendLimitValue: BigDecimal = BigDecimal("100") - fun transactionIsSent(): Boolean { - return registrationStorage.data.transactionsSent - } - suspend fun checkHasGas(): Result { return when (val hasGasResult = gnosisRegistrator.checkHasGas()) { is com.tangem.blockchain.extensions.Result.Success -> if (hasGasResult.data) { @@ -103,13 +97,7 @@ class SaltPayActivationManager( pin = pinCode, ) - val result = paymentologyService.registerWallet(request) - - registrationStorage.data = registrationStorage.data.copy( - transactionsSent = result is Result.Success, - ) - - return result + return paymentologyService.registerWallet(request) } suspend fun getAmountToClaim(): Result { @@ -166,7 +154,6 @@ class SaltPayActivationManager( kycProvider = SaltPayConfig.stub().kycProvider, paymentologyService = PaymentologyApiService.stub(), gnosisRegistrator = GnosisRegistrator.stub(), - registrationStorage = SaltPayActivationStorage.stub(), cardId = "", cardPublicKey = byteArrayOf(), walletPublicKey = byteArrayOf(), diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayState.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayState.kt index 419c8fb750..64d23417bd 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayState.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/saltPay/redux/OnboardingSaltPayState.kt @@ -17,8 +17,6 @@ import com.tangem.tap.features.onboarding.products.wallet.saltPay.KYCProvider import com.tangem.tap.features.onboarding.products.wallet.saltPay.SaltPayActivationManager import com.tangem.tap.features.onboarding.products.wallet.saltPay.SaltPayConfig import com.tangem.tap.features.wallet.redux.ProgressState -import com.tangem.tap.persistence.SaltPayActivationStorage -import com.tangem.tap.preferencesStorage import com.tangem.tap.store import java.math.BigDecimal @@ -60,7 +58,6 @@ data class OnboardingSaltPayState( scanResponse = scanResponse, gnosisRegistrator = gnosisRegistrator, paymentologyService = store.state.domainNetworks.paymentologyService, - registrationStorage = preferencesStorage.saltPayActivationStorage, kycProvider = saltPayConfig.kycProvider, ) test(scanResponse, gnosisRegistrator) @@ -83,7 +80,6 @@ data class OnboardingSaltPayState( scanResponse: ScanResponse, gnosisRegistrator: GnosisRegistrator, paymentologyService: PaymentologyApiService, - registrationStorage: SaltPayActivationStorage, kycProvider: KYCProvider, ): SaltPayActivationManager { if (!scanResponse.isSaltPay()) { @@ -100,7 +96,6 @@ data class OnboardingSaltPayState( kycProvider = kycProvider, paymentologyService = paymentologyService, gnosisRegistrator = gnosisRegistrator, - registrationStorage = registrationStorage, ) } diff --git a/app/src/main/java/com/tangem/tap/persistence/PreferencesStorage.kt b/app/src/main/java/com/tangem/tap/persistence/PreferencesStorage.kt index 1fad689559..fad5cd8acd 100644 --- a/app/src/main/java/com/tangem/tap/persistence/PreferencesStorage.kt +++ b/app/src/main/java/com/tangem/tap/persistence/PreferencesStorage.kt @@ -15,7 +15,6 @@ class PreferencesStorage(applicationContext: Application) { val appRatingLaunchObserver: AppRatingLaunchObserver val usedCardsPrefStorage: UsedCardsPrefStorage val fiatCurrenciesPrefStorage: FiatCurrenciesPrefStorage - val saltPayActivationStorage: SaltPayActivationStorage val disclaimerPrefStorage: DisclaimerPrefStorage init { @@ -25,7 +24,6 @@ class PreferencesStorage(applicationContext: Application) { usedCardsPrefStorage.migrate() fiatCurrenciesPrefStorage = FiatCurrenciesPrefStorage(preferences, MoshiJsonConverter.INSTANCE) fiatCurrenciesPrefStorage.migrate() - saltPayActivationStorage = SaltPayActivationPrefStorage(applicationContext, MoshiJsonConverter.INSTANCE) disclaimerPrefStorage = DisclaimerPrefStorage(preferences) } diff --git a/app/src/main/java/com/tangem/tap/persistence/SaltPayActivationPrefStorage.kt b/app/src/main/java/com/tangem/tap/persistence/SaltPayActivationPrefStorage.kt deleted file mode 100644 index 9bfbddc594..0000000000 --- a/app/src/main/java/com/tangem/tap/persistence/SaltPayActivationPrefStorage.kt +++ /dev/null @@ -1,82 +0,0 @@ -package com.tangem.tap.persistence - -import android.content.Context -import androidx.core.content.edit -import at.favre.lib.armadillo.ArmadilloSharedPreferences -import com.tangem.common.json.MoshiJsonConverter -import com.tangem.common.services.secure.SecureStorage -import com.tangem.tangem_sdk_new.storage.createEncryptedSharedPreferences - -/** -[REDACTED_AUTHOR] - */ -interface SaltPayActivationStorage { - var data: SaltPayActivationData - - fun reset() - - companion object { - fun stub(): SaltPayActivationStorage = object : SaltPayActivationStorage { - override var data: SaltPayActivationData = SaltPayActivationData() - override fun reset() {} - } - } -} - -data class SaltPayActivationData( - val transactionsSent: Boolean = false, -) - -class SaltPayActivationPrefStorage( - context: Context, - private val converter: MoshiJsonConverter, -) : SaltPayActivationStorage { - - private val storage: ArmadilloSharedPreferences = SecureStorage.createEncryptedSharedPreferences( - context = context, - storageName = "saltpay", - ) - - private var isFetching: Boolean = false - - init { - fetch() - } - - override var data: SaltPayActivationData = SaltPayActivationData() - set(value) { - field = value - if (!isFetching) save() - } - - override fun reset() { - storage.edit(true) { - this.remove(REGISTRATION_DATA_KEY) - data = SaltPayActivationData() - } - } - - private fun save() { - storage.edit(true) { - putString(REGISTRATION_DATA_KEY, converter.toJson(data)) - } - } - - private fun fetch(): SaltPayActivationData { - isFetching = true - - val jsonData = storage.getString(REGISTRATION_DATA_KEY, null) - data = if (jsonData == null) { - SaltPayActivationData() - } else { - converter.fromJson(jsonData) ?: SaltPayActivationData() - } - isFetching = false - - return data - } - - companion object { - private const val REGISTRATION_DATA_KEY = "saltpay_registration_data" - } -} \ No newline at end of file