1 files changed, 7 insertions, 14 deletions
diff --git a/trackersservicestandalone/src/main/java/foundation/e/advancedprivacy/trackers/service/TrackersService.kt b/trackersservicestandalone/src/main/java/foundation/e/advancedprivacy/trackers/service/TrackersService.kt
index 918977f..152a3e9 100644
--- a/trackersservicestandalone/src/main/java/foundation/e/advancedprivacy/trackers/service/TrackersService.kt
+++ b/trackersservicestandalone/src/main/java/foundation/e/advancedprivacy/trackers/service/TrackersService.kt
@@ -16,16 +16,15 @@
  */
 package foundation.e.advancedprivacy.trackers.service
 
-import android.content.Context
 import android.content.Intent
 import android.net.VpnService
 import android.os.Build
 import android.os.ParcelFileDescriptor
 import foundation.e.advancedprivacy.core.utils.notificationBuilder
-import foundation.e.advancedprivacy.domain.entities.FeatureServiceState
+import foundation.e.advancedprivacy.domain.entities.FeatureState
 import foundation.e.advancedprivacy.domain.entities.NOTIFICATION_TRACKER_FLAG
 import foundation.e.advancedprivacy.domain.entities.NotificationContent
-import foundation.e.advancedprivacy.trackers.domain.externalinterfaces.TrackersServiceSupervisor
+import foundation.e.advancedprivacy.trackers.domain.externalinterfaces.TrackersSupervisor
 import foundation.e.advancedprivacy.trackers.service.Config.DNS_SERVER_TO_CATCH_IPV4
 import foundation.e.advancedprivacy.trackers.service.Config.DNS_SERVER_TO_CATCH_IPV6
 import foundation.e.advancedprivacy.trackers.service.Config.SESSION_NAME
@@ -39,18 +38,12 @@ import timber.log.Timber
 class TrackersService : VpnService() {
     companion object {
         var coroutineScope = CoroutineScope(Dispatchers.IO)
-
-        fun start(context: Context) {
-            prepare(context)
-            val intent = Intent(context, TrackersService::class.java)
-            context.startService(intent)
-        }
     }
 
     private val networkDNSAddressRepository: NetworkDNSAddressRepository = get(NetworkDNSAddressRepository::class.java)
-    private val trackersServiceSupervisor: TrackersServiceSupervisorImpl = get(
-        TrackersServiceSupervisor::class.java
-    ) as TrackersServiceSupervisorImpl
+    private val trackersSupervisor: TrackersSupervisorStandalone = get(
+        TrackersSupervisor::class.java
+    ) as TrackersSupervisorStandalone
 
     private val notificationTrackerFlag: NotificationContent = get(NotificationContent::class.java, named("notificationTrackerFlag"))
 
@@ -64,14 +57,14 @@ class TrackersService : VpnService() {
                 content = notificationTrackerFlag
             ).build()
         )
-        trackersServiceSupervisor.state.value = FeatureServiceState.ON
+        trackersSupervisor.mutableState.value = FeatureState.ON
 
         return START_STICKY
     }
 
     override fun onDestroy() {
         networkDNSAddressRepository.stop()
-        trackersServiceSupervisor.state.value = FeatureServiceState.OFF
+        trackersSupervisor.mutableState.value = FeatureState.OFF
         super.onDestroy()
     }