feat: auto-tunneling flexibility

.github/workflows/pre-release.yml

@@ -89,30 +89,6 @@ jobs:
           draft: false
           prerelease: true
           files: ${{ github.workspace }}/${{ steps.apk-path.outputs.path }}
-
-      - name: Install apksigner
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y apksigner
-
-      - name: Get checksum
-        id: checksum
-        run: echo "checksum=$(apksigner verify -print-certs ${{ steps.apk-path.outputs.path }} | grep -Po "(?<=SHA-256 digest:) .*")" | awk '{$1=$1};1' >> $GITHUB_OUTPUT
-
-      - name: Append checksum
-        id: append_checksum
-        uses: softprops/action-gh-release@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          body: >
-            <br /> SHA256 Checksum: <br /> ```${{ steps.checksum.outputs.checksum }}```
-          tag_name: ${{ github.ref_name }}
-          name: ${{ github.ref_name }}
-          draft: false
-          prerelease: true
-          append_body: true
-
       - name: Deploy with fastlane
         uses: ruby/setup-ruby@v1
         with:

.github/workflows/release.yml

@@ -95,30 +95,6 @@ jobs:
           draft: false
           prerelease: false
           files: ${{ github.workspace }}/${{ steps.apk-path.outputs.path }}
-
-      - name: Install apksigner
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y apksigner
-
-      - name: Get checksum
-        id: checksum
-        run: echo "checksum=$(apksigner verify -print-certs ${{ steps.apk-path.outputs.path }} | grep -Po "(?<=SHA-256 digest:) .*")" | awk '{$1=$1};1' >> $GITHUB_OUTPUT
-
-      - name: Append checksum
-        id: append_checksum
-        uses: softprops/action-gh-release@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          body: >
-            <br /> SHA256 Checksum: <br /> ```${{ steps.checksum.outputs.checksum }}```
-          tag_name: ${{ github.ref_name }}
-          name: ${{ github.ref_name }}
-          draft: false
-          prerelease: false
-          append_body: true
-
       - name: Deploy with fastlane
         uses: ruby/setup-ruby@v1
         with:

README.md

@@ -49,18 +49,16 @@ and on while on different networks. This app was created to offer a free solutio
 ## Features
 
 * Add tunnels via .conf file, zip, manual entry, or QR code
-* Auto connect to tunnels based on Wi-Fi SSID, ethernet, or mobile data
+* Auto connect to VPN based on Wi-Fi SSID, ethernet, or mobile data
 * Split tunneling by application with search
 * WireGuard support for kernel and userspace modes
 * Always-On VPN support
 * Export tunnels to zip
-* Quick tile support for tunnel toggling, auto-tunneling
-* Static shortcuts support for tunnel toggling, auto-tunneling
+* Quick tile support for VPN toggling
+* Static shortcuts support for primary tunnel for automation integration
 * Intent automation support for all tunnels
-* Automatic auto-tunneling service restart after reboot
-* Automatic tunnel restart after reboot
+* Automatic service restart after reboot
 * Battery preservation measures
-* Restart tunnel on ping failure (beta)
 
 ## Docs (WIP)
 

SECURITY.md

@@ -1,5 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-Please report security issues to `support@zaneschepke.com`

app/src/main/AndroidManifest.xml

@@ -52,7 +52,7 @@
     <application
         android:name=".WireGuardAutoTunnel"
         android:allowBackup="true"
-        android:banner="@drawable/ic_banner"
+        android:banner="@mipmap/ic_banner"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:enableOnBackInvokedCallback="true"
         android:fullBackupContent="@xml/backup_rules"

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/foreground/ForegroundService.kt

@@ -25,6 +25,7 @@ open class ForegroundService : LifecycleService() {
                 Action.START.name,
                 Action.START_FOREGROUND.name -> startService(intent.extras)
 
+                Action.STOP.name -> stopService(intent.extras)
                 Constants.ALWAYS_ON_VPN_ACTION -> {
                     Timber.i("Always-on VPN starting service")
                     startService(intent.extras)
@@ -44,7 +45,6 @@ open class ForegroundService : LifecycleService() {
     override fun onDestroy() {
         super.onDestroy()
         Timber.d("The service has been destroyed")
-        stopService()
     }
 
     protected open fun startService(extras: Bundle?) {
@@ -53,7 +53,7 @@ open class ForegroundService : LifecycleService() {
         isServiceStarted = true
     }
 
-    protected open fun stopService() {
+    protected open fun stopService(extras: Bundle?) {
         Timber.d("Stopping ${this.javaClass.simpleName}")
         try {
             stopForeground(STOP_FOREGROUND_REMOVE)

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

@@ -23,9 +23,15 @@ class ServiceManager(private val appDataRepository: AppDataRepository) {
         intent.component?.javaClass
         try {
             when (action) {
-                Action.START_FOREGROUND -> context.startForegroundService(intent)
-                Action.START -> context.startService(intent)
-                Action.STOP -> context.stopService(intent)
+                Action.START_FOREGROUND -> {
+                    context.startForegroundService(intent)
+                }
+
+                Action.START -> {
+                    context.startService(intent)
+                }
+
+                Action.STOP -> context.startService(intent)
             }
         } catch (e: Exception) {
             Timber.e(e.message)
@@ -48,7 +54,7 @@ class ServiceManager(private val appDataRepository: AppDataRepository) {
 
     suspend fun stopVpnService(context: Context, isManualStop: Boolean = false) {
         if (isManualStop) onManualStop()
-        Timber.i("Stopping vpn service")
+        Timber.d("Stopping vpn service action")
         actionOnService(
             Action.STOP,
             context,

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/foreground/ServiceState.kt

@@ -0,0 +1,6 @@
+package com.zaneschepke.wireguardautotunnel.service.foreground
+
+enum class ServiceState {
+    STARTED,
+    STOPPED,
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/foreground/WireGuardConnectivityWatcherService.kt

@@ -74,11 +74,6 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
         }
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
-        stopService()
-    }
-
     override fun startService(extras: Bundle?) {
         super.startService(extras)
         try {
@@ -91,8 +86,8 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
         }
     }
 
-    override fun stopService() {
-        super.stopService()
+    override fun stopService(extras: Bundle?) {
+        super.stopService(extras)
         wakeLock?.let {
             if (it.isHeld) {
                 it.release()

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/foreground/WireGuardTunnelService.kt

@@ -49,11 +49,6 @@ class WireGuardTunnelService : ForegroundService() {
         }
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
-
-    }
-
     override fun startService(extras: Bundle?) {
         super.startService(extras)
         cancelJob()
@@ -122,8 +117,8 @@ class WireGuardTunnelService : ForegroundService() {
         )
     }
 
-    override fun stopService() {
-        super.stopService()
+    override fun stopService(extras: Bundle?) {
+        super.stopService(extras)
         lifecycleScope.launch(Dispatchers.IO) {
             vpnService.stopTunnel()
             didShowConnected = false

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/tile/AutoTunnelControlTile.kt

@@ -53,11 +53,6 @@ class AutoTunnelControlTile : TileService() {
         }
     }
 
-    override fun onTileAdded() {
-        super.onTileAdded()
-        onStartListening()
-    }
-
     override fun onDestroy() {
         super.onDestroy()
         scope.cancel()

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/tile/TunnelControlTile.kt

@@ -69,21 +69,13 @@ class TunnelControlTile : TileService() {
         scope.cancel()
     }
 
-    override fun onTileAdded() {
-        super.onTileAdded()
-        onStartListening()
-    }
-
     override fun onClick() {
         super.onClick()
         unlockAndRun {
             scope.launch {
                 try {
                     if (vpnService.getState() == Tunnel.State.UP) {
-                        serviceManager.stopVpnService(
-                            this@TunnelControlTile,
-                            isManualStop = true,
-                        )
+                        serviceManager.stopVpnService(this@TunnelControlTile, isManualStop = true)
                     } else {
                         serviceManager.startVpnServiceForeground(
                             this@TunnelControlTile, manualStartConfig?.id, isManualStart = true,

app/src/main/res/mipmap-anydpi-v26/ic_channel.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_channel_background" />
-    <foreground android:drawable="@mipmap/ic_channel_foreground" />
-</adaptive-icon>

app/src/main/res/values/ic_channel_background.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="ic_channel_background">#1D1A20</color>
-</resources>

buildSrc/src/main/kotlin/Constants.kt

@@ -1,7 +1,7 @@
 object Constants {
-    const val VERSION_NAME = "3.4.1"
+    const val VERSION_NAME = "3.4.0"
     const val JVM_TARGET = "17"
-    const val VERSION_CODE = 34100
+    const val VERSION_CODE = 34000
     const val TARGET_SDK = 34
     const val MIN_SDK = 26
     const val APP_ID = "com.zaneschepke.wireguardautotunnel"

fastlane/metadata/android/en-US/changelogs/34100.txt

@@ -1,5 +0,0 @@
-What's new:
-- Improved auto tunnel reliability
-- Improved tile sync
-- Added AndroidTV assets
-- Added apk fingerprint

gradle/libs.versions.toml

@@ -20,7 +20,7 @@ pinLockCompose = "1.0.3"
 roomVersion = "2.6.1"
 timber = "5.0.1"
 tunnel = "1.0.20230706"
-androidGradlePlugin = "8.4.0-rc01"
+androidGradlePlugin = "8.3.1"
 kotlin = "1.9.23"
 ksp = "1.9.23-1.0.19"
 composeBom = "2024.03.00"

gradle/wrapper/gradle-wrapper.properties

@@ -1,8 +1,8 @@
 #Wed Oct 11 22:39:21 EDT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
-distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionSha256Sum=3e1af3ae886920c3ac87f7a91f816c0c7c436f276a6eefdb3da152100fef72ae
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists