From 91ce27ea21d49ccb65a5907de31f7ade87f3f735 Mon Sep 17 00:00:00 2001 From: jacquarg Date: Wed, 16 Apr 2025 09:51:47 +0200 Subject: [PATCH] fix:3058: filter 0 calls per period weeklyreports --- .../domain/usecases/WeeklyReportUseCase.kt | 55 ++++++++++--------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/WeeklyReportUseCase.kt b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/WeeklyReportUseCase.kt index 26f16e57..7181d871 100644 --- a/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/WeeklyReportUseCase.kt +++ b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/WeeklyReportUseCase.kt @@ -119,36 +119,41 @@ class WeeklyReportUseCase( return } - val hoursInWeek = 7 * 24 - candidates.add( - WeeklyReport( - endOfWeek, - WeeklyReport.StatType.CALLS_PER_APP, - WeeklyReport.LabelId.CALLS_PER_APP_1, - app, - listOf((callsPerWeek / hoursInWeek).toString()) + val callsPerHours = callsPerWeek / (7 * 24) + if (callsPerHours > 0) { + candidates.add( + WeeklyReport( + endOfWeek, + WeeklyReport.StatType.CALLS_PER_APP, + WeeklyReport.LabelId.CALLS_PER_APP_1, + app, + listOf(callsPerHours.toString()) + ) ) - ) - candidates.add( - WeeklyReport( - endOfWeek, - WeeklyReport.StatType.CALLS_PER_APP, - WeeklyReport.LabelId.CALLS_PER_APP_2, - app, - listOf((callsPerWeek / hoursInWeek).toString()) + candidates.add( + WeeklyReport( + endOfWeek, + WeeklyReport.StatType.CALLS_PER_APP, + WeeklyReport.LabelId.CALLS_PER_APP_2, + app, + listOf(callsPerHours.toString()) + ) ) - ) + } - candidates.add( - WeeklyReport( - endOfWeek, - WeeklyReport.StatType.CALLS_PER_APP, - WeeklyReport.LabelId.CALLS_PER_APP_3, - app, - listOf((callsPerWeek / 7).toString()) + val callsPerDay = callsPerWeek / 7 + if (callsPerDay > 0) { + candidates.add( + WeeklyReport( + endOfWeek, + WeeklyReport.StatType.CALLS_PER_APP, + WeeklyReport.LabelId.CALLS_PER_APP_3, + app, + listOf((callsPerDay).toString()) + ) ) - ) + } } private suspend fun addNewTrackerCandidates(candidates: MutableList, endOfWeek: Instant) = withContext(Dispatchers.IO) { -- GitLab