1 files changed, 4 insertions, 82 deletions

diff --git a/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/TrackersStatisticsUseCase.kt b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/TrackersStatisticsUseCase.kt
index 3d6ade0..8f290b8 100644
--- a/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/TrackersStatisticsUseCase.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/TrackersStatisticsUseCase.kt
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2021 E FOUNDATION, 2022 - 2023 MURENA SAS
+ * Copyright (C) 2022 - 2023 MURENA SAS
+ * Copyright (C) 2021 E FOUNDATION
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +22,6 @@ import android.content.res.Resources
 import foundation.e.advancedprivacy.R
 import foundation.e.advancedprivacy.common.throttleFirst
 import foundation.e.advancedprivacy.data.repositories.AppListsRepository
-import foundation.e.advancedprivacy.domain.entities.AppWithCounts
 import foundation.e.advancedprivacy.domain.entities.ApplicationDescription
 import foundation.e.advancedprivacy.domain.entities.TrackersPeriodicStatistics
 import foundation.e.advancedprivacy.trackers.data.StatsDatabase
@@ -167,27 +167,7 @@ class TrackersStatisticsUseCase(
         )
     }
 
-    fun getTrackersWithWhiteList(app: ApplicationDescription): List<Pair<Tracker, Boolean>> {
-        return appListsRepository.mapReduceForHiddenApps(
-            app = app,
-            map = { appDesc: ApplicationDescription ->
-                (
-                    statisticsUseCase.getTrackers(listOf(appDesc)) to
-                        getWhiteList(appDesc)
-                    )
-            },
-            reduce = { lists ->
-                lists.unzip().let { (trackerLists, whiteListedIdLists) ->
-                    val whiteListedIds = whiteListedIdLists.flatten().map { it.id }.toSet()
-
-                    trackerLists.flatten().distinctBy { it.id }.sortedBy { it.label.lowercase() }
-                        .map { tracker -> tracker to (tracker.id in whiteListedIds) }
-                }
-            }
-        )
-    }
-
-    fun isWhiteListEmpty(app: ApplicationDescription): Boolean {
+    suspend fun isWhiteListEmpty(app: ApplicationDescription): Boolean {
         return appListsRepository.mapReduceForHiddenApps(
             app = app,
             map = { appDesc: ApplicationDescription ->
@@ -197,7 +177,7 @@ class TrackersStatisticsUseCase(
         )
     }
 
-    fun getCalls(app: ApplicationDescription): Pair<Int, Int> {
+    suspend fun getCalls(app: ApplicationDescription): Pair<Int, Int> {
         return appListsRepository.mapReduceForHiddenApps(
             app = app,
             map = {
@@ -211,67 +191,9 @@ class TrackersStatisticsUseCase(
         )
     }
 
-    fun getAppsWithCounts(): Flow<List<AppWithCounts>> {
-        val trackersCounts = statisticsUseCase.getContactedTrackersCountByApp()
-        val hiddenAppsTrackersWithWhiteList =
-            getTrackersWithWhiteList(appListsRepository.dummySystemApp)
-        val acAppsTrackersWithWhiteList =
-            getTrackersWithWhiteList(appListsRepository.dummyCompatibilityApp)
-
-        return appListsRepository.apps()
-            .map { apps ->
-                val callsByApp = statisticsUseCase.getCallsByApps(24, ChronoUnit.HOURS)
-                apps.map { app ->
-                    val calls = appListsRepository.mapReduceForHiddenApps(
-                        app = app,
-                        map = { callsByApp.getOrDefault(app, 0 to 0) },
-                        reduce = {
-                            it.unzip().let { (blocked, leaked) ->
-                                blocked.sum() to leaked.sum()
-                            }
-                        }
-                    )
-
-                    AppWithCounts(
-                        app = app,
-                        isWhitelisted = !whitelistRepository.isBlockingEnabled ||
-                            isWhitelisted(app, appListsRepository, whitelistRepository),
-                        trackersCount = when (app) {
-                            appListsRepository.dummySystemApp ->
-                                hiddenAppsTrackersWithWhiteList.size
-                            appListsRepository.dummyCompatibilityApp ->
-                                acAppsTrackersWithWhiteList.size
-                            else -> trackersCounts.getOrDefault(app, 0)
-                        },
-                        whiteListedTrackersCount = when (app) {
-                            appListsRepository.dummySystemApp ->
-                                hiddenAppsTrackersWithWhiteList.count { it.second }
-                            appListsRepository.dummyCompatibilityApp ->
-                                acAppsTrackersWithWhiteList.count { it.second }
-                            else ->
-                                getWhiteList(app).size
-                        },
-                        blockedLeaks = calls.first,
-                        leaks = calls.second
-                    )
-                }
-                    .sortedWith(mostLeakedAppsComparator)
-            }
-    }
-
     private fun getWhiteList(app: ApplicationDescription): List<Tracker> {
         return whitelistRepository.getWhiteListForApp(app).mapNotNull {
             trackersRepository.getTracker(it)
         }
     }
-
-    private val mostLeakedAppsComparator: Comparator<AppWithCounts> = Comparator { o1, o2 ->
-        val leaks = o2.leaks - o1.leaks
-        if (leaks != 0) leaks else {
-            val whitelisted = o2.whiteListedTrackersCount - o1.whiteListedTrackersCount
-            if (whitelisted != 0) whitelisted else {
-                o2.trackersCount - o1.trackersCount
-            }
-        }
-    }
 }