From f1d5b12dd11019508208571db5e5f57f43e3c4b6 Mon Sep 17 00:00:00 2001 From: Guillaume Jacquart Date: Mon, 2 Jan 2023 08:35:20 +0000 Subject: 5648: display trackers for pro-profile app instances. --- .../domain/usecases/TrackersStateUseCase.kt | 10 +++++----- .../domain/usecases/TrackersStatisticsUseCase.kt | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'app/src/main/java/foundation/e/privacycentralapp/domain') diff --git a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/TrackersStateUseCase.kt b/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/TrackersStateUseCase.kt index 8b37152..11f0466 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/TrackersStateUseCase.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/TrackersStateUseCase.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 E FOUNDATION + * Copyright (C) 2021 E FOUNDATION, 2022 MURENA SAS * * 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 @@ -68,7 +68,7 @@ class TrackersStateUseCase( fun getTrackersWhitelistIds(appUid: Int): List { return if (appUid == appListsRepository.dummySystemApp.uid) { - appListsRepository.getHiddenSystemApps().fold(mutableSetOf()) { acc, app -> + appListsRepository.getAllProfilesHiddenSystemApps().fold(mutableSetOf()) { acc, app -> acc.addAll(blockTrackersPrivacyModule.getWhiteList(app.uid).map { it.id }) acc }.toList() @@ -77,7 +77,7 @@ class TrackersStateUseCase( fun toggleAppWhitelist(appUid: Int, isWhitelisted: Boolean) { if (appUid == appListsRepository.dummySystemApp.uid) { - appListsRepository.getHiddenSystemApps().forEach { + appListsRepository.getAllProfilesHiddenSystemApps().forEach { blockTrackersPrivacyModule.setWhiteListed(it.uid, isWhitelisted) } } else blockTrackersPrivacyModule.setWhiteListed(appUid, isWhitelisted) @@ -87,7 +87,7 @@ class TrackersStateUseCase( fun blockTracker(appUid: Int, tracker: Tracker, isBlocked: Boolean) { if (appUid == appListsRepository.dummySystemApp.uid) { - appListsRepository.getHiddenSystemApps().forEach { + appListsRepository.getAllProfilesHiddenSystemApps().forEach { blockTrackersPrivacyModule.setWhiteListed(tracker, it.uid, !isBlocked) } } else blockTrackersPrivacyModule.setWhiteListed(tracker, appUid, !isBlocked) @@ -107,7 +107,7 @@ fun isWhitelisted( blockTrackersPrivacyModule: IBlockTrackersPrivacyModule ): Boolean { return if (appUid == appListsRepository.dummySystemApp.uid) { - appListsRepository.getHiddenSystemApps().any { + appListsRepository.getAllProfilesHiddenSystemApps().any { blockTrackersPrivacyModule.isWhitelisted(it.uid) } } else blockTrackersPrivacyModule.isWhitelisted(appUid) diff --git a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/TrackersStatisticsUseCase.kt b/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/TrackersStatisticsUseCase.kt index 57ab1a4..7323769 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/TrackersStatisticsUseCase.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/TrackersStatisticsUseCase.kt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 E FOUNDATION + * Copyright (C) 2021 E FOUNDATION, 2022 MURENA SAS * * 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 @@ -47,7 +47,7 @@ class TrackersStatisticsUseCase( private val resources: Resources ) { fun initAppList() { - appListsRepository.getVisibleApps() + appListsRepository.getAllProfilesVisibleApps() } private fun rawUpdates(): Flow = callbackFlow { @@ -147,7 +147,7 @@ class TrackersStatisticsUseCase( fun getTrackers(appUid: Int): List { val trackers = if (appUid == appListsRepository.dummySystemApp.uid) { - appListsRepository.getHiddenSystemApps().map { + appListsRepository.getAllProfilesHiddenSystemApps().map { trackTrackersPrivacyModule.getTrackersForApp(it.uid) }.flatten().distinctBy { it.id } } else trackTrackersPrivacyModule.getTrackersForApp(appUid) @@ -159,7 +159,7 @@ class TrackersStatisticsUseCase( val trackers: List val whiteListedTrackersIds: Set if (appUid == appListsRepository.dummySystemApp.uid) { - val hiddenApps = appListsRepository.getHiddenSystemApps() + val hiddenApps = appListsRepository.getAllProfilesHiddenSystemApps() trackers = trackTrackersPrivacyModule.getTrackers(hiddenApps.map { it.uid }) whiteListedTrackersIds = hiddenApps.fold(HashSet()) { acc, app -> @@ -177,7 +177,7 @@ class TrackersStatisticsUseCase( fun getCalls(appUid: Int): Pair { return if (appUid == appListsRepository.dummySystemApp.uid) { - appListsRepository.getHiddenSystemApps().map { + appListsRepository.getAllProfilesHiddenSystemApps().map { trackTrackersPrivacyModule.getPastDayTrackersCallsForApp(it.uid) }.reduce { (accBlocked, accLeaked), (blocked, leaked) -> accBlocked + blocked to accLeaked + leaked @@ -190,7 +190,7 @@ class TrackersStatisticsUseCase( val hiddenAppsTrackersWithWhiteList = getTrackersWithWhiteList(appListsRepository.dummySystemApp.uid) - return appListsRepository.getVisibleApps() + return appListsRepository.getAllProfilesVisibleApps() .map { apps -> val callsByApp = trackTrackersPrivacyModule.getPastDayTrackersCallsByApps() apps.map { app -> @@ -233,7 +233,7 @@ class TrackersStatisticsUseCase( fun getNonBlockedTrackersCount(): Flow { return if (blockTrackersPrivacyModule.isBlockingEnabled()) - appListsRepository.getVisibleAndHiddenApps().map { apps -> + appListsRepository.getAllApps().map { apps -> val whiteListedTrackers = mutableSetOf() val whiteListedAppUids = blockTrackersPrivacyModule.getWhiteListedApp() apps.forEach { app -> -- cgit v1.2.3