Merge pull request #14917 from woocommerce/encrypted-logging-volley-fix

Bump Encrypted Logging to the version without Volley

Author: irfano

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

@@ -51,6 +51,10 @@ class DeveloperOptionsFragment : BaseFragment() {
                     ToastUtils.showToast(context, event.message)
                 }
 
+                is DeveloperOptionsViewModel.DeveloperOptionsEvents.ShowToastText -> {
+                    ToastUtils.showToast(context, event.message)
+                }
+
                 is DeveloperOptionsViewModel.DeveloperOptionsEvents.ShowUpdateOptionsDialog -> {
                     showUpdateOptionsDialog(
                         values = event.options,

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

@@ -1,5 +1,6 @@
 package com.woocommerce.android.ui.prefs.developer
 
+import com.automattic.android.tracks.crashlogging.CrashLogging
 import com.woocommerce.android.AppPrefs
 import com.woocommerce.android.cardreader.CardReaderManager
 import com.woocommerce.android.di.AppCoroutineScope
@@ -16,6 +17,7 @@ class DeveloperOptionsRepository @Inject constructor(
     private val appPrefs: AppPrefs,
     private val clearCardReaderDataAction: ClearCardReaderDataAction,
     private val cardReaderManager: CardReaderManager,
+    private val crashLogging: CrashLogging,
     @AppCoroutineScope appScope: CoroutineScope
 ) {
     private val appPrefsTrigger = appPrefs.observePrefs().shareIn(appScope, started = SharingStarted.WhileSubscribed())
@@ -71,4 +73,14 @@ class DeveloperOptionsRepository @Inject constructor(
             )
         }
     }
+
+    fun sendTestSentryReport() {
+        appPrefs.setCrashReportingEnabled(true)
+
+        crashLogging.sendReport(
+            exception = Exception("Test Sentry report from Developer Options"),
+            tags = mapOf("source" to "developer_options"),
+            message = "This is a test report triggered from Developer Options"
+        )
+    }
 }

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

@@ -90,12 +90,23 @@ class DeveloperOptionsViewModel @Inject constructor(
         )
     )
 
+    private val sendSentryReportFlow = flowOf(
+        NonToggleableListItem(
+            icon = R.drawable.ic_email,
+            iconTint = R.color.color_primary,
+            label = UiString.UiStringText("Send Sentry Report"),
+            isEnabled = true,
+            onClick = ::onSendSentryReportClicked
+        )
+    )
+
     val viewState = combine(
         simulatedCardReaderFlow,
         readerUpdateFrequencyFlow,
         interacPaymentEnabledFlow,
         savedPrivacySettingsOnDialogFlow,
-        apiFakerFlow
+        apiFakerFlow,
+        sendSentryReportFlow
     ) { items ->
         DeveloperOptionsViewState(
             rows = items.filterNotNull()
@@ -131,8 +142,16 @@ class DeveloperOptionsViewModel @Inject constructor(
         developerOptionsRepository.updateSimulatedReaderOption(selectedOption.toDomainModel())
     }
 
+    private fun onSendSentryReportClicked() {
+        developerOptionsRepository.sendTestSentryReport()
+        triggerEvent(
+            DeveloperOptionsEvents.ShowToastText("Sentry report sent")
+        )
+    }
+
     sealed class DeveloperOptionsEvents : MultiLiveEvent.Event() {
         data class ShowToastString(val message: Int) : DeveloperOptionsEvents()
+        data class ShowToastText(val message: String) : DeveloperOptionsEvents()
         data class ShowUpdateOptionsDialog(
             val options: List<UpdateFrequencyUiModel>,
             var selectedValue: UpdateFrequencyUiModel,

gradle/libs.versions.toml

@@ -41,7 +41,7 @@ androidx-work = '2.10.5'
 apache-commons-text = '1.14.0'
 apache-http-client-android = '4.3.5.1'
 automattic-about = '1.7.0'
-automattic-encryptedlogging = '1.1.1'
+automattic-encryptedlogging = '1.1.2'
 automattic-measure-builds = '3.2.1'
 automattic-tracks = '6.0.6'
 assertj = '3.27.3'