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 2022-04-26 11:32:21 +03:00
parent aefdfb1705
commit b6a38918fc
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
domain/src/main/java/com/tangem/domain/common/form/FieldsValidators.kt
View file

@ -1,11 +1,11 @@
package com.tangem.domain.common.form
import com.tangem.blockchain.blockchains.binance.BinanceAddressService
import com.tangem.blockchain.blockchains.ethereum.EthereumAddressService
import com.tangem.blockchain.blockchains.solana.SolanaAddressService
import com.tangem.blockchain.common.Blockchain
import com.tangem.blockchain.common.address.AddressService
import com.tangem.common.Validator
import com.tangem.common.card.EllipticCurve
import com.tangem.domain.AddCustomTokenError
import timber.log.Timber
@ -48,10 +48,9 @@ class TokenContractAddressValidator : CustomTokenValidator<String>() {
private fun getAddressService(): AddressService {
return when (blockchain) {
Blockchain.Unknown -> EthereumAddressService()
Blockchain.Unknown -> successAddressValidator
Blockchain.Binance, Blockchain.BinanceTestnet -> successAddressValidator
Blockchain.Solana, Blockchain.SolanaTestnet -> SolanaAddressService()
Blockchain.Binance -> BinanceAddressService()
Blockchain.BinanceTestnet -> BinanceAddressService(true)
else -> {
if (blockchain.isEvm()) {
EthereumAddressService()
@ -62,6 +61,14 @@ class TokenContractAddressValidator : CustomTokenValidator<String>() {
}
}
}
private val successAddressValidator = object : AddressService() {
override fun makeAddress(walletPublicKey: ByteArray, curve: EllipticCurve?): String {
throw UnsupportedOperationException()
}
override fun validate(address: String): Boolean = true
}
}
class TokenNetworkValidator : CustomTokenValidator<Blockchain>() {

4
domain/src/main/java/com/tangem/domain/features/addCustomToken/redux/AddCustomTokenHub.kt
View file

@ -69,7 +69,7 @@ internal class AddCustomTokenHub : BaseStoreHub<AddCustomTokenState>("AddCustomT
val contractAddress = ContractAddress.getFieldValue<String>()
validateContractAddressAndNotify(contractAddress)
if (!hubState.tokensAnyFieldsIsFilled()){
if (!hubState.tokensAnyFieldsIsFilled()) {
val isAlreadyAdded = isBlockchainPersistIntoAppSavedTokensList(
selectedNetwork = action.blockchainNetwork.value
)
@ -120,6 +120,8 @@ internal class AddCustomTokenHub : BaseStoreHub<AddCustomTokenState>("AddCustomT
}
private suspend fun validateContractAddressAndNotify(contractAddress: String): AddCustomTokenError? {
if (!Network.isFilled()) return null
val error = ContractAddress.validateValue(contractAddress)
when (error) {
null -> {