From a8108f2e1734ab848ea075c52bdee55945b61de0 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 24 Nov 2021 12:09:15 +0100
Subject: [PATCH] Analytics: simpler API

---
 .../java/im/vector/app/features/analytics/VectorAnalytics.kt  | 2 +-
 .../app/features/analytics/impl/DefaultVectorAnalytics.kt     | 4 ++--
 .../im/vector/app/features/analytics/store/AnalyticsStore.kt  | 4 ++--
 .../analytics/ui/consent/AnalyticsConsentViewModel.kt         | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/vector/src/main/java/im/vector/app/features/analytics/VectorAnalytics.kt b/vector/src/main/java/im/vector/app/features/analytics/VectorAnalytics.kt
index 4503f4152d..ae119561b3 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/VectorAnalytics.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/VectorAnalytics.kt
@@ -37,7 +37,7 @@ interface VectorAnalytics {
     /**
      * Store the fact that the user has been asked for their consent
      */
-    suspend fun setDidAskUserConsent(didAskUserConsent: Boolean)
+    suspend fun setDidAskUserConsent()
 
     /**
      * Return a Flow of String, used for analytics Id
diff --git a/vector/src/main/java/im/vector/app/features/analytics/impl/DefaultVectorAnalytics.kt b/vector/src/main/java/im/vector/app/features/analytics/impl/DefaultVectorAnalytics.kt
index 541c040ed0..2b5a7dd544 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/impl/DefaultVectorAnalytics.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/impl/DefaultVectorAnalytics.kt
@@ -52,8 +52,8 @@ class DefaultVectorAnalytics @Inject constructor(
         return analyticsStore.didAskUserConsentFlow
     }
 
-    override suspend fun setDidAskUserConsent(didAskUserConsent: Boolean) {
-        analyticsStore.setDidAskUserConsent(didAskUserConsent)
+    override suspend fun setDidAskUserConsent() {
+        analyticsStore.setDidAskUserConsent()
     }
 
     override fun getAnalyticsId(): Flow<String> {
diff --git a/vector/src/main/java/im/vector/app/features/analytics/store/AnalyticsStore.kt b/vector/src/main/java/im/vector/app/features/analytics/store/AnalyticsStore.kt
index b4d93e674f..efb824d3db 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/store/AnalyticsStore.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/store/AnalyticsStore.kt
@@ -61,9 +61,9 @@ class AnalyticsStore @Inject constructor(
         }
     }
 
-    suspend fun setDidAskUserConsent(newDidAskUserConsent: Boolean) {
+    suspend fun setDidAskUserConsent() {
         context.dataStore.edit { settings ->
-            settings[didAskUserConsent] = newDidAskUserConsent
+            settings[didAskUserConsent] = true
         }
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsConsentViewModel.kt b/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsConsentViewModel.kt
index 00ed86b0ca..4fdbf08c5f 100644
--- a/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsConsentViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsConsentViewModel.kt
@@ -65,7 +65,7 @@ class AnalyticsConsentViewModel @AssistedInject constructor(
             analytics.setUserConsent(action.userConsent)
             if (!action.userConsent) {
                 // User explicitly changed the default value, let's avoid reverting to the default value
-                analytics.setDidAskUserConsent(true)
+                analytics.setDidAskUserConsent()
             }
         }
     }
@@ -73,7 +73,7 @@ class AnalyticsConsentViewModel @AssistedInject constructor(
     private fun handleOnScreenLeft() {
         // Whatever the state of the box, consider the user acknowledge it
         viewModelScope.launch {
-            analytics.setDidAskUserConsent(true)
+            analytics.setDidAskUserConsent()
         }
     }
 }