Updated on 2026-08-14

This commit is contained in:
Tangem 2020-04-28 19:31:04 +03:00
parent 73c298e21a
commit 7b4b9e4ff7
7 changed files with 8 additions and 40 deletions

View file

@ -17,7 +17,6 @@ class PersonalizationResources() {
initCommon(holder)
initSigningMethod(holder)
initSignHashExProp(holder)
initDenomination(holder)
initToken(holder)
initProductMask(holder)
initSettingsMask(holder)
@ -72,11 +71,6 @@ class PersonalizationResources() {
holder.register(SignHashExProp.CheckPin3, Resources(R.string.pers_item_check_pin3_on_card, R.string.info_pers_item_check_pin3_on_card))
}
private fun initDenomination(holder: TypedHolder<Id, Resources>) {
holder.register(Denomination.WriteOnPersonalize, Resources(R.string.pers_item_write_on_personalize, R.string.info_pers_item_write_on_personalize))
holder.register(Denomination.Denomination, Resources(R.string.pers_item_denomination, R.string.info_pers_item_denomination))
}
private fun initToken(holder: TypedHolder<Id, Resources>) {
holder.register(Token.ItsToken, Resources(R.string.pers_item_its_token, R.string.info_pers_item_its_token))
holder.register(Token.Symbol, Resources(R.string.pers_item_symbol, R.string.info_pers_item_symbol))

View file

@ -54,11 +54,6 @@ enum class SignHashExProp : PersonalizationId {
CheckPin3,
}
enum class Denomination : PersonalizationId {
WriteOnPersonalize,
Denomination,
}
enum class Token : PersonalizationId {
ItsToken,
Symbol,

View file

@ -34,8 +34,6 @@ class ConfigValuesHolder : BaseTypedHolder<Id, Value>() {
register(SignHashExProp.RequireTerminalCertSig, Value(default.requireTerminalCertSignature))
register(SignHashExProp.RequireTerminalTxSig, Value(default.requireTerminalTxSignature))
register(SignHashExProp.CheckPin3, Value(default.checkPIN3onCard))
register(Denomination.WriteOnPersonalize, Value(default.writeOnPersonalization))
register(Denomination.Denomination, Value(default.denomination))
register(Token.ItsToken, Value(default.itsToken))
register(Token.Symbol, Value(default.symbol))
register(Token.ContractAddress, Value(default.contractAddress))
@ -49,7 +47,7 @@ class ConfigValuesHolder : BaseTypedHolder<Id, Value>() {
register(SettingsMask.ForbidPurge, Value(default.forbidPurgeWallet))
register(SettingsMask.AllowSelectBlockchain, Value(default.allowSelectBlockchain))
register(SettingsMask.UseBlock, Value(default.useBlock))
register(SettingsMask.OneApdu, Value(default.oneApdu))
register(SettingsMask.OneApdu, Value(default.useOneCommandAtTime))
register(SettingsMask.UseCvc, Value(default.useCVC))
register(SettingsMask.AllowSwapPin, Value(default.allowSwapPIN))
register(SettingsMask.AllowSwapPin2, Value(default.allowSwapPIN2))

View file

@ -17,7 +17,7 @@ class ItemTypes {
Common.CreateWallet, SigningMethod.SignTx, SigningMethod.SignTxRaw, SigningMethod.SignValidatedTx,
SigningMethod.SignValidatedTxRaw, SigningMethod.SignValidatedTxIssuer,
SigningMethod.SignValidatedTxRawIssuer, SigningMethod.SignExternal, SignHashExProp.RequireTerminalCertSig,
SignHashExProp.RequireTerminalTxSig, SignHashExProp.CheckPin3, Denomination.WriteOnPersonalize, Token.ItsToken,
SignHashExProp.RequireTerminalTxSig, SignHashExProp.CheckPin3, Token.ItsToken,
ProductMask.Note, ProductMask.Tag, ProductMask.IdCard, ProductMask.IdIssuerCard, SettingsMask.IsReusable, SettingsMask.NeedActivation,
SettingsMask.ForbidPurge, SettingsMask.AllowSelectBlockchain, SettingsMask.UseBlock, SettingsMask.OneApdu,
SettingsMask.UseCvc, SettingsMask.AllowSwapPin, SettingsMask.AllowSwapPin2, SettingsMask.ForbidDefaultPin,
@ -34,7 +34,7 @@ class ItemTypes {
)
val numberList = mutableListOf(
CardNumber.Number, Common.MaxSignatures, SignHashExProp.PinLessFloorLimit, Denomination.Denomination, Token.Decimal
CardNumber.Number, Common.MaxSignatures, SignHashExProp.PinLessFloorLimit, Token.Decimal
)
val hiddenList = mutableListOf<Id>(

View file

@ -70,8 +70,6 @@ class ItemsToPersonalizationConfig : ItemsToModel<PersonalizationConfig> {
export.requireTerminalCertSignature = getTyped(SignHashExProp.RequireTerminalCertSig)
export.requireTerminalTxSignature = getTyped(SignHashExProp.RequireTerminalTxSig)
export.checkPIN3onCard = getTyped(SignHashExProp.CheckPin3)
export.writeOnPersonalization = getTyped(Denomination.WriteOnPersonalize)
export.denomination = getTyped(Denomination.Denomination)
export.itsToken = getTyped(Token.ItsToken)
export.symbol = getTyped(Token.Symbol)
export.contractAddress = getTyped(Token.ContractAddress)
@ -85,7 +83,7 @@ class ItemsToPersonalizationConfig : ItemsToModel<PersonalizationConfig> {
export.forbidPurgeWallet = getTyped(SettingsMask.ForbidPurge)
export.allowSelectBlockchain = getTyped(SettingsMask.AllowSelectBlockchain)
export.useBlock = getTyped(SettingsMask.UseBlock)
export.oneApdu = getTyped(SettingsMask.OneApdu)
export.useOneCommandAtTime = getTyped(SettingsMask.OneApdu)
export.useCVC = getTyped(SettingsMask.UseCvc)
export.allowSwapPIN = getTyped(SettingsMask.AllowSwapPin)
export.allowSwapPIN2 = getTyped(SettingsMask.AllowSwapPin2)
@ -139,7 +137,6 @@ class PersonalizationConfigToItems : ModelToItems<PersonalizationConfig> {
blocList.add(common())
blocList.add(signingMethod())
blocList.add(signHashExProperties())
blocList.add(denomination())
blocList.add(token())
blocList.add(productMask())
blocList.add(settingsMask())
@ -203,15 +200,6 @@ class PersonalizationConfigToItems : ModelToItems<PersonalizationConfig> {
return block
}
private fun denomination(): ItemGroup {
val block = createGroup(BlockId.Denomination)
mutableListOf(
Denomination.WriteOnPersonalize,
Denomination.Denomination
).forEach { createItem(block, it) }
return block
}
private fun token(): ItemGroup {
val block = createGroup(BlockId.Token)
mutableListOf(

View file

@ -101,7 +101,7 @@ class PersonalizationConfigToCardConfig : Converter<PersonalizationConfig, CardC
from.useCVC,
from.useNDEF,
from.useDynamicNDEF,
from.oneApdu,
from.useOneCommandAtTime,
from.useBlock,
from.allowSelectBlockchain,
from.forbidPurgeWallet,

View file

@ -1,6 +1,7 @@
package com.tangem.devkit.ucase.variants.personalize.dto
import com.tangem.commands.EllipticCurve
import com.tangem.commands.personalization.entities.NdefRecord
/**
[REDACTED_AUTHOR]
@ -35,10 +36,6 @@ class PersonalizationConfig {
var requireTerminalCertSignature = false
var checkPIN3onCard = false
// Denomination
var writeOnPersonalization = false
var denomination: Long = 0
// Token
var itsToken = false
var symbol = ""
@ -53,7 +50,7 @@ class PersonalizationConfig {
var forbidPurgeWallet = false
var allowSelectBlockchain = false
var useBlock = false
var oneApdu = false
var useOneCommandAtTime = false
var useCVC = false
var allowSwapPIN = false
var allowSwapPIN2 = false
@ -114,10 +111,6 @@ class PersonalizationConfig {
requireTerminalCertSignature = false
checkPIN3onCard = true
// Denomination
writeOnPersonalization = false
denomination = 1000000L
// Token
itsToken = false
symbol = ""
@ -132,7 +125,7 @@ class PersonalizationConfig {
forbidPurgeWallet = false
allowSelectBlockchain = false
useBlock = false
oneApdu = false
useOneCommandAtTime = false
useCVC = false
allowSwapPIN = true
allowSwapPIN2 = true