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-02-19 11:00:19 +00:00
commit e15b532c6a
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1 +1 @@
Subproject commit 4a1be08512fe2b45504f2bdaa0e35f5c11e11319
Subproject commit 82f4a8aebcab924047705ad3ecd5f008f07ca0b5

8
app/src/main/java/com/tangem/tap/common/feedback/FeedbackDataBuilder.kt
View file

@ -1,6 +1,5 @@
package com.tangem.tap.common.feedback
import com.tangem.blockchain.common.Blockchain
import com.tangem.tap.common.extensions.breakLine
class FeedbackDataBuilder(
@ -33,9 +32,10 @@ class FeedbackDataBuilder(
builder.appendKeyValue("Blockchain", walletInfo.blockchain.fullName)
builder.appendKeyValue("Derivation path", walletInfo.derivationPath)
if (walletInfo.blockchain == Blockchain.Bitcoin) {
builder.appendKeyValue("XPUB", infoHolder.extendedPublicKey)
}
// enable later
// if (walletInfo.blockchain == Blockchain.Bitcoin) {
// builder.appendKeyValue("XPUB", infoHolder.extendedPublicKey)
// }
builder.appendKeyValue("Outputs count", walletInfo.outputsCount)

3
app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt
View file

@ -23,6 +23,7 @@ import com.tangem.domain.common.TwinsHelper
import com.tangem.domain.common.configs.CardConfig
import com.tangem.domain.common.util.derivationStyleProvider
import com.tangem.domain.models.scan.CardDTO
import com.tangem.domain.models.scan.CardDTO.Companion.RING_BATCH_IDS
import com.tangem.domain.models.scan.ProductType
import com.tangem.domain.models.scan.ScanResponse
import com.tangem.operations.ScanTask
@ -239,7 +240,7 @@ private class ScanWalletProcessor(
}
private fun getWalletProductType(card: CardDTO): ProductType {
if (card.batchId == CardDTO.RING_BATCH_ID) {
if (RING_BATCH_IDS.contains(card.batchId)) {
return ProductType.Ring
}
return if (card.firmwareVersion >= FirmwareVersion.Ed25519Slip0010Available &&

2
domain/models/src/main/kotlin/com/tangem/domain/models/scan/CardDTO.kt
View file

@ -321,6 +321,6 @@ data class CardDTO(
}
companion object {
const val RING_BATCH_ID = "AC17"
val RING_BATCH_IDS = listOf("AC17", "BA01")
}
}