From b7840df04124550eb216f2c8aa3168b0ab8817ad Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 23 Aug 2023 21:17:25 +0800
Subject: [PATCH] Updated on 2026-08-14

---
 app/src/main/java/com/tangem/tap/MainActivity.kt           | 7 +++++++
 .../com/tangem/data/card/sdk/DefaultCardSdkProvider.kt     | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/tangem/tap/MainActivity.kt b/app/src/main/java/com/tangem/tap/MainActivity.kt
index 0d64c958e4..429cbe3e57 100644
--- a/app/src/main/java/com/tangem/tap/MainActivity.kt
+++ b/app/src/main/java/com/tangem/tap/MainActivity.kt
@@ -215,6 +215,13 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
 
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
+
+        /*
+         * FIXME: Test functionality. TangemSdk is null on some devices when HomeAction.Read is called
+         *  inside IntentHandler.
+         */
+        cardSdkLifecycleObserver.onCreate(context = this)
+
         scope.launch {
             intentProcessor.handleIntent(intent)
         }
diff --git a/data/card/src/main/java/com/tangem/data/card/sdk/DefaultCardSdkProvider.kt b/data/card/src/main/java/com/tangem/data/card/sdk/DefaultCardSdkProvider.kt
index 522b4d2b9b..993a613c73 100644
--- a/data/card/src/main/java/com/tangem/data/card/sdk/DefaultCardSdkProvider.kt
+++ b/data/card/src/main/java/com/tangem/data/card/sdk/DefaultCardSdkProvider.kt
@@ -24,7 +24,9 @@ internal class DefaultCardSdkProvider @Inject constructor() : CardSdkProvider, C
     private var _sdk: TangemSdk? = null
 
     override fun onCreate(context: Context) {
-        _sdk = TangemSdk.initWithBiometrics(activity = context as FragmentActivity, config = config)
+        if (_sdk == null) {
+            _sdk = TangemSdk.initWithBiometrics(activity = context as FragmentActivity, config = config)
+        }
     }
 
     override fun onDestroy() {