diff --git a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/domain/responses/ResponseJsonConverter.kt b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/domain/responses/ResponseJsonConverter.kt index 06ca8702e5..4c6148b6f9 100644 --- a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/domain/responses/ResponseJsonConverter.kt +++ b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/domain/responses/ResponseJsonConverter.kt @@ -36,7 +36,7 @@ class ByteTypeAdapter( private val fieldConverter: ResponseFieldConverter ) : JsonSerializer { override fun serialize(src: ByteArray, typeOfSrc: Type, context: JsonSerializationContext): JsonElement { - return JsonPrimitive(fieldConverter.byteArray(src)) + return JsonPrimitive(fieldConverter.byteArrayToHex(src)) } } @@ -109,7 +109,11 @@ class ResponseFieldConverter { return Settings.values().filter { masks.contains(it) }.map { it.name } } - fun byteArray(byteArray: ByteArray?): String? { + fun byteArrayToHex(byteArray: ByteArray?): String? { return byteArray?.toHexString() } + + fun byteArrayToString(byteArray: ByteArray?): String? { + return if (byteArray == null) null else String(byteArray) + } } \ No newline at end of file diff --git a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/responses/converter/CardConverter.kt b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/responses/converter/CardConverter.kt index 44e2a5d571..adc53f1fd3 100644 --- a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/responses/converter/CardConverter.kt +++ b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/responses/converter/CardConverter.kt @@ -43,12 +43,12 @@ class CardConverter : BaseResponseConverter() { group.addItem(TextItem(CardId.manufacturerName, from.manufacturerName)) group.addItem(TextItem(CardId.status, valueToString(from.status))) group.addItem(TextItem(CardId.firmwareVersion, from.firmwareVersion)) - group.addItem(TextItem(CardId.cardPublicKey, fieldConverter.byteArray(from.cardPublicKey))) - group.addItem(TextItem(CardId.issuerPublicKey, fieldConverter.byteArray(from.issuerPublicKey))) + group.addItem(TextItem(CardId.cardPublicKey, fieldConverter.byteArrayToHex(from.cardPublicKey))) + group.addItem(TextItem(CardId.issuerPublicKey, fieldConverter.byteArrayToHex(from.issuerPublicKey))) group.addItem(TextItem(CardId.curve, valueToString(from.curve))) group.addItem(TextItem(CardId.maxSignatures, valueToString(from.maxSignatures))) group.addItem(TextItem(CardId.pauseBeforePin2, valueToString(from.pauseBeforePin2))) - group.addItem(TextItem(CardId.walletPublicKey, fieldConverter.byteArray(from.walletPublicKey))) + group.addItem(TextItem(CardId.walletPublicKey, fieldConverter.byteArrayToHex(from.walletPublicKey))) group.addItem(TextItem(CardId.walletRemainingSignatures, valueToString(from.walletRemainingSignatures))) group.addItem(TextItem(CardId.walletSignedHashes, valueToString(from.walletSignedHashes))) group.addItem(TextItem(CardId.health, valueToString(from.health))) @@ -72,7 +72,7 @@ class CardConverter : BaseResponseConverter() { group.addItem(TextItem(CardDataId.manufactureDateTime, valueToString(data.manufactureDateTime))) group.addItem(TextItem(CardDataId.issuerName, data.issuerName)) group.addItem(TextItem(CardDataId.blockchainName, data.blockchainName)) - group.addItem(TextItem(CardDataId.manufacturerSignature, fieldConverter.byteArray(data.manufacturerSignature))) + group.addItem(TextItem(CardDataId.manufacturerSignature, fieldConverter.byteArrayToHex(data.manufacturerSignature))) group.addItem(TextItem(CardDataId.tokenSymbol, data.tokenSymbol)) group.addItem(TextItem(CardDataId.tokenContractAddress, data.tokenContractAddress)) group.addItem(TextItem(CardDataId.tokenDecimal, data.tokenSymbol)) diff --git a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/responses/converter/SimpleConverters.kt b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/responses/converter/SimpleConverters.kt index e68c77e083..e06e2492f0 100644 --- a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/responses/converter/SimpleConverters.kt +++ b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/responses/converter/SimpleConverters.kt @@ -17,7 +17,7 @@ class SignResponseConverter : BaseResponseConverter() { TextItem(SignId.cid, from.cardId), TextItem(SignId.walletSignedHashes, valueToString(from.walletSignedHashes)), TextItem(SignId.walletRemainingSignatures, valueToString(from.walletRemainingSignatures)), - TextItem(SignId.signature, fieldConverter.byteArray(from.signature)) + TextItem(SignId.signature, fieldConverter.byteArrayToHex(from.signature)) ) } } @@ -33,7 +33,7 @@ class CreateWalletResponseConverter : BaseResponseConverter { return listOf( TextItem(ReadIssuerDataId.cid, from.cardId), - TextItem(ReadIssuerDataId.issuerData, fieldConverter.byteArray(from.issuerData)), - TextItem(ReadIssuerDataId.issuerDataSignature, fieldConverter.byteArray(from.issuerDataSignature)), + TextItem(ReadIssuerDataId.issuerData, fieldConverter.byteArrayToString(from.issuerData)), + TextItem(ReadIssuerDataId.issuerDataSignature, fieldConverter.byteArrayToHex(from.issuerDataSignature)), TextItem(ReadIssuerDataId.issuerDataCounter, valueToString(from.issuerDataCounter)) ) } @@ -63,8 +63,8 @@ class ReadIssuerExtraDataResponseConverter : BaseResponseConverter { return listOf( TextItem(ReadUserDataId.cid, from.cardId), - TextItem(ReadUserDataId.userData, fieldConverter.byteArray(from.userData)), - TextItem(ReadUserDataId.userProtectedData, fieldConverter.byteArray(from.userProtectedData)), + TextItem(ReadUserDataId.userData, fieldConverter.byteArrayToString(from.userData)), + TextItem(ReadUserDataId.userProtectedData, fieldConverter.byteArrayToString(from.userProtectedData)), TextItem(ReadUserDataId.userCounter, valueToString(from.userCounter)), TextItem(ReadUserDataId.userProtectedCounter, valueToString(from.userProtectedCounter)) )