From 07b30e1f02681e622f8e175ba23dd64bcff5c672 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 20 Jan 2020 12:48:05 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../com/tangem/wallet/ethID/EthIdData.java    | 39 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/tangem/wallet/ethID/EthIdData.java b/app/src/main/java/com/tangem/wallet/ethID/EthIdData.java
index a3197b35d0..6cdf9fcf0b 100644
--- a/app/src/main/java/com/tangem/wallet/ethID/EthIdData.java
+++ b/app/src/main/java/com/tangem/wallet/ethID/EthIdData.java
@@ -1,11 +1,14 @@
 package com.tangem.wallet.ethID;
 
+import android.os.Bundle;
+import android.util.Log;
+
 import com.tangem.wallet.CoinData;
 
 public class EthIdData extends CoinData {
     private boolean hasApprovalTx = false;
-    private long approvalAddressNonce;
-    private byte[] CKDpub;
+    private Long approvalAddressNonce;
+    private byte[] CKDpub = null;
 
     public boolean isHasApprovalTx() {
         return hasApprovalTx;
@@ -30,4 +33,36 @@ public class EthIdData extends CoinData {
     public void setCKDpub(byte[] CKDpub) {
         this.CKDpub = CKDpub;
     }
+
+    @Override
+    public void clearInfo() {
+        super.clearInfo();
+        hasApprovalTx = false;
+        approvalAddressNonce = null;
+    }
+
+    @Override
+    public void loadFromBundle(Bundle B) {
+        super.loadFromBundle(B);
+
+        if (B.containsKey("ApprovalAddressNonce")) {
+            approvalAddressNonce = B.getLong("ApprovalAddressNonce");
+        }
+        if (B.containsKey("CKDpub")) CKDpub = B.getByteArray("CKDpub");
+        hasApprovalTx = B.getBoolean("HasApprovalTx");
+    }
+
+    @Override
+    public void saveToBundle(Bundle B) {
+        super.saveToBundle(B);
+        try {
+            if (approvalAddressNonce != null) B.putLong("ApprovalAddressNonce", approvalAddressNonce);
+            if (CKDpub != null) B.putByteArray("CKDpub", CKDpub);
+            B.putBoolean("HasApprovalTx", hasApprovalTx);
+
+        } catch (Exception e) {
+            Log.e("Can't save to bundle ", e.getMessage());
+        }
+
+    }
 }