Updated on 2026-08-14

app/src/main/java/com/tangem/tap/ApplicationEntryPoint.kt

@@ -32,6 +32,7 @@ import com.tangem.domain.wallets.repository.WalletsRepository
 import com.tangem.domain.wallets.usecase.GenerateWalletNameUseCase
 import com.tangem.features.details.DetailsFeatureToggles
 import com.tangem.features.pushnotifications.api.featuretoggles.PushNotificationsFeatureToggles
+import com.tangem.tap.common.log.TangemAppLoggerInitializer
 import com.tangem.tap.domain.walletconnect2.domain.WalletConnectSessionsRepository
 import com.tangem.tap.features.customtoken.api.featuretoggles.CustomTokenFeatureToggles
 import com.tangem.tap.proxy.AppStateHolder
@@ -116,4 +117,6 @@ interface ApplicationEntryPoint {
     fun getAppRouter(): AppRouter
 
     fun getPushNotificationsFeatureToggles(): PushNotificationsFeatureToggles
+
+    fun getTangemAppLogger(): TangemAppLoggerInitializer
 }

app/src/main/java/com/tangem/tap/TangemApplication.kt

@@ -6,8 +6,6 @@ import android.content.pm.PackageManager
 import coil.ImageLoader
 import coil.ImageLoaderFactory
 import com.chuckerteam.chucker.api.ChuckerInterceptor
-import com.orhanobut.logger.AndroidLogAdapter
-import com.orhanobut.logger.Logger
 import com.tangem.Log
 import com.tangem.LogFormat
 import com.tangem.TangemSdkLogger
@@ -54,8 +52,8 @@ import com.tangem.tap.common.analytics.handlers.firebase.FirebaseAnalyticsHandle
 import com.tangem.tap.common.feedback.AdditionalFeedbackInfo
 import com.tangem.tap.common.feedback.LegacyFeedbackManager
 import com.tangem.tap.common.images.createCoilImageLoader
+import com.tangem.tap.common.log.TangemAppLoggerInitializer
 import com.tangem.tap.common.log.TangemLogCollector
-import com.tangem.tap.common.log.TimberFormatStrategy
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.appReducer
 import com.tangem.tap.common.redux.global.GlobalAction
@@ -69,7 +67,6 @@ import com.tangem.wallet.BuildConfig
 import dagger.hilt.EntryPoints
 import kotlinx.coroutines.runBlocking
 import org.rekotlin.Store
-import timber.log.Timber
 import com.tangem.tap.domain.walletconnect2.domain.LegacyWalletConnectRepository as WalletConnect2Repository
 
 lateinit var store: Store<AppState>
@@ -191,6 +188,9 @@ abstract class TangemApplication : Application(), ImageLoaderFactory {
 
     private val pushNotificationsFeatureToggles: PushNotificationsFeatureToggles
         get() = entryPoint.getPushNotificationsFeatureToggles()
+
+    private val tangemAppLoggerInitializer: TangemAppLoggerInitializer
+        get() = entryPoint.getTangemAppLogger()
     // endregion
 
     override fun onCreate() {
@@ -202,16 +202,7 @@ abstract class TangemApplication : Application(), ImageLoaderFactory {
     fun init() {
         store = createReduxStore()
 
-        if (BuildConfig.LOG_ENABLED) {
-            Logger.addLogAdapter(AndroidLogAdapter(TimberFormatStrategy()))
-            Timber.plant(
-                object : Timber.DebugTree() {
-                    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
-                        Logger.log(priority, tag, message, t)
-                    }
-                },
-            )
-        }
+        tangemAppLoggerInitializer.initialize()
 
         foregroundActivityObserver = ForegroundActivityObserver()
         activityResultCaller = foregroundActivityObserver

app/src/main/java/com/tangem/tap/common/log/TangemAppLoggerInitializer.kt

@@ -0,0 +1,48 @@
+package com.tangem.tap.common.log
+
+import android.util.Log
+import com.orhanobut.logger.AndroidLogAdapter
+import com.orhanobut.logger.Logger
+import com.tangem.domain.settings.repositories.SettingsRepository
+import com.tangem.wallet.BuildConfig
+import timber.log.Timber
+
+/**
+ * Tangem app logger
+ *
+ * @property settingsRepository repository for saving logs
+ *
+[REDACTED_AUTHOR]
+ */
+class TangemAppLoggerInitializer(
+    private val settingsRepository: SettingsRepository,
+) {
+
+    /** Initialize */
+    fun initialize() {
+        if (IS_LOG_ENABLED) {
+            Logger.addLogAdapter(AndroidLogAdapter(TimberFormatStrategy()))
+        }
+
+        Timber.plant(tree = createTimberTree())
+    }
+
+    private fun createTimberTree(): Timber.Tree {
+        return object : Timber.DebugTree() {
+            override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
+                if (IS_LOG_ENABLED) {
+                    Logger.log(priority, tag, message, t)
+                }
+
+                if (PERMITTED_PRIORITY.contains(priority)) {
+                    settingsRepository.saveLogMessage(message)
+                }
+            }
+        }
+    }
+
+    private companion object {
+        val IS_LOG_ENABLED: Boolean = BuildConfig.LOG_ENABLED
+        val PERMITTED_PRIORITY = listOf(Log.ERROR, Log.INFO)
+    }
+}

app/src/main/java/com/tangem/tap/common/log/TangemCardSDKLogger.kt

@@ -4,11 +4,6 @@ import com.tangem.Log
 import com.tangem.LogFormat
 import com.tangem.TangemSdkLogger
 import com.tangem.domain.settings.repositories.SettingsRepository
-import com.tangem.utils.coroutines.CoroutineDispatcherProvider
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
 
 /**
  * CardSDK logger implementation
@@ -16,7 +11,6 @@ import kotlinx.coroutines.sync.withLock
  * @property levels             logging levels
  * @property messageFormatter   message formatter
  * @property settingsRepository settings repository
- * @property dispatchers        coroutine dispatchers provider
  *
 [REDACTED_AUTHOR]
  */
@@ -24,19 +18,11 @@ internal class TangemCardSDKLogger(
     private val levels: List<Log.Level>,
     private val messageFormatter: LogFormat,
     private val settingsRepository: SettingsRepository,
-    private val dispatchers: CoroutineDispatcherProvider,
 ) : TangemSdkLogger {
 
-    private val scope = CoroutineScope(dispatchers.main)
-    private val mutex = Mutex()
-
     override fun log(message: () -> String, level: Log.Level) {
         if (!levels.contains(level)) return
 
-        scope.launch(dispatchers.main) {
-            mutex.withLock {
-                settingsRepository.updateAppLogs(message = messageFormatter.format(message, level))
-            }
-        }
+        settingsRepository.saveLogMessage(message = messageFormatter.format(message, level))
     }
 }

app/src/main/java/com/tangem/tap/data/TangemBlockchainSDKLogger.kt

@@ -2,33 +2,19 @@ package com.tangem.tap.data
 
 import com.tangem.blockchain.common.logging.BlockchainSDKLogger
 import com.tangem.domain.settings.repositories.SettingsRepository
-import com.tangem.utils.coroutines.CoroutineDispatcherProvider
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
 
 /**
  * BlockchainSDK logger implementation
  *
  * @property settingsRepository settings repository
- * @property dispatchers        coroutine dispatchers provider
  *
 [REDACTED_AUTHOR]
  */
 internal class TangemBlockchainSDKLogger(
     private val settingsRepository: SettingsRepository,
-    private val dispatchers: CoroutineDispatcherProvider,
 ) : BlockchainSDKLogger {
 
-    private val scope = CoroutineScope(dispatchers.main)
-    private val mutex = Mutex()
-
     override fun log(level: BlockchainSDKLogger.Level, message: String) {
-        scope.launch(dispatchers.main) {
-            mutex.withLock {
-                settingsRepository.updateAppLogs(message)
-            }
-        }
+        settingsRepository.saveLogMessage(message)
     }
 }

app/src/main/java/com/tangem/tap/di/data/BlockchainSDKLoggerModule.kt

@@ -1,25 +0,0 @@
-package com.tangem.tap.di.data
-
-import com.tangem.blockchain.common.logging.BlockchainSDKLogger
-import com.tangem.domain.settings.repositories.SettingsRepository
-import com.tangem.tap.data.TangemBlockchainSDKLogger
-import com.tangem.utils.coroutines.CoroutineDispatcherProvider
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-internal object BlockchainSDKLoggerModule {
-
-    @Provides
-    @Singleton
-    fun provideBlockchainSDKLogger(
-        settingsRepository: SettingsRepository,
-        dispatchers: CoroutineDispatcherProvider,
-    ): BlockchainSDKLogger {
-        return TangemBlockchainSDKLogger(settingsRepository, dispatchers)
-    }
-}

app/src/main/java/com/tangem/tap/di/data/TangemLoggingModule.kt

@@ -3,9 +3,11 @@ package com.tangem.tap.di.data
 import com.tangem.Log
 import com.tangem.LogFormat
 import com.tangem.TangemSdkLogger
+import com.tangem.blockchain.common.logging.BlockchainSDKLogger
 import com.tangem.domain.settings.repositories.SettingsRepository
+import com.tangem.tap.common.log.TangemAppLoggerInitializer
 import com.tangem.tap.common.log.TangemCardSDKLogger
-import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import com.tangem.tap.data.TangemBlockchainSDKLogger
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -14,14 +16,17 @@ import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
-internal object CardSDKLoggerModule {
+internal object TangemLoggingModule {
 
     @Provides
     @Singleton
-    fun provideCardSDKLogger(
-        settingsRepository: SettingsRepository,
-        dispatchers: CoroutineDispatcherProvider,
-    ): TangemSdkLogger {
+    fun provideAppLoggerInitializer(settingsRepository: SettingsRepository): TangemAppLoggerInitializer {
+        return TangemAppLoggerInitializer(settingsRepository)
+    }
+
+    @Provides
+    @Singleton
+    fun provideCardSDKLogger(settingsRepository: SettingsRepository): TangemSdkLogger {
         val logLevels = listOf(
             Log.Level.ApduCommand,
             Log.Level.Apdu,
@@ -40,7 +45,12 @@ internal object CardSDKLoggerModule {
             levels = logLevels,
             messageFormatter = LogFormat.StairsFormatter(),
             settingsRepository = settingsRepository,
-            dispatchers = dispatchers,
         )
     }
+
+    @Provides
+    @Singleton
+    fun provideBlockchainSDKLogger(settingsRepository: SettingsRepository): BlockchainSDKLogger {
+        return TangemBlockchainSDKLogger(settingsRepository)
+    }
 }