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-05-30 16:38:53 +04:00
parent 185fffe11c
commit 8176ce8032
9 changed files with 45 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -93,7 +93,7 @@ dependencies {
implementation 'com.google.android.play:core-ktx:1.8.1'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
implementation 'com.tangem:blockchain:develop-83'
implementation 'com.tangem:blockchain:develop-84'
// implementation 'com.tangem:blockchain:0.0.1'
implementation 'com.tangem.tangem-sdk-kotlin:core:develop-142'
implementation 'com.tangem.tangem-sdk-kotlin:android:develop-142'

2
app/src/main/assets/tangem-app-config

@ -1 +1 @@
Subproject commit 64ae04d2086e5a605dd4da3cba4af32a60d46c79
Subproject commit 7f058ec409b4eaaf8688ecd4bf944ef8d58d3564

1
app/src/main/java/com/tangem/tap/domain/tokens/CurrenciesRepository.kt
View file

@ -9,6 +9,7 @@ import com.tangem.blockchain.common.DerivationStyle
import com.tangem.blockchain.common.Token
import com.tangem.common.card.FirmwareVersion
import com.tangem.common.services.Result
import com.tangem.domain.common.extensions.getTokens
import com.tangem.domain.common.extensions.toNetworkId
import com.tangem.network.api.tangemTech.TangemTechService
import com.tangem.network.common.MoshiConverter

3
app/src/main/java/com/tangem/tap/domain/tokens/models/BlockchainDao.kt
View file

@ -4,6 +4,7 @@ import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass
import com.tangem.blockchain.common.Blockchain
@Deprecated("The class is used only for migration from older versions of the app")
@JsonClass(generateAdapter = true)
data class BlockchainDao(
@Json(name = "key")
@ -11,6 +12,7 @@ data class BlockchainDao(
@Json(name = "testnet")
val isTestNet: Boolean
) {
@Deprecated("The method is used only for migration from older versions of the app")
fun toBlockchain(): Blockchain {
val blockchain = Blockchain.values().find { it.name.lowercase() == name.lowercase() }
?: throw Exception("Invalid BlockchainDao")
@ -19,6 +21,7 @@ data class BlockchainDao(
}
companion object {
@Deprecated("The method is used only for migration from older versions of the app")
fun fromBlockchain(blockchain: Blockchain): BlockchainDao {
val name = blockchain.name.removeSuffix("Testnet").lowercase()
return BlockchainDao(name, blockchain.isTestnet())

9
app/src/main/java/com/tangem/tap/domain/tokens/models/BlockchainNetwork.kt
View file

@ -5,6 +5,7 @@ import com.tangem.blockchain.common.Blockchain
import com.tangem.blockchain.common.Token
import com.tangem.blockchain.common.WalletManager
import com.tangem.common.card.Card
import com.tangem.common.extensions.calculateHashCode
import com.tangem.domain.common.TapWorkarounds.derivationStyle
@JsonClass(generateAdapter = true)
@ -39,11 +40,9 @@ data class BlockchainNetwork(
return true
}
override fun hashCode(): Int {
var result = blockchain.hashCode()
result = 31 * result + (derivationPath?.hashCode() ?: 0)
return result
}
override fun hashCode(): Int = calculateHashCode(
blockchain.hashCode(), derivationPath?.hashCode() ?: 0
)
companion object {
fun fromWalletManager(walletManager: WalletManager): BlockchainNetwork {

2
domain/build.gradle
View file

@ -59,7 +59,7 @@ dependencies {
implementation implementation(project(path: ':network'))
implementation implementation(project(path: ':common'))
implementation 'com.tangem:blockchain:develop-83'
implementation 'com.tangem:blockchain:develop-84'
// implementation 'com.tangem:blockchain:0.0.1'
implementation 'com.tangem.tangem-sdk-kotlin:core:develop-142'
implementation 'com.tangem.tangem-sdk-kotlin:android:develop-142'

27
domain/src/main/java/com/tangem/domain/common/extensions/TangemTechService.kt Normal file
View file

@ -0,0 +1,27 @@
package com.tangem.domain.common.extensions
import com.tangem.common.services.Result
import com.tangem.network.api.tangemTech.CoinsResponse
import com.tangem.network.api.tangemTech.TangemTechService
suspend fun TangemTechService.getTokens(
contractAddress: String,
networkId: String? = null,
active: Boolean? = null,
): Result<CoinsResponse> = coins(
contractAddress = contractAddress,
networkIds = networkId,
active = active
)
suspend fun TangemTechService.getListOfCoins(
networkIds: List<String>,
searchText: String? = null,
offset: Int? = null,
limit: Int? = null
): Result<CoinsResponse> = coins(
networkIds = networkIds.joinToString(","),
searchText = searchText,
offset = offset,
limit = limit
)

1
domain/src/main/java/com/tangem/domain/features/addCustomToken/AddCustomTokenService.kt
View file

@ -1,6 +1,7 @@
package com.tangem.domain.features.addCustomToken
import com.tangem.common.services.Result
import com.tangem.domain.common.extensions.getTokens
import com.tangem.network.api.tangemTech.CoinsResponse
import com.tangem.network.api.tangemTech.TangemTechService

22
network/src/main/java/com/tangem/network/api/tangemTech/TangemTechService.kt
View file

@ -18,29 +18,19 @@ class TangemTechService {
private var api: TangemTechApi = createApi()
suspend fun getTokens(
contractAddress: String,
networkId: String? = null,
suspend fun coins(
contractAddress: String? = null,
networkIds: String? = null,
active: Boolean? = null,
): Result<CoinsResponse> = withContext(Dispatchers.IO) {
performRequest {
api.coins(
contractAddress = contractAddress,
networkIds = networkId,
active = active
)
}
}
suspend fun getListOfCoins(
networkIds: List<String>,
searchText: String? = null,
offset: Int? = null,
limit: Int? = null
): Result<CoinsResponse> = withContext(Dispatchers.IO) {
performRequest {
api.coins(
networkIds = networkIds.joinToString(","),
contractAddress = contractAddress,
networkIds = networkIds,
active = active,
searchText = searchText,
offset = offset,
limit = limit