Push: improve Push history screen, log and stored data (#4601)

* Add adb tools to help with doze mode and app standby

* Add info about the device state when an error occurs in push.

* Keep more events in the DB.

* Push history: add confirmation dialog when resetting the data

* Push history: add a filter to see only the errors

* Update screenshots

* Push history: print out invalid/ignored data received.

* Increase log level for push, to make such log more visible.
It also appears that sometimes Timber.d are not present in the rageshakes.

* Log priority

* Do not include device state for invalid/ignored event.

* Fix tests.

* Fix format issue.

* Fix mistake in code blocks and do not filter when not necessary.

* Improve formatting and add missing unit test.

* Reduce nesting of blocks.

---------

Co-authored-by: ElementBot <android@element.io>

libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryEvents.kt

@@ -8,5 +8,7 @@
 package io.element.android.libraries.troubleshoot.impl.history
 
 sealed interface PushHistoryEvents {
-    data object Reset : PushHistoryEvents
+    data class SetShowOnlyErrors(val showOnlyErrors: Boolean) : PushHistoryEvents
+    data class Reset(val requiresConfirmation: Boolean) : PushHistoryEvents
+    data object ClearDialog : PushHistoryEvents
 }

libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryPresenter.kt

@@ -10,11 +10,15 @@ package io.element.android.libraries.troubleshoot.impl.history
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.push.api.PushService
 import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -25,14 +29,36 @@ class PushHistoryPresenter @Inject constructor(
     override fun present(): PushHistoryState {
         val coroutineScope = rememberCoroutineScope()
         val pushCounter by pushService.pushCounter.collectAsState(0)
-        val pushHistory by remember {
-            pushService.getPushHistoryItemsFlow()
+        var showOnlyErrors: Boolean by remember { mutableStateOf(false) }
+        val pushHistory by remember(showOnlyErrors) {
+            pushService.getPushHistoryItemsFlow().map {
+                if (showOnlyErrors) {
+                    it.filter { item -> item.hasBeenResolved.not() }
+                } else {
+                    it
+                }
+            }
         }.collectAsState(emptyList())
+        var resetAction: AsyncAction<Unit> by remember { mutableStateOf(AsyncAction.Uninitialized) }
 
         fun handleEvents(event: PushHistoryEvents) {
             when (event) {
-                PushHistoryEvents.Reset -> coroutineScope.launch {
-                    pushService.resetPushHistory()
+                is PushHistoryEvents.SetShowOnlyErrors -> {
+                    showOnlyErrors = event.showOnlyErrors
+                }
+                is PushHistoryEvents.Reset -> {
+                    if (event.requiresConfirmation) {
+                        resetAction = AsyncAction.ConfirmingNoParams
+                    } else {
+                        resetAction = AsyncAction.Loading
+                        coroutineScope.launch {
+                            pushService.resetPushHistory()
+                            resetAction = AsyncAction.Uninitialized
+                        }
+                    }
+                }
+                PushHistoryEvents.ClearDialog -> {
+                    resetAction = AsyncAction.Uninitialized
                 }
             }
         }
@@ -40,6 +66,8 @@ class PushHistoryPresenter @Inject constructor(
         return PushHistoryState(
             pushCounter = pushCounter,
             pushHistoryItems = pushHistory.toImmutableList(),
+            showOnlyErrors = showOnlyErrors,
+            resetAction = resetAction,
             eventSink = ::handleEvents
         )
     }

libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryState.kt

@@ -7,11 +7,14 @@
 
 package io.element.android.libraries.troubleshoot.impl.history
 
+import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.push.api.history.PushHistoryItem
 import kotlinx.collections.immutable.ImmutableList
 
 data class PushHistoryState(
     val pushCounter: Int,
     val pushHistoryItems: ImmutableList<PushHistoryItem>,
+    val showOnlyErrors: Boolean,
+    val resetAction: AsyncAction<Unit>,
     val eventSink: (PushHistoryEvents) -> Unit,
 )

libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryStateProvider.kt

@@ -8,6 +8,7 @@
 package io.element.android.libraries.troubleshoot.impl.history
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.SessionId
@@ -36,16 +37,23 @@ open class PushHistoryStateProvider : PreviewParameterProvider<PushHistoryState>
                     )
                 )
             ),
+            aPushHistoryState(
+                resetAction = AsyncAction.ConfirmingNoParams,
+            ),
         )
 }
 
 fun aPushHistoryState(
     pushCounter: Int = 0,
     pushHistoryItems: List<PushHistoryItem> = emptyList(),
+    showOnlyErrors: Boolean = false,
+    resetAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
     eventSink: (PushHistoryEvents) -> Unit = {},
 ) = PushHistoryState(
     pushCounter = pushCounter,
     pushHistoryItems = pushHistoryItems.toImmutableList(),
+    showOnlyErrors = showOnlyErrors,
+    resetAction = resetAction,
     eventSink = eventSink,
 )
 

libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryView.kt

@@ -24,6 +24,10 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
@@ -31,16 +35,20 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
+import io.element.android.libraries.designsystem.components.async.AsyncActionView
 import io.element.android.libraries.designsystem.components.button.BackButton
+import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
 import io.element.android.libraries.designsystem.components.list.ListItemContent
 import io.element.android.libraries.designsystem.preview.ElementPreview
 import io.element.android.libraries.designsystem.preview.PreviewsDayNight
 import io.element.android.libraries.designsystem.theme.aliasScreenTitle
+import io.element.android.libraries.designsystem.theme.components.DropdownMenu
+import io.element.android.libraries.designsystem.theme.components.DropdownMenuItem
 import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.designsystem.theme.components.IconButton
 import io.element.android.libraries.designsystem.theme.components.ListItem
 import io.element.android.libraries.designsystem.theme.components.Scaffold
 import io.element.android.libraries.designsystem.theme.components.Text
-import io.element.android.libraries.designsystem.theme.components.TextButton
 import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -57,6 +65,8 @@ fun PushHistoryView(
     onItemClick: (SessionId, RoomId, EventId) -> Unit,
     modifier: Modifier = Modifier,
 ) {
+    var showMenu by remember { mutableStateOf(false) }
+
     Scaffold(
         modifier = modifier
             .fillMaxSize()
@@ -77,12 +87,42 @@ fun PushHistoryView(
                     )
                 },
                 actions = {
-                    TextButton(
-                        text = stringResource(CommonStrings.action_reset),
-                        onClick = {
-                            state.eventSink(PushHistoryEvents.Reset)
-                        },
-                    )
+                    IconButton(onClick = { showMenu = !showMenu }) {
+                        Icon(
+                            imageVector = CompoundIcons.OverflowVertical(),
+                            contentDescription = stringResource(id = CommonStrings.a11y_user_menu),
+                        )
+                    }
+                    DropdownMenu(
+                        expanded = showMenu,
+                        onDismissRequest = { showMenu = false },
+                    ) {
+                        DropdownMenuItem(
+                            text = { Text("Show only errors") },
+                            trailingIcon = if (state.showOnlyErrors) {
+                                {
+                                    Icon(
+                                        imageVector = CompoundIcons.CheckCircleSolid(),
+                                        contentDescription = null,
+                                        modifier = Modifier.size(16.dp),
+                                    )
+                                }
+                            } else {
+                                null
+                            },
+                            onClick = {
+                                showMenu = false
+                                state.eventSink(PushHistoryEvents.SetShowOnlyErrors(state.showOnlyErrors.not()))
+                            },
+                        )
+                        DropdownMenuItem(
+                            text = { Text(stringResource(id = CommonStrings.action_reset)) },
+                            onClick = {
+                                showMenu = false
+                                state.eventSink(PushHistoryEvents.Reset(requiresConfirmation = true))
+                            },
+                        )
+                    }
                 }
             )
         },
@@ -95,6 +135,22 @@ fun PushHistoryView(
             onItemClick = onItemClick,
         )
     }
+
+    AsyncActionView(
+        async = state.resetAction,
+        onSuccess = {},
+        confirmationDialog = {
+            ConfirmationDialog(
+                content = "",
+                title = stringResource(CommonStrings.dialog_title_confirmation),
+                submitText = stringResource(CommonStrings.action_reset),
+                cancelText = stringResource(CommonStrings.action_cancel),
+                onSubmitClick = { state.eventSink(PushHistoryEvents.Reset(requiresConfirmation = false)) },
+                onDismiss = { state.eventSink(PushHistoryEvents.ClearDialog) },
+            )
+        },
+        onErrorDismiss = {},
+    )
 }
 
 @Composable