Merge pull request #9107 from woocommerce/issue/8949_handle_settings_cta

Privacy Banner: handle Settings CTA

Author: atorresveiga

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt

@@ -12,6 +12,7 @@ import android.os.Build.VERSION
 import android.os.Build.VERSION_CODES
 import android.os.Bundle
 import android.os.Handler
+import android.os.Parcelable
 import android.text.method.LinkMovementMethod
 import android.view.Menu
 import android.view.MenuItem
@@ -98,6 +99,7 @@ import com.woocommerce.android.ui.plans.di.StartUpgradeFlowFactory
 import com.woocommerce.android.ui.plans.di.TrialStatusBarFormatterFactory
 import com.woocommerce.android.ui.plans.trial.DetermineTrialStatusBarState.TrialStatusBarState
 import com.woocommerce.android.ui.prefs.AppSettingsActivity
+import com.woocommerce.android.ui.prefs.RequestedAnalyticsValue
 import com.woocommerce.android.ui.products.ProductListFragmentDirections
 import com.woocommerce.android.ui.reviews.ReviewListFragmentDirections
 import com.woocommerce.android.ui.sitepicker.SitePickerFragmentDirections
@@ -599,6 +601,17 @@ class MainActivity :
         startActivityForResult(intent, RequestCodes.SETTINGS)
     }
 
+    private fun showPrivacySettingsScreen(requestedAnalyticsValue: Parcelable) {
+        val intent = Intent(this, AppSettingsActivity::class.java).apply {
+            putExtra(AppSettingsActivity.EXTRA_SHOW_PRIVACY_SETTINGS, true)
+            putExtra(
+                AppSettingsActivity.EXTRA_REQUESTED_ANALYTICS_VALUE_FROM_ERROR,
+                requestedAnalyticsValue
+            )
+        }
+        startActivityForResult(intent, RequestCodes.SETTINGS)
+    }
+
     override fun showAnalytics(targetPeriod: StatsTimeRangeSelection.SelectionType) {
         val action = MyStoreFragmentDirections.actionMyStoreToAnalytics(targetPeriod)
         navController.navigateSafely(action)
@@ -754,6 +767,12 @@ class MainActivity :
                         viewModel.onRequestPrivacyUpdate(event.analyticsEnabled)
                     }.show()
                 }
+                MainActivityViewModel.ShowPrivacySettings -> {
+                    showPrivacySettingsScreen(RequestedAnalyticsValue.NONE)
+                }
+                is MainActivityViewModel.ShowPrivacySettingsWithError -> {
+                    showPrivacySettingsScreen(event.requestedAnalyticsValue)
+                }
             }
         }
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityViewModel.kt

@@ -28,6 +28,7 @@ import com.woocommerce.android.ui.moremenu.MoreMenuNewFeature
 import com.woocommerce.android.ui.moremenu.MoreMenuNewFeatureHandler
 import com.woocommerce.android.ui.plans.trial.DetermineTrialStatusBarState
 import com.woocommerce.android.ui.prefs.PrivacySettingsRepository
+import com.woocommerce.android.ui.prefs.RequestedAnalyticsValue
 import com.woocommerce.android.ui.whatsnew.FeatureAnnouncementRepository
 import com.woocommerce.android.util.BuildConfigWrapper
 import com.woocommerce.android.util.WooLog
@@ -275,6 +276,14 @@ class MainActivityViewModel @Inject constructor(
         }
     }
 
+    fun onPrivacySettingsTapped() {
+        triggerEvent(ShowPrivacySettings)
+    }
+
+    fun onSettingsPrivacyPreferenceUpdateFailed(requestedAnalyticsPreference: RequestedAnalyticsValue) {
+        triggerEvent(ShowPrivacySettingsWithError(requestedAnalyticsPreference))
+    }
+
     object ViewOrderList : Event()
     object ViewReviewList : Event()
     object ViewMyStoreStats : Event()
@@ -292,6 +301,8 @@ class MainActivityViewModel @Inject constructor(
     data class ViewReviewDetail(val uniqueId: Long) : Event()
     data class ViewOrderDetail(val uniqueId: Long, val remoteNoteId: Long) : Event()
     data class ShowPrivacyPreferenceUpdatedFailed(val analyticsEnabled: Boolean) : Event()
+    object ShowPrivacySettings : Event()
+    data class ShowPrivacySettingsWithError(val requestedAnalyticsValue: RequestedAnalyticsValue) : Event()
 
     sealed class MoreMenuBadgeState {
         data class UnseenReviews(val count: Int) : MoreMenuBadgeState()

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/AppSettingsActivity.kt

@@ -27,6 +27,7 @@ import com.woocommerce.android.ui.main.AppBarStatus
 import com.woocommerce.android.ui.main.MainActivity
 import com.woocommerce.android.ui.prefs.MainSettingsFragment.AppSettingsListener
 import com.woocommerce.android.util.AnalyticsUtils
+import com.woocommerce.android.util.parcelable
 import dagger.android.DispatchingAndroidInjector
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
@@ -37,6 +38,8 @@ class AppSettingsActivity :
     AppSettingsListener,
     AppSettingsContract.View {
     companion object {
+        const val EXTRA_SHOW_PRIVACY_SETTINGS = "extra_show_privacy_settings"
+        const val EXTRA_REQUESTED_ANALYTICS_VALUE_FROM_ERROR = "extra_requested_analytics_value_from_error"
         const val RESULT_CODE_BETA_OPTIONS_CHANGED = 2
         const val KEY_BETA_OPTION_CHANGED = "key_beta_option_changed"
     }
@@ -75,6 +78,19 @@ class AppSettingsActivity :
         if (isBetaOptionChanged) {
             setResult(RESULT_CODE_BETA_OPTIONS_CHANGED)
         }
+
+        if (intent.getBooleanExtra(EXTRA_SHOW_PRIVACY_SETTINGS, false)) {
+
+            val requestedAnalyticsValue =
+                intent.parcelable(EXTRA_REQUESTED_ANALYTICS_VALUE_FROM_ERROR)
+                    ?: RequestedAnalyticsValue.NONE
+
+            navHostFragment.navController.navigate(
+                MainSettingsFragmentDirections.actionMainSettingsFragmentToPrivacySettingsFragment(
+                    requestedAnalyticsValue
+                )
+            )
+        }
     }
 
     private val fragmentLifecycleObserver: FragmentLifecycleCallbacks = object : FragmentLifecycleCallbacks() {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/MainSettingsFragment.kt

@@ -184,7 +184,11 @@ class MainSettingsFragment : Fragment(R.layout.fragment_settings_main), MainSett
 
         binding.optionPrivacy.setOnClickListener {
             AnalyticsTracker.track(SETTINGS_PRIVACY_SETTINGS_BUTTON_TAPPED)
-            findNavController().navigateSafely(R.id.action_mainSettingsFragment_to_privacySettingsFragment)
+            findNavController().navigateSafely(
+                MainSettingsFragmentDirections.actionMainSettingsFragmentToPrivacySettingsFragment(
+                    RequestedAnalyticsValue.NONE
+                )
+            )
         }
 
         binding.optionSendFeedback.setOnClickListener {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/PrivacySettingsViewModel.kt

@@ -11,6 +11,7 @@ import com.woocommerce.android.viewmodel.MultiLiveEvent
 import com.woocommerce.android.viewmodel.ResourceProvider
 import com.woocommerce.android.viewmodel.ScopedViewModel
 import com.woocommerce.android.viewmodel.combineWith
+import com.woocommerce.android.viewmodel.navArgs
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import javax.inject.Inject
@@ -24,6 +25,8 @@ class PrivacySettingsViewModel @Inject constructor(
     private val repository: PrivacySettingsRepository,
 ) : ScopedViewModel(savedState) {
 
+    private val args: PrivacySettingsFragmentArgs by savedState.navArgs()
+
     private val analyticsEnabled: LiveData<Boolean> = analyticsTrackerWrapper
         .observeSendUsageStats()
         .asLiveData()
@@ -60,6 +63,17 @@ class PrivacySettingsViewModel @Inject constructor(
                         }
                     )
                 }
+
+                if (args.requestedAnalyticsValue != RequestedAnalyticsValue.NONE) {
+                    val checked =
+                        args.requestedAnalyticsValue == RequestedAnalyticsValue.ENABLED
+
+                    triggerEvent(
+                        MultiLiveEvent.Event.ShowActionSnackbar(
+                            resourceProvider.getString(R.string.settings_tracking_analytics_error_update)
+                        ) { onSendStatsSettingChanged(checked) }
+                    )
+                }
             }
         }
     }
@@ -100,6 +114,7 @@ class PrivacySettingsViewModel @Inject constructor(
 
                 event.fold(
                     onSuccess = {
+                        appPrefs.savedPrivacyBannerSettings = true
                         analyticsTrackerWrapper.sendUsageStats = checked
                     },
                     onFailure = {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/RequestedAnalyticsValue.kt

@@ -0,0 +1,9 @@
+package com.woocommerce.android.ui.prefs
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+enum class RequestedAnalyticsValue : Parcelable {
+    NONE, ENABLED, DISABLE
+}

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/privacy/banner/PrivacyBannerFragment.kt

@@ -37,13 +37,23 @@ class PrivacyBannerFragment : WCBottomSheetDialogFragment() {
         viewModel.event.observe(viewLifecycleOwner) { event ->
             when (event) {
                 is PrivacyBannerViewModel.ShowError -> {
-                    mainViewModel.onPrivacyPreferenceUpdateFailed(event.requestedChange)
+                    mainViewModel.onPrivacyPreferenceUpdateFailed(event.requestedAnalyticsValue)
                     dismiss()
                 }
 
                 is PrivacyBannerViewModel.Dismiss -> {
                     dismiss()
                 }
+
+                is PrivacyBannerViewModel.ShowSettings -> {
+                    mainViewModel.onPrivacySettingsTapped()
+                    dismiss()
+                }
+
+                is PrivacyBannerViewModel.ShowErrorOnSettings -> {
+                    mainViewModel.onSettingsPrivacyPreferenceUpdateFailed(event.requestedAnalyticsValue)
+                    dismiss()
+                }
             }
         }
     }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/privacy/banner/PrivacyBannerScreen.kt

@@ -44,7 +44,8 @@ fun PrivacyBannerScreen(viewModel: PrivacyBannerViewModel) {
     PrivacyBannerScreen(
         state,
         viewModel::onSwitchChanged,
-        viewModel::onSavePressed
+        viewModel::onSavePressed,
+        viewModel::onSettingsPressed,
     )
 }
 
@@ -53,6 +54,7 @@ fun PrivacyBannerScreen(
     state: PrivacyBannerViewModel.State,
     onSwitchChanged: (Boolean) -> Unit,
     onSavePressed: () -> Unit,
+    onSettingsPressed: () -> Unit,
 ) {
     Box(Modifier.background(MaterialTheme.colors.surface)) {
         Column(
@@ -120,7 +122,7 @@ fun PrivacyBannerScreen(
                         hoveredElevation = 0.dp,
                         focusedElevation = 0.dp
                     ),
-                    onClick = { /*TODO*/ }
+                    onClick = onSettingsPressed
                 ) {
                     Text(stringResource(R.string.privacy_banner_settings))
                 }
@@ -178,7 +180,7 @@ private fun Default() {
                 analyticsSwitchEnabled = false,
                 loading = true
             ),
-            {}, {}
+            {}, {}, {}
         )
     }
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/prefs/privacy/banner/PrivacyBannerViewModel.kt

@@ -6,6 +6,7 @@ import androidx.lifecycle.SavedStateHandle
 import com.woocommerce.android.AppPrefsWrapper
 import com.woocommerce.android.analytics.AnalyticsTrackerWrapper
 import com.woocommerce.android.ui.prefs.PrivacySettingsRepository
+import com.woocommerce.android.ui.prefs.RequestedAnalyticsValue
 import com.woocommerce.android.viewmodel.MultiLiveEvent
 import com.woocommerce.android.viewmodel.ScopedViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -20,10 +21,11 @@ class PrivacyBannerViewModel @Inject constructor(
     private val repository: PrivacySettingsRepository,
 ) : ScopedViewModel(savedStateHandle) {
 
+    private val initialUserPreference: Boolean = analyticsTrackerWrapper.sendUsageStats
+
     private val _state: MutableLiveData<State> = MutableLiveData(
         State(
-            analyticsSwitchEnabled = analyticsTrackerWrapper.sendUsageStats,
-            loading = false
+            analyticsSwitchEnabled = initialUserPreference, loading = false
         )
     )
 
@@ -33,6 +35,45 @@ class PrivacyBannerViewModel @Inject constructor(
         _state.value = _state.value?.copy(analyticsSwitchEnabled = checked)
     }
 
+    fun onSettingsPressed() {
+        val analyticsPreference = _state.value?.analyticsSwitchEnabled ?: false
+
+        if (analyticsPreference == initialUserPreference) {
+            appPrefsWrapper.savedPrivacyBannerSettings = true
+            triggerEvent(ShowSettings)
+            return
+        }
+
+        launch {
+            if (repository.isUserWPCOM()) {
+                _state.value = _state.value?.copy(loading = true)
+                val event =
+                    repository.updateTracksSetting(_state.value?.analyticsSwitchEnabled ?: false)
+                _state.value = _state.value?.copy(loading = false)
+
+                event.fold(
+                    onSuccess = {
+                        appPrefsWrapper.savedPrivacyBannerSettings = true
+                        analyticsTrackerWrapper.sendUsageStats = analyticsPreference
+                        triggerEvent(ShowSettings)
+                    },
+                    onFailure = {
+                        triggerEvent(
+                            ShowErrorOnSettings(
+                                requestedAnalyticsValue = if (analyticsPreference) RequestedAnalyticsValue.ENABLED
+                                else RequestedAnalyticsValue.DISABLE
+                            )
+                        )
+                    }
+                )
+            } else {
+                appPrefsWrapper.savedPrivacyBannerSettings = true
+                analyticsTrackerWrapper.sendUsageStats = analyticsPreference
+                triggerEvent(ShowSettings)
+            }
+        }
+    }
+
     fun onSavePressed() {
         val analyticsPreference = _state.value?.analyticsSwitchEnabled ?: false
 
@@ -50,7 +91,7 @@ class PrivacyBannerViewModel @Inject constructor(
                         triggerEvent(Dismiss)
                     },
                     onFailure = {
-                        triggerEvent(ShowError(requestedChange = analyticsPreference))
+                        triggerEvent(ShowError(requestedAnalyticsValue = analyticsPreference))
                     }
                 )
             } else {
@@ -67,5 +108,9 @@ class PrivacyBannerViewModel @Inject constructor(
     )
 
     object Dismiss : MultiLiveEvent.Event()
-    data class ShowError(val requestedChange: Boolean) : MultiLiveEvent.Event()
+    data class ShowError(val requestedAnalyticsValue: Boolean) : MultiLiveEvent.Event()
+    object ShowSettings : MultiLiveEvent.Event()
+    data class ShowErrorOnSettings(
+        val requestedAnalyticsValue: RequestedAnalyticsValue
+    ) : MultiLiveEvent.Event()
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/util/ActivityUtils.kt

@@ -6,6 +6,8 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
+import android.os.Build.VERSION.SDK_INT
+import android.os.Parcelable
 import androidx.core.content.FileProvider
 import com.woocommerce.android.R
 import com.woocommerce.android.extensions.intentActivities
@@ -140,3 +142,9 @@ object ActivityUtils {
         context.startActivity(Intent.createChooser(sendIntent, title))
     }
 }
+
+@Suppress("MagicNumber")
+inline fun <reified T : Parcelable> Intent.parcelable(key: String): T? = when {
+    SDK_INT >= 33 -> getParcelableExtra(key, T::class.java)
+    else -> @Suppress("DEPRECATION") getParcelableExtra(key) as? T
+}