fix: FireTV file selection bug

Fixes bug where FireTV devices were unable to launch a proper file browser to select tunnel configs.
fix: foreground service start crashes
2026-07-03 14:07:49 +02:00 · 2023-09-11 11:15:44 -04:00 · 2023-09-10 00:23:23 -04:00 · 2023-09-08 12:43:41 -04:00 · 2023-09-04 05:52:27 -04:00 · 2023-09-04 05:52:15 -04:00
12 changed files with 90 additions and 19 deletions
@@ -13,6 +13,7 @@ WG Tunnel


 [![Google Play](https://img.shields.io/badge/Google_Play-414141?style=for-the-badge&logo=google-play&logoColor=white)](https://play.google.com/store/apps/details?id=com.zaneschepke.wireguardautotunnel)
+[![Fire TV](https://img.shields.io/badge/fire%20tv-fc3b2d?style=for-the-badge&logo=amazon%20fire%20tv&logoColor=white)](https://www.amazon.com/gp/product/B0CFGGL7WK)

 </span>

@@ -50,8 +51,10 @@ The inspiration for this app came from the inconvenience of constantly having to

 * Add tunnels via .conf file
 * Auto connect to VPN based on Wi-Fi SSID
-* Split tunneling by application
+* Split tunneling by application with search
 * Always-on VPN for Android support
+* Quick tile support for vpn toggling
+* Dynamic shortcuts support for automation integration
 * Configurable Trusted Network list 
 * Optional auto connect on mobile data
 * Automatic service restart after reboot
@@ -17,7 +17,7 @@ android {

    val versionMajor = 2
    val versionMinor = 4
-    val versionPatch = 1
+    val versionPatch = 4
    val versionBuild = 0

    defaultConfig {
@@ -4,6 +4,7 @@ import android.app.Application
 import android.content.Context
 import android.content.pm.PackageManager
 import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.google.mlkit.common.MlKit
 import com.zaneschepke.wireguardautotunnel.repository.Repository
 import com.zaneschepke.wireguardautotunnel.service.tunnel.model.Settings
 import dagger.hilt.android.HiltAndroidApp
@@ -22,6 +23,11 @@ class WireGuardAutoTunnel : Application() {
            FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(false);
            Timber.plant(Timber.DebugTree())
        }
+        try {
+            MlKit.initialize(this)
+        } catch (e : Exception) {
+            Timber.e(e.message)
+        }
        settingsRepo.init()
    }

@@ -2,5 +2,6 @@ package com.zaneschepke.wireguardautotunnel.service.foreground

 enum class Action {
    START,
+    START_FOREGROUND,
    STOP
 }
@@ -22,7 +22,7 @@ open class ForegroundService : Service() {
            val action = intent.action
            Timber.d("using an intent with action $action")
            when (action) {
-                Action.START.name -> startService(intent.extras)
+                Action.START.name, Action.START_FOREGROUND.name -> startService(intent.extras)
                Action.STOP.name -> stopService(intent.extras)
                "android.net.VpnService" -> {
                    Timber.d("Always-on VPN starting service")
@@ -1,7 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.service.foreground

 import android.app.ActivityManager
-import android.app.Application
 import android.app.Service
 import android.content.Context
 import android.content.Context.ACTIVITY_SERVICE
@@ -35,7 +34,12 @@ object ServiceManager {
        intent.component?.javaClass
        try {
            when(action) {
-                Action.START -> context.startForegroundService(intent)
+                Action.START_FOREGROUND -> {
+                    context.startForegroundService(intent)
+                }
+                Action.START -> {
+                    context.startService(intent)
+                }
                Action.STOP -> context.startService(intent)
            }
        } catch (e : Exception) {
@@ -58,6 +62,22 @@ object ServiceManager {
        )
    }

+    fun startVpnServiceForeground(context : Context, tunnelConfig : String) {
+        actionOnService(
+            Action.START_FOREGROUND,
+            context,
+            WireGuardTunnelService::class.java,
+            mapOf(context.getString(R.string.tunnel_extras_key) to tunnelConfig))
+    }
+
+    private fun startWatcherServiceForeground(context : Context, tunnelConfig : String) {
+        actionOnService(
+            Action.START, context,
+            WireGuardConnectivityWatcherService::class.java, mapOf(context.
+            getString(R.string.tunnel_extras_key) to
+                    tunnelConfig))
+    }
+
    fun startWatcherService(context : Context, tunnelConfig : String) {
        actionOnService(
            Action.START, context,
@@ -79,4 +99,12 @@ object ServiceManager {
            ServiceState.STOPPED -> startWatcherService(context, tunnelConfig)
        }
    }
+
+    fun toggleWatcherServiceForeground(context: Context, tunnelConfig : String) {
+        when(getServiceState( context,
+            WireGuardConnectivityWatcherService::class.java,)) {
+            ServiceState.STARTED -> stopWatcherService(context)
+            ServiceState.STOPPED -> startWatcherServiceForeground(context, tunnelConfig)
+        }
+    }
 }
@@ -59,8 +59,16 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
    private val tag = this.javaClass.name;


+    override fun onCreate() {
+        super.onCreate()
+        CoroutineScope(Dispatchers.Main).launch {
+            launchWatcherNotification()
+        }
+    }
+
    override fun startService(extras: Bundle?) {
        super.startService(extras)
+        launchWatcherNotification()
        val tunnelId = extras?.getString(getString(R.string.tunnel_extras_key))
        if (tunnelId != null) {
            this.tunnelConfig = tunnelId
@@ -68,7 +76,6 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
        // we need this lock so our service gets not affected by Doze Mode
        initWakeLock()
        cancelWatcherJob()
-        launchWatcherNotification()
        if(this::tunnelConfig.isInitialized) {
            startWatcherJob()
        } else {
@@ -181,7 +188,7 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
        }

    private suspend fun manageVpn() {
-        while(watcherJob.isActive) {
+        while(true) {
            if(setting.isTunnelOnMobileDataEnabled &&
                !isWifiConnected &&
                isMobileDataConnected
@@ -37,8 +37,16 @@ class WireGuardTunnelService : ForegroundService() {

    private var tunnelName : String = ""

+    override fun onCreate() {
+        super.onCreate()
+        CoroutineScope(Dispatchers.Main).launch {
+            launchVpnStartingNotification()
+        }
+    }
+
    override fun startService(extras : Bundle?) {
        super.startService(extras)
+        launchVpnStartingNotification()
        val tunnelConfigString = extras?.getString(getString(R.string.tunnel_extras_key))
        cancelJob()
        job = CoroutineScope(Dispatchers.IO).launch {
@@ -98,7 +106,7 @@ class WireGuardTunnelService : ForegroundService() {

    override fun stopService(extras : Bundle?) {
        super.stopService(extras)
-        CoroutineScope(Dispatchers.IO).launch() {
+        CoroutineScope(Dispatchers.IO).launch {
            vpnService.stopTunnel()
        }
        cancelJob()
@@ -117,6 +125,18 @@ class WireGuardTunnelService : ForegroundService() {
        super.startForeground(foregroundId, notification)
    }

+    private fun launchVpnStartingNotification() {
+        val notification = notificationService.createNotification(
+            channelId = getString(R.string.vpn_channel_id),
+            channelName = getString(R.string.vpn_channel_name),
+            title = getString(R.string.vpn_starting),
+            onGoing = false,
+            showTimestamp = true,
+            description = getString(R.string.attempt_connection)
+        )
+        super.startForeground(foregroundId, notification)
+    }
+
    private fun launchVpnConnectionFailedNotification(message : String) {
        val notification = notificationService.createNotification(
            channelId = getString(R.string.vpn_channel_id),
@@ -66,7 +66,7 @@ class TunnelControlTile : TileService() {
                        if(vpnService.getState() == Tunnel.State.UP) {
                            ServiceManager.stopVpnService(this@TunnelControlTile)
                        } else {
-                            ServiceManager.startVpnService(this@TunnelControlTile, tunnel.toString())
+                            ServiceManager.startVpnServiceForeground(this@TunnelControlTile, tunnel.toString())
                        }
                    }
                } catch (e : Exception) {
@@ -100,7 +100,7 @@ class TunnelControlTile : TileService() {
            if (!settings.isNullOrEmpty()) {
                val setting = settings.first()
                if(setting.isAutoTunnelEnabled) {
-                    ServiceManager.toggleWatcherService(this@TunnelControlTile, tunnelConfig)
+                    ServiceManager.toggleWatcherServiceForeground(this@TunnelControlTile, tunnelConfig)
                }
            }
        }
@@ -1,6 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.main

 import android.annotation.SuppressLint
+import android.content.Intent
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.animation.AnimatedVisibility
@@ -17,7 +18,6 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
@@ -103,6 +103,7 @@ fun MainScreen(
    val state by viewModel.state.collectAsStateWithLifecycle(Tunnel.State.DOWN)
    val tunnelName by viewModel.tunnelName.collectAsStateWithLifecycle("")

+
    // Nested scroll for control FAB
    val nestedScrollConnection = remember {
        object : NestedScrollConnection {
@@ -135,11 +136,9 @@ fun MainScreen(
    }

    val pickFileLauncher = rememberLauncherForActivityResult(
-        ActivityResultContracts.GetContent()
-    ) { file ->
-        if (file != null) {
-            viewModel.onTunnelFileSelected(file)
-        }
+        ActivityResultContracts.StartActivityForResult()
+    ) { result ->
+        result.data?.data?.let { viewModel.onTunnelFileSelected(it) }
    }

    Scaffold(
@@ -196,7 +195,11 @@ fun MainScreen(
                        .fillMaxWidth()
                        .clickable {
                            showBottomSheet = false
-                            pickFileLauncher.launch("*/*")
+                            val fileSelectionIntent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
+                                addCategory(Intent.CATEGORY_OPENABLE)
+                                type = "*/*"
+                            }
+                            pickFileLauncher.launch(fileSelectionIntent)
                        }
                        .padding(10.dp)
                ) {
@@ -242,7 +245,8 @@ fun MainScreen(
        ) {

            LazyColumn(
-                modifier = Modifier.fillMaxSize()
+                modifier = Modifier
+                    .fillMaxSize()
                    .nestedScroll(nestedScrollConnection),
            ) {
                itemsIndexed(tunnels.toList()) { index, tunnel ->
@@ -89,4 +89,6 @@
    <string name="hint_search_packages">Search packages</string>
    <string name="clear_icon">Clear Icon</string>
    <string name="search_icon">Search Icon</string>
+    <string name="attempt_connection">Attempting connection..</string>
+    <string name="vpn_starting">VPN Starting</string>
 </resources>
@@ -13,7 +13,7 @@ buildscript {
 }

 plugins {
-    id("com.android.application") version "8.2.0-beta01" apply false
+    id("com.android.application") version "8.2.0-beta03" apply false
    id("org.jetbrains.kotlin.android") version "1.8.22"  apply false
    id("com.google.dagger.hilt.android") version "2.44" apply false
    kotlin("plugin.serialization") version "1.8.22" apply false
Author	SHA1	Message	Date
Zane Schepke	e81066f508	fix: FireTV file selection bug Fixes bug where FireTV devices were unable to launch a proper file browser to select tunnel configs.	2023-09-11 11:15:44 -04:00
Zane Schepke	64bb9f3b82	fix: foreground service start crashes Attempt to fix startForegrounService causing crashes on some devices by not meeting the 5 second notification rule. Add notification to onCreate of services. Limit startForeground to only be called where it is truly necessary in the TileService to allow starting the VPN while app is not running. Attempt to manually initialize mlkit for QR code scanning to remediate some crashes caused by config scanning.	2023-09-10 00:23:23 -04:00
Zane Schepke	c1b560e822	chore: update README.md	2023-09-08 12:43:41 -04:00
Zane Schepke	14fe5821cc	Merge branch 'main' of github.com:zaneschepke/wgtunnel	2023-09-04 05:52:27 -04:00
Zane Schepke	9d9b7bebca	fix: foreground service crash on older devices Fixes a bug where older device take a longer time to launch the foreground service and connect to the VPN. Combined with a delayed launch of foreground notification until VPN connection is confirmed, this would break foreground service,s 5 second notification rule. Fixed by adding a new attempting connection notification to launch on vpn initial connection attempt.	2023-09-04 05:52:15 -04:00
Zane Schepke	12d1ccc084	chore: update README.md	2023-09-04 02:51:05 -04:00