Merge branch 'e_trackers_list' into 'main'

Use embeded E-trackers list, #4600

See merge request e/privacy-central/privacycentralapp!14

2 files changed, 5 insertions, 2 deletions

diff --git a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/AppListUseCase.kt b/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/AppListUseCase.kt
index e44aa76..acb8a36 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/AppListUseCase.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/AppListUseCase.kt
@@ -20,7 +20,7 @@ package foundation.e.privacycentralapp.domain.usecases
 import android.Manifest
 import foundation.e.privacymodules.permissions.PermissionsPrivacyModule
 import foundation.e.privacymodules.permissions.data.ApplicationDescription
-import foundation.e.trackerfilter.api.BlockTrackersPrivacyModule
+import foundation.e.privacymodules.trackers.api.BlockTrackersPrivacyModule
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
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 51bdc35..e140b19 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
@@ -18,6 +18,7 @@
 package foundation.e.privacycentralapp.domain.usecases
 
 import foundation.e.privacycentralapp.data.repositories.LocalStateRepository
+import foundation.e.privacycentralapp.data.repositories.TrackersRepository
 import foundation.e.privacymodules.permissions.PermissionsPrivacyModule
 import foundation.e.privacymodules.permissions.data.ApplicationDescription
 import foundation.e.privacymodules.trackers.IBlockTrackersPrivacyModule
@@ -34,6 +35,7 @@ class TrackersStateUseCase(
     private val trackersPrivacyModule: ITrackTrackersPrivacyModule,
     private val permissionsPrivacyModule: PermissionsPrivacyModule,
     private val localStateRepository: LocalStateRepository,
+    private val trackersRepository: TrackersRepository,
     coroutineScope: CoroutineScope
 ) {
 
@@ -44,6 +46,7 @@ class TrackersStateUseCase(
     val areAllTrackersBlocked: StateFlow<Boolean> = _areAllTrackersBlocked
 
     init {
+        trackersPrivacyModule.start(trackersRepository.trackers, enableNotification = false)
         coroutineScope.launch {
             localStateRepository.quickPrivacyEnabledFlow.collect { enabled ->
                 if (enabled) {
@@ -73,7 +76,7 @@ class TrackersStateUseCase(
         return blockTrackersPrivacyModule.isWhitelisted(appUid)
     }
 
-    fun getTrackersWhitelistIds(appUid: Int): List<Int> {
+    fun getTrackersWhitelistIds(appUid: Int): List<String> {
         return blockTrackersPrivacyModule.getWhiteList(appUid).map { it.id }
     }