From 7b4b9e4ff7dc57ce9bc83ca467ed690911819659 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 28 Apr 2020 19:31:04 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../initializers/PersonalizationResources.kt | 6 ------ .../devkit/ucase/variants/personalize/Ids.kt | 5 ----- .../personalize/converter/DefaultValues.kt | 4 +--- .../variants/personalize/converter/ItemTypes.kt | 4 ++-- .../converter/PersonalizationConfigConverter.kt | 14 +------------- .../converter/PersonalizationConfigToCardConfig.kt | 2 +- .../personalize/dto/PersonalizationConfig.kt | 13 +++---------- 7 files changed, 8 insertions(+), 40 deletions(-) diff --git a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/resources/initializers/PersonalizationResources.kt b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/resources/initializers/PersonalizationResources.kt index f92eee7e95..d5a9eb0601 100644 --- a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/resources/initializers/PersonalizationResources.kt +++ b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/resources/initializers/PersonalizationResources.kt @@ -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) { - 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) { 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)) diff --git a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/Ids.kt b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/Ids.kt index 2e10c89ab8..fd186e61f2 100644 --- a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/Ids.kt +++ b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/Ids.kt @@ -54,11 +54,6 @@ enum class SignHashExProp : PersonalizationId { CheckPin3, } -enum class Denomination : PersonalizationId { - WriteOnPersonalize, - Denomination, -} - enum class Token : PersonalizationId { ItsToken, Symbol, diff --git a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/converter/DefaultValues.kt b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/converter/DefaultValues.kt index bb3edb89e9..8c558ab19f 100644 --- a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/converter/DefaultValues.kt +++ b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/converter/DefaultValues.kt @@ -34,8 +34,6 @@ class ConfigValuesHolder : BaseTypedHolder() { 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() { 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)) diff --git a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/converter/ItemTypes.kt b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/converter/ItemTypes.kt index 209036fc03..c257887476 100644 --- a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/converter/ItemTypes.kt +++ b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/converter/ItemTypes.kt @@ -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( diff --git a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/converter/PersonalizationConfigConverter.kt b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/converter/PersonalizationConfigConverter.kt index c2c6810da3..47bc3f2e6a 100644 --- a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/converter/PersonalizationConfigConverter.kt +++ b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/converter/PersonalizationConfigConverter.kt @@ -70,8 +70,6 @@ class ItemsToPersonalizationConfig : ItemsToModel { 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 { 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 { 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 { 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( diff --git a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/converter/PersonalizationConfigToCardConfig.kt b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/converter/PersonalizationConfigToCardConfig.kt index e71acdacd5..719b6bea7a 100644 --- a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/converter/PersonalizationConfigToCardConfig.kt +++ b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/personalize/converter/PersonalizationConfigToCardConfig.kt @@ -101,7 +101,7 @@ class PersonalizationConfigToCardConfig : Converter