mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-10-25 04:06:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Analytics: Display the opt in screen from the setting, and cleanup the code

Browse source
This commit is contained in:
Benoit Marty 2021-12-07 14:22:11 +01:00
parent 219bb89c3a
commit d63f9073b7
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
vector/src/main/java/im/vector/app/features/analytics/ui/consent/AnalyticsConsentViewState.kt
View file

@ -21,12 +21,4 @@ import com.airbnb.mvrx.MavericksState
data class AnalyticsConsentViewState( data class AnalyticsConsentViewState(
val userConsent: Boolean = false, val userConsent: Boolean = false,
val didAskUserConsent: Boolean = false val didAskUserConsent: Boolean = false
) : MavericksState { ) : MavericksState
val shouldCheckTheBox: Boolean =
if (didAskUserConsent) {
userConsent
} else {
// default value
true
}
}

13
vector/src/main/java/im/vector/app/features/settings/VectorSettingsSecurityPrivacyFragment.kt
View file

@ -288,7 +288,7 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
} }
private fun observeAnalyticsState() { private fun observeAnalyticsState() {
analyticsConsentViewModel.onEach(AnalyticsConsentViewState::shouldCheckTheBox) { analyticsConsentViewModel.onEach(AnalyticsConsentViewState::userConsent) {
analyticsConsent.isChecked = it analyticsConsent.isChecked = it
} }
} }
@ -296,8 +296,15 @@ class VectorSettingsSecurityPrivacyFragment @Inject constructor(
private fun setUpAnalytics() { private fun setUpAnalytics() {
analyticsCategory.isVisible = analyticsConfig.isEnabled analyticsCategory.isVisible = analyticsConfig.isEnabled
analyticsConsent.setOnPreferenceClickListener { analyticsConsent.setOnPreferenceChangeListener { _, newValue ->
analyticsConsentViewModel.handle(AnalyticsConsentViewActions.SetUserConsent(analyticsConsent.isChecked)) val newValueBool = newValue as? Boolean ?: false
if (newValueBool) {
// User want to enable analytics, display the opt in screen
navigator.openAnalyticsOptIn(requireContext())
} else {
// Just disable analytics
analyticsConsentViewModel.handle(AnalyticsConsentViewActions.SetUserConsent(false))
}
true true
} }
} }