fix: auto tunnel service worker

app/build.gradle.kts

@@ -178,6 +178,7 @@ dependencies {
     implementation(libs.bundles.hilt.android)
     implementation(libs.bundles.androidx.work)
     ksp(libs.hilt.android.compiler)
+    ksp(libs.androidx.hilt.compiler)
 
     // Networking and serialization
     implementation(libs.bundles.ktor.client)

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/service/ServiceManager.kt

@@ -121,6 +121,8 @@ constructor(
         context.bindService(intent, autoTunnelServiceConnection, Context.BIND_AUTO_CREATE)
     }
 
+    suspend fun startAutoTunnelService() = autoTunnelMutex.withLock { startServiceInternal() }
+
     private fun stopServiceInternal() {
         _autoTunnelService.value?.stop()
         try {

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/worker/ServiceWorker.kt

@@ -47,7 +47,6 @@ constructor(
         }
     }
 
-    // TODO this needs to be changed
     override suspend fun doWork(): Result =
         withContext(ioDispatcher) {
             Timber.i("Service worker started")
@@ -55,7 +54,7 @@ constructor(
                 Timber.i("Checking to see if auto-tunnel has been killed by system")
                 if (isAutoTunnelEnabled && serviceManager.autoTunnelService.value == null) {
                     Timber.i("Service has been killed by system, restoring.")
-                    autoTunnelSettingsRepository.updateAutoTunnelEnabled(true)
+                    serviceManager.startAutoTunnelService()
                 }
             }
             Result.success()

gradle/libs.versions.toml

@@ -55,7 +55,7 @@ androidx-lifecycle-core = ["androidx-lifecycle-runtime-ktx", "androidx-lifecycle
 
 # Compose UI essentials
 androidx-compose-ui = ["androidx-compose-ui", "androidx-compose-ui-graphics", "androidx-compose-ui-tooling-preview"]
-androidx-compose-material = ["androidx-material3", "androidx-compose-animation-graphics"]  # Merged animation for UI fluidity
+androidx-compose-material = ["androidx-material3", "androidx-compose-animation-graphics"]
 
 # Material and icons
 google-material = ["material"]
@@ -63,7 +63,7 @@ material-icons = ["material-icons-core", "material-icons-extended"]
 
 # Navigation and related
 androidx-navigation3 = ["androidx-navigation3-runtime", "androidx-navigation3-ui"]
-navigation-lifecycle = ["androidx-lifecycle-viewmodel-navigation3"]  # Kept as-is since it's tightly coupled
+navigation-lifecycle = ["androidx-lifecycle-viewmodel-navigation3"]
 
 # Accompanist utilities
 accompanist = ["accompanist-permissions", "accompanist-drawablepainter"]
@@ -74,7 +74,7 @@ androidx-datastore = ["androidx-datastore-preferences"]
 
 # Hilt DI and work
 hilt-android = ["hilt-android"]
-androidx-hilt = ["androidx-hilt-compiler", "androidx-hilt-work", "androidx-hilt-hilt-navigation-compose"]
+androidx-hilt = ["androidx-hilt-work", "androidx-hilt-hilt-navigation-compose"]
 androidx-work = ["androidx-work-runtime"]
 
 # Ktor networking

logcatter/src/main/java/com/zaneschepke/logcatter/LogFileManager.kt

@@ -1,12 +1,12 @@
 package com.zaneschepke.logcatter
 
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import java.io.BufferedOutputStream
 import java.io.File
 import java.io.FileOutputStream
 import java.util.zip.ZipEntry
 import java.util.zip.ZipOutputStream
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 
 class LogFileManager(
     private val logDir: String,

logcatter/src/main/java/com/zaneschepke/logcatter/LogcatStreamReader.kt

@@ -1,13 +1,13 @@
 package com.zaneschepke.logcatter
 
 import com.zaneschepke.logcatter.model.LogMessage
+import java.io.BufferedReader
+import java.io.IOException
+import java.io.InputStreamReader
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
-import java.io.BufferedReader
-import java.io.IOException
-import java.io.InputStreamReader
 
 class LogcatStreamReader(private val pid: Int, private val fileManager: LogFileManager) {
     private val bufferSize = 1024

logcatter/src/main/java/com/zaneschepke/logcatter/model/LogMessage.kt

@@ -26,7 +26,6 @@ data class LogMessage(
                     logcatLine,
                 )
             } else {
-                // TODO improve this
                 val parts = logcatLine.trim().split(" ").filter { it.isNotEmpty() }
                 val epochParts = parts[0].split(".").map { it.toLong() }
                 val message = parts.subList(5, parts.size).joinToString(" ")