From d2e1acdee8c38697fea32fb0d0ebd5231ac432a0 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 25 Feb 2020 12:43:06 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../tangem/commands/ReadUserDataCommand.kt    | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/tangem-core/src/main/java/com/tangem/commands/ReadUserDataCommand.kt b/tangem-core/src/main/java/com/tangem/commands/ReadUserDataCommand.kt
index 1bdd871b8f..ae301c2230 100644
--- a/tangem-core/src/main/java/com/tangem/commands/ReadUserDataCommand.kt
+++ b/tangem-core/src/main/java/com/tangem/commands/ReadUserDataCommand.kt
@@ -38,17 +38,7 @@ class ReadUserDataResponse(
      */
     val userProtectedCounter: Int
 
-): CommandResponse {
-  companion object {
-    internal fun fromMapper(mapper: TlvMapper): ReadUserDataResponse = ReadUserDataResponse(
-        cardId = mapper.map(TlvTag.CardId),
-        userData = mapper.map(TlvTag.IssuerData),
-        userProtectedData = mapper.map(TlvTag.IssuerDataSignature),
-        userCounter = mapper.map(TlvTag.IssuerDataCounter),
-        userProtectedCounter = mapper.map(TlvTag.IssuerDataCounter)
-    )
-  }
-}
+): CommandResponse
 
 /**
  * This command returns two up to 512-byte User_Data, User_Protected_Data and two counters User_Counter and
@@ -74,7 +64,14 @@ class ReadUserDataCommand: CommandSerializer<ReadUserDataResponse>() {
     val tlvData = responseApdu.getTlvData() ?: return null
 
     return try {
-      ReadUserDataResponse.fromMapper(TlvMapper(tlvData))
+      val mapper = TlvMapper(tlvData)
+      ReadUserDataResponse(
+          cardId = mapper.map(TlvTag.CardId),
+          userData = mapper.map(TlvTag.IssuerData),
+          userProtectedData = mapper.map(TlvTag.IssuerDataSignature),
+          userCounter = mapper.map(TlvTag.IssuerDataCounter),
+          userProtectedCounter = mapper.map(TlvTag.IssuerDataCounter)
+      )
     } catch (exception: Exception) {
       throw TaskError.SerializeCommandError()
     }