fix: countly general implementation fixes (WPB-14941) (#3732)

wireapp · Dec 11, 2024 · ea04edd · ea04edd
1 parent e6d8091
commit ea04edd
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 2 deletions.
diff --git a/...abled/src/main/kotlin/com/wire/android/feature/analytics/AnonymousAnalyticsManagerImpl.kt b/...abled/src/main/kotlin/com/wire/android/feature/analytics/AnonymousAnalyticsManagerImpl.kt
@@ -42,6 +42,9 @@ object AnonymousAnalyticsManagerImpl : AnonymousAnalyticsManager {
     private val mutex = Mutex()
     private lateinit var coroutineScope: CoroutineScope
 
+    // TODO: Sync with product, when we want to enable view tracking, var for testing purposes
+    internal var VIEW_TRACKING_ENABLED: Boolean = false
+
     override fun <T> init(
         context: Context,
         analyticsSettings: AnalyticsSettings,
@@ -172,6 +175,10 @@ object AnonymousAnalyticsManagerImpl : AnonymousAnalyticsManager {
         }
 
     override fun recordView(screen: String) {
+        if (!VIEW_TRACKING_ENABLED) {
+            Log.d(TAG, "View tracking is disabled for this build.")
+            return
+        }
         coroutineScope.launch {
             mutex.withLock {
                 if (!isAnonymousUsageDataEnabled) return@withLock
@@ -181,6 +188,10 @@ object AnonymousAnalyticsManagerImpl : AnonymousAnalyticsManager {
     }
 
     override fun stopView(screen: String) {
+        if (!VIEW_TRACKING_ENABLED) {
+            Log.d(TAG, "View tracking is disabled for this build.")
+            return
+        }
         coroutineScope.launch {
             mutex.withLock {
                 if (!isAnonymousUsageDataEnabled) return@withLock

diff --git a/...bled/src/main/kotlin/com/wire/android/feature/analytics/AnonymousAnalyticsRecorderImpl.kt b/...bled/src/main/kotlin/com/wire/android/feature/analytics/AnonymousAnalyticsRecorderImpl.kt
@@ -85,7 +85,7 @@ class AnonymousAnalyticsRecorderImpl : AnonymousAnalyticsRecorder {
 
     override fun halt() {
         isConfigured = false
-        Countly.sharedInstance().halt()
+        Countly.sharedInstance().consent().removeConsentAll()
     }
 
     override suspend fun setTrackingIdentifierWithMerge(

diff --git a/...abled/src/test/kotlin/com/wire/android/feature/analytics/AnonymousAnalyticsManagerTest.kt b/...abled/src/test/kotlin/com/wire/android/feature/analytics/AnonymousAnalyticsManagerTest.kt
@@ -294,6 +294,37 @@ class AnonymousAnalyticsManagerTest {
         }
     }
 
+    @Test
+    fun givenManagerInitialized_whenRecordingViewAndFlagDisabled_thenScreenIsNOTRecorded() = runTest(dispatcher) {
+        // given
+        val (arrangement, manager) = Arrangement()
+            .withAnonymousAnalyticsRecorderConfigure()
+            .arrange(shouldTrackViews = false)
+
+        val screen = "screen"
+        arrangement.withAnalyticsResult(Arrangement.existingIdentifierResult)
+
+        // when
+        manager.init(
+            context = arrangement.context,
+            analyticsSettings = Arrangement.analyticsSettings,
+            analyticsResultFlow = arrangement.analyticsResultChannel.consumeAsFlow(),
+            anonymousAnalyticsRecorder = arrangement.anonymousAnalyticsRecorder,
+            migrationHandler = arrangement.migrationHandler,
+            propagationHandler = arrangement.propagationHandler,
+            dispatcher = dispatcher
+        )
+        advanceUntilIdle()
+
+        manager.recordView(screen)
+        advanceUntilIdle()
+
+        // then
+        verify(exactly = 0) {
+            arrangement.anonymousAnalyticsRecorder.recordView(eq(screen))
+        }
+    }
+
     @Test
     fun givenManagerInitialized_whenStoppingView_thenScreenIsStoppedToRecord() = runTest(dispatcher) {
         // given
@@ -387,7 +418,7 @@ class AnonymousAnalyticsManagerTest {
             AnonymousAnalyticsManagerImpl
         }
 
-        fun arrange() = this to manager
+        fun arrange(shouldTrackViews: Boolean = true) = this to manager.apply { VIEW_TRACKING_ENABLED = shouldTrackViews }
 
         fun withAnonymousAnalyticsRecorderConfigure() = apply {
             every { anonymousAnalyticsRecorder.configure(any(), any()) } returns Unit