From f45ce626b91efe436438783ab16428b1593f3102 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 25 Oct 2022 21:35:45 +0500 Subject: [PATCH] Updated on 2026-08-14 --- .../common/analytics/api/EventHandlerApi.kt | 21 ++++++++++++++++++- .../amplitude/AmplitudeAnalyticsHandler.kt | 11 ---------- .../appsFlyer/AppsFlyerAnalyticsHandler.kt | 11 ---------- .../firebase/FirebaseAnalyticsHandler.kt | 10 --------- 4 files changed, 20 insertions(+), 33 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/common/analytics/api/EventHandlerApi.kt b/app/src/main/java/com/tangem/tap/common/analytics/api/EventHandlerApi.kt index 0491d03b80..dce88977e6 100644 --- a/app/src/main/java/com/tangem/tap/common/analytics/api/EventHandlerApi.kt +++ b/app/src/main/java/com/tangem/tap/common/analytics/api/EventHandlerApi.kt @@ -7,6 +7,7 @@ import com.tangem.common.core.TangemSdkError import com.tangem.tap.common.analytics.AnalyticsAnOld import com.tangem.tap.common.analytics.AnalyticsEventAnOld import com.tangem.tap.common.analytics.AnalyticsParamAnOld +import com.tangem.tap.common.analytics.events.AnalyticsEvent import com.tangem.tap.common.extensions.filterNotNull /** @@ -18,12 +19,26 @@ interface AnalyticsEventHandler { params: Map = emptyMap(), ) + fun handleAnalyticsEvent( + event: AnalyticsEvent, + card: Card? = null, + blockchain: String? = null, + ) { + handleEvent( + event = prepareEventString(event.category, event.event), + params = prepareParams(card, blockchain, event.params), + ) + } + + @Deprecated("Migrate to AnalyticsEvent") fun handleAnalyticsEvent( event: AnalyticsEventAnOld, params: Map = emptyMap(), card: Card? = null, blockchain: String? = null, - ) + ) { + handleEvent(event.event, prepareParams(card, blockchain, params)) + } fun prepareParams( card: Card?, @@ -34,6 +49,10 @@ interface AnalyticsEventHandler { AnalyticsParamAnOld.BATCH_ID.param to card?.batchId, AnalyticsParamAnOld.BLOCKCHAIN.param to blockchain, ).filterNotNull() + params + + fun prepareEventString(category: String, event: String): String { + return "[$category] $event" + } } interface ErrorEventHandler { diff --git a/app/src/main/java/com/tangem/tap/common/analytics/handlers/amplitude/AmplitudeAnalyticsHandler.kt b/app/src/main/java/com/tangem/tap/common/analytics/handlers/amplitude/AmplitudeAnalyticsHandler.kt index dcc0930b4e..27132a1f61 100644 --- a/app/src/main/java/com/tangem/tap/common/analytics/handlers/amplitude/AmplitudeAnalyticsHandler.kt +++ b/app/src/main/java/com/tangem/tap/common/analytics/handlers/amplitude/AmplitudeAnalyticsHandler.kt @@ -1,7 +1,5 @@ package com.tangem.tap.common.analytics.handlers.amplitude -import com.tangem.common.card.Card -import com.tangem.tap.common.analytics.AnalyticsEventAnOld import com.tangem.tap.common.analytics.api.AnalyticsEventHandler class AmplitudeAnalyticsHandler( @@ -11,13 +9,4 @@ class AmplitudeAnalyticsHandler( override fun handleEvent(event: String, params: Map) { client.logEvent(event, params) } - - override fun handleAnalyticsEvent( - event: AnalyticsEventAnOld, - params: Map, - card: Card?, - blockchain: String?, - ) { - handleEvent(event.event, prepareParams(card, blockchain, params)) - } } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/common/analytics/handlers/appsFlyer/AppsFlyerAnalyticsHandler.kt b/app/src/main/java/com/tangem/tap/common/analytics/handlers/appsFlyer/AppsFlyerAnalyticsHandler.kt index 42ddfb8925..0acfb1dc2f 100644 --- a/app/src/main/java/com/tangem/tap/common/analytics/handlers/appsFlyer/AppsFlyerAnalyticsHandler.kt +++ b/app/src/main/java/com/tangem/tap/common/analytics/handlers/appsFlyer/AppsFlyerAnalyticsHandler.kt @@ -4,8 +4,6 @@ import com.appsflyer.AFInAppEventParameterName import com.appsflyer.AFInAppEventType import com.shopify.buy3.Storefront import com.tangem.common.Converter -import com.tangem.common.card.Card -import com.tangem.tap.common.analytics.AnalyticsEventAnOld import com.tangem.tap.common.analytics.api.AnalyticsEventHandler import com.tangem.tap.common.analytics.api.ShopifyOrderEventHandler @@ -17,15 +15,6 @@ class AppsFlyerAnalyticsHandler( client.logEvent(event, params) } - override fun handleAnalyticsEvent( - event: AnalyticsEventAnOld, - params: Map, - card: Card?, - blockchain: String?, - ) { - handleEvent(event.event, prepareParams(card, blockchain, params)) - } - override fun handleShopifyOrderEvent(order: Storefront.Order) { handleEvent(ORDER_EVENT, OrderToParamsConverter().convert(order)) } diff --git a/app/src/main/java/com/tangem/tap/common/analytics/handlers/firebase/FirebaseAnalyticsHandler.kt b/app/src/main/java/com/tangem/tap/common/analytics/handlers/firebase/FirebaseAnalyticsHandler.kt index 08404f01f7..3ab6326670 100644 --- a/app/src/main/java/com/tangem/tap/common/analytics/handlers/firebase/FirebaseAnalyticsHandler.kt +++ b/app/src/main/java/com/tangem/tap/common/analytics/handlers/firebase/FirebaseAnalyticsHandler.kt @@ -7,7 +7,6 @@ import com.tangem.common.Converter import com.tangem.common.card.Card import com.tangem.common.core.TangemSdkError import com.tangem.tap.common.analytics.AnalyticsAnOld -import com.tangem.tap.common.analytics.AnalyticsEventAnOld import com.tangem.tap.common.analytics.AnalyticsParamAnOld import com.tangem.tap.common.analytics.api.AnalyticsEventHandler import com.tangem.tap.common.analytics.api.ErrorEventHandler @@ -24,15 +23,6 @@ class FirebaseAnalyticsHandler( client.logEvent(event, params) } - override fun handleAnalyticsEvent( - event: AnalyticsEventAnOld, - params: Map, - card: Card?, - blockchain: String?, - ) { - handleEvent(event.name, prepareParams(card, blockchain, params)) - } - override fun handleErrorEvent(error: Throwable, params: Map) { client.logErrorEvent(error, params) }