[fix]: proper fix of clearing logs

F0x1d · Jul 13, 2024 · 67d35da · 67d35da
1 parent aa4be24
commit 67d35da
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...ure/feature-logging/src/main/kotlin/com/f0x1d/feature/logging/ui/fragment/LogsFragment.kt b/...ure/feature-logging/src/main/kotlin/com/f0x1d/feature/logging/ui/fragment/LogsFragment.kt
@@ -125,7 +125,6 @@ class LogsFragment: BaseViewModelFragment<LogsViewModel, FragmentLogsBinding>()
             }
             setClickListenerOn(R.id.clear_item) {
                 requireContext().sendService<LoggingService>(action = LoggingService.ACTION_CLEAR_LOGS)
-                updateLogsList(null)
             }
             setClickListenerOn(R.id.restart_logging_item) {
                 requireContext().sendService<LoggingService>(action = LoggingService.ACTION_RESTART_LOGGING)

diff --git a/feature/feature-logging/src/main/kotlin/com/f0x1d/feature/logging/viewmodel/LogsViewModel.kt b/feature/feature-logging/src/main/kotlin/com/f0x1d/feature/logging/viewmodel/LogsViewModel.kt
@@ -76,11 +76,12 @@ class LogsViewModel @Inject constructor(
         LogsData(logs, filters, query, paused)
     }.scan(LogsData()) { accumulator, data ->
         when {
-            !data.paused -> data
+            !data.paused
+                    // In case they were cleared
+                    || data.logs.isEmpty() -> data
 
             data.query != accumulator.query
                     || data.filters != accumulator.filters
-                    || data.logs.isNotEmpty() // Logs were cleared
             -> data.copy(
                 logs = accumulator.logs,
             )