diff options
| author | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2023-10-23 15:55:13 +0000 |
|---|---|---|
| committer | Guillaume Jacquart <guillaume.jacquart@hoodbrains.com> | 2023-10-23 15:55:13 +0000 |
| commit | 0312ce64f85b5530a00bdc72eb310ba9dc1de05b (patch) | |
| tree | 030ccbed3f44a2a1f96413947f50ec0520fb064d /trackersservicee | |
| parent | d0c2b36ec81cd2a102d4b0a5b0fbeb1c1aa52e70 (diff) | |
| parent | 54892a227a77839ee81df90df904675f958831a3 (diff) | |
Merge branch 'epic18-standalone_trackers_tor_alone' into 'main'
epic18: tracker control while tor is activated.
See merge request e/os/advanced-privacy!148
Diffstat (limited to 'trackersservicee')
| -rw-r--r-- | trackersservicee/build.gradle | 9 | ||||
| -rw-r--r-- | trackersservicee/src/main/java/foundation/e/advancedprivacy/trackers/service/TrackersServiceSupervisorImpl.kt | 7 |
2 files changed, 10 insertions, 6 deletions
diff --git a/trackersservicee/build.gradle b/trackersservicee/build.gradle index f7725bf..e93d5d6 100644 --- a/trackersservicee/build.gradle +++ b/trackersservicee/build.gradle @@ -5,14 +5,11 @@ plugins { android { namespace 'foundation.e.advancedprivacy.trackers.service' - compileSdk 33 + compileSdkVersion buildConfig.compileSdk defaultConfig { - minSdk 24 - targetSdk 33 - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles "consumer-rules.pro" + minSdkVersion buildConfig.minSdk + targetSdkVersion buildConfig.targetSdk } buildTypes { diff --git a/trackersservicee/src/main/java/foundation/e/advancedprivacy/trackers/service/TrackersServiceSupervisorImpl.kt b/trackersservicee/src/main/java/foundation/e/advancedprivacy/trackers/service/TrackersServiceSupervisorImpl.kt index 3903db4..dcdf0d4 100644 --- a/trackersservicee/src/main/java/foundation/e/advancedprivacy/trackers/service/TrackersServiceSupervisorImpl.kt +++ b/trackersservicee/src/main/java/foundation/e/advancedprivacy/trackers/service/TrackersServiceSupervisorImpl.kt @@ -21,7 +21,9 @@ import android.content.Intent import foundation.e.advancedprivacy.trackers.domain.externalinterfaces.TrackersServiceSupervisor import foundation.e.advancedprivacy.trackers.service.TrackersService.Companion.ACTION_START import kotlinx.coroutines.isActive +import org.koin.core.module.dsl.bind import org.koin.core.module.dsl.factoryOf +import org.koin.core.module.dsl.singleOf import org.koin.dsl.module class TrackersServiceSupervisorImpl(private val context: Context) : TrackersServiceSupervisor { @@ -39,8 +41,13 @@ class TrackersServiceSupervisorImpl(private val context: Context) : TrackersServ override fun isRunning(): Boolean { return TrackersService.coroutineScope.isActive } + + override val dnsFilterForIpScrambling = null } val trackerServiceModule = module { factoryOf(::DNSBlocker) + singleOf(::TrackersServiceSupervisorImpl) { + bind<TrackersServiceSupervisor>() + } } |