epic18: Trackers control on standalone app (without Ipscrambling).

4 files changed, 11 insertions, 4 deletions

diff --git a/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/FakeLocationStateUseCase.kt b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/FakeLocationStateUseCase.kt
index 30c8e6b..983ba71 100644
--- a/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/FakeLocationStateUseCase.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/FakeLocationStateUseCase.kt
@@ -202,7 +202,7 @@ class FakeLocationStateUseCase(
 
             lastKnownLocation?.let { localListener.onLocationChanged(it) }
         } catch (se: SecurityException) {
-            Timber.e("Missing permission", se)
+            Timber.e(se, "Missing permission")
         }
     }
 }
diff --git a/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/IpScramblingStateUseCase.kt b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/IpScramblingStateUseCase.kt
index 27e7fe4..9c89329 100644
--- a/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/IpScramblingStateUseCase.kt
+++ b/app/src/main/java/foundation/e/advancedprivacy/domain/usecases/IpScramblingStateUseCase.kt
@@ -19,6 +19,7 @@
 package foundation.e.advancedprivacy.domain.usecases
 
 import android.content.Intent
+import foundation.e.advancedprivacy.common.isStandaloneBuild
 import foundation.e.advancedprivacy.data.repositories.AppListsRepository
 import foundation.e.advancedprivacy.data.repositories.LocalStateRepository
 import foundation.e.advancedprivacy.domain.entities.ApplicationDescription
@@ -190,7 +191,7 @@ class IpScramblingStateUseCase(
 
     fun startIpScrambling() {
         localStateRepository.internetPrivacyMode.value = HIDE_IP_LOADING
-        ipScramblerModule.start(enableNotification = false) // change the false ?
+        ipScramblerModule.start(enableNotification = isStandaloneBuild)
     }
 
     private fun map(status: IpScramblerModule.Status): InternetPrivacyMode {
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 ed15a41..9b79dcc 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
@@ -22,6 +22,7 @@ import foundation.e.advancedprivacy.data.repositories.LocalStateRepository
 import foundation.e.advancedprivacy.domain.entities.ApplicationDescription
 import foundation.e.advancedprivacy.trackers.data.WhitelistRepository
 import foundation.e.advancedprivacy.trackers.domain.entities.Tracker
+import foundation.e.advancedprivacy.trackers.domain.externalinterfaces.TrackersServiceSupervisor
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
@@ -29,7 +30,8 @@ class TrackersStateUseCase(
     private val whitelistRepository: WhitelistRepository,
     private val localStateRepository: LocalStateRepository,
     private val appListsRepository: AppListsRepository,
-    coroutineScope: CoroutineScope
+    private val trackersServiceSupervisor: TrackersServiceSupervisor,
+    coroutineScope: CoroutineScope,
 ) {
     init {
         coroutineScope.launch {
@@ -38,6 +40,8 @@ class TrackersStateUseCase(
                 updateAllTrackersBlockedState()
             }
         }
+
+        trackersServiceSupervisor.start()
     }
 
     private fun updateAllTrackersBlockedState() {
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 b0c9f39..3d6ade0 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
@@ -24,6 +24,7 @@ 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
 import foundation.e.advancedprivacy.trackers.data.TrackersRepository
 import foundation.e.advancedprivacy.trackers.data.WhitelistRepository
 import foundation.e.advancedprivacy.trackers.domain.entities.Tracker
@@ -44,6 +45,7 @@ class TrackersStatisticsUseCase(
     private val whitelistRepository: WhitelistRepository,
     private val trackersRepository: TrackersRepository,
     private val appListsRepository: AppListsRepository,
+    private val statsDatabase: StatsDatabase,
     private val resources: Resources
 ) {
     fun initAppList() {
@@ -52,7 +54,7 @@ class TrackersStatisticsUseCase(
 
     @OptIn(FlowPreview::class)
     fun listenUpdates(debounce: Duration = 1.seconds) =
-        statisticsUseCase.newDataAvailable
+        statsDatabase.newDataAvailable
             .throttleFirst(windowDuration = debounce)
             .onStart { emit(Unit) }