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 2020-05-07 08:59:24 +00:00
commit f4bbdebc48
4 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/converter/PersonalizationJsonConverter.kt
View file

@ -80,7 +80,8 @@ internal class JsonToConfig : Converter<PersonalizationJson, PersonalizationConf
// copy whole object and then checking tricky places
config.cardData = jsonCardData
config.itsToken = jsonCardData.token_contract_address.isNotEmpty() || jsonCardData.token_symbol.isNotEmpty()
config.itsToken = jsonCardData.token_contract_address?.isNotEmpty() ?: false
|| jsonCardData.token_symbol?.isNotEmpty() ?: false
val selectedBlockchain = Helper.listOfBlockchain().firstOrNull { it.value == jsonCardData.blockchain }
if (selectedBlockchain == null) {
@ -180,9 +181,9 @@ internal class ConfigToJson : Converter<PersonalizationConfig, PersonalizationJs
jsonDto.cardData.token_symbol = config.cardData.token_symbol
jsonDto.cardData.token_decimal = config.cardData.token_decimal
} else {
jsonDto.cardData.token_contract_address = ""
jsonDto.cardData.token_symbol = ""
jsonDto.cardData.token_decimal = 0
jsonDto.cardData.token_contract_address = null
jsonDto.cardData.token_symbol = null
jsonDto.cardData.token_decimal = null
}
}

6
tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/dto/PersonalizationConfig.kt
View file

@ -192,9 +192,9 @@ class CardData {
var date = ""
var batch = ""
var blockchain = ""
var token_symbol = ""
var token_contract_address = ""
var token_decimal: Long = 0
var token_symbol: String? = null
var token_contract_address: String? = null
var token_decimal: Long? = null
var product_note = false
var product_tag = false
var product_id_card = false

2
tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/dto/PersonalizationJson.kt
View file

@ -87,7 +87,7 @@ fun PersonalizationJson.toCardConfig(): CardConfig {
productMask = productMask,
tokenSymbol = this.cardData.token_symbol,
tokenContractAddress = this.cardData.token_contract_address,
tokenDecimal = this.cardData.token_decimal.toInt(),
tokenDecimal = this.cardData.token_decimal?.toInt(),
issuerName = this.issuerName,
manufactureDateTime = Calendar.getInstance().time,
manufacturerSignature = null)

4
tangem-devkit/src/main/res/values/strings_response.xml
View file

@ -151,9 +151,9 @@
<!-- Field names - Response: Depersonalize -->
<string name="response_depersonalize_is_success">Is success</string>
<string name="response_depersonalize_is_success">Success</string>
<string name="info_response_depersonalize_is_success">Is success</string>
<string name="info_response_depersonalize_is_success">Success</string>
<!-- Field names - Response: Read Issuer (Extra) Data -->