diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/PersonalizeResources.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/PersonalizeResources.kt index f5e5338d4d..1413ede425 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/PersonalizeResources.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/resources/initializers/PersonalizeResources.kt @@ -88,6 +88,7 @@ class PersonalizeResources() { holder.register(ProductMask.Note, Resources(R.string.pers_item_note, R.string.info_pers_item_note)) holder.register(ProductMask.Tag, Resources(R.string.pers_item_tag, R.string.info_pers_item_tag)) holder.register(ProductMask.CardId, Resources(R.string.pers_item_id_card, R.string.info_pers_item_id_card)) + holder.register(ProductMask.IssuerId, Resources(R.string.pers_item_id_issuer, R.string.info_pers_item_id_issuer)) } private fun initSettingsMask(holder: TypedHolder) { diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/Ids.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/Ids.kt index eb631b200f..b0cf3f78de 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/Ids.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/Ids.kt @@ -71,7 +71,8 @@ enum class Token : BlockItem { enum class ProductMask : BlockItem { Note, Tag, - CardId + CardId, + IssuerId } enum class SettingsMask : BlockItem { diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/DefaultValues.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/DefaultValues.kt index 5b60115730..9fac214af2 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/DefaultValues.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/DefaultValues.kt @@ -43,6 +43,7 @@ class PersonalizeConfigValuesHolder : BaseTypedHolder() { register(ProductMask.Note, Value(default.cardData.product_note)) register(ProductMask.Tag, Value(default.cardData.product_tag)) register(ProductMask.CardId, Value(default.cardData.product_id_card)) + register(ProductMask.IssuerId, Value(default.cardData.product_id_issuer)) register(SettingsMask.IsReusable, Value(default.isReusable)) register(SettingsMask.NeedActivation, Value(default.useActivation)) register(SettingsMask.ForbidPurge, Value(default.forbidPurgeWallet)) diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/fromTo/ItemTypes.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/fromTo/ItemTypes.kt index 7deee294d8..4c6b277667 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/fromTo/ItemTypes.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/fromTo/ItemTypes.kt @@ -17,7 +17,7 @@ class ItemTypes { SigningMethod.SignValidatedTxRaw, SigningMethod.SignValidatedTxIssuer, SigningMethod.SignValidatedTxRawIssuer, SigningMethod.SignExternal, SignHashExProp.RequireTerminalCertSig, SignHashExProp.RequireTerminalTxSig, SignHashExProp.CheckPin3, Denomination.WriteOnPersonalize, Token.ItsToken, - ProductMask.Note, ProductMask.Tag, ProductMask.CardId, SettingsMask.IsReusable, SettingsMask.NeedActivation, + ProductMask.Note, ProductMask.Tag, ProductMask.CardId, ProductMask.IssuerId,SettingsMask.IsReusable, SettingsMask.NeedActivation, SettingsMask.ForbidPurge, SettingsMask.AllowSelectBlockchain, SettingsMask.UseBlock, SettingsMask.OneApdu, SettingsMask.UseCvc, SettingsMask.AllowSwapPin, SettingsMask.AllowSwapPin2, SettingsMask.ForbidDefaultPin, SettingsMask.SmartSecurityDelay, SettingsMask.ProtectIssuerDataAgainstReplay, diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/fromTo/ItemsToPersonalizeConfig.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/fromTo/ItemsToPersonalizeConfig.kt index f1a8d7a1ac..d6ea20bf06 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/fromTo/ItemsToPersonalizeConfig.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/fromTo/ItemsToPersonalizeConfig.kt @@ -68,6 +68,7 @@ class ItemsToPersonalizeConfig : ItemsToModel { export.cardData = export.cardData.apply { this.product_note = getTyped(ProductMask.Note) } export.cardData = export.cardData.apply { this.product_tag = getTyped(ProductMask.Tag) } export.cardData = export.cardData.apply { this.product_id_card = getTyped(ProductMask.CardId) } + export.cardData = export.cardData.apply { this.product_id_issuer = getTyped(ProductMask.IssuerId) } export.isReusable = getTyped(SettingsMask.IsReusable) export.useActivation = getTyped(SettingsMask.NeedActivation) export.forbidPurgeWallet = getTyped(SettingsMask.ForbidPurge) diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/fromTo/PersonalizeConfigTo.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/fromTo/PersonalizeConfigTo.kt index a1186a3291..73baa0b078 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/fromTo/PersonalizeConfigTo.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/converter/fromTo/PersonalizeConfigTo.kt @@ -121,7 +121,8 @@ class PersonalizeConfigToItem : ModelToItems { mutableListOf( ProductMask.Note, ProductMask.Tag, - ProductMask.CardId + ProductMask.CardId, + ProductMask.IssuerId ).forEach { createItem(block, it) } return block } @@ -215,11 +216,13 @@ class PersonalizeConfigToCardConfig : Converter { val isNote = from.cardData.product_note val isTag = from.cardData.product_tag val isIdCard = from.cardData.product_id_card + val isIdIssuer = from.cardData.product_id_card val productMaskBuilder = ProductMaskBuilder() if (isNote) productMaskBuilder.add(com.tangem.commands.ProductMask.note) if (isTag) productMaskBuilder.add(com.tangem.commands.ProductMask.tag) if (isIdCard) productMaskBuilder.add(com.tangem.commands.ProductMask.idCard) + if (isIdIssuer) productMaskBuilder.add(com.tangem.commands.ProductMask.idIssuer) val productMask = productMaskBuilder.build() var tokenSymbol: String? = null diff --git a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizeConfig.kt b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizeConfig.kt index 1c16a6d5f0..0ebc993776 100644 --- a/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizeConfig.kt +++ b/tangem-demo/src/main/java/com/tangem/tangemtest/ucase/variants/personalize/dto/PersonalizeConfig.kt @@ -105,4 +105,5 @@ class CardData { var product_note = true var product_tag = false var product_id_card = false + var product_id_issuer = false } \ No newline at end of file diff --git a/tangem-demo/src/main/res/values/strings_personalization.xml b/tangem-demo/src/main/res/values/strings_personalization.xml index f43540df2c..6ae2c26d5b 100644 --- a/tangem-demo/src/main/res/values/strings_personalization.xml +++ b/tangem-demo/src/main/res/values/strings_personalization.xml @@ -44,6 +44,7 @@ Note Tag ID card + ID Issuer Is reusable Need activation Forbid purge @@ -115,6 +116,7 @@ Self-custodial wallet or note Anti-counterfeit tag Personal ID card + Defines what happens when user calls PURGE_WALLET command: \nOff - Card will switch to Purged state \nOn - Card will switch to Empty state and let create a new wallet again