1 files changed, 21 insertions, 40 deletions

diff --git a/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/TrackersStateUseCase.kt b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/TrackersStateUseCase.kt
index 882d53f..ed15a41 100644
--- a/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/TrackersStateUseCase.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/TrackersStateUseCase.kt
@@ -19,87 +19,68 @@ package foundation.e.advancedprivacy.domain.usecases
 
 import foundation.e.advancedprivacy.data.repositories.AppListsRepository
 import foundation.e.advancedprivacy.data.repositories.LocalStateRepository
-import foundation.e.advancedprivacy.data.repositories.TrackersRepository
-import foundation.e.privacymodules.permissions.data.ApplicationDescription
-import foundation.e.privacymodules.trackers.api.IBlockTrackersPrivacyModule
-import foundation.e.privacymodules.trackers.api.ITrackTrackersPrivacyModule
-import foundation.e.privacymodules.trackers.api.Tracker
+import foundation.e.advancedprivacy.domain.entities.ApplicationDescription
+import foundation.e.advancedprivacy.trackers.data.WhitelistRepository
+import foundation.e.advancedprivacy.trackers.domain.entities.Tracker
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
 class TrackersStateUseCase(
-    private val blockTrackersPrivacyModule: IBlockTrackersPrivacyModule,
-    private val trackersPrivacyModule: ITrackTrackersPrivacyModule,
+    private val whitelistRepository: WhitelistRepository,
     private val localStateRepository: LocalStateRepository,
-    private val trackersRepository: TrackersRepository,
     private val appListsRepository: AppListsRepository,
-    private val coroutineScope: CoroutineScope
+    coroutineScope: CoroutineScope
 ) {
     init {
-        trackersPrivacyModule.start(
-            trackers = trackersRepository.trackers,
-            getAppByAPId = appListsRepository::getApp,
-            getAppByUid = appListsRepository::getApp,
-            enableNotification = false
-        )
         coroutineScope.launch {
             localStateRepository.blockTrackers.collect { enabled ->
-                if (enabled) {
-                    blockTrackersPrivacyModule.enableBlocking()
-                } else {
-                    blockTrackersPrivacyModule.disableBlocking()
-                }
+                whitelistRepository.isBlockingEnabled = enabled
                 updateAllTrackersBlockedState()
             }
         }
     }
 
     private fun updateAllTrackersBlockedState() {
-        localStateRepository.areAllTrackersBlocked.value = blockTrackersPrivacyModule.isBlockingEnabled() &&
-            blockTrackersPrivacyModule.isWhiteListEmpty()
+        localStateRepository.areAllTrackersBlocked.value = whitelistRepository.isBlockingEnabled &&
+            whitelistRepository.areWhiteListEmpty()
     }
 
     fun isWhitelisted(app: ApplicationDescription): Boolean {
-        return isWhitelisted(app, appListsRepository, blockTrackersPrivacyModule)
+        return isWhitelisted(app, appListsRepository, whitelistRepository)
     }
 
     fun toggleAppWhitelist(app: ApplicationDescription, isWhitelisted: Boolean) {
         appListsRepository.applyForHiddenApps(app) {
-            blockTrackersPrivacyModule.setWhiteListed(it, isWhitelisted)
+            whitelistRepository.setWhiteListed(it.apId, isWhitelisted)
         }
         updateAllTrackersBlockedState()
     }
 
     fun blockTracker(app: ApplicationDescription, tracker: Tracker, isBlocked: Boolean) {
         appListsRepository.applyForHiddenApps(app) {
-            blockTrackersPrivacyModule.setWhiteListed(tracker, it, !isBlocked)
+            whitelistRepository.setWhiteListed(tracker, it.apId, !isBlocked)
         }
         updateAllTrackersBlockedState()
     }
 
     fun clearWhitelist(app: ApplicationDescription) {
         appListsRepository.applyForHiddenApps(
-            app,
-            blockTrackersPrivacyModule::clearWhiteList
-        )
+            app
+        ) {
+            whitelistRepository.clearWhiteList(it.apId)
+        }
         updateAllTrackersBlockedState()
     }
-
-    fun updateTrackers() = coroutineScope.launch {
-        trackersRepository.update()
-        trackersPrivacyModule.start(
-            trackers = trackersRepository.trackers,
-            getAppByAPId = appListsRepository::getApp,
-            getAppByUid = appListsRepository::getApp,
-            enableNotification = false
-        )
-    }
 }
 
 fun isWhitelisted(
     app: ApplicationDescription,
     appListsRepository: AppListsRepository,
-    blockTrackersPrivacyModule: IBlockTrackersPrivacyModule
+    whitelistRepository: WhitelistRepository
+
 ): Boolean {
-    return appListsRepository.anyForHiddenApps(app, blockTrackersPrivacyModule::isWhitelisted)
+    return appListsRepository.anyForHiddenApps(
+        app,
+        whitelistRepository::isAppWhiteListed
+    )
 }