Skip to content

Commit

Permalink
added CustomerIOAnalytics
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrehan27
mrehan27 committed Oct 12, 2023
1 parent 29dea10 commit 8e5d931
Show file tree
Hide file tree
Showing 55 changed files with 169 additions and 2,509 deletions.
6 changes: 3 additions & 3 deletions messaginginapp/src/main/java/io/customer/messaginginapp/ModuleMessagingInApp.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import io.customer.sdk.data.request.MetricEvent
import io.customer.sdk.di.CustomerIOComponent
import io.customer.sdk.hooks.HookModule
import io.customer.sdk.hooks.HooksManager
import io.customer.sdk.module.CustomerIOAnalytics
import io.customer.sdk.module.CustomerIOModule
import io.customer.sdk.repository.TrackRepository

class ModuleMessagingInApp
@VisibleForTesting @InternalCustomerIOApi
Expand Down Expand Up @@ -47,8 +47,8 @@ internal constructor(
private val diGraph: CustomerIOComponent
get() = overrideDiGraph ?: CustomerIO.instance().diGraph

private val trackRepository: TrackRepository
get() = diGraph.trackRepository
private val trackRepository: CustomerIOAnalytics
get() = diGraph.analyticsModule

private val identifier: String?
get() = diGraph.sitePreferenceRepository.getIdentifier()
Expand Down
7 changes: 6 additions & 1 deletion messagingpush/api/messagingpush.api
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,12 @@ public final class io/customer/messagingpush/util/PushTrackingUtil$Companion {
}

public final class io/customer/messagingpush/util/PushTrackingUtilImpl : io/customer/messagingpush/util/PushTrackingUtil {
public fun <init> (Lio/customer/sdk/repository/TrackRepository;)V
public fun <init> (Lio/customer/sdk/module/AnalyticsModule;)V
public fun parseLaunchedActivityForTracking (Landroid/os/Bundle;)Z
}

public abstract interface class io/customer/sdk/device/DeviceTokenProvider {
public abstract fun getCurrentToken (Lkotlin/jvm/functions/Function1;)V
public abstract fun isValidForThisDevice (Landroid/content/Context;)Z
}

0 ...ustomer/sdk/device/DeviceTokenProvider.kt → ...ssagingpush/device/DeviceTokenProvider.kt
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions messagingpush/src/main/java/io/customer/messagingpush/di/DiGraphMessagingPush.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ internal val CustomerIOComponent.deepLinkUtil: DeepLinkUtil

@InternalCustomerIOApi
val CustomerIOComponent.pushTrackingUtil: PushTrackingUtil
get() = override() ?: PushTrackingUtilImpl(trackRepository)
get() = override() ?: PushTrackingUtilImpl(analyticsModule)

internal val CustomerIOComponent.pushMessageProcessor: PushMessageProcessor
get() = override() ?: getSingletonInstanceCreate {
PushMessageProcessorImpl(
logger = logger,
moduleConfig = moduleConfig,
trackRepository = trackRepository
trackRepository = analyticsModule
)
}

Expand Down
4 changes: 2 additions & 2 deletions messagingpush/src/main/java/io/customer/messagingpush/processor/PushMessageProcessorImpl.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import androidx.annotation.VisibleForTesting
import io.customer.messagingpush.MessagingPushModuleConfig
import io.customer.messagingpush.util.PushTrackingUtil
import io.customer.sdk.data.request.MetricEvent
import io.customer.sdk.repository.TrackRepository
import io.customer.sdk.module.CustomerIOAnalytics
import io.customer.sdk.util.Logger

internal class PushMessageProcessorImpl(
private val logger: Logger,
private val moduleConfig: MessagingPushModuleConfig,
private val trackRepository: TrackRepository
private val trackRepository: CustomerIOAnalytics
) : PushMessageProcessor {

/**
Expand Down
4 changes: 2 additions & 2 deletions messagingpush/src/main/java/io/customer/messagingpush/util/PushTrackingUtil.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package io.customer.messagingpush.util

import android.os.Bundle
import io.customer.sdk.data.request.MetricEvent
import io.customer.sdk.repository.TrackRepository
import io.customer.sdk.module.CustomerIOAnalytics

interface PushTrackingUtil {
fun parseLaunchedActivityForTracking(bundle: Bundle): Boolean
Expand All @@ -14,7 +14,7 @@ interface PushTrackingUtil {
}

class PushTrackingUtilImpl(
private val trackRepository: TrackRepository
private val trackRepository: CustomerIOAnalytics
) : PushTrackingUtil {

override fun parseLaunchedActivityForTracking(bundle: Bundle): Boolean {
Expand Down
100 changes: 45 additions & 55 deletions sdk/api/sdk.api
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public final class io/customer/sdk/CustomerIO$Builder {
public final fun autoTrackScreenViews (Z)Lio/customer/sdk/CustomerIO$Builder;
public final fun build ()Lio/customer/sdk/CustomerIO;
public final fun getOverrideDiGraph ()Lio/customer/sdk/di/CustomerIOComponent;
public final fun setAnalyticsTracking (Lio/customer/sdk/module/AnalyticsModule;)Lio/customer/sdk/CustomerIO$Builder;
public final fun setBackgroundQueueMinNumberOfTasks (I)Lio/customer/sdk/CustomerIO$Builder;
public final fun setBackgroundQueueSecondsDelay (D)Lio/customer/sdk/CustomerIO$Builder;
public final fun setClient (Lio/customer/sdk/data/store/Client;)Lio/customer/sdk/CustomerIO$Builder;
Expand All @@ -48,17 +49,6 @@ public final class io/customer/sdk/CustomerIO$Companion {
public final fun instance ()Lio/customer/sdk/CustomerIO;
}

public final class io/customer/sdk/CustomerIOActivityLifecycleCallbacks : android/app/Application$ActivityLifecycleCallbacks {
public fun onActivityCreated (Landroid/app/Activity;Landroid/os/Bundle;)V
public fun onActivityDestroyed (Landroid/app/Activity;)V
public fun onActivityPaused (Landroid/app/Activity;)V
public fun onActivityResumed (Landroid/app/Activity;)V
public fun onActivitySaveInstanceState (Landroid/app/Activity;Landroid/os/Bundle;)V
public fun onActivityStarted (Landroid/app/Activity;)V
public fun onActivityStopped (Landroid/app/Activity;)V
public final fun registerCallback (Lio/customer/sdk/lifecycle/LifecycleCallback;)V
}

public final class io/customer/sdk/CustomerIOConfig {
public static final field Companion Lio/customer/sdk/CustomerIOConfig$Companion;
public fun <init> (Lio/customer/sdk/data/store/Client;Ljava/lang/String;Ljava/lang/String;Lio/customer/sdk/data/model/Region;JZZIDDLio/customer/sdk/util/CioLogLevel;Ljava/lang/String;Ljava/util/Map;)V
Expand Down Expand Up @@ -155,7 +145,9 @@ public final class io/customer/sdk/CustomerIOShared {
public final fun getDiStaticGraph ()Lio/customer/sdk/di/CustomerIOStaticComponent;
public final fun initializeAndGetSharedComponent (Landroid/content/Context;)Lio/customer/sdk/di/CustomerIOSharedComponent;
public static final fun instance ()Lio/customer/sdk/CustomerIOShared;
public final fun registerModule (Lio/customer/sdk/module/CustomerIOModule;)V
public final fun setDiSharedGraph (Lio/customer/sdk/di/CustomerIOSharedComponent;)V
public final fun unregisterModule (Lio/customer/sdk/module/CustomerIOModule;)V
}

public final class io/customer/sdk/CustomerIOShared$Companion {
Expand Down Expand Up @@ -229,34 +221,17 @@ public final class io/customer/sdk/data/request/MetricEvent$Companion {
public final fun getEvent (Ljava/lang/String;)Lio/customer/sdk/data/request/MetricEvent;
}

public abstract interface class io/customer/sdk/device/DeviceTokenProvider {
public abstract fun getCurrentToken (Lkotlin/jvm/functions/Function1;)V
public abstract fun isValidForThisDevice (Landroid/content/Context;)Z
}

public final class io/customer/sdk/di/CustomerIOComponent : io/customer/sdk/di/DiGraph {
public fun <init> (Lio/customer/sdk/di/CustomerIOStaticComponent;Landroid/content/Context;Lio/customer/sdk/CustomerIOConfig;)V
public final fun getActivityLifecycleCallbacks ()Lio/customer/sdk/CustomerIOActivityLifecycleCallbacks;
public final fun getCioHttpRetryPolicy ()Lio/customer/sdk/api/HttpRetryPolicy;
public fun <init> (Lio/customer/sdk/di/CustomerIOStaticComponent;Landroid/content/Context;Lio/customer/sdk/module/AnalyticsModule;Lio/customer/sdk/CustomerIOConfig;)V
public final fun getActivityLifecycleCallbacks ()Lio/customer/sdk/lifecycle/CustomerIOActivityLifecycleCallbacks;
public final fun getAnalyticsModule ()Lio/customer/sdk/module/AnalyticsModule;
public final fun getContext ()Landroid/content/Context;
public final fun getDateUtil ()Lio/customer/sdk/util/DateUtil;
public final fun getDeviceRepository ()Lio/customer/sdk/repository/DeviceRepository;
public final fun getDispatchersProvider ()Lio/customer/sdk/util/DispatchersProvider;
public final fun getFileStorage ()Lio/customer/sdk/data/store/FileStorage;
public final fun getHooksManager ()Lio/customer/sdk/hooks/HooksManager;
public final fun getJsonAdapter ()Lio/customer/sdk/util/JsonAdapter;
public final fun getLogger ()Lio/customer/sdk/util/Logger;
public final fun getMoshi ()Lcom/squareup/moshi/Moshi;
public final fun getProfileRepository ()Lio/customer/sdk/repository/ProfileRepository;
public final fun getQueue ()Lio/customer/sdk/queue/Queue;
public final fun getQueueQueryRunner ()Lio/customer/sdk/queue/QueueQueryRunner;
public final fun getQueueRunRequest ()Lio/customer/sdk/queue/QueueRunRequest;
public final fun getQueueRunner ()Lio/customer/sdk/queue/QueueRunner;
public final fun getQueueStorage ()Lio/customer/sdk/queue/QueueStorage;
public final fun getSdkConfig ()Lio/customer/sdk/CustomerIOConfig;
public final fun getSitePreferenceRepository ()Lio/customer/sdk/repository/preference/SitePreferenceRepository;
public final fun getTimer ()Lio/customer/sdk/util/SimpleTimer;
public final fun getTrackRepository ()Lio/customer/sdk/repository/TrackRepository;
}

public final class io/customer/sdk/di/CustomerIOSharedComponent : io/customer/sdk/di/DiGraph {
Expand Down Expand Up @@ -315,6 +290,17 @@ public abstract class io/customer/sdk/hooks/ModuleHookProvider {
public fun screenTrackedHook (Lio/customer/sdk/hooks/ModuleHook$ScreenTrackedHook;)V
}

public final class io/customer/sdk/lifecycle/CustomerIOActivityLifecycleCallbacks : android/app/Application$ActivityLifecycleCallbacks {
public fun onActivityCreated (Landroid/app/Activity;Landroid/os/Bundle;)V
public fun onActivityDestroyed (Landroid/app/Activity;)V
public fun onActivityPaused (Landroid/app/Activity;)V
public fun onActivityResumed (Landroid/app/Activity;)V
public fun onActivitySaveInstanceState (Landroid/app/Activity;Landroid/os/Bundle;)V
public fun onActivityStarted (Landroid/app/Activity;)V
public fun onActivityStopped (Landroid/app/Activity;)V
public final fun registerCallback (Lio/customer/sdk/lifecycle/LifecycleCallback;)V
}

public abstract interface class io/customer/sdk/lifecycle/LifecycleCallback {
public abstract fun getEventsToObserve ()Ljava/util/List;
public abstract fun onEventChanged (Landroidx/lifecycle/Lifecycle$Event;Landroid/app/Activity;Landroid/os/Bundle;)V
Expand All @@ -325,6 +311,34 @@ public final class io/customer/sdk/lifecycle/LifecycleCallback$DefaultImpls {
public static synthetic fun onEventChanged$default (Lio/customer/sdk/lifecycle/LifecycleCallback;Landroidx/lifecycle/Lifecycle$Event;Landroid/app/Activity;Landroid/os/Bundle;ILjava/lang/Object;)V
}

public abstract interface class io/customer/sdk/module/AnalyticsModule : io/customer/sdk/module/CustomerIOModule {
public abstract fun addCustomDeviceAttributes (Ljava/util/Map;)V
public abstract fun addCustomProfileAttributes (Ljava/util/Map;)V
public abstract fun cleanup (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
public abstract fun clearIdentify ()V
public abstract fun deleteDeviceToken ()V
public abstract fun getDeviceAttributes ()Ljava/util/Map;
public abstract fun getProfileAttributes ()Ljava/util/Map;
public abstract fun getRegisteredDeviceToken ()Ljava/lang/String;
public abstract fun identify (Ljava/lang/String;)V
public abstract fun identify (Ljava/lang/String;Ljava/util/Map;)V
public abstract fun registerDeviceToken (Ljava/lang/String;Ljava/util/Map;)V
public abstract fun screen (Landroid/app/Activity;)V
public abstract fun screen (Landroid/app/Activity;Ljava/util/Map;)V
public abstract fun screen (Ljava/lang/String;)V
public abstract fun screen (Ljava/lang/String;Ljava/util/Map;)V
public abstract fun setDeviceAttributes (Ljava/util/Map;)V
public abstract fun setProfileAttributes (Ljava/util/Map;)V
public abstract fun track (Ljava/lang/String;)V
public abstract fun track (Ljava/lang/String;Ljava/util/Map;)V
public abstract fun trackInAppMetric (Ljava/lang/String;Lio/customer/sdk/data/request/MetricEvent;Ljava/util/Map;)V
public abstract fun trackMetric (Ljava/lang/String;Lio/customer/sdk/data/request/MetricEvent;Ljava/lang/String;)V
}

public final class io/customer/sdk/module/AnalyticsModule$DefaultImpls {
public static synthetic fun trackInAppMetric$default (Lio/customer/sdk/module/AnalyticsModule;Ljava/lang/String;Lio/customer/sdk/data/request/MetricEvent;Ljava/util/Map;ILjava/lang/Object;)V
}

public abstract interface class io/customer/sdk/module/CustomerIOModule {
public abstract fun getModuleConfig ()Lio/customer/sdk/module/CustomerIOModuleConfig;
public abstract fun getModuleName ()Ljava/lang/String;
Expand All @@ -338,30 +352,6 @@ public abstract interface class io/customer/sdk/module/CustomerIOModuleConfig$Bu
public abstract fun build ()Lio/customer/sdk/module/CustomerIOModuleConfig;
}

public abstract interface class io/customer/sdk/repository/DeviceRepository {
public abstract fun addCustomDeviceAttributes (Ljava/util/Map;)V
public abstract fun deleteDeviceToken ()V
public abstract fun getDeviceToken ()Ljava/lang/String;
public abstract fun registerDeviceToken (Ljava/lang/String;Ljava/util/Map;)V
}

public abstract interface class io/customer/sdk/repository/ProfileRepository {
public abstract fun addCustomProfileAttributes (Ljava/util/Map;)V
public abstract fun clearIdentify ()V
public abstract fun identify (Ljava/lang/String;Ljava/util/Map;)V
}

public abstract interface class io/customer/sdk/repository/TrackRepository {
public abstract fun screen (Ljava/lang/String;Ljava/util/Map;)V
public abstract fun track (Ljava/lang/String;Ljava/util/Map;)V
public abstract fun trackInAppMetric (Ljava/lang/String;Lio/customer/sdk/data/request/MetricEvent;Ljava/util/Map;)V
public abstract fun trackMetric (Ljava/lang/String;Lio/customer/sdk/data/request/MetricEvent;Ljava/lang/String;)V
}

public final class io/customer/sdk/repository/TrackRepository$DefaultImpls {
public static synthetic fun trackInAppMetric$default (Lio/customer/sdk/repository/TrackRepository;Ljava/lang/String;Lio/customer/sdk/data/request/MetricEvent;Ljava/util/Map;ILjava/lang/Object;)V
}

public abstract interface class io/customer/sdk/repository/preference/SitePreferenceRepository {
public abstract fun clearAll ()V
public abstract fun getDeviceToken ()Ljava/lang/String;
Expand Down
Loading

0 comments on commit 8e5d931

Please sign in to comment.