build(deps): bump androidGradlePlugin from 8.5.1 to 8.5.2

Bumps `androidGradlePlugin` from 8.5.1 to 8.5.2.

Updates `com.android.application` from 8.5.1 to 8.5.2

Updates `com.android.library` from 8.5.1 to 8.5.2

---
updated-dependencies:
- dependency-name: com.android.application
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.android.library
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/FUNDING.yml

@@ -1,3 +1,2 @@
 ko_fi: zaneschepke
 liberapay: zaneschepke
-github: zaneschepke

.github/ISSUE_TEMPLATE/bug_report.md

@@ -15,7 +15,6 @@ A clear and concise description of what the bug is.
 - Device: [e.g. Pixel 4a]
 - Android Version: [e.g. Android 13]
 - App Version [e.g. 3.3.3]
-- Backend: [e.g. Kernel, Userspace]
 
 **To Reproduce**
 Steps to reproduce the behavior:

.github/workflows/issue-workflow.yml

@@ -1,4 +1,4 @@
-name: on-issue
+name: Issue Updates Workflow
 
 on:
   issues:
@@ -7,8 +7,8 @@ on:
 
 jobs:
 
-  on-issue:
+  build:
-    name: On new issue
+    name: Build
     runs-on: ubuntu-latest
     steps:
       - name: Send Telegram Message

.github/workflows/publish-workflow.yml

@@ -1,4 +1,4 @@
-name: on-publish
+name: Release Updates Workflow
 
 on:
   release:
@@ -7,8 +7,8 @@ on:
 
 jobs:
 
-  on-publish:
+  build:
-    name: On publish
+    name: Build
     runs-on: ubuntu-latest
     steps:
       - name: Send Telegram Message

.github/workflows/release.yml

@@ -14,7 +14,7 @@ on:
           - alpha
           - beta
           - production
-        default: none
+        default: alpha
         required: true
       release_type:
         type: choice
@@ -30,34 +30,13 @@ on:
         description: "Tag name for release"
         required: false
         default: nightly
-  workflow_call:
 
 jobs:
-  check_commits:
-    name: Check for New Commits
-    runs-on: ubuntu-latest
-    outputs:
-      has_new_commits: ${{ steps.check.outputs.new_commits }}
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0  # This fetches all history so we can check commits
-
-      - name: Check for new commits
-        id: check
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          # This script checks for commits newer than 23 hours ago
-          NEW_COMMITS=$(git rev-list --count --after="$(date -Iseconds -d '23 hours ago')" ${{ github.sha }})
-          echo "new_commits=$NEW_COMMITS" >> $GITHUB_OUTPUT
   build:
-    needs: check_commits
-    if: ${{ needs.check_commits.outputs.has_new_commits > 0 && inputs.release_type != 'none' }}
     name: Build Signed APK
+    if: ${{ inputs.release_type != 'none' }}
     runs-on: ubuntu-latest
+
     env:
       SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
       SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
@@ -94,32 +73,6 @@ jobs:
           fileDir: ${{ env.KEY_STORE_LOCATION }}
           encodedString: ${{ secrets.KEYSTORE }}
 
-      # update latest tag
-      - name: Set latest tag
-        uses: rickstaa/action-create-tag@v1
-        id: tag_creation
-        with:
-          tag: "latest"  # or any tag name you wish to use
-          message: "Automated tag for HEAD commit"
-          force_push_tag: true
-          tag_exists_error: false
-
-      - name: Get latest release
-        id: latest_release
-        uses: kaliber5/action-get-release@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          latest: true
-
-      - name: Generate Changelog
-        id: changelog
-        uses: requarks/changelog-action@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          toTag: ${{ github.event_name == 'schedule' && 'nightly' || steps.latest_release.outputs.tag_name }}
-          fromTag: "latest"
-          writeToFile: false  # we won't write to file, just output
-
       # create keystore path for gradle to read
       - name: Create keystore path env var
         run: |
@@ -157,24 +110,9 @@ jobs:
           version_code=$(grep "VERSION_CODE" buildSrc/src/main/kotlin/Constants.kt | awk '{print $5}' | tr -d '\n')
           echo "VERSION_CODE=$version_code" >> $GITHUB_ENV
 
-      - name: Commit and push versionCode changes
-        if: ${{ inputs.release_type == '' || inputs.release_type == 'nightly'  || inputs.release_type == 'prerelease' }}
-        run: |
-          git config --global user.name 'GitHub Actions'
-          git config --global user.email 'actions@github.com'
-          git add versionCode.txt
-          git commit -m "Automated build update"
-
-      - name: Push changes
-        if: ${{ inputs.release_type == '' || inputs.release_type == 'nightly'  || inputs.release_type == 'prerelease' }}
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ github.ref }}
-
       # Save the APK after the Build job is complete to publish it as a Github release in the next job
       - name: Upload APK
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.3.6
         with:
           name: wgtunnel
           path: ${{ env.APK_PATH }}
@@ -211,7 +149,6 @@ jobs:
         run: |
           echo "RELEASE_NOTES=Nightly build for the latest development version of the app." >> $GITHUB_ENV
           gh release delete nightly --yes || true
-          git push origin :nightly || true
 
       - name: On prerelease release notes
         if: ${{ inputs.release_type == 'prerelease' }}
@@ -235,9 +172,6 @@ jobs:
 
             SHA256 fingerprint:
             ```${{ steps.checksum.outputs.checksum }}```
-
-            ### Changelog
-            ${{ steps.changelog.outputs.changes }}
           tag_name: ${{ env.TAG_NAME }}
           name: ${{ env.TAG_NAME }}
           draft: false

.gitignore

@@ -71,4 +71,3 @@ app/release/output.json
 .idea/codeStyles/
 # where we keep our signing secrets locally
 app/signing.properties
-/.kotlin/

README.md

@@ -5,6 +5,7 @@ WG Tunnel
 <div align="center">
 
 [![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/rbRRNh6H7V)
+[![X Community](https://img.shields.io/badge/X-000000?style=for-the-badge&logo=x&logoColor=white)](https://twitter.com/i/communities/1780655267685736818)
 [![Telegram](https://img.shields.io/badge/Telegram-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)](https://t.me/wgtunnel)
 
 </div>
@@ -54,13 +55,13 @@ and on while on different networks. This app was created to offer a free solutio
 * Split tunneling by application with search
 * WireGuard support for kernel and userspace modes
 * Amnezia support for userspace mode for DPI/censorship protection
-* Pre/Post Up/Down scripts support for all modes on a rooted device
 * Always-On VPN support
 * Export Amnezia and WireGuard tunnels to zip
 * Quick tile support for tunnel toggling, auto-tunneling
 * Static shortcuts support for tunnel toggling, auto-tunneling
 * Intent automation support for all tunnels
-* Automatic auto-tunneling service and/or tunnel restart after reboot or app update
+* Automatic auto-tunneling service restart after reboot
+* Automatic tunnel restart after reboot
 * Battery preservation measures
 * Restart tunnel on ping failure (beta)
 

app/build.gradle.kts

@@ -8,21 +8,6 @@ plugins {
 	alias(libs.plugins.grgit)
 }
 
-val versionFile = file("$rootDir/versionCode.txt")
-
-val versionCodeIncrement = with(getBuildTaskName().lowercase()) {
-	when {
-		this.contains(Constants.NIGHTLY) || this.contains(Constants.PRERELEASE) -> {
-			if (versionFile.exists()) {
-				versionFile.readText().toInt() + 1
-			} else {
-				1
-			}
-		}
-		else -> 0
-	}
-}
-
 android {
 	namespace = Constants.APP_ID
 	compileSdk = Constants.TARGET_SDK
@@ -35,7 +20,7 @@ android {
 		applicationId = Constants.APP_ID
 		minSdk = Constants.MIN_SDK
 		targetSdk = Constants.TARGET_SDK
-		versionCode = Constants.VERSION_CODE + versionCodeIncrement
+		versionCode = determineVersionCode()
 		versionName = determineVersionName()
 
 		ksp { arg("room.schemaLocation", "$projectDir/schemas") }
@@ -44,8 +29,6 @@ android {
 			getByName("debug").assets.srcDirs(files("$projectDir/schemas")) // Room
 		}
 
-		buildConfigField("String[]", "LANGUAGES", "new String[]{ ${languageList().joinToString(separator = ", ") { "\"$it\"" }} }")
-
 		testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 		vectorDrawables { useSupportLibrary = true }
 	}
@@ -74,30 +57,15 @@ android {
 				"proguard-rules.pro",
 			)
 			signingConfig = signingConfigs.getByName(Constants.RELEASE)
-			resValue("string", "provider", "\"${Constants.APP_NAME}.provider\"")
-		}
-		debug {
-			applicationIdSuffix = ".debug"
-			versionNameSuffix = "-debug"
-			resValue("string", "app_name", "WG Tunnel - Debug")
-			isDebuggable = true
-			resValue("string", "provider", "\"${Constants.APP_NAME}.provider.debug\"")
 		}
+		debug { isDebuggable = true }
 
 		create(Constants.PRERELEASE) {
 			initWith(buildTypes.getByName(Constants.RELEASE))
-			applicationIdSuffix = ".prerelease"
-			versionNameSuffix = "-pre"
-			resValue("string", "app_name", "WG Tunnel - Pre")
-			resValue("string", "provider", "\"${Constants.APP_NAME}.provider.pre\"")
 		}
 
 		create(Constants.NIGHTLY) {
 			initWith(buildTypes.getByName(Constants.RELEASE))
-			applicationIdSuffix = ".nightly"
-			versionNameSuffix = "-nightly"
-			resValue("string", "app_name", "WG Tunnel - Nightly")
-			resValue("string", "provider", "\"${Constants.APP_NAME}.provider.nightly\"")
 		}
 
 		applicationVariants.all {
@@ -135,6 +103,8 @@ android {
 	packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
 }
 
+val generalImplementation by configurations
+
 dependencies {
 
 	implementation(project(":logcatter"))
@@ -151,7 +121,6 @@ dependencies {
 	implementation(libs.androidx.compose.ui.tooling.preview)
 	implementation(libs.androidx.material3)
 	implementation(libs.androidx.appcompat)
-	implementation(libs.material)
 
 	// test
 	testImplementation(libs.junit)
@@ -165,7 +134,6 @@ dependencies {
 	debugImplementation(libs.androidx.compose.manifest)
 
 	// get tunnel lib from github packages or mavenLocal
-// 	implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.aar"))))
 	implementation(libs.tunnel)
 	implementation(libs.amneziawg.android)
 	coreLibraryDesugaring(libs.desugar.jdk.libs)
@@ -177,6 +145,8 @@ dependencies {
 	implementation(libs.androidx.navigation.compose)
 	implementation(libs.androidx.hilt.navigation.compose)
 
+	implementation(libs.zaneschepke.multifab)
+
 	// hilt
 	implementation(libs.hilt.android)
 	ksp(libs.hilt.android.compiler)
@@ -217,6 +187,16 @@ dependencies {
 	implementation(libs.androidx.core.splashscreen)
 }
 
+fun determineVersionCode(): Int {
+	return with(getBuildTaskName().lowercase()) {
+		when {
+			contains(Constants.NIGHTLY) -> Constants.VERSION_CODE + Constants.NIGHTLY_CODE
+			contains(Constants.PRERELEASE) -> Constants.VERSION_CODE + Constants.PRERELEASE_CODE
+			else -> Constants.VERSION_CODE
+		}
+	}
+}
+
 fun determineVersionName(): String {
 	return with(getBuildTaskName().lowercase()) {
 		when {
@@ -227,19 +207,3 @@ fun determineVersionName(): String {
 		}
 	}
 }
-
-val incrementVersionCode by tasks.registering {
-	doLast {
-		val versionFile = file("$rootDir/versionCode.txt")
-		if (versionFile.exists()) {
-			versionFile.writeText(versionCodeIncrement.toString())
-			println("Incremented versionCode to $versionCodeIncrement")
-		}
-	}
-}
-
-tasks.whenTaskAdded {
-	if (name.startsWith("assemble") && !name.lowercase().contains("debug")) {
-		dependsOn(incrementVersionCode)
-	}
-}

app/schemas/com.zaneschepke.wireguardautotunnel.data.AppDatabase/10.json

@@ -1,225 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 10,
-    "identityHash": "c8621055524f90b4d1972f6171f59e80",
-    "entities": [
-      {
-        "tableName": "Settings",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_tunnel_enabled` INTEGER NOT NULL, `is_tunnel_on_mobile_data_enabled` INTEGER NOT NULL, `trusted_network_ssids` TEXT NOT NULL, `is_always_on_vpn_enabled` INTEGER NOT NULL, `is_tunnel_on_ethernet_enabled` INTEGER NOT NULL, `is_shortcuts_enabled` INTEGER NOT NULL DEFAULT false, `is_tunnel_on_wifi_enabled` INTEGER NOT NULL DEFAULT false, `is_kernel_enabled` INTEGER NOT NULL DEFAULT false, `is_restore_on_boot_enabled` INTEGER NOT NULL DEFAULT false, `is_multi_tunnel_enabled` INTEGER NOT NULL DEFAULT false, `is_auto_tunnel_paused` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `is_amnezia_enabled` INTEGER NOT NULL DEFAULT false)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAutoTunnelEnabled",
-            "columnName": "is_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnMobileDataEnabled",
-            "columnName": "is_tunnel_on_mobile_data_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "trustedNetworkSSIDs",
-            "columnName": "trusted_network_ssids",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAlwaysOnVpnEnabled",
-            "columnName": "is_always_on_vpn_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnEthernetEnabled",
-            "columnName": "is_tunnel_on_ethernet_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isShortcutsEnabled",
-            "columnName": "is_shortcuts_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isTunnelOnWifiEnabled",
-            "columnName": "is_tunnel_on_wifi_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isKernelEnabled",
-            "columnName": "is_kernel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isRestoreOnBootEnabled",
-            "columnName": "is_restore_on_boot_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isMultiTunnelEnabled",
-            "columnName": "is_multi_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isAutoTunnelPaused",
-            "columnName": "is_auto_tunnel_paused",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isAmneziaEnabled",
-            "columnName": "is_amnezia_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "TunnelConfig",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `wg_quick` TEXT NOT NULL, `tunnel_networks` TEXT NOT NULL DEFAULT '', `is_mobile_data_tunnel` INTEGER NOT NULL DEFAULT false, `is_primary_tunnel` INTEGER NOT NULL DEFAULT false, `am_quick` TEXT NOT NULL DEFAULT '', `is_Active` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `ping_interval` INTEGER DEFAULT null, `ping_cooldown` INTEGER DEFAULT null, `ping_ip` TEXT DEFAULT null)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "wgQuick",
-            "columnName": "wg_quick",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "tunnelNetworks",
-            "columnName": "tunnel_networks",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isMobileDataTunnel",
-            "columnName": "is_mobile_data_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPrimaryTunnel",
-            "columnName": "is_primary_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "amQuick",
-            "columnName": "am_quick",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isActive",
-            "columnName": "is_Active",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "pingInterval",
-            "columnName": "ping_interval",
-            "affinity": "INTEGER",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "pingCooldown",
-            "columnName": "ping_cooldown",
-            "affinity": "INTEGER",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "pingIp",
-            "columnName": "ping_ip",
-            "affinity": "TEXT",
-            "notNull": false,
-            "defaultValue": "null"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_TunnelConfig_name",
-            "unique": true,
-            "columnNames": [
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_TunnelConfig_name` ON `${TABLE_NAME}` (`name`)"
-          }
-        ],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'c8621055524f90b4d1972f6171f59e80')"
-    ]
-  }
-}

app/schemas/com.zaneschepke.wireguardautotunnel.data.AppDatabase/11.json

@@ -1,232 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 11,
-    "identityHash": "4c9418386f72dfac5d28ab96c1e5ea0b",
-    "entities": [
-      {
-        "tableName": "Settings",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_tunnel_enabled` INTEGER NOT NULL, `is_tunnel_on_mobile_data_enabled` INTEGER NOT NULL, `trusted_network_ssids` TEXT NOT NULL, `is_always_on_vpn_enabled` INTEGER NOT NULL, `is_tunnel_on_ethernet_enabled` INTEGER NOT NULL, `is_shortcuts_enabled` INTEGER NOT NULL DEFAULT false, `is_tunnel_on_wifi_enabled` INTEGER NOT NULL DEFAULT false, `is_kernel_enabled` INTEGER NOT NULL DEFAULT false, `is_restore_on_boot_enabled` INTEGER NOT NULL DEFAULT false, `is_multi_tunnel_enabled` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `is_amnezia_enabled` INTEGER NOT NULL DEFAULT false, `is_wildcards_enabled` INTEGER NOT NULL DEFAULT false, `is_wifi_by_shell_enabled` INTEGER NOT NULL DEFAULT false)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAutoTunnelEnabled",
-            "columnName": "is_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnMobileDataEnabled",
-            "columnName": "is_tunnel_on_mobile_data_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "trustedNetworkSSIDs",
-            "columnName": "trusted_network_ssids",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAlwaysOnVpnEnabled",
-            "columnName": "is_always_on_vpn_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnEthernetEnabled",
-            "columnName": "is_tunnel_on_ethernet_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isShortcutsEnabled",
-            "columnName": "is_shortcuts_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isTunnelOnWifiEnabled",
-            "columnName": "is_tunnel_on_wifi_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isKernelEnabled",
-            "columnName": "is_kernel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isRestoreOnBootEnabled",
-            "columnName": "is_restore_on_boot_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isMultiTunnelEnabled",
-            "columnName": "is_multi_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isAmneziaEnabled",
-            "columnName": "is_amnezia_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isWildcardsEnabled",
-            "columnName": "is_wildcards_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isWifiNameByShellEnabled",
-            "columnName": "is_wifi_by_shell_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "TunnelConfig",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `wg_quick` TEXT NOT NULL, `tunnel_networks` TEXT NOT NULL DEFAULT '', `is_mobile_data_tunnel` INTEGER NOT NULL DEFAULT false, `is_primary_tunnel` INTEGER NOT NULL DEFAULT false, `am_quick` TEXT NOT NULL DEFAULT '', `is_Active` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `ping_interval` INTEGER DEFAULT null, `ping_cooldown` INTEGER DEFAULT null, `ping_ip` TEXT DEFAULT null)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "wgQuick",
-            "columnName": "wg_quick",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "tunnelNetworks",
-            "columnName": "tunnel_networks",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isMobileDataTunnel",
-            "columnName": "is_mobile_data_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPrimaryTunnel",
-            "columnName": "is_primary_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "amQuick",
-            "columnName": "am_quick",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isActive",
-            "columnName": "is_Active",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "pingInterval",
-            "columnName": "ping_interval",
-            "affinity": "INTEGER",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "pingCooldown",
-            "columnName": "ping_cooldown",
-            "affinity": "INTEGER",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "pingIp",
-            "columnName": "ping_ip",
-            "affinity": "TEXT",
-            "notNull": false,
-            "defaultValue": "null"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_TunnelConfig_name",
-            "unique": true,
-            "columnNames": [
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_TunnelConfig_name` ON `${TABLE_NAME}` (`name`)"
-          }
-        ],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '4c9418386f72dfac5d28ab96c1e5ea0b')"
-    ]
-  }
-}

app/schemas/com.zaneschepke.wireguardautotunnel.data.AppDatabase/12.json

@@ -1,246 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 12,
-    "identityHash": "acf79ac5defacda5be6c3f976e777de3",
-    "entities": [
-      {
-        "tableName": "Settings",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_tunnel_enabled` INTEGER NOT NULL, `is_tunnel_on_mobile_data_enabled` INTEGER NOT NULL, `trusted_network_ssids` TEXT NOT NULL, `is_always_on_vpn_enabled` INTEGER NOT NULL, `is_tunnel_on_ethernet_enabled` INTEGER NOT NULL, `is_shortcuts_enabled` INTEGER NOT NULL DEFAULT false, `is_tunnel_on_wifi_enabled` INTEGER NOT NULL DEFAULT false, `is_kernel_enabled` INTEGER NOT NULL DEFAULT false, `is_restore_on_boot_enabled` INTEGER NOT NULL DEFAULT false, `is_multi_tunnel_enabled` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `is_amnezia_enabled` INTEGER NOT NULL DEFAULT false, `is_wildcards_enabled` INTEGER NOT NULL DEFAULT false, `is_wifi_by_shell_enabled` INTEGER NOT NULL DEFAULT false, `is_stop_on_no_internet_enabled` INTEGER NOT NULL DEFAULT false)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAutoTunnelEnabled",
-            "columnName": "is_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnMobileDataEnabled",
-            "columnName": "is_tunnel_on_mobile_data_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "trustedNetworkSSIDs",
-            "columnName": "trusted_network_ssids",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAlwaysOnVpnEnabled",
-            "columnName": "is_always_on_vpn_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnEthernetEnabled",
-            "columnName": "is_tunnel_on_ethernet_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isShortcutsEnabled",
-            "columnName": "is_shortcuts_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isTunnelOnWifiEnabled",
-            "columnName": "is_tunnel_on_wifi_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isKernelEnabled",
-            "columnName": "is_kernel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isRestoreOnBootEnabled",
-            "columnName": "is_restore_on_boot_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isMultiTunnelEnabled",
-            "columnName": "is_multi_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isAmneziaEnabled",
-            "columnName": "is_amnezia_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isWildcardsEnabled",
-            "columnName": "is_wildcards_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isWifiNameByShellEnabled",
-            "columnName": "is_wifi_by_shell_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isStopOnNoInternetEnabled",
-            "columnName": "is_stop_on_no_internet_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "TunnelConfig",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `wg_quick` TEXT NOT NULL, `tunnel_networks` TEXT NOT NULL DEFAULT '', `is_mobile_data_tunnel` INTEGER NOT NULL DEFAULT false, `is_primary_tunnel` INTEGER NOT NULL DEFAULT false, `am_quick` TEXT NOT NULL DEFAULT '', `is_Active` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `ping_interval` INTEGER DEFAULT null, `ping_cooldown` INTEGER DEFAULT null, `ping_ip` TEXT DEFAULT null, `is_ethernet_tunnel` INTEGER NOT NULL DEFAULT false)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "wgQuick",
-            "columnName": "wg_quick",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "tunnelNetworks",
-            "columnName": "tunnel_networks",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isMobileDataTunnel",
-            "columnName": "is_mobile_data_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPrimaryTunnel",
-            "columnName": "is_primary_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "amQuick",
-            "columnName": "am_quick",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isActive",
-            "columnName": "is_Active",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "pingInterval",
-            "columnName": "ping_interval",
-            "affinity": "INTEGER",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "pingCooldown",
-            "columnName": "ping_cooldown",
-            "affinity": "INTEGER",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "pingIp",
-            "columnName": "ping_ip",
-            "affinity": "TEXT",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "isEthernetTunnel",
-            "columnName": "is_ethernet_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_TunnelConfig_name",
-            "unique": true,
-            "columnNames": [
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_TunnelConfig_name` ON `${TABLE_NAME}` (`name`)"
-          }
-        ],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'acf79ac5defacda5be6c3f976e777de3')"
-    ]
-  }
-}

app/schemas/com.zaneschepke.wireguardautotunnel.data.AppDatabase/13.json

@@ -1,267 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 13,
-    "identityHash": "ff209157b98a641c424f5086818ec585",
-    "entities": [
-      {
-        "tableName": "Settings",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_tunnel_enabled` INTEGER NOT NULL, `is_tunnel_on_mobile_data_enabled` INTEGER NOT NULL, `trusted_network_ssids` TEXT NOT NULL, `is_always_on_vpn_enabled` INTEGER NOT NULL, `is_tunnel_on_ethernet_enabled` INTEGER NOT NULL, `is_shortcuts_enabled` INTEGER NOT NULL DEFAULT false, `is_tunnel_on_wifi_enabled` INTEGER NOT NULL DEFAULT false, `is_kernel_enabled` INTEGER NOT NULL DEFAULT false, `is_restore_on_boot_enabled` INTEGER NOT NULL DEFAULT false, `is_multi_tunnel_enabled` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `is_amnezia_enabled` INTEGER NOT NULL DEFAULT false, `is_wildcards_enabled` INTEGER NOT NULL DEFAULT false, `is_wifi_by_shell_enabled` INTEGER NOT NULL DEFAULT false, `is_stop_on_no_internet_enabled` INTEGER NOT NULL DEFAULT false, `is_vpn_kill_switch_enabled` INTEGER NOT NULL DEFAULT false, `is_kernel_kill_switch_enabled` INTEGER NOT NULL DEFAULT false, `is_lan_on_kill_switch_enabled` INTEGER NOT NULL DEFAULT false)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAutoTunnelEnabled",
-            "columnName": "is_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnMobileDataEnabled",
-            "columnName": "is_tunnel_on_mobile_data_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "trustedNetworkSSIDs",
-            "columnName": "trusted_network_ssids",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAlwaysOnVpnEnabled",
-            "columnName": "is_always_on_vpn_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnEthernetEnabled",
-            "columnName": "is_tunnel_on_ethernet_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isShortcutsEnabled",
-            "columnName": "is_shortcuts_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isTunnelOnWifiEnabled",
-            "columnName": "is_tunnel_on_wifi_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isKernelEnabled",
-            "columnName": "is_kernel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isRestoreOnBootEnabled",
-            "columnName": "is_restore_on_boot_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isMultiTunnelEnabled",
-            "columnName": "is_multi_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isAmneziaEnabled",
-            "columnName": "is_amnezia_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isWildcardsEnabled",
-            "columnName": "is_wildcards_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isWifiNameByShellEnabled",
-            "columnName": "is_wifi_by_shell_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isStopOnNoInternetEnabled",
-            "columnName": "is_stop_on_no_internet_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isVpnKillSwitchEnabled",
-            "columnName": "is_vpn_kill_switch_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isKernelKillSwitchEnabled",
-            "columnName": "is_kernel_kill_switch_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isLanOnKillSwitchEnabled",
-            "columnName": "is_lan_on_kill_switch_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "TunnelConfig",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `wg_quick` TEXT NOT NULL, `tunnel_networks` TEXT NOT NULL DEFAULT '', `is_mobile_data_tunnel` INTEGER NOT NULL DEFAULT false, `is_primary_tunnel` INTEGER NOT NULL DEFAULT false, `am_quick` TEXT NOT NULL DEFAULT '', `is_Active` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `ping_interval` INTEGER DEFAULT null, `ping_cooldown` INTEGER DEFAULT null, `ping_ip` TEXT DEFAULT null, `is_ethernet_tunnel` INTEGER NOT NULL DEFAULT false)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "wgQuick",
-            "columnName": "wg_quick",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "tunnelNetworks",
-            "columnName": "tunnel_networks",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isMobileDataTunnel",
-            "columnName": "is_mobile_data_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPrimaryTunnel",
-            "columnName": "is_primary_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "amQuick",
-            "columnName": "am_quick",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isActive",
-            "columnName": "is_Active",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "pingInterval",
-            "columnName": "ping_interval",
-            "affinity": "INTEGER",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "pingCooldown",
-            "columnName": "ping_cooldown",
-            "affinity": "INTEGER",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "pingIp",
-            "columnName": "ping_ip",
-            "affinity": "TEXT",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "isEthernetTunnel",
-            "columnName": "is_ethernet_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_TunnelConfig_name",
-            "unique": true,
-            "columnNames": [
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_TunnelConfig_name` ON `${TABLE_NAME}` (`name`)"
-          }
-        ],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ff209157b98a641c424f5086818ec585')"
-    ]
-  }
-}

app/schemas/com.zaneschepke.wireguardautotunnel.data.AppDatabase/9.json

@@ -1,197 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 9,
-    "identityHash": "e2c91dbf1885a9da592d3f54f1e08302",
-    "entities": [
-      {
-        "tableName": "Settings",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_tunnel_enabled` INTEGER NOT NULL, `is_tunnel_on_mobile_data_enabled` INTEGER NOT NULL, `trusted_network_ssids` TEXT NOT NULL, `is_always_on_vpn_enabled` INTEGER NOT NULL, `is_tunnel_on_ethernet_enabled` INTEGER NOT NULL, `is_shortcuts_enabled` INTEGER NOT NULL DEFAULT false, `is_tunnel_on_wifi_enabled` INTEGER NOT NULL DEFAULT false, `is_kernel_enabled` INTEGER NOT NULL DEFAULT false, `is_restore_on_boot_enabled` INTEGER NOT NULL DEFAULT false, `is_multi_tunnel_enabled` INTEGER NOT NULL DEFAULT false, `is_auto_tunnel_paused` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `is_amnezia_enabled` INTEGER NOT NULL DEFAULT false)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAutoTunnelEnabled",
-            "columnName": "is_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnMobileDataEnabled",
-            "columnName": "is_tunnel_on_mobile_data_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "trustedNetworkSSIDs",
-            "columnName": "trusted_network_ssids",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAlwaysOnVpnEnabled",
-            "columnName": "is_always_on_vpn_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnEthernetEnabled",
-            "columnName": "is_tunnel_on_ethernet_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isShortcutsEnabled",
-            "columnName": "is_shortcuts_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isTunnelOnWifiEnabled",
-            "columnName": "is_tunnel_on_wifi_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isKernelEnabled",
-            "columnName": "is_kernel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isRestoreOnBootEnabled",
-            "columnName": "is_restore_on_boot_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isMultiTunnelEnabled",
-            "columnName": "is_multi_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isAutoTunnelPaused",
-            "columnName": "is_auto_tunnel_paused",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isAmneziaEnabled",
-            "columnName": "is_amnezia_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "TunnelConfig",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `wg_quick` TEXT NOT NULL, `tunnel_networks` TEXT NOT NULL DEFAULT '', `is_mobile_data_tunnel` INTEGER NOT NULL DEFAULT false, `is_primary_tunnel` INTEGER NOT NULL DEFAULT false, `am_quick` TEXT NOT NULL DEFAULT '', `is_Active` INTEGER NOT NULL DEFAULT false)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "wgQuick",
-            "columnName": "wg_quick",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "tunnelNetworks",
-            "columnName": "tunnel_networks",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isMobileDataTunnel",
-            "columnName": "is_mobile_data_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPrimaryTunnel",
-            "columnName": "is_primary_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "amQuick",
-            "columnName": "am_quick",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isActive",
-            "columnName": "is_Active",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_TunnelConfig_name",
-            "unique": true,
-            "columnNames": [
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_TunnelConfig_name` ON `${TABLE_NAME}` (`name`)"
-          }
-        ],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'e2c91dbf1885a9da592d3f54f1e08302')"
-    ]
-  }
-}

app/src/main/AndroidManifest.xml

@@ -3,7 +3,17 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32"
+        tools:ignore="ScopedStorage" />
+    <uses-permission
+        android:name="android.permission.ACCESS_WIFI_STATE"
+        android:maxSdkVersion="30"
+        tools:ignore="LeanbackUsesWifi" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -12,8 +22,7 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <!--foreground service exempt android 14-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
-    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
-		tools:ignore="ProtectedPermissions" />
 
     <!--foreground service permissions-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -22,12 +31,6 @@
     <!--start service on boot permission-->
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <!--android tv support-->
-
-	<permission
-		android:name="${applicationId}.permission.CONTROL_TUNNELS"
-		android:icon="@mipmap/ic_launcher"
-		android:protectionLevel="dangerous" />
-
     <uses-feature
         android:name="android.software.leanback"
         android:required="false" />
@@ -40,12 +43,6 @@
     <uses-feature
         android:name="android.hardware.screen.portrait"
         android:required="false" />
-	<uses-feature
-		android:name="android.hardware.gamepad"
-		android:required="false"/>
-
-	<uses-feature android:name="android.hardware.wifi"
-		android:required="false"/>
 
     <queries>
         <intent>
@@ -63,14 +60,12 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.App.Start"
+        android:theme="@style/Theme.AppSplashScreen"
         tools:targetApi="tiramisu">
         <activity
-            android:name=".ui.MainActivity"
+            android:name=".ui.SplashActivity"
             android:exported="true"
-            android:theme="@style/Theme.WireguardAutoTunnel"
+            android:theme="@style/Theme.AppSplashScreen">
-			android:configChanges="orientation|screenSize|keyboardHidden"
-			>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -82,6 +77,11 @@
                 android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
         </activity>
+        <activity
+            android:name=".ui.MainActivity"
+            android:exported="true"
+            android:theme="@style/Theme.WireguardAutoTunnel">
+        </activity>
         <activity
             android:name="com.journeyapps.barcodescanner.CaptureActivity"
             android:screenOrientation="portrait"
@@ -97,16 +97,12 @@
 			android:launchMode="singleInstance"
             android:theme="@android:style/Theme.NoDisplay" />
 
-		<provider
+        <service
-			android:name="androidx.core.content.FileProvider"
+            android:name=".service.foreground.ForegroundService"
-			android:authorities="@string/provider"
+            android:enabled="true"
             android:exported="false"
-			android:grantUriPermissions="true">
+            android:foregroundServiceType="systemExempted"
-			<meta-data
+            tools:node="merge" />
-				android:name="android.support.FILE_PROVIDER_PATHS"
-				android:resource="@xml/file_paths" />
-		</provider>
-
         <service
             android:name=".service.tile.TunnelControlTile"
             android:exported="true"
@@ -142,7 +138,7 @@
             </intent-filter>
         </service>
         <service
-			android:name=".service.tunnel.AlwaysOnVpnService"
+            android:name=".service.foreground.WireGuardTunnelService"
             android:enabled="true"
             android:exported="false"
             android:foregroundServiceType="systemExempted"
@@ -157,7 +153,7 @@
                 android:value="true" />
         </service>
         <service
-            android:name=".service.foreground.autotunnel.AutoTunnelService"
+            android:name=".service.foreground.WireGuardConnectivityWatcherService"
             android:enabled="true"
             android:exported="false"
             android:foregroundServiceType="systemExempted"
@@ -165,17 +161,6 @@
             android:stopWithTask="false"
             tools:node="merge" />
 
-		<service
-			android:name=".service.foreground.TunnelBackgroundService"
-			android:exported="false"
-			android:persistent="true"
-			android:foregroundServiceType="systemExempted"
-			android:permission="android.permission.BIND_VPN_SERVICE">
-			<intent-filter>
-				<action android:name="android.net.VpnService" />
-			</intent-filter>
-		</service>
-
         <receiver
             android:name=".receiver.BootReceiver"
             android:enabled="true"
@@ -188,26 +173,9 @@
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
                 <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
             </intent-filter>
-        </receiver>
-		<receiver
-			android:name=".receiver.AppUpdateReceiver"
-			android:exported="false">
-			<intent-filter>
-				<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
-			</intent-filter>
-		</receiver>
-		<receiver
-			android:name=".receiver.KernelReceiver"
-			android:exported="false"
-			android:permission="${applicationId}.permission.CONTROL_TUNNELS">
-			<intent-filter>
-				<action android:name="com.wireguard.android.action.REFRESH_TUNNEL_STATES" />
-			</intent-filter>
         </receiver>
         <receiver
             android:name=".receiver.NotificationActionReceiver"
-			android:exported="false"
+            android:exported="false" />
-			android:permission="${applicationId}.permission.CONTROL_TUNNELS">
-		</receiver>
     </application>
 </manifest>

app/src/main/java/com/zaneschepke/wireguardautotunnel/WireGuardAutoTunnel.kt

@@ -1,48 +1,19 @@
 package com.zaneschepke.wireguardautotunnel
 
 import android.app.Application
+import android.content.ComponentName
+import android.content.pm.PackageManager
 import android.os.StrictMode
 import android.os.StrictMode.ThreadPolicy
-import com.zaneschepke.logcatter.LogReader
+import android.service.quicksettings.TileService
-import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
+import com.zaneschepke.wireguardautotunnel.service.tile.AutoTunnelControlTile
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.service.tile.TunnelControlTile
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.service.tunnel.BackendState
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
 import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
-import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import dagger.hilt.android.HiltAndroidApp
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 @HiltAndroidApp
 class WireGuardAutoTunnel : Application() {
-
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
-
-	@Inject
-	lateinit var logReader: LogReader
-
-	@Inject
-	lateinit var appStateRepository: AppStateRepository
-
-	@Inject
-	lateinit var settingsRepository: SettingsRepository
-
-	@Inject
-	lateinit var tunnelService: TunnelService
-
-	@Inject
-	@IoDispatcher
-	lateinit var ioDispatcher: CoroutineDispatcher
-
 	override fun onCreate() {
 		super.onCreate()
 		instance = this
@@ -59,33 +30,28 @@ class WireGuardAutoTunnel : Application() {
 		} else {
 			Timber.plant(ReleaseTree())
 		}
-		applicationScope.launch {
-			if (!settingsRepository.getSettings().isKernelEnabled) {
-				tunnelService.setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
-			}
-			appStateRepository.getLocale()?.let {
-				LocaleUtil.changeLocale(it)
-			}
-		}
-		if (!isRunningOnTv()) {
-			applicationScope.launch(ioDispatcher) {
-				if (appStateRepository.isLocalLogsEnabled()) {
-					Timber.d("Starting logger")
-					logReader.start()
-				}
-			}
-		}
-	}
-
-	override fun onTerminate() {
-		applicationScope.launch {
-			tunnelService.setBackendState(BackendState.INACTIVE, emptyList())
-		}
-		super.onTerminate()
 	}
 
 	companion object {
 		lateinit var instance: WireGuardAutoTunnel
 			private set
+
+		fun isRunningOnAndroidTv(): Boolean {
+			return instance.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
+		}
+
+		fun requestTunnelTileServiceStateUpdate() {
+			TileService.requestListeningState(
+				instance,
+				ComponentName(instance, TunnelControlTile::class.java),
+			)
+		}
+
+		fun requestAutoTunnelTileServiceUpdate() {
+			TileService.requestListeningState(
+				instance,
+				ComponentName(instance, AutoTunnelControlTile::class.java),
+			)
+		}
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/AppDatabase.kt

@@ -11,7 +11,7 @@ import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 
 @Database(
 	entities = [Settings::class, TunnelConfig::class],
-	version = 13,
+	version = 8,
 	autoMigrations =
 	[
 		AutoMigration(from = 1, to = 2),
@@ -34,21 +34,6 @@ import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 			spec = RemoveLegacySettingColumnsMigration::class,
 		),
 		AutoMigration(7, 8),
-		AutoMigration(8, 9),
-		AutoMigration(9, 10),
-		AutoMigration(
-			from = 10,
-			to = 11,
-			spec = RemoveTunnelPauseMigration::class,
-		),
-		AutoMigration(
-			from = 11,
-			to = 12,
-		),
-		AutoMigration(
-			from = 12,
-			to = 13,
-		),
 	],
 	exportSchema = true,
 )
@@ -68,9 +53,3 @@ abstract class AppDatabase : RoomDatabase() {
 	columnName = "is_battery_saver_enabled",
 )
 class RemoveLegacySettingColumnsMigration : AutoMigrationSpec
-
-@DeleteColumn(
-	tableName = "Settings",
-	columnName = "is_auto_tunnel_paused",
-)
-class RemoveTunnelPauseMigration : AutoMigrationSpec

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/Queries.kt

@@ -16,7 +16,7 @@ object Queries {
 		        VALUES
 		        ('false',
 		        'false',
-		        '',
+		        'sampleSSID1,sampleSSID2',
 		        'false',
 		        'false',
 		        'false',

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/TunnelConfigDao.kt

@@ -6,7 +6,7 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
+import com.zaneschepke.wireguardautotunnel.util.TunnelConfigs
 import kotlinx.coroutines.flow.Flow
 
 @Dao
@@ -23,9 +23,6 @@ interface TunnelConfigDao {
 	@Query("SELECT * FROM TunnelConfig WHERE name=:name")
 	suspend fun getByName(name: String): TunnelConfig?
 
-	@Query("SELECT * FROM TunnelConfig WHERE is_Active=1")
-	suspend fun getActive(): TunnelConfigs
-
 	@Query("SELECT * FROM TunnelConfig")
 	suspend fun getAll(): TunnelConfigs
 
@@ -44,9 +41,6 @@ interface TunnelConfigDao {
 	@Query("UPDATE TunnelConfig SET is_mobile_data_tunnel = 0 WHERE is_mobile_data_tunnel =1")
 	suspend fun resetMobileDataTunnel()
 
-	@Query("UPDATE TunnelConfig SET is_ethernet_tunnel = 0 WHERE is_ethernet_tunnel =1")
-	suspend fun resetEthernetTunnel()
-
 	@Query("SELECT * FROM TUNNELCONFIG WHERE is_primary_tunnel=1")
 	suspend fun findByPrimary(): TunnelConfigs
 

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/datastore/DataStoreManager.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.intPreferencesKey
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
@@ -21,14 +22,13 @@ class DataStoreManager(
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) {
 	companion object {
-		val locationDisclosureShown = booleanPreferencesKey("LOCATION_DISCLOSURE_SHOWN")
+		val LOCATION_DISCLOSURE_SHOWN = booleanPreferencesKey("LOCATION_DISCLOSURE_SHOWN")
-		val batteryDisableShown = booleanPreferencesKey("BATTERY_OPTIMIZE_DISABLE_SHOWN")
+		val BATTERY_OPTIMIZE_DISABLE_SHOWN = booleanPreferencesKey("BATTERY_OPTIMIZE_DISABLE_SHOWN")
-		val currentSSID = stringPreferencesKey("CURRENT_SSID")
+		val TUNNEL_RUNNING_FROM_MANUAL_START =
-		val pinLockEnabled = booleanPreferencesKey("PIN_LOCK_ENABLED")
+			booleanPreferencesKey("TUNNEL_RUNNING_FROM_MANUAL_START")
-		val tunnelStatsExpanded = booleanPreferencesKey("TUNNEL_STATS_EXPANDED")
+		val ACTIVE_TUNNEL = intPreferencesKey("ACTIVE_TUNNEL")
-		val isLocalLogsEnabled = booleanPreferencesKey("LOCAL_LOGS_ENABLED")
+		val CURRENT_SSID = stringPreferencesKey("CURRENT_SSID")
-		val locale = stringPreferencesKey("LOCALE")
+		val IS_PIN_LOCK_ENABLED = booleanPreferencesKey("PIN_LOCK_ENABLED")
-		val theme = stringPreferencesKey("THEME")
 	}
 
 	// preferences
@@ -60,18 +60,6 @@ class DataStoreManager(
 		}
 	}
 
-	suspend fun <T> removeFromDataStore(key: Preferences.Key<T>) {
-		withContext(ioDispatcher) {
-			try {
-				context.dataStore.edit { it.remove(key) }
-			} catch (e: IOException) {
-				Timber.e(e)
-			} catch (e: Exception) {
-				Timber.e(e)
-			}
-		}
-	}
-
 	fun <T> getFromStoreFlow(key: Preferences.Key<T>) = context.dataStore.data.map { it[key] }
 
 	suspend fun <T> getFromStore(key: Preferences.Key<T>): T? {

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/domain/GeneralState.kt

@@ -1,21 +1,16 @@
 package com.zaneschepke.wireguardautotunnel.data.domain
 
-import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
-
 data class GeneralState(
 	val isLocationDisclosureShown: Boolean = LOCATION_DISCLOSURE_SHOWN_DEFAULT,
 	val isBatteryOptimizationDisableShown: Boolean = BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
+	val isTunnelRunningFromManualStart: Boolean = TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT,
 	val isPinLockEnabled: Boolean = PIN_LOCK_ENABLED_DEFAULT,
-	val isTunnelStatsExpanded: Boolean = IS_TUNNEL_STATS_EXPANDED,
+	val activeTunnelId: Int? = null,
-	val isLocalLogsEnabled: Boolean = IS_LOGS_ENABLED_DEFAULT,
-	val locale: String? = null,
-	val theme: Theme = Theme.AUTOMATIC,
 ) {
 	companion object {
 		const val LOCATION_DISCLOSURE_SHOWN_DEFAULT = false
 		const val BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT = false
+		const val TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT = false
 		const val PIN_LOCK_ENABLED_DEFAULT = false
-		const val IS_TUNNEL_STATS_EXPANDED = false
-		const val IS_LOGS_ENABLED_DEFAULT = false
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/domain/Settings.kt

@@ -40,6 +40,11 @@ data class Settings(
 		defaultValue = "false",
 	)
 	val isMultiTunnelEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_auto_tunnel_paused",
+		defaultValue = "false",
+	)
+	val isAutoTunnelPaused: Boolean = false,
 	@ColumnInfo(
 		name = "is_ping_enabled",
 		defaultValue = "false",
@@ -50,34 +55,4 @@ data class Settings(
 		defaultValue = "false",
 	)
 	val isAmneziaEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_wildcards_enabled",
-		defaultValue = "false",
-	)
-	val isWildcardsEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_wifi_by_shell_enabled",
-		defaultValue = "false",
-	)
-	val isWifiNameByShellEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_stop_on_no_internet_enabled",
-		defaultValue = "false",
-	)
-	val isStopOnNoInternetEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_vpn_kill_switch_enabled",
-		defaultValue = "false",
-	)
-	val isVpnKillSwitchEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_kernel_kill_switch_enabled",
-		defaultValue = "false",
-	)
-	val isKernelKillSwitchEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_lan_on_kill_switch_enabled",
-		defaultValue = "false",
-	)
-	val isLanOnKillSwitchEnabled: Boolean = false,
 )

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/domain/TunnelConfig.kt

@@ -5,7 +5,6 @@ import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
 import com.wireguard.config.Config
-import com.zaneschepke.wireguardautotunnel.util.extensions.toWgQuickString
 import java.io.InputStream
 
 @Entity(indices = [Index(value = ["name"], unique = true)])
@@ -33,44 +32,8 @@ data class TunnelConfig(
 		defaultValue = "",
 	)
 	val amQuick: String = AM_QUICK_DEFAULT,
-	@ColumnInfo(
-		name = "is_Active",
-		defaultValue = "false",
-	)
-	val isActive: Boolean = false,
-	@ColumnInfo(
-		name = "is_ping_enabled",
-		defaultValue = "false",
-	)
-	val isPingEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "ping_interval",
-		defaultValue = "null",
-	)
-	val pingInterval: Long? = null,
-	@ColumnInfo(
-		name = "ping_cooldown",
-		defaultValue = "null",
-	)
-	val pingCooldown: Long? = null,
-	@ColumnInfo(
-		name = "ping_ip",
-		defaultValue = "null",
-	)
-	var pingIp: String? = null,
-	@ColumnInfo(
-		name = "is_ethernet_tunnel",
-		defaultValue = "false",
-	)
-	var isEthernetTunnel: Boolean = false,
 ) {
-
-	fun toAmConfig(): org.amnezia.awg.config.Config {
-		return configFromAmQuick(if (amQuick != "") amQuick else wgQuick)
-	}
-
 	companion object {
-
 		fun configFromWgQuick(wgQuick: String): Config {
 			val inputStream: InputStream = wgQuick.byteInputStream()
 			return inputStream.bufferedReader(Charsets.UTF_8).use {
@@ -85,21 +48,6 @@ data class TunnelConfig(
 			}
 		}
 
-		fun tunnelConfigFromAmConfig(config: org.amnezia.awg.config.Config, name: String): TunnelConfig {
-			val amQuick = config.toAwgQuickString(true)
-			val wgQuick = config.toWgQuickString()
-			return TunnelConfig(name = name, wgQuick = wgQuick, amQuick = amQuick)
-		}
-
 		const val AM_QUICK_DEFAULT = ""
-
-		val IPV4_PUBLIC_NETWORKS = setOf(
-			"0.0.0.0/5", "8.0.0.0/7", "11.0.0.0/8", "12.0.0.0/6", "16.0.0.0/4", "32.0.0.0/3",
-			"64.0.0.0/2", "128.0.0.0/3", "160.0.0.0/5", "168.0.0.0/6", "172.0.0.0/12",
-			"172.32.0.0/11", "172.64.0.0/10", "172.128.0.0/9", "173.0.0.0/8", "174.0.0.0/7",
-			"176.0.0.0/4", "192.0.0.0/9", "192.128.0.0/11", "192.160.0.0/13", "192.169.0.0/16",
-			"192.170.0.0/15", "192.172.0.0/14", "192.176.0.0/12", "192.192.0.0/10",
-			"193.0.0.0/8", "194.0.0.0/7", "196.0.0.0/6", "200.0.0.0/5", "208.0.0.0/4",
-		)
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/repository/AppDataRepository.kt

@@ -7,6 +7,8 @@ interface AppDataRepository {
 
 	suspend fun getStartTunnelConfig(): TunnelConfig?
 
+	suspend fun toggleWatcherServicePause()
+
 	val settings: SettingsRepository
 	val tunnels: TunnelConfigRepository
 	val appState: AppStateRepository

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/repository/AppDataRoomRepository.kt

@@ -15,9 +15,24 @@ constructor(
 	}
 
 	override suspend fun getStartTunnelConfig(): TunnelConfig? {
-		tunnels.getActive().let {
+		return if (appState.isTunnelRunningFromManualStart()) {
-			if (it.isNotEmpty()) return it.first()
+			appState.getActiveTunnelId()?.let {
-			return getPrimaryOrFirstTunnel()
+				tunnels.getById(it)
+			}
+		} else {
+			null
+		}
+	}
+
+	override suspend fun toggleWatcherServicePause() {
+		val settings = settings.getSettings()
+		if (settings.isAutoTunnelEnabled) {
+			val pauseAutoTunnel = !settings.isAutoTunnelPaused
+			this.settings.save(
+				settings.copy(
+					isAutoTunnelPaused = pauseAutoTunnel,
+				),
+			)
 		}
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/repository/AppStateRepository.kt

@@ -1,7 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.domain.GeneralState
-import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 import kotlinx.coroutines.flow.Flow
 
 interface AppStateRepository {
@@ -17,21 +16,17 @@ interface AppStateRepository {
 
 	suspend fun setBatteryOptimizationDisableShown(shown: Boolean)
 
-	suspend fun isTunnelStatsExpanded(): Boolean
+	suspend fun isTunnelRunningFromManualStart(): Boolean
 
-	suspend fun setTunnelStatsExpanded(expanded: Boolean)
+	suspend fun setTunnelRunningFromManualStart(id: Int)
 
-	suspend fun setTheme(theme: Theme)
+	suspend fun setManualStop()
 
-	suspend fun getTheme(): Theme
+	suspend fun getActiveTunnelId(): Int?
 
-	suspend fun isLocalLogsEnabled(): Boolean
+	suspend fun getCurrentSsid(): String?
 
-	suspend fun setLocalLogsEnabled(enabled: Boolean)
+	suspend fun setCurrentSsid(ssid: String)
-
-	suspend fun setLocale(localeTag: String)
-
-	suspend fun getLocale(): String?
 
 	val generalStateFlow: Flow<GeneralState>
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/repository/DataStoreAppStateRepository.kt

@@ -2,79 +2,71 @@ package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
 import com.zaneschepke.wireguardautotunnel.data.domain.GeneralState
-import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import timber.log.Timber
 
-class DataStoreAppStateRepository(
+class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager) :
-	private val dataStoreManager: DataStoreManager,
-) :
 	AppStateRepository {
 	override suspend fun isLocationDisclosureShown(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.locationDisclosureShown)
+		return dataStoreManager.getFromStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN)
 			?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT
 	}
 
 	override suspend fun setLocationDisclosureShown(shown: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.locationDisclosureShown, shown)
+		dataStoreManager.saveToDataStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN, shown)
 	}
 
 	override suspend fun isPinLockEnabled(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.pinLockEnabled)
+		return dataStoreManager.getFromStore(DataStoreManager.IS_PIN_LOCK_ENABLED)
 			?: GeneralState.PIN_LOCK_ENABLED_DEFAULT
 	}
 
 	override suspend fun setPinLockEnabled(enabled: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.pinLockEnabled, enabled)
+		dataStoreManager.saveToDataStore(DataStoreManager.IS_PIN_LOCK_ENABLED, enabled)
 	}
 
 	override suspend fun isBatteryOptimizationDisableShown(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.batteryDisableShown)
+		return dataStoreManager.getFromStore(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN)
 			?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT
 	}
 
 	override suspend fun setBatteryOptimizationDisableShown(shown: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.batteryDisableShown, shown)
+		dataStoreManager.saveToDataStore(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN, shown)
 	}
 
-	override suspend fun isTunnelStatsExpanded(): Boolean {
+	override suspend fun isTunnelRunningFromManualStart(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.tunnelStatsExpanded)
+		return dataStoreManager.getFromStore(DataStoreManager.TUNNEL_RUNNING_FROM_MANUAL_START)
-			?: GeneralState.IS_TUNNEL_STATS_EXPANDED
+			?: GeneralState.TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT
 	}
 
-	override suspend fun setTunnelStatsExpanded(expanded: Boolean) {
+	override suspend fun setTunnelRunningFromManualStart(id: Int) {
-		dataStoreManager.saveToDataStore(DataStoreManager.tunnelStatsExpanded, expanded)
+		setTunnelRunningFromManualStart(true)
+		setActiveTunnelId(id)
 	}
 
-	override suspend fun setTheme(theme: Theme) {
+	override suspend fun setManualStop() {
-		dataStoreManager.saveToDataStore(DataStoreManager.theme, theme.name)
+		setTunnelRunningFromManualStart(false)
 	}
 
-	override suspend fun getTheme(): Theme {
+	private suspend fun setTunnelRunningFromManualStart(running: Boolean) {
-		return dataStoreManager.getFromStore(DataStoreManager.theme)?.let {
+		dataStoreManager.saveToDataStore(DataStoreManager.TUNNEL_RUNNING_FROM_MANUAL_START, running)
-			try {
-				Theme.valueOf(it)
-			} catch (_: IllegalArgumentException) {
-				Theme.AUTOMATIC
-			}
-		} ?: Theme.AUTOMATIC
 	}
 
-	override suspend fun isLocalLogsEnabled(): Boolean {
+	override suspend fun getActiveTunnelId(): Int? {
-		return dataStoreManager.getFromStore(DataStoreManager.isLocalLogsEnabled) ?: GeneralState.IS_LOGS_ENABLED_DEFAULT
+		return dataStoreManager.getFromStore(DataStoreManager.ACTIVE_TUNNEL)
 	}
 
-	override suspend fun setLocalLogsEnabled(enabled: Boolean) {
+	private suspend fun setActiveTunnelId(id: Int) {
-		dataStoreManager.saveToDataStore(DataStoreManager.isLocalLogsEnabled, enabled)
+		dataStoreManager.saveToDataStore(DataStoreManager.ACTIVE_TUNNEL, id)
 	}
 
-	override suspend fun setLocale(localeTag: String) {
+	override suspend fun getCurrentSsid(): String? {
-		dataStoreManager.saveToDataStore(DataStoreManager.locale, localeTag)
+		return dataStoreManager.getFromStore(DataStoreManager.CURRENT_SSID)
 	}
 
-	override suspend fun getLocale(): String? {
+	override suspend fun setCurrentSsid(ssid: String) {
-		return dataStoreManager.getFromStore(DataStoreManager.locale)
+		dataStoreManager.saveToDataStore(DataStoreManager.CURRENT_SSID, ssid)
 	}
 
 	override val generalStateFlow: Flow<GeneralState> =
@@ -83,18 +75,17 @@ class DataStoreAppStateRepository(
 				try {
 					GeneralState(
 						isLocationDisclosureShown =
-						pref[DataStoreManager.locationDisclosureShown]
+						pref[DataStoreManager.LOCATION_DISCLOSURE_SHOWN]
 							?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT,
 						isBatteryOptimizationDisableShown =
-						pref[DataStoreManager.batteryDisableShown]
+						pref[DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN]
 							?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
+						isTunnelRunningFromManualStart =
+						pref[DataStoreManager.TUNNEL_RUNNING_FROM_MANUAL_START]
+							?: GeneralState.TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT,
 						isPinLockEnabled =
-						pref[DataStoreManager.pinLockEnabled]
+						pref[DataStoreManager.IS_PIN_LOCK_ENABLED]
-							?: GeneralState.PIN_LOCK_ENABLED_DEFAULT,
+							?: GeneralState.TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT,
-						isTunnelStatsExpanded = pref[DataStoreManager.tunnelStatsExpanded] ?: GeneralState.IS_TUNNEL_STATS_EXPANDED,
-						isLocalLogsEnabled = pref[DataStoreManager.isLocalLogsEnabled] ?: GeneralState.IS_LOGS_ENABLED_DEFAULT,
-						locale = pref[DataStoreManager.locale],
-						theme = getTheme(),
 					)
 				} catch (e: IllegalArgumentException) {
 					Timber.e(e)

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/repository/RoomSettingsRepository.kt

@@ -2,29 +2,22 @@ package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.SettingsDao
 import com.zaneschepke.wireguardautotunnel.data.domain.Settings
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.withContext
 
-class RoomSettingsRepository(private val settingsDoa: SettingsDao, @IoDispatcher private val ioDispatcher: CoroutineDispatcher) : SettingsRepository {
+class RoomSettingsRepository(private val settingsDoa: SettingsDao) : SettingsRepository {
 	override suspend fun save(settings: Settings) {
-		withContext(ioDispatcher) {
 		settingsDoa.save(settings)
 	}
-	}
 
 	override fun getSettingsFlow(): Flow<Settings> {
 		return settingsDoa.getSettingsFlow()
 	}
 
 	override suspend fun getSettings(): Settings {
-		return withContext(ioDispatcher) {
+		return settingsDoa.getAll().firstOrNull() ?: Settings()
-			settingsDoa.getAll().firstOrNull() ?: Settings()
-		}
 	}
 
 	override suspend fun getAll(): List<Settings> {
-		return withContext(ioDispatcher) { settingsDoa.getAll() }
+		return settingsDoa.getAll()
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/repository/RoomTunnelConfigRepository.kt

@@ -2,33 +2,24 @@ package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.TunnelConfigDao
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.util.TunnelConfigs
-import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
-import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.withContext
 
-class RoomTunnelConfigRepository(
+class RoomTunnelConfigRepository(private val tunnelConfigDao: TunnelConfigDao) :
-	private val tunnelConfigDao: TunnelConfigDao,
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-) :
 	TunnelConfigRepository {
 	override fun getTunnelConfigsFlow(): Flow<TunnelConfigs> {
 		return tunnelConfigDao.getAllFlow()
 	}
 
 	override suspend fun getAll(): TunnelConfigs {
-		return withContext(ioDispatcher) { tunnelConfigDao.getAll() }
+		return tunnelConfigDao.getAll()
 	}
 
 	override suspend fun save(tunnelConfig: TunnelConfig) {
-		withContext(ioDispatcher) {
 		tunnelConfigDao.save(tunnelConfig)
 	}
-	}
 
 	override suspend fun updatePrimaryTunnel(tunnelConfig: TunnelConfig?) {
-		withContext(ioDispatcher) {
 		tunnelConfigDao.resetPrimaryTunnel()
 		tunnelConfig?.let {
 			save(
@@ -38,10 +29,8 @@ class RoomTunnelConfigRepository(
 			)
 		}
 	}
-	}
 
 	override suspend fun updateMobileDataTunnel(tunnelConfig: TunnelConfig?) {
-		withContext(ioDispatcher) {
 		tunnelConfigDao.resetMobileDataTunnel()
 		tunnelConfig?.let {
 			save(
@@ -51,54 +40,32 @@ class RoomTunnelConfigRepository(
 			)
 		}
 	}
-	}
-
-	override suspend fun updateEthernetTunnel(tunnelConfig: TunnelConfig?) {
-		withContext(ioDispatcher) {
-			tunnelConfigDao.resetEthernetTunnel()
-			tunnelConfig?.let {
-				save(
-					it.copy(
-						isEthernetTunnel = true,
-					),
-				)
-			}
-		}
-	}
 
 	override suspend fun delete(tunnelConfig: TunnelConfig) {
-		withContext(ioDispatcher) {
 		tunnelConfigDao.delete(tunnelConfig)
 	}
-	}
 
 	override suspend fun getById(id: Int): TunnelConfig? {
-		return withContext(ioDispatcher) { tunnelConfigDao.getById(id.toLong()) }
+		return tunnelConfigDao.getById(id.toLong())
-	}
-
-	override suspend fun getActive(): TunnelConfigs {
-		return withContext(ioDispatcher) {
-			tunnelConfigDao.getActive()
-		}
 	}
 
 	override suspend fun count(): Int {
-		return withContext(ioDispatcher) { tunnelConfigDao.count().toInt() }
+		return tunnelConfigDao.count().toInt()
 	}
 
 	override suspend fun findByTunnelName(name: String): TunnelConfig? {
-		return withContext(ioDispatcher) { tunnelConfigDao.getByName(name) }
+		return tunnelConfigDao.getByName(name)
 	}
 
 	override suspend fun findByTunnelNetworksName(name: String): TunnelConfigs {
-		return withContext(ioDispatcher) { tunnelConfigDao.findByTunnelNetworkName(name) }
+		return tunnelConfigDao.findByTunnelNetworkName(name)
 	}
 
 	override suspend fun findByMobileDataTunnel(): TunnelConfigs {
-		return withContext(ioDispatcher) { tunnelConfigDao.findByMobileDataTunnel() }
+		return tunnelConfigDao.findByMobileDataTunnel()
 	}
 
 	override suspend fun findPrimary(): TunnelConfigs {
-		return withContext(ioDispatcher) { tunnelConfigDao.findByPrimary() }
+		return tunnelConfigDao.findByPrimary()
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/repository/TunnelConfigRepository.kt

@@ -1,7 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
+import com.zaneschepke.wireguardautotunnel.util.TunnelConfigs
 import kotlinx.coroutines.flow.Flow
 
 interface TunnelConfigRepository {
@@ -15,14 +15,10 @@ interface TunnelConfigRepository {
 
 	suspend fun updateMobileDataTunnel(tunnelConfig: TunnelConfig?)
 
-	suspend fun updateEthernetTunnel(tunnelConfig: TunnelConfig?)
-
 	suspend fun delete(tunnelConfig: TunnelConfig)
 
 	suspend fun getById(id: Int): TunnelConfig?
 
-	suspend fun getActive(): TunnelConfigs
-
 	suspend fun count(): Int
 
 	suspend fun findByTunnelName(name: String): TunnelConfig?

app/src/main/java/com/zaneschepke/wireguardautotunnel/module/AppModule.kt

@@ -1,10 +1,8 @@
 package com.zaneschepke.wireguardautotunnel.module
 
 import android.content.Context
-import com.zaneschepke.logcatter.LogReader
+import com.zaneschepke.logcatter.LocalLogCollector
-import com.zaneschepke.logcatter.LogcatCollector
+import com.zaneschepke.logcatter.LogcatUtil
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
-import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -26,13 +24,7 @@ class AppModule {
 
 	@Singleton
 	@Provides
-	fun provideLogCollect(@ApplicationContext context: Context): LogReader {
+	fun provideLogCollect(@ApplicationContext context: Context): LocalLogCollector {
-		return LogcatCollector.init(context = context)
+		return LogcatUtil.init(context = context)
-	}
-
-	@Singleton
-	@Provides
-	fun provideNotificationService(@ApplicationContext context: Context): NotificationService {
-		return WireGuardNotification(context)
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/module/BackendQualifiers.kt

@@ -9,11 +9,3 @@ annotation class Kernel
 @Qualifier
 @Retention(AnnotationRetention.BINARY)
 annotation class Userspace
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class TunnelShell
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class AppShell

app/src/main/java/com/zaneschepke/wireguardautotunnel/module/RepositoryModule.kt

@@ -54,14 +54,14 @@ class RepositoryModule {
 
 	@Singleton
 	@Provides
-	fun provideTunnelConfigRepository(tunnelConfigDao: TunnelConfigDao, @IoDispatcher ioDispatcher: CoroutineDispatcher): TunnelConfigRepository {
+	fun provideTunnelConfigRepository(tunnelConfigDao: TunnelConfigDao): TunnelConfigRepository {
-		return RoomTunnelConfigRepository(tunnelConfigDao, ioDispatcher)
+		return RoomTunnelConfigRepository(tunnelConfigDao)
 	}
 
 	@Singleton
 	@Provides
-	fun provideSettingsRepository(settingsDao: SettingsDao, @IoDispatcher ioDispatcher: CoroutineDispatcher): SettingsRepository {
+	fun provideSettingsRepository(settingsDao: SettingsDao): SettingsRepository {
-		return RoomSettingsRepository(settingsDao, ioDispatcher)
+		return RoomSettingsRepository(settingsDao)
 	}
 
 	@Singleton

app/src/main/java/com/zaneschepke/wireguardautotunnel/module/ServiceModule.kt

@@ -4,6 +4,8 @@ import com.zaneschepke.wireguardautotunnel.service.network.EthernetService
 import com.zaneschepke.wireguardautotunnel.service.network.MobileDataService
 import com.zaneschepke.wireguardautotunnel.service.network.NetworkService
 import com.zaneschepke.wireguardautotunnel.service.network.WifiService
+import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
+import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -13,6 +15,10 @@ import dagger.hilt.android.scopes.ServiceScoped
 @Module
 @InstallIn(ServiceComponent::class)
 abstract class ServiceModule {
+	@Binds
+	@ServiceScoped
+	abstract fun provideNotificationService(wireGuardNotification: WireGuardNotification): NotificationService
+
 	@Binds
 	@ServiceScoped
 	abstract fun provideWifiService(wifiService: WifiService): NetworkService<WifiService>

app/src/main/java/com/zaneschepke/wireguardautotunnel/module/TunnelModule.kt

@@ -3,15 +3,12 @@ package com.zaneschepke.wireguardautotunnel.module
 import android.content.Context
 import com.wireguard.android.backend.Backend
 import com.wireguard.android.backend.GoBackend
-import com.wireguard.android.backend.RootTunnelActionHandler
 import com.wireguard.android.backend.WgQuickBackend
 import com.wireguard.android.util.RootShell
 import com.wireguard.android.util.ToolsInstaller
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
+import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.WireGuardTunnel
 import dagger.Module
 import dagger.Provides
@@ -26,78 +23,55 @@ import javax.inject.Singleton
 @Module
 @InstallIn(SingletonComponent::class)
 class TunnelModule {
-
 	@Provides
 	@Singleton
-	@TunnelShell
+	fun provideRootShell(@ApplicationContext context: Context): RootShell {
-	fun provideTunnelRootShell(@ApplicationContext context: Context): RootShell {
 		return RootShell(context)
 	}
 
-	@Provides
-	@Singleton
-	@AppShell
-	fun provideAppRootShell(@ApplicationContext context: Context): RootShell {
-		return RootShell(context)
-	}
-
-	@Provides
-	@Singleton
-	fun provideRootShellAm(@ApplicationContext context: Context): org.amnezia.awg.util.RootShell {
-		return org.amnezia.awg.util.RootShell(context)
-	}
-
 	@Provides
 	@Singleton
 	@Userspace
-	fun provideUserspaceBackend(@ApplicationContext context: Context, @TunnelShell rootShell: RootShell): Backend {
+	fun provideUserspaceBackend(@ApplicationContext context: Context): Backend {
-		return GoBackend(context, RootTunnelActionHandler(rootShell))
+		return GoBackend(context)
 	}
 
 	@Provides
 	@Singleton
 	@Kernel
-	fun provideKernelBackend(@ApplicationContext context: Context, @TunnelShell rootShell: RootShell): Backend {
+	fun provideKernelBackend(@ApplicationContext context: Context, rootShell: RootShell): Backend {
-		return WgQuickBackend(context, rootShell, ToolsInstaller(context, rootShell), RootTunnelActionHandler(rootShell))
+		return WgQuickBackend(context, rootShell, ToolsInstaller(context, rootShell))
 	}
 
 	@Provides
 	@Singleton
-	fun provideAmneziaBackend(@ApplicationContext context: Context, rootShell: org.amnezia.awg.util.RootShell): org.amnezia.awg.backend.Backend {
+	fun provideAmneziaBackend(@ApplicationContext context: Context): org.amnezia.awg.backend.Backend {
-		return org.amnezia.awg.backend.GoBackend(context, org.amnezia.awg.backend.RootTunnelActionHandler(rootShell))
+		return org.amnezia.awg.backend.GoBackend(context)
 	}
 
 	@Provides
 	@Singleton
 	fun provideVpnService(
 		amneziaBackend: Provider<org.amnezia.awg.backend.Backend>,
+		@Userspace userspaceBackend: Provider<Backend>,
 		@Kernel kernelBackend: Provider<Backend>,
 		appDataRepository: AppDataRepository,
-		tunnelConfigRepository: TunnelConfigRepository,
 		@ApplicationScope applicationScope: CoroutineScope,
 		@IoDispatcher ioDispatcher: CoroutineDispatcher,
-		serviceManager: ServiceManager,
+	): VpnService {
-		notificationService: NotificationService,
-	): TunnelService {
 		return WireGuardTunnel(
 			amneziaBackend,
-			tunnelConfigRepository,
+			userspaceBackend,
 			kernelBackend,
 			appDataRepository,
 			applicationScope,
 			ioDispatcher,
-			serviceManager,
-			notificationService,
 		)
 	}
 
-	@Singleton
 	@Provides
-	fun provideServiceManager(
+	@Singleton
-		@ApplicationContext context: Context,
+	fun provideServiceManager(appDataRepository: AppDataRepository, @IoDispatcher ioDispatcher: CoroutineDispatcher): ServiceManager {
-		@IoDispatcher ioDispatcher: CoroutineDispatcher,
+		return ServiceManager(appDataRepository, ioDispatcher)
-		appDataRepository: AppDataRepository,
-	): ServiceManager {
-		return ServiceManager(context, ioDispatcher, appDataRepository)
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/receiver/AppUpdateReceiver.kt

@@ -1,47 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Provider
-
-@AndroidEntryPoint
-class AppUpdateReceiver : BroadcastReceiver() {
-
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
-
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
-
-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
-
-	@Inject
-	lateinit var serviceManager: ServiceManager
-
-	override fun onReceive(context: Context, intent: Intent) {
-		if (intent.action != Intent.ACTION_MY_PACKAGE_REPLACED) return
-		applicationScope.launch {
-			val settings = appDataRepository.settings.getSettings()
-			if (settings.isAutoTunnelEnabled) {
-				Timber.i("Restarting services after upgrade")
-				serviceManager.startAutoTunnel(true)
-			}
-			if (!settings.isAutoTunnelEnabled) {
-				val tunnels = appDataRepository.tunnels.getAll().filter { it.isActive }
-				if (tunnels.isNotEmpty()) tunnelService.get().startTunnel(tunnels.first(), true)
-			}
-		}
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/receiver/BootReceiver.kt

@@ -6,14 +6,11 @@ import android.content.Intent
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
-import javax.inject.Provider
 
 @AndroidEntryPoint
 class BootReceiver : BroadcastReceiver() {
@@ -21,29 +18,35 @@ class BootReceiver : BroadcastReceiver() {
 	lateinit var appDataRepository: AppDataRepository
 
 	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
+	lateinit var serviceManager: ServiceManager
 
 	@Inject
 	@ApplicationScope
 	lateinit var applicationScope: CoroutineScope
 
-	@Inject
+	override fun onReceive(context: Context?, intent: Intent?) {
-	lateinit var serviceManager: ServiceManager
+		if (Intent.ACTION_BOOT_COMPLETED != intent?.action) return
-
+		context?.run {
-	override fun onReceive(context: Context, intent: Intent) {
-		if (Intent.ACTION_BOOT_COMPLETED != intent.action) return
 			applicationScope.launch {
-			with(appDataRepository.settings.getSettings()) {
+				val settings = appDataRepository.settings.getSettings()
-				if (isRestoreOnBootEnabled) {
+				if (settings.isRestoreOnBootEnabled) {
-					val activeTunnels = appDataRepository.tunnels.getActive()
+					if (settings.isAutoTunnelEnabled) {
-					val tunState = tunnelService.get().vpnState.value.status
-					if (activeTunnels.isNotEmpty() && tunState != TunnelState.UP) {
-						Timber.i("Starting previously active tunnel")
-						tunnelService.get().startTunnel(activeTunnels.first(), true)
-					}
-					if (isAutoTunnelEnabled) {
 						Timber.i("Starting watcher service from boot")
-						serviceManager.startAutoTunnel(true)
+						serviceManager.startWatcherServiceForeground(context)
+					}
+					if (appDataRepository.appState.isTunnelRunningFromManualStart()) {
+						appDataRepository.appState.getActiveTunnelId()?.let {
+							Timber.i("Starting tunnel that was active before reboot")
+							serviceManager.startVpnServiceForeground(
+								context,
+								appDataRepository.tunnels.getById(it)?.id,
+							)
+							return@launch
+						}
+					}
+					if (settings.isAlwaysOnVpnEnabled) {
+						Timber.i("Starting vpn service from boot AOVPN")
+						serviceManager.startVpnServiceForeground(context)
 					}
 				}
 			}

app/src/main/java/com/zaneschepke/wireguardautotunnel/receiver/KernelReceiver.kt

@@ -1,51 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-import javax.inject.Provider
-
-@AndroidEntryPoint
-class KernelReceiver : BroadcastReceiver() {
-
-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
-
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
-
-	@Inject
-	lateinit var tunnelConfigRepository: TunnelConfigRepository
-
-	@Inject
-	lateinit var serviceManager: ServiceManager
-
-	override fun onReceive(context: Context, intent: Intent) {
-		val action = intent.action ?: return
-		applicationScope.launch {
-			if (action == REFRESH_TUNNELS_ACTION) {
-				tunnelService.get().runningTunnelNames().forEach { name ->
-					// TODO can optimize later
-					val tunnel = tunnelConfigRepository.findByTunnelName(name)
-					tunnel?.let {
-						tunnelConfigRepository.save(it.copy(isActive = true))
-					}
-				}
-				serviceManager.updateTunnelTile()
-			}
-		}
-	}
-
-	companion object {
-		const val REFRESH_TUNNELS_ACTION = "com.wireguard.android.action.REFRESH_TUNNEL_STATES"
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/receiver/NotificationActionReceiver.kt

@@ -3,33 +3,41 @@ package com.zaneschepke.wireguardautotunnel.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
 import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationAction
+import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class NotificationActionReceiver : BroadcastReceiver() {
+	@Inject
+	lateinit var settingsRepository: SettingsRepository
 
 	@Inject
 	lateinit var serviceManager: ServiceManager
 
-	@Inject
-	lateinit var tunnelService: TunnelService
-
 	@Inject
 	@ApplicationScope
 	lateinit var applicationScope: CoroutineScope
 
-	override fun onReceive(context: Context, intent: Intent) {
+	override fun onReceive(context: Context, intent: Intent?) {
 		applicationScope.launch {
-			when (intent.action) {
+			try {
-				NotificationAction.AUTO_TUNNEL_OFF.name -> serviceManager.stopAutoTunnel()
+				// TODO fix for manual start changes when enabled
-				NotificationAction.TUNNEL_OFF.name -> tunnelService.stopTunnel()
+				serviceManager.stopVpnServiceForeground(context)
+				delay(Constants.TOGGLE_TUNNEL_DELAY)
+				serviceManager.startVpnServiceForeground(context)
+			} catch (e: Exception) {
+				Timber.e(e)
+			} finally {
+				cancel()
 			}
 		}
 	}

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

@@ -0,0 +1,8 @@
+package com.zaneschepke.wireguardautotunnel.service.foreground
+
+enum class Action {
+	START,
+	START_FOREGROUND,
+	STOP,
+	STOP_FOREGROUND,
+}

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

@@ -0,0 +1,57 @@
+package com.zaneschepke.wireguardautotunnel.service.foreground
+
+import android.content.Intent
+import android.os.Bundle
+import android.os.IBinder
+import androidx.lifecycle.LifecycleService
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import timber.log.Timber
+
+open class ForegroundService : LifecycleService() {
+	private var isServiceStarted = false
+
+	override fun onBind(intent: Intent): IBinder? {
+		super.onBind(intent)
+		// We don't provide binding, so return null
+		return null
+	}
+
+	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+		super.onStartCommand(intent, flags, startId)
+		Timber.d("onStartCommand executed with startId: $startId")
+		if (intent != null) {
+			val action = intent.action
+			when (action) {
+				Action.START.name,
+				Action.START_FOREGROUND.name,
+				-> startService(intent.extras)
+
+				Action.STOP.name, Action.STOP_FOREGROUND.name -> stopService()
+				Constants.ALWAYS_ON_VPN_ACTION -> {
+					Timber.i("Always-on VPN starting service")
+					startService(intent.extras)
+				}
+
+				else -> Timber.d("This should never happen. No action in the received intent")
+			}
+		} else {
+			Timber.d(
+				"with a null intent. It has been probably restarted by the system.",
+			)
+		}
+		return START_STICKY
+	}
+
+	protected open fun startService(extras: Bundle?) {
+		if (isServiceStarted) return
+		Timber.d("Starting ${this.javaClass.simpleName}")
+		isServiceStarted = true
+	}
+
+	protected open fun stopService() {
+		Timber.d("Stopping ${this.javaClass.simpleName}")
+		stopForeground(STOP_FOREGROUND_REMOVE)
+		stopSelf()
+		isServiceStarted = false
+	}
+}

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

@@ -4,115 +4,114 @@ import android.app.Service
 import android.content.Context
 import android.content.Intent
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.AutoTunnelService
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.service.tile.AutoTunnelControlTile
+import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.service.tile.TunnelControlTile
-import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
-import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
-import jakarta.inject.Inject
-import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 
-@OptIn(ExperimentalCoroutinesApi::class)
+class ServiceManager(
-class ServiceManager
+	private val appDataRepository: AppDataRepository,
-@Inject constructor(private val context: Context, private val ioDispatcher: CoroutineDispatcher, private val appDataRepository: AppDataRepository) {
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-
+) {
-	private val _autoTunnelActive = MutableStateFlow(false)
+	private fun <T : Service> actionOnService(action: Action, context: Context, cls: Class<T>, extras: Map<String, Int>? = null) {
-
+		val intent =
-	val autoTunnelActive = _autoTunnelActive.asStateFlow()
+			Intent(context, cls).also {
-
+				it.action = action.name
-	var autoTunnelService = CompletableDeferred<AutoTunnelService>()
+				extras?.forEach { (k, v) -> it.putExtra(k, v) }
-	var backgroundService = CompletableDeferred<TunnelBackgroundService>()
-	var autoTunnelTile = CompletableDeferred<AutoTunnelControlTile>()
-	var tunnelControlTile = CompletableDeferred<TunnelControlTile>()
-
-	private fun <T : Service> startService(cls: Class<T>, background: Boolean) {
-		runCatching {
-			val intent = Intent(context, cls)
-			if (background) {
-				context.startForegroundService(intent)
-			} else {
-				context.startService(intent)
-			}
-		}.onFailure { Timber.e(it) }
 			}
+		intent.component?.javaClass
+		try {
+			when (action) {
+				Action.START_FOREGROUND, Action.STOP_FOREGROUND ->
+					context.startForegroundService(
+						intent,
+					)
 
-	suspend fun startAutoTunnel(background: Boolean) {
+				Action.START, Action.STOP -> context.startService(intent)
-		val settings = appDataRepository.settings.getSettings()
+			}
-		appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = true))
+		} catch (e: Exception) {
-		if (autoTunnelService.isCompleted) return _autoTunnelActive.update { true }
+			Timber.e(e.message)
-		kotlin.runCatching {
-			startService(AutoTunnelService::class.java, background)
-			autoTunnelService.await()
-			autoTunnelService.getCompleted().start()
-			_autoTunnelActive.update { true }
-			updateAutoTunnelTile()
-		}.onFailure {
-			Timber.e(it)
 		}
 	}
 
-	suspend fun startBackgroundService() {
+	suspend fun startVpnService(context: Context, tunnelId: Int? = null, isManualStart: Boolean = false) {
-		if (backgroundService.isCompleted) return
+		if (isManualStart) onManualStart(tunnelId)
-		kotlin.runCatching {
+		actionOnService(
-			startService(TunnelBackgroundService::class.java, true)
+			Action.START,
-			backgroundService.await()
+			context,
-			backgroundService.getCompleted().start()
+			WireGuardTunnelService::class.java,
-		}.onFailure {
+			tunnelId?.let { mapOf(Constants.TUNNEL_EXTRA_KEY to it) },
-			Timber.e(it)
+		)
-		}
 	}
 
-	fun stopBackgroundService() {
+	suspend fun stopVpnServiceForeground(context: Context, isManualStop: Boolean = false) {
-		if (!backgroundService.isCompleted) return
-		runCatching {
-			backgroundService.getCompleted().stop()
-		}.onFailure {
-			Timber.e(it)
-		}
-	}
-
-	suspend fun toggleAutoTunnel(background: Boolean) {
 		withContext(ioDispatcher) {
-			if (_autoTunnelActive.value) return@withContext stopAutoTunnel()
+			if (isManualStop) onManualStop()
-			startAutoTunnel(background)
+			Timber.i("Stopping vpn service")
+			actionOnService(
+				Action.STOP_FOREGROUND,
+				context,
+				WireGuardTunnelService::class.java,
+			)
 		}
 	}
 
-	fun updateAutoTunnelTile() {
+	suspend fun stopVpnService(context: Context, isManualStop: Boolean = false) {
-		if (autoTunnelTile.isCompleted) {
-			autoTunnelTile.getCompleted().updateTileState()
-		} else {
-			context.requestAutoTunnelTileServiceUpdate()
-		}
-	}
-
-	fun updateTunnelTile() {
-		if (tunnelControlTile.isCompleted) {
-			tunnelControlTile.getCompleted().updateTileState()
-		} else {
-			context.requestTunnelTileServiceStateUpdate()
-		}
-	}
-
-	suspend fun stopAutoTunnel() {
 		withContext(ioDispatcher) {
-			val settings = appDataRepository.settings.getSettings()
+			if (isManualStop) onManualStop()
-			appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = false))
+			Timber.i("Stopping vpn service")
-			if (!autoTunnelService.isCompleted) return@withContext
+			actionOnService(
-			runCatching {
+				Action.STOP,
-				autoTunnelService.getCompleted().stop()
+				context,
-				_autoTunnelActive.update { false }
+				WireGuardTunnelService::class.java,
-				updateAutoTunnelTile()
+			)
-			}.onFailure {
-				Timber.e(it)
 		}
 	}
+
+	private suspend fun onManualStop() {
+		appDataRepository.appState.setManualStop()
+	}
+
+	private suspend fun onManualStart(tunnelId: Int?) {
+		tunnelId?.let {
+			appDataRepository.appState.setTunnelRunningFromManualStart(it)
+		}
+	}
+
+	suspend fun startVpnServiceForeground(context: Context, tunnelId: Int? = null, isManualStart: Boolean = false) {
+		withContext(ioDispatcher) {
+			if (isManualStart) onManualStart(tunnelId)
+			actionOnService(
+				Action.START_FOREGROUND,
+				context,
+				WireGuardTunnelService::class.java,
+				tunnelId?.let { mapOf(Constants.TUNNEL_EXTRA_KEY to it) },
+			)
+		}
+	}
+
+	fun startWatcherServiceForeground(context: Context) {
+		actionOnService(
+			Action.START_FOREGROUND,
+			context,
+			WireGuardConnectivityWatcherService::class.java,
+		)
+	}
+
+	fun startWatcherService(context: Context) {
+		actionOnService(
+			Action.START,
+			context,
+			WireGuardConnectivityWatcherService::class.java,
+		)
+	}
+
+	fun stopWatcherService(context: Context) {
+		actionOnService(
+			Action.STOP,
+			context,
+			WireGuardConnectivityWatcherService::class.java,
+		)
 	}
 }

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

@@ -1,67 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground
-
-import android.app.Notification
-import android.content.Intent
-import android.os.IBinder
-import androidx.core.app.ServiceCompat
-import androidx.lifecycle.LifecycleService
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
-import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CompletableDeferred
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class TunnelBackgroundService : LifecycleService() {
-
-	@Inject
-	lateinit var notificationService: NotificationService
-
-	@Inject
-	lateinit var serviceManager: ServiceManager
-
-	override fun onCreate() {
-		super.onCreate()
-		start()
-	}
-
-	override fun onBind(intent: Intent): IBinder? {
-		super.onBind(intent)
-		// We don't provide binding, so return null
-		return null
-	}
-
-	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-		serviceManager.backgroundService.complete(this)
-		return super.onStartCommand(intent, flags, startId)
-	}
-
-	fun start() {
-		ServiceCompat.startForeground(
-			this,
-			NotificationService.KERNEL_SERVICE_NOTIFICATION_ID,
-			createNotification(),
-			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
-		)
-	}
-
-	fun stop() {
-		stopForeground(STOP_FOREGROUND_REMOVE)
-		stopSelf()
-	}
-
-	override fun onDestroy() {
-		serviceManager.backgroundService = CompletableDeferred()
-		super.onDestroy()
-	}
-
-	private fun createNotification(): Notification {
-		return notificationService.createNotification(
-			WireGuardNotification.NotificationChannels.VPN,
-			getString(R.string.tunnel_running),
-			description = "",
-		)
-	}
-}

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

@@ -0,0 +1,73 @@
+package com.zaneschepke.wireguardautotunnel.service.foreground
+
+import com.zaneschepke.wireguardautotunnel.data.domain.Settings
+
+data class WatcherState(
+	val isWifiConnected: Boolean = false,
+	val isEthernetConnected: Boolean = false,
+	val isMobileDataConnected: Boolean = false,
+	val currentNetworkSSID: String = "",
+	val settings: Settings = Settings(),
+) {
+	fun isEthernetConditionMet(): Boolean {
+		return (
+			isEthernetConnected &&
+				settings.isTunnelOnEthernetEnabled
+			)
+	}
+
+	fun isMobileDataConditionMet(): Boolean {
+		return (
+			!isEthernetConnected &&
+				settings.isTunnelOnMobileDataEnabled &&
+				!isWifiConnected &&
+				isMobileDataConnected
+			)
+	}
+
+	fun isTunnelOffOnMobileDataConditionMet(): Boolean {
+		return (
+			!isEthernetConnected &&
+				!settings.isTunnelOnMobileDataEnabled &&
+				isMobileDataConnected &&
+				!isWifiConnected
+			)
+	}
+
+	fun isUntrustedWifiConditionMet(): Boolean {
+		return (
+			!isEthernetConnected &&
+				isWifiConnected &&
+				!settings.trustedNetworkSSIDs.contains(currentNetworkSSID) &&
+				settings.isTunnelOnWifiEnabled
+			)
+	}
+
+	fun isTrustedWifiConditionMet(): Boolean {
+		return (
+			!isEthernetConnected &&
+				(
+					isWifiConnected &&
+						settings.trustedNetworkSSIDs.contains(currentNetworkSSID)
+					)
+			)
+	}
+
+	fun isTunnelOffOnWifiConditionMet(): Boolean {
+		return (
+			!isEthernetConnected &&
+				(
+					isWifiConnected &&
+						!settings.isTunnelOnWifiEnabled
+					)
+			)
+	}
+
+	fun isTunnelOffOnNoConnectivityMet(): Boolean {
+		return (
+			!isEthernetConnected &&
+				!isWifiConnected &&
+				!isMobileDataConnected
+			)
+	}
+}

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

@@ -0,0 +1,474 @@
+package com.zaneschepke.wireguardautotunnel.service.foreground
+
+import android.content.Context
+import android.os.Bundle
+import android.os.PowerManager
+import androidx.core.app.ServiceCompat
+import androidx.lifecycle.lifecycleScope
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.module.MainImmediateDispatcher
+import com.zaneschepke.wireguardautotunnel.service.network.EthernetService
+import com.zaneschepke.wireguardautotunnel.service.network.MobileDataService
+import com.zaneschepke.wireguardautotunnel.service.network.NetworkService
+import com.zaneschepke.wireguardautotunnel.service.network.NetworkStatus
+import com.zaneschepke.wireguardautotunnel.service.network.WifiService
+import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
+import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.net.InetAddress
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class WireGuardConnectivityWatcherService : ForegroundService() {
+	private val foregroundId = 122
+
+	@Inject
+	lateinit var wifiService: NetworkService<WifiService>
+
+	@Inject
+	lateinit var mobileDataService: NetworkService<MobileDataService>
+
+	@Inject
+	lateinit var ethernetService: NetworkService<EthernetService>
+
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
+
+	@Inject
+	lateinit var notificationService: NotificationService
+
+	@Inject
+	lateinit var vpnService: VpnService
+
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
+	@Inject
+	@IoDispatcher
+	lateinit var ioDispatcher: CoroutineDispatcher
+
+	@Inject
+	@MainImmediateDispatcher
+	lateinit var mainImmediateDispatcher: CoroutineDispatcher
+
+	private val networkEventsFlow = MutableStateFlow(WatcherState())
+
+	private var watcherJob: Job? = null
+
+	private var wakeLock: PowerManager.WakeLock? = null
+	private val tag = this.javaClass.name
+
+	override fun onCreate() {
+		super.onCreate()
+		lifecycleScope.launch(mainImmediateDispatcher) {
+			try {
+				if (appDataRepository.settings.getSettings().isAutoTunnelPaused) {
+					launchWatcherPausedNotification()
+				} else {
+					launchWatcherNotification()
+				}
+			} catch (e: Exception) {
+				Timber.e("Failed to start watcher service, not enough permissions")
+			}
+		}
+	}
+
+	override fun startService(extras: Bundle?) {
+		super.startService(extras)
+		try {
+			// we need this lock so our service gets not affected by Doze Mode
+			lifecycleScope.launch { initWakeLock() }
+			cancelWatcherJob()
+			startWatcherJob()
+		} catch (e: Exception) {
+			Timber.e("Failed to launch watcher service, no permissions")
+		}
+	}
+
+	override fun stopService() {
+		super.stopService()
+		wakeLock?.let {
+			if (it.isHeld) {
+				it.release()
+			}
+		}
+		cancelWatcherJob()
+		stopSelf()
+	}
+
+	private fun launchWatcherNotification(description: String = getString(R.string.watcher_notification_text_active)) {
+		val notification =
+			notificationService.createNotification(
+				channelId = getString(R.string.watcher_channel_id),
+				channelName = getString(R.string.watcher_channel_name),
+				title = getString(R.string.auto_tunnel_title),
+				description = description,
+			)
+		ServiceCompat.startForeground(
+			this,
+			foregroundId,
+			notification,
+			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+		)
+	}
+
+	private fun launchWatcherPausedNotification() {
+		launchWatcherNotification(getString(R.string.watcher_notification_text_paused))
+	}
+
+	private fun initWakeLock() {
+		wakeLock =
+			(getSystemService(Context.POWER_SERVICE) as PowerManager).run {
+				newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "$tag::lock").apply {
+					try {
+						Timber.i("Initiating wakelock with 10 min timeout")
+						acquire(Constants.BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT)
+					} finally {
+						release()
+					}
+				}
+			}
+	}
+
+	private fun cancelWatcherJob() {
+		try {
+			watcherJob?.cancel()
+		} catch (e: CancellationException) {
+			Timber.i("Watcher job cancelled")
+		}
+	}
+
+	private fun startWatcherJob() {
+		watcherJob =
+			lifecycleScope.launch {
+				val setting = appDataRepository.settings.getSettings()
+				launch {
+					Timber.i("Starting wifi watcher")
+					watchForWifiConnectivityChanges()
+				}
+				if (setting.isTunnelOnMobileDataEnabled) {
+					launch {
+						Timber.i("Starting mobile data watcher")
+						watchForMobileDataConnectivityChanges()
+					}
+				}
+				if (setting.isTunnelOnEthernetEnabled) {
+					launch {
+						Timber.i("Starting ethernet data watcher")
+						watchForEthernetConnectivityChanges()
+					}
+				}
+				launch {
+					Timber.i("Starting settings watcher")
+					watchForSettingsChanges()
+				}
+				if (setting.isPingEnabled) {
+					launch {
+						Timber.i("Starting ping watcher")
+						watchForPingFailure()
+					}
+				}
+				launch {
+					Timber.i("Starting management watcher")
+					manageVpn()
+				}
+			}
+	}
+
+	private suspend fun watchForMobileDataConnectivityChanges() {
+		withContext(ioDispatcher) {
+			mobileDataService.networkStatus.collect { status ->
+				when (status) {
+					is NetworkStatus.Available -> {
+						Timber.i("Gained Mobile data connection")
+						networkEventsFlow.update {
+							it.copy(
+								isMobileDataConnected = true,
+							)
+						}
+					}
+
+					is NetworkStatus.CapabilitiesChanged -> {
+						networkEventsFlow.update {
+							it.copy(
+								isMobileDataConnected = true,
+							)
+						}
+						Timber.i("Mobile data capabilities changed")
+					}
+
+					is NetworkStatus.Unavailable -> {
+						networkEventsFlow.update {
+							it.copy(
+								isMobileDataConnected = false,
+							)
+						}
+						Timber.i("Lost mobile data connection")
+					}
+				}
+			}
+		}
+	}
+
+	private suspend fun watchForPingFailure() {
+		val context = this
+		withContext(ioDispatcher) {
+			try {
+				do {
+					if (vpnService.vpnState.value.status == TunnelState.UP) {
+						val tunnelConfig = vpnService.vpnState.value.tunnelConfig
+						tunnelConfig?.let {
+							val config = TunnelConfig.configFromWgQuick(it.wgQuick)
+							val results =
+								config.peers.map { peer ->
+									val host =
+										if (peer.endpoint.isPresent &&
+											peer.endpoint.get().resolved.isPresent
+										) {
+											peer.endpoint.get().resolved.get().host
+										} else {
+											Constants.DEFAULT_PING_IP
+										}
+									Timber.i("Checking reachability of: $host")
+									val reachable =
+										InetAddress.getByName(host)
+											.isReachable(Constants.PING_TIMEOUT.toInt())
+									Timber.i("Result: reachable - $reachable")
+									reachable
+								}
+							if (results.contains(false)) {
+								Timber.i("Restarting VPN for ping failure")
+								serviceManager.stopVpnServiceForeground(context)
+								delay(Constants.VPN_RESTART_DELAY)
+								serviceManager.startVpnServiceForeground(context, it.id)
+								delay(Constants.PING_COOLDOWN)
+							}
+						}
+					}
+					delay(Constants.PING_INTERVAL)
+				} while (true)
+			} catch (e: Exception) {
+				Timber.e(e)
+			}
+		}
+	}
+
+	private suspend fun watchForSettingsChanges() {
+		appDataRepository.settings.getSettingsFlow().collect { settings ->
+			if (networkEventsFlow.value.settings.isAutoTunnelPaused
+				!= settings.isAutoTunnelPaused
+			) {
+				when (settings.isAutoTunnelPaused) {
+					true -> launchWatcherPausedNotification()
+					false -> launchWatcherNotification()
+				}
+			}
+			networkEventsFlow.update {
+				it.copy(
+					settings = settings,
+				)
+			}
+		}
+	}
+
+	private suspend fun watchForEthernetConnectivityChanges() {
+		withContext(ioDispatcher) {
+			ethernetService.networkStatus.collect { status ->
+				when (status) {
+					is NetworkStatus.Available -> {
+						Timber.i("Gained Ethernet connection")
+						networkEventsFlow.update {
+							it.copy(
+								isEthernetConnected = true,
+							)
+						}
+					}
+
+					is NetworkStatus.CapabilitiesChanged -> {
+						Timber.i("Ethernet capabilities changed")
+						networkEventsFlow.update {
+							it.copy(
+								isEthernetConnected = true,
+							)
+						}
+					}
+
+					is NetworkStatus.Unavailable -> {
+						networkEventsFlow.update {
+							it.copy(
+								isEthernetConnected = false,
+							)
+						}
+						Timber.i("Lost Ethernet connection")
+					}
+				}
+			}
+		}
+	}
+
+	private suspend fun watchForWifiConnectivityChanges() {
+		withContext(ioDispatcher) {
+			wifiService.networkStatus.collect { status ->
+				when (status) {
+					is NetworkStatus.Available -> {
+						Timber.i("Gained Wi-Fi connection")
+						networkEventsFlow.update {
+							it.copy(
+								isWifiConnected = true,
+							)
+						}
+					}
+
+					is NetworkStatus.CapabilitiesChanged -> {
+						Timber.i("Wifi capabilities changed")
+						networkEventsFlow.update {
+							it.copy(
+								isWifiConnected = true,
+							)
+						}
+						val ssid = wifiService.getNetworkName(status.networkCapabilities)
+						ssid?.let { name ->
+							if (name.contains(Constants.UNREADABLE_SSID)) {
+								Timber.w("SSID unreadable: missing permissions")
+							} else {
+								Timber.i("Detected valid SSID")
+							}
+							appDataRepository.appState.setCurrentSsid(name)
+							networkEventsFlow.update {
+								it.copy(
+									currentNetworkSSID = name,
+								)
+							}
+						} ?: Timber.w("Failed to read ssid")
+					}
+
+					is NetworkStatus.Unavailable -> {
+						networkEventsFlow.update {
+							it.copy(
+								isWifiConnected = false,
+							)
+						}
+						Timber.i("Lost Wi-Fi connection")
+					}
+				}
+			}
+		}
+	}
+
+	private suspend fun getMobileDataTunnel(): TunnelConfig? {
+		return appDataRepository.tunnels.findByMobileDataTunnel().firstOrNull()
+	}
+
+	private suspend fun getSsidTunnel(ssid: String): TunnelConfig? {
+		return appDataRepository.tunnels.findByTunnelNetworksName(ssid).firstOrNull()
+	}
+
+	private fun isTunnelDown(): Boolean {
+		return vpnService.vpnState.value.status == TunnelState.DOWN
+	}
+
+	private suspend fun manageVpn() {
+		val context = this
+		withContext(ioDispatcher) {
+			networkEventsFlow.collectLatest { watcherState ->
+				val autoTunnel = "Auto-tunnel watcher"
+				if (!watcherState.settings.isAutoTunnelPaused) {
+					// delay for rapid network state changes and then collect latest
+					delay(Constants.WATCHER_COLLECTION_DELAY)
+					val tunnelConfig = vpnService.vpnState.value.tunnelConfig
+					when {
+						watcherState.isEthernetConditionMet() -> {
+							Timber.i("$autoTunnel - tunnel on on ethernet condition met")
+							if (isTunnelDown()) serviceManager.startVpnServiceForeground(context)
+						}
+
+						watcherState.isMobileDataConditionMet() -> {
+							Timber.i("$autoTunnel - tunnel on mobile data condition met")
+							val mobileDataTunnel = getMobileDataTunnel()
+							val tunnel =
+								mobileDataTunnel ?: appDataRepository.getPrimaryOrFirstTunnel()
+							if (isTunnelDown() || tunnelConfig?.isMobileDataTunnel == false) {
+								serviceManager.startVpnServiceForeground(
+									context,
+									tunnel?.id,
+								)
+							}
+						}
+
+						watcherState.isTunnelOffOnMobileDataConditionMet() -> {
+							Timber.i("$autoTunnel - tunnel off on mobile data met, turning vpn off")
+							if (!isTunnelDown()) serviceManager.stopVpnServiceForeground(context)
+						}
+
+						watcherState.isUntrustedWifiConditionMet() -> {
+							if (tunnelConfig?.tunnelNetworks?.contains(watcherState.currentNetworkSSID) == false ||
+								tunnelConfig == null
+							) {
+								Timber.i(
+									"$autoTunnel - tunnel on ssid not associated with current tunnel condition met",
+								)
+								getSsidTunnel(watcherState.currentNetworkSSID)?.let {
+									Timber.i("Found tunnel associated with this SSID, bringing tunnel up: ${it.name}")
+									if (isTunnelDown() || tunnelConfig?.id != it.id) {
+										serviceManager.startVpnServiceForeground(
+											context,
+											it.id,
+										)
+									}
+								} ?: suspend {
+									Timber.i("No tunnel associated with this SSID, using defaults")
+									val default = appDataRepository.getPrimaryOrFirstTunnel()
+									if (default?.name != vpnService.name) {
+										default?.let {
+											serviceManager.startVpnServiceForeground(context, it.id)
+										}
+									}
+								}.invoke()
+							}
+						}
+
+						watcherState.isTrustedWifiConditionMet() -> {
+							Timber.i(
+								"$autoTunnel - tunnel off on trusted wifi condition met, turning vpn off",
+							)
+							if (!isTunnelDown()) serviceManager.stopVpnServiceForeground(context)
+						}
+
+						watcherState.isTunnelOffOnWifiConditionMet() -> {
+							Timber.i(
+								"$autoTunnel - tunnel off on wifi condition met, turning vpn off",
+							)
+							if (!isTunnelDown()) serviceManager.stopVpnServiceForeground(context)
+						}
+
+						watcherState.isTunnelOffOnNoConnectivityMet() -> {
+							Timber.i(
+								"$autoTunnel - tunnel off on no connectivity met, turning vpn off",
+							)
+							if (!isTunnelDown()) serviceManager.stopVpnServiceForeground(context)
+						}
+
+						else -> {
+							Timber.i("$autoTunnel - no condition met")
+						}
+					}
+				}
+			}
+		}
+	}
+}

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

@@ -0,0 +1,198 @@
+package com.zaneschepke.wireguardautotunnel.service.foreground
+
+import android.app.PendingIntent
+import android.content.Intent
+import android.os.Bundle
+import androidx.core.app.ServiceCompat
+import androidx.lifecycle.lifecycleScope
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.module.MainImmediateDispatcher
+import com.zaneschepke.wireguardautotunnel.receiver.NotificationActionReceiver
+import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
+import com.zaneschepke.wireguardautotunnel.service.tunnel.HandshakeStatus
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
+import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.handshakeStatus
+import com.zaneschepke.wireguardautotunnel.util.mapPeerStats
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class WireGuardTunnelService : ForegroundService() {
+	private val foregroundId = 123
+
+	@Inject
+	lateinit var vpnService: VpnService
+
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
+
+	@Inject
+	lateinit var notificationService: NotificationService
+
+	@Inject
+	@MainImmediateDispatcher
+	lateinit var mainImmediateDispatcher: CoroutineDispatcher
+
+	@Inject
+	@IoDispatcher
+	lateinit var ioDispatcher: CoroutineDispatcher
+
+	private var job: Job? = null
+
+	private var didShowConnected = false
+
+	override fun onCreate() {
+		super.onCreate()
+		lifecycleScope.launch(mainImmediateDispatcher) {
+			// TODO fix this to not launch if AOVPN
+			if (appDataRepository.tunnels.count() != 0) {
+				launchVpnNotification()
+			}
+		}
+	}
+
+	override fun startService(extras: Bundle?) {
+		super.startService(extras)
+		cancelJob()
+		job =
+			lifecycleScope.launch {
+				launch {
+					val tunnelId = extras?.getInt(Constants.TUNNEL_EXTRA_KEY)
+					if (vpnService.getState() == TunnelState.UP) {
+						vpnService.stopTunnel()
+					}
+					vpnService.startTunnel(
+						tunnelId?.let {
+							appDataRepository.tunnels.getById(it)
+						},
+					)
+				}
+				launch {
+					handshakeNotifications()
+				}
+			}
+	}
+
+	// TODO improve tunnel notifications
+	private suspend fun handshakeNotifications() {
+		withContext(ioDispatcher) {
+			var tunnelName: String? = null
+			vpnService.vpnState.collect { state ->
+				state.statistics
+					?.mapPeerStats()
+					?.map { it.value?.handshakeStatus() }
+					.let { statuses ->
+						when {
+							statuses?.all { it == HandshakeStatus.HEALTHY } == true -> {
+								if (!didShowConnected) {
+									delay(Constants.VPN_CONNECTED_NOTIFICATION_DELAY)
+									tunnelName = state.tunnelConfig?.name
+									launchVpnNotification(
+										getString(R.string.tunnel_start_title),
+										"${getString(R.string.tunnel_start_text)} - $tunnelName",
+									)
+									didShowConnected = true
+								}
+							}
+
+							statuses?.any { it == HandshakeStatus.STALE } == true -> {}
+							statuses?.all { it == HandshakeStatus.NOT_STARTED } ==
+								true -> {
+							}
+
+							else -> {}
+						}
+					}
+				if (state.status == TunnelState.UP && state.tunnelConfig?.name != tunnelName) {
+					tunnelName = state.tunnelConfig?.name
+					launchVpnNotification(
+						getString(R.string.tunnel_start_title),
+						"${getString(R.string.tunnel_start_text)} - $tunnelName",
+					)
+				}
+			}
+		}
+	}
+
+	private fun launchAlwaysOnDisabledNotification() {
+		launchVpnNotification(
+			title = this.getString(R.string.vpn_connection_failed),
+			description = this.getString(R.string.always_on_disabled),
+		)
+	}
+
+	override fun stopService() {
+		super.stopService()
+		lifecycleScope.launch {
+			vpnService.stopTunnel()
+			didShowConnected = false
+		}
+		cancelJob()
+		stopSelf()
+	}
+
+	private fun launchVpnNotification(title: String = getString(R.string.vpn_starting), description: String = getString(R.string.attempt_connection)) {
+		val notification =
+			notificationService.createNotification(
+				channelId = getString(R.string.vpn_channel_id),
+				channelName = getString(R.string.vpn_channel_name),
+				title = title,
+				onGoing = false,
+				vibration = false,
+				showTimestamp = true,
+				description = description,
+			)
+		ServiceCompat.startForeground(
+			this,
+			foregroundId,
+			notification,
+			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+		)
+	}
+
+	private fun launchVpnConnectionFailedNotification(message: String) {
+		val notification =
+			notificationService.createNotification(
+				channelId = getString(R.string.vpn_channel_id),
+				channelName = getString(R.string.vpn_channel_name),
+				action =
+				PendingIntent.getBroadcast(
+					this,
+					0,
+					Intent(this, NotificationActionReceiver::class.java),
+					PendingIntent.FLAG_IMMUTABLE,
+				),
+				actionText = getString(R.string.restart),
+				title = getString(R.string.vpn_connection_failed),
+				onGoing = false,
+				vibration = true,
+				showTimestamp = true,
+				description = message,
+			)
+		ServiceCompat.startForeground(
+			this,
+			foregroundId,
+			notification,
+			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+		)
+	}
+
+	private fun cancelJob() {
+		try {
+			job?.cancel()
+		} catch (e: CancellationException) {
+			Timber.i("Tunnel job cancelled")
+		}
+	}
+}

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

@@ -1,309 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel
-
-import android.content.Intent
-import android.net.NetworkCapabilities
-import android.os.IBinder
-import android.os.PowerManager
-import androidx.core.app.ServiceCompat
-import androidx.lifecycle.LifecycleService
-import androidx.lifecycle.lifecycleScope
-import com.wireguard.android.util.RootShell
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.data.domain.Settings
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.module.AppShell
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.module.MainImmediateDispatcher
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model.AutoTunnelEvent
-import com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model.AutoTunnelState
-import com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model.NetworkState
-import com.zaneschepke.wireguardautotunnel.service.network.EthernetService
-import com.zaneschepke.wireguardautotunnel.service.network.MobileDataService
-import com.zaneschepke.wireguardautotunnel.service.network.NetworkService
-import com.zaneschepke.wireguardautotunnel.service.network.NetworkStatus
-import com.zaneschepke.wireguardautotunnel.service.network.WifiService
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationAction
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
-import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
-import com.zaneschepke.wireguardautotunnel.util.extensions.cancelWithMessage
-import com.zaneschepke.wireguardautotunnel.util.extensions.getCurrentWifiName
-import com.zaneschepke.wireguardautotunnel.util.extensions.isReachable
-import com.zaneschepke.wireguardautotunnel.util.extensions.onNotRunning
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.filterNot
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-import java.net.InetAddress
-import java.util.concurrent.atomic.AtomicBoolean
-import javax.inject.Inject
-import javax.inject.Provider
-
-@AndroidEntryPoint
-class AutoTunnelService : LifecycleService() {
-
-	@Inject
-	@AppShell
-	lateinit var rootShell: Provider<RootShell>
-
-	@Inject
-	lateinit var wifiService: NetworkService<WifiService>
-
-	@Inject
-	lateinit var mobileDataService: NetworkService<MobileDataService>
-
-	@Inject
-	lateinit var ethernetService: NetworkService<EthernetService>
-
-	@Inject
-	lateinit var appDataRepository: Provider<AppDataRepository>
-
-	@Inject
-	lateinit var notificationService: NotificationService
-
-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
-
-	@Inject
-	@IoDispatcher
-	lateinit var ioDispatcher: CoroutineDispatcher
-
-	@Inject
-	lateinit var serviceManager: ServiceManager
-
-	@Inject
-	@MainImmediateDispatcher
-	lateinit var mainImmediateDispatcher: CoroutineDispatcher
-
-	private val autoTunnelStateFlow = MutableStateFlow(AutoTunnelState())
-
-	private var wakeLock: PowerManager.WakeLock? = null
-
-	private val pingTunnelRestartActive = AtomicBoolean(false)
-
-	private var pingJob: Job? = null
-
-	override fun onCreate() {
-		super.onCreate()
-		serviceManager.autoTunnelService.complete(this)
-		lifecycleScope.launch(mainImmediateDispatcher) {
-			kotlin.runCatching {
-				launchWatcherNotification()
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
-	}
-
-	override fun onBind(intent: Intent): IBinder? {
-		super.onBind(intent)
-		return null
-	}
-
-	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-		Timber.d("onStartCommand executed with startId: $startId")
-		serviceManager.autoTunnelService.complete(this)
-		return super.onStartCommand(intent, flags, startId)
-	}
-
-	fun start() {
-		kotlin.runCatching {
-			lifecycleScope.launch(mainImmediateDispatcher) {
-				launchWatcherNotification()
-				initWakeLock()
-			}
-			startAutoTunnelJob()
-			startAutoTunnelStateJob()
-			startPingStateJob()
-		}.onFailure {
-			Timber.e(it)
-		}
-	}
-
-	fun stop() {
-		wakeLock?.let { if (it.isHeld) it.release() }
-		stopSelf()
-	}
-
-	override fun onDestroy() {
-		cancelAndResetPingJob()
-		serviceManager.autoTunnelService = CompletableDeferred()
-		super.onDestroy()
-	}
-
-	private fun launchWatcherNotification(description: String = getString(R.string.monitoring_state_changes)) {
-		val notification =
-			notificationService.createNotification(
-				WireGuardNotification.NotificationChannels.AUTO_TUNNEL,
-				title = getString(R.string.auto_tunnel_title),
-				description = description,
-				actions = listOf(
-					notificationService.createNotificationAction(NotificationAction.AUTO_TUNNEL_OFF),
-				),
-			)
-		ServiceCompat.startForeground(
-			this,
-			NotificationService.AUTO_TUNNEL_NOTIFICATION_ID,
-			notification,
-			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
-		)
-	}
-
-	private fun initWakeLock() {
-		wakeLock = (getSystemService(POWER_SERVICE) as PowerManager).run {
-			val tag = this.javaClass.name
-			newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "$tag::lock").apply {
-				try {
-					Timber.i("Initiating wakelock with 10 min timeout")
-					acquire(Constants.BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT)
-				} finally {
-					release()
-				}
-			}
-		}
-	}
-
-	private fun startPingJob() = lifecycleScope.launch {
-		watchForPingFailure()
-	}
-
-	private fun startPingStateJob() = lifecycleScope.launch {
-		autoTunnelStateFlow.collect {
-			if (it.isPingEnabled()) {
-				pingJob.onNotRunning { pingJob = startPingJob() }
-			} else {
-				if (!pingTunnelRestartActive.get()) cancelAndResetPingJob()
-			}
-		}
-	}
-
-	private suspend fun watchForPingFailure() {
-		withContext(ioDispatcher) {
-			Timber.i("Starting ping watcher")
-			runCatching {
-				do {
-					val vpnState = autoTunnelStateFlow.value.vpnState
-					if (vpnState.status.isUp() && !autoTunnelStateFlow.value.isNoConnectivity()) {
-						if (vpnState.tunnelConfig != null) {
-							val config = TunnelConfig.configFromWgQuick(vpnState.tunnelConfig.wgQuick)
-							val results = if (vpnState.tunnelConfig.pingIp != null) {
-								Timber.d("Pinging custom ip : ${vpnState.tunnelConfig.pingIp}")
-								listOf(InetAddress.getByName(vpnState.tunnelConfig.pingIp).isReachable(Constants.PING_TIMEOUT.toInt()))
-							} else {
-								Timber.d("Pinging all peers")
-								config.peers.map { peer ->
-									peer.isReachable()
-								}
-							}
-							Timber.i("Ping results reachable: $results")
-							if (results.contains(false)) {
-								Timber.i("Restarting VPN for ping failure")
-								val cooldown = vpnState.tunnelConfig.pingCooldown
-								pingTunnelRestartActive.set(true)
-								tunnelService.get().bounceTunnel()
-								pingTunnelRestartActive.set(false)
-								delay(cooldown ?: Constants.PING_COOLDOWN)
-								continue
-							}
-						}
-					}
-					delay(vpnState.tunnelConfig?.pingInterval ?: Constants.PING_INTERVAL)
-				} while (true)
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
-	}
-
-	private fun startAutoTunnelStateJob() = lifecycleScope.launch(ioDispatcher) {
-		combine(
-			combineSettings(),
-			combineNetworkEventsJob(),
-		) { double, networkState ->
-			AutoTunnelState(tunnelService.get().vpnState.value, networkState, double.first, double.second)
-		}.collect { state ->
-			autoTunnelStateFlow.update {
-				it.copy(state.vpnState, state.networkState, state.settings, state.tunnels)
-			}
-		}
-	}
-
-	private fun cancelAndResetPingJob() {
-		pingJob?.cancelWithMessage("Ping job canceled")
-		pingJob = null
-	}
-
-	private fun combineNetworkEventsJob(): Flow<NetworkState> {
-		return combine(
-			wifiService.networkStatus,
-			mobileDataService.networkStatus,
-			ethernetService.networkStatus,
-		) { wifi, mobileData, ethernet ->
-			NetworkState(
-				wifi.isConnected,
-				mobileData.isConnected,
-				ethernet.isConnected,
-				when (wifi) {
-					is NetworkStatus.CapabilitiesChanged -> getWifiSSID(wifi.networkCapabilities)
-					is NetworkStatus.Available -> autoTunnelStateFlow.value.networkState.wifiName
-					is NetworkStatus.Unavailable -> null
-				},
-			)
-		}.distinctUntilChanged().filterNot { it.isWifiConnected && it.wifiName == null }
-	}
-
-	private fun combineSettings(): Flow<Pair<Settings, TunnelConfigs>> {
-		return combine(
-			appDataRepository.get().settings.getSettingsFlow(),
-			appDataRepository.get().tunnels.getTunnelConfigsFlow().distinctUntilChanged { old, new ->
-				old.map { it.isActive } != new.map { it.isActive }
-			},
-		) { settings, tunnels ->
-			Pair(settings, tunnels)
-		}.distinctUntilChanged()
-	}
-
-	private suspend fun getWifiSSID(networkCapabilities: NetworkCapabilities): String? {
-		return withContext(ioDispatcher) {
-			with(autoTunnelStateFlow.value.settings) {
-				if (isWifiNameByShellEnabled) return@withContext rootShell.get().getCurrentWifiName()
-				wifiService.getNetworkName(networkCapabilities)
-			}.also {
-				if (it?.contains(Constants.UNREADABLE_SSID) == true) {
-					Timber.w("SSID unreadable: missing permissions")
-				} else {
-					Timber.i("Detected valid SSID")
-				}
-			}
-		}
-	}
-
-	private fun startAutoTunnelJob() = lifecycleScope.launch(ioDispatcher) {
-		Timber.i("Starting auto-tunnel network event watcher")
-		autoTunnelStateFlow.collect { watcherState ->
-			Timber.d("New auto tunnel state emitted")
-			when (val event = watcherState.asAutoTunnelEvent()) {
-				is AutoTunnelEvent.Start -> tunnelService.get().startTunnel(
-					event.tunnelConfig
-						?: appDataRepository.get().getPrimaryOrFirstTunnel(),
-				)
-				is AutoTunnelEvent.Stop -> tunnelService.get().stopTunnel()
-				AutoTunnelEvent.DoNothing -> Timber.i("Auto-tunneling: no condition met")
-			}
-		}
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/foreground/autotunnel/model/AutoTunnelEvent.kt

@@ -1,9 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model
-
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-
-sealed class AutoTunnelEvent {
-	data class Start(val tunnelConfig: TunnelConfig? = null) : AutoTunnelEvent()
-	data object Stop : AutoTunnelEvent()
-	data object DoNothing : AutoTunnelEvent()
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/foreground/autotunnel/model/AutoTunnelState.kt

@@ -1,147 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model
-
-import com.zaneschepke.wireguardautotunnel.data.domain.Settings
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnState
-import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
-import com.zaneschepke.wireguardautotunnel.util.extensions.isMatchingToWildcardList
-import timber.log.Timber
-
-data class AutoTunnelState(
-	val vpnState: VpnState = VpnState(),
-	val networkState: NetworkState = NetworkState(),
-	val settings: Settings = Settings(),
-	val tunnels: TunnelConfigs = emptyList(),
-) {
-
-	private fun isMobileDataActive(): Boolean {
-		return !networkState.isEthernetConnected && !networkState.isWifiConnected && networkState.isMobileDataConnected
-	}
-
-	private fun isMobileTunnelDataChangeNeeded(): Boolean {
-		val preferredTunnel = preferredMobileDataTunnel()
-		return preferredTunnel != null &&
-			vpnState.status.isUp() && preferredTunnel.id != vpnState.tunnelConfig?.id
-	}
-
-	private fun isEthernetTunnelChangeNeeded(): Boolean {
-		val preferredTunnel = preferredEthernetTunnel()
-		return preferredTunnel != null && vpnState.status.isUp() && preferredTunnel.id != vpnState.tunnelConfig?.id
-	}
-
-	private fun preferredMobileDataTunnel(): TunnelConfig? {
-		return tunnels.firstOrNull { it.isMobileDataTunnel } ?: tunnels.firstOrNull { it.isPrimaryTunnel }
-	}
-
-	private fun preferredEthernetTunnel(): TunnelConfig? {
-		return tunnels.firstOrNull { it.isEthernetTunnel } ?: tunnels.firstOrNull { it.isPrimaryTunnel }
-	}
-
-	private fun preferredWifiTunnel(): TunnelConfig? {
-		return getTunnelWithMatchingTunnelNetwork() ?: tunnels.firstOrNull { it.isPrimaryTunnel }
-	}
-
-	private fun isWifiActive(): Boolean {
-		return !networkState.isEthernetConnected && networkState.isWifiConnected
-	}
-
-	private fun startOnEthernet(): Boolean {
-		return networkState.isEthernetConnected && settings.isTunnelOnEthernetEnabled && vpnState.status.isDown()
-	}
-
-	private fun stopOnEthernet(): Boolean {
-		return networkState.isEthernetConnected && !settings.isTunnelOnEthernetEnabled && vpnState.status.isUp()
-	}
-
-	fun isNoConnectivity(): Boolean {
-		return !networkState.isEthernetConnected && !networkState.isWifiConnected && !networkState.isMobileDataConnected
-	}
-
-	private fun stopOnMobileData(): Boolean {
-		return isMobileDataActive() && !settings.isTunnelOnMobileDataEnabled && vpnState.status.isUp()
-	}
-
-	private fun startOnMobileData(): Boolean {
-		return isMobileDataActive() && settings.isTunnelOnMobileDataEnabled && vpnState.status.isDown()
-	}
-
-	private fun changeOnMobileData(): Boolean {
-		return isMobileDataActive() && settings.isTunnelOnMobileDataEnabled && isMobileTunnelDataChangeNeeded()
-	}
-
-	private fun changeOnEthernet(): Boolean {
-		return networkState.isEthernetConnected && settings.isTunnelOnEthernetEnabled && isEthernetTunnelChangeNeeded()
-	}
-
-	private fun stopOnWifi(): Boolean {
-		return isWifiActive() && !settings.isTunnelOnWifiEnabled && vpnState.status.isUp()
-	}
-
-	private fun stopOnTrustedWifi(): Boolean {
-		return isWifiActive() && settings.isTunnelOnWifiEnabled && vpnState.status.isUp() && isCurrentSSIDTrusted()
-	}
-
-	private fun startOnUntrustedWifi(): Boolean {
-		Timber.d("Is tunnel on wifi enabled ${settings.isTunnelOnWifiEnabled}")
-		return isWifiActive() && settings.isTunnelOnWifiEnabled && vpnState.status.isDown() && !isCurrentSSIDTrusted()
-	}
-
-	private fun changeOnUntrustedWifi(): Boolean {
-		return isWifiActive() && settings.isTunnelOnWifiEnabled && vpnState.status.isUp() && !isCurrentSSIDTrusted() && !isWifiTunnelPreferred()
-	}
-
-	private fun isWifiTunnelPreferred(): Boolean {
-		val preferred = preferredWifiTunnel()
-		val vpnTunnel = vpnState.tunnelConfig
-		return if (preferred != null && vpnTunnel != null) {
-			preferred.id == vpnTunnel.id
-		} else {
-			true
-		}
-	}
-
-	fun asAutoTunnelEvent(): AutoTunnelEvent {
-		return when {
-			// ethernet scenarios
-			stopOnEthernet() -> AutoTunnelEvent.Stop
-			startOnEthernet() || changeOnEthernet() -> AutoTunnelEvent.Start(preferredEthernetTunnel())
-			// mobile data scenarios
-			stopOnMobileData() -> AutoTunnelEvent.Stop
-			startOnMobileData() || changeOnMobileData() -> AutoTunnelEvent.Start(preferredMobileDataTunnel())
-			// wifi scenarios
-			stopOnWifi() -> AutoTunnelEvent.Stop
-			stopOnTrustedWifi() -> AutoTunnelEvent.Stop
-			startOnUntrustedWifi() || changeOnUntrustedWifi() -> AutoTunnelEvent.Start(preferredWifiTunnel())
-			// no connectivity
-			isNoConnectivity() && settings.isStopOnNoInternetEnabled -> AutoTunnelEvent.Stop
-			else -> AutoTunnelEvent.DoNothing
-		}
-	}
-
-	private fun isCurrentSSIDTrusted(): Boolean {
-		return networkState.wifiName?.let {
-			hasTrustedWifiName(it)
-		} == true
-	}
-
-	private fun hasTrustedWifiName(wifiName: String, wifiNames: List<String> = settings.trustedNetworkSSIDs): Boolean {
-		return if (settings.isWildcardsEnabled) {
-			wifiNames.isMatchingToWildcardList(wifiName)
-		} else {
-			wifiNames.contains(wifiName)
-		}
-	}
-
-	private fun getTunnelWithMatchingTunnelNetwork(): TunnelConfig? {
-		return networkState.wifiName?.let { wifiName ->
-			tunnels.firstOrNull {
-				hasTrustedWifiName(wifiName, it.tunnelNetworks)
-			}
-		}
-	}
-
-	fun isPingEnabled(): Boolean {
-		return settings.isPingEnabled ||
-			(vpnState.status.isUp() && vpnState.tunnelConfig != null && tunnels.first { it.id == vpnState.tunnelConfig.id }.isPingEnabled)
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/foreground/autotunnel/model/NetworkState.kt

@@ -1,8 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model
-
-data class NetworkState(
-	val isWifiConnected: Boolean = false,
-	val isMobileDataConnected: Boolean = false,
-	val isEthernetConnected: Boolean = false,
-	val wifiName: String? = null,
-)

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/network/BaseNetworkService.kt

@@ -5,15 +5,14 @@ import android.net.ConnectivityManager
 import android.net.Network
 import android.net.NetworkCapabilities
 import android.net.NetworkRequest
+import android.net.wifi.SupplicantState
+import android.net.wifi.WifiInfo
 import android.net.wifi.WifiManager
 import android.os.Build
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.conflate
 import kotlinx.coroutines.flow.map
-import timber.log.Timber
 
 abstract class BaseNetworkService<T : BaseNetworkService<T>>(
 	val context: Context,
@@ -22,20 +21,11 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
 	private val connectivityManager =
 		context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
 
-	val wifiManager =
+	private val wifiManager =
 		context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
 
-	fun checkHasCapability(networkCapability: Int): Boolean {
-		val network = connectivityManager.activeNetwork
-		val networkCapabilities = connectivityManager.getNetworkCapabilities(network)
-		return networkCapabilities?.hasTransport(networkCapability) == true
-	}
-
 	override val networkStatus =
 		callbackFlow {
-			if (!checkHasCapability(networkCapability)) {
-				trySend(NetworkStatus.Unavailable())
-			}
 			val networkStatusCallback =
 				when (Build.VERSION.SDK_INT) {
 					in Build.VERSION_CODES.S..Int.MAX_VALUE -> {
@@ -48,7 +38,7 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
 							}
 
 							override fun onLost(network: Network) {
-								trySend(NetworkStatus.Unavailable())
+								trySend(NetworkStatus.Unavailable(network))
 							}
 
 							override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
@@ -69,7 +59,7 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
 							}
 
 							override fun onLost(network: Network) {
-								trySend(NetworkStatus.Unavailable())
+								trySend(NetworkStatus.Unavailable(network))
 							}
 
 							override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
@@ -92,20 +82,41 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
 			connectivityManager.registerNetworkCallback(request, networkStatusCallback)
 
 			awaitClose { connectivityManager.unregisterNetworkCallback(networkStatusCallback) }
-		}.catch {
+		}
-			Timber.e(it)
+
-			// conflate for backpressure
+	override fun getNetworkName(networkCapabilities: NetworkCapabilities): String? {
-		}.conflate()
+		var ssid: String? = getWifiNameFromCapabilities(networkCapabilities)
+		if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
+			val info = wifiManager.connectionInfo
+			if (info.supplicantState === SupplicantState.COMPLETED) {
+				ssid = info.ssid
+			}
+		}
+		return ssid?.trim('"')
+	}
+
+	companion object {
+		private fun getWifiNameFromCapabilities(networkCapabilities: NetworkCapabilities): String? {
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+				val info: WifiInfo
+				if (networkCapabilities.transportInfo is WifiInfo) {
+					info = networkCapabilities.transportInfo as WifiInfo
+					return info.ssid
+				}
+			}
+			return null
+		}
+	}
 }
 
 inline fun <Result> Flow<NetworkStatus>.map(
-	crossinline onUnavailable: suspend () -> Result,
+	crossinline onUnavailable: suspend (network: Network) -> Result,
 	crossinline onAvailable: suspend (network: Network) -> Result,
 	crossinline onCapabilitiesChanged:
 	suspend (network: Network, networkCapabilities: NetworkCapabilities) -> Result,
 ): Flow<Result> = map { status ->
 	when (status) {
-		is NetworkStatus.Unavailable -> onUnavailable()
+		is NetworkStatus.Unavailable -> onUnavailable(status.network)
 		is NetworkStatus.Available -> onAvailable(status.network)
 		is NetworkStatus.CapabilitiesChanged ->
 			onCapabilitiesChanged(

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/network/EthernetService.kt

@@ -10,9 +10,4 @@ class EthernetService
 constructor(
 	@ApplicationContext context: Context,
 ) :
-	BaseNetworkService<EthernetService>(context, NetworkCapabilities.TRANSPORT_ETHERNET) {
+	BaseNetworkService<EthernetService>(context, NetworkCapabilities.TRANSPORT_ETHERNET)
-
-	override fun isNetworkSecure(): Boolean {
-		return true
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/network/MobileDataService.kt

@@ -10,8 +10,4 @@ class MobileDataService
 constructor(
 	@ApplicationContext context: Context,
 ) :
-	BaseNetworkService<MobileDataService>(context, NetworkCapabilities.TRANSPORT_CELLULAR) {
+	BaseNetworkService<MobileDataService>(context, NetworkCapabilities.TRANSPORT_CELLULAR)
-	override fun isNetworkSecure(): Boolean {
-		return false
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/network/NetworkExtensions.kt

@@ -1,16 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.network
-
-import android.net.NetworkCapabilities
-import android.net.wifi.WifiInfo
-import android.os.Build
-
-fun NetworkCapabilities.getWifiName(): String? {
-	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-		val info: WifiInfo
-		if (transportInfo is WifiInfo) {
-			info = transportInfo as WifiInfo
-			return info.ssid
-		}
-	}
-	return null
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/network/NetworkService.kt

@@ -4,11 +4,7 @@ import android.net.NetworkCapabilities
 import kotlinx.coroutines.flow.Flow
 
 interface NetworkService<T> {
-	fun getNetworkName(networkCapabilities: NetworkCapabilities): String? {
+	fun getNetworkName(networkCapabilities: NetworkCapabilities): String?
-		return null
-	}
-
-	fun isNetworkSecure(): Boolean
 
 	val networkStatus: Flow<NetworkStatus>
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/network/NetworkStatus.kt

@@ -4,11 +4,10 @@ import android.net.Network
 import android.net.NetworkCapabilities
 
 sealed class NetworkStatus {
-	abstract val isConnected: Boolean
+	class Available(val network: Network) : NetworkStatus()
-	class Available(val network: Network, override val isConnected: Boolean = true) : NetworkStatus()
 
-	class Unavailable(override val isConnected: Boolean = false) : NetworkStatus()
+	class Unavailable(val network: Network) : NetworkStatus()
 
-	class CapabilitiesChanged(val network: Network, val networkCapabilities: NetworkCapabilities, override val isConnected: Boolean = true) :
+	class CapabilitiesChanged(val network: Network, val networkCapabilities: NetworkCapabilities) :
 		NetworkStatus()
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/network/WifiService.kt

@@ -2,8 +2,6 @@ package com.zaneschepke.wireguardautotunnel.service.network
 
 import android.content.Context
 import android.net.NetworkCapabilities
-import android.net.wifi.SupplicantState
-import android.os.Build
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
@@ -12,21 +10,4 @@ class WifiService
 constructor(
 	@ApplicationContext context: Context,
 ) :
-	BaseNetworkService<WifiService>(context, NetworkCapabilities.TRANSPORT_WIFI) {
+	BaseNetworkService<WifiService>(context, NetworkCapabilities.TRANSPORT_WIFI)
-
-	override fun getNetworkName(networkCapabilities: NetworkCapabilities): String? {
-		var ssid = networkCapabilities.getWifiName()
-		if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S) {
-			val info = wifiManager.connectionInfo
-			if (info.supplicantState === SupplicantState.COMPLETED) {
-				ssid = info.ssid
-			}
-		}
-		return ssid?.trim('"')
-	}
-
-	override fun isNetworkSecure(): Boolean {
-		// TODO
-		return false
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/notification/NotificationAction.kt

@@ -1,17 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.notification
-
-import android.content.Context
-import com.zaneschepke.wireguardautotunnel.R
-
-enum class NotificationAction {
-	TUNNEL_OFF,
-	AUTO_TUNNEL_OFF,
-	;
-
-	fun title(context: Context): String {
-		return when (this) {
-			TUNNEL_OFF -> context.getString(R.string.stop)
-			AUTO_TUNNEL_OFF -> context.getString(R.string.stop)
-		}
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/notification/NotificationService.kt

@@ -2,32 +2,21 @@ package com.zaneschepke.wireguardautotunnel.service.notification
 
 import android.app.Notification
 import android.app.NotificationManager
-import android.content.Context
+import android.app.PendingIntent
-import androidx.core.app.NotificationCompat
-import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification.NotificationChannels
 
 interface NotificationService {
-	val context: Context
 	fun createNotification(
-		channel: NotificationChannels,
+		channelId: String,
+		channelName: String,
 		title: String = "",
-		actions: Collection<NotificationCompat.Action> = emptyList(),
+		action: PendingIntent? = null,
-		description: String = "",
+		actionText: String? = null,
+		description: String,
 		showTimestamp: Boolean = false,
 		importance: Int = NotificationManager.IMPORTANCE_HIGH,
+		vibration: Boolean = false,
 		onGoing: Boolean = true,
+		lights: Boolean = true,
 		onlyAlertOnce: Boolean = true,
 	): Notification
-
-	fun createNotificationAction(action: NotificationAction): NotificationCompat.Action
-
-	fun remove(notificationId: Int)
-
-	fun show(notificationId: Int, notification: Notification)
-
-	companion object {
-		const val KERNEL_SERVICE_NOTIFICATION_ID = 123
-		const val AUTO_TUNNEL_NOTIFICATION_ID = 122
-		const val VPN_NOTIFICATION_ID = 100
-	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/notification/WireGuardNotification.kt

@@ -1,134 +1,105 @@
 package com.zaneschepke.wireguardautotunnel.service.notification
 
-import android.Manifest
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.graphics.Color
-import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.receiver.NotificationActionReceiver
+import com.zaneschepke.wireguardautotunnel.ui.SplashActivity
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
 class WireGuardNotification
 @Inject
 constructor(
-	@ApplicationContext override val context: Context,
+	@ApplicationContext private val context: Context,
-) : NotificationService {
+) :
+	NotificationService {
+	private val notificationManager =
+		context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-	enum class NotificationChannels {
+	private val watcherBuilder: NotificationCompat.Builder =
-		VPN,
+		NotificationCompat.Builder(
-		AUTO_TUNNEL,
+			context,
-	}
+			context.getString(R.string.watcher_channel_id),
-
+		)
-	private val notificationManager = NotificationManagerCompat.from(context)
+	private val tunnelBuilder: NotificationCompat.Builder =
+		NotificationCompat.Builder(
+			context,
+			context.getString(R.string.vpn_channel_id),
+		)
 
 	override fun createNotification(
-		channel: NotificationChannels,
+		channelId: String,
+		channelName: String,
 		title: String,
-		actions: Collection<NotificationCompat.Action>,
+		action: PendingIntent?,
+		actionText: String?,
 		description: String,
 		showTimestamp: Boolean,
 		importance: Int,
+		vibration: Boolean,
 		onGoing: Boolean,
+		lights: Boolean,
 		onlyAlertOnce: Boolean,
 	): Notification {
-		notificationManager.createNotificationChannel(channel.asChannel())
+		val channel =
-		return channel.asBuilder().apply {
+			NotificationChannel(
-			actions.forEach {
+				channelId,
-				addAction(it)
+				channelName,
+				importance,
+			)
+				.let {
+					it.description = title
+					it.enableLights(lights)
+					it.lightColor = Color.RED
+					it.enableVibration(vibration)
+					it.vibrationPattern = longArrayOf(100, 200, 300)
+					it
 				}
-			setContentTitle(title)
+		notificationManager.createNotificationChannel(channel)
-			setContentText(description)
+		val pendingIntent: PendingIntent =
-			setOnlyAlertOnce(onlyAlertOnce)
+			Intent(context, SplashActivity::class.java).let { notificationIntent ->
-			setOngoing(onGoing)
+				PendingIntent.getActivity(
-			setPriority(NotificationCompat.PRIORITY_HIGH)
-			setShowWhen(showTimestamp)
-			setSmallIcon(R.drawable.ic_launcher)
-		}.build()
-	}
-
-	override fun createNotificationAction(notificationAction: NotificationAction): NotificationCompat.Action {
-		val pendingIntent = PendingIntent.getBroadcast(
 					context,
 					0,
-			Intent(context, NotificationActionReceiver::class.java).apply {
+					notificationIntent,
-				action = notificationAction.name
-			},
 					PendingIntent.FLAG_IMMUTABLE,
 				)
-		return NotificationCompat.Action.Builder(
-			R.drawable.ic_launcher,
-			notificationAction.title(context).uppercase(),
-			pendingIntent,
-		).build()
 			}
 
-	override fun remove(notificationId: Int) {
+		val builder =
-		notificationManager.cancel(notificationId)
+			when (channelId) {
-	}
+				context.getString(R.string.watcher_channel_id) -> watcherBuilder
-
+				context.getString(R.string.vpn_channel_id) -> tunnelBuilder
-	override fun show(notificationId: Int, notification: Notification) {
+				else -> {
-		with(notificationManager) {
-			if (ActivityCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
-				return
-			}
-			notify(notificationId, notification)
-		}
-	}
-
-	fun NotificationChannels.asBuilder(): NotificationCompat.Builder {
-		return when (this) {
-			NotificationChannels.VPN -> {
 					NotificationCompat.Builder(
 						context,
-					context.getString(R.string.auto_tunnel_channel_id),
+						channelId,
-				)
-			}
-			NotificationChannels.AUTO_TUNNEL -> {
-				NotificationCompat.Builder(
-					context,
-					context.getString(R.string.vpn_channel_id),
 					)
 				}
 			}
-	}
 
-	fun NotificationChannels.asChannel(): NotificationChannel {
+		return builder.let {
-		return when (this) {
+			if (action != null && actionText != null) {
-			NotificationChannels.VPN -> {
+				it.addAction(
-				NotificationChannel(
+					NotificationCompat.Action.Builder(0, actionText, action).build(),
-					context.getString(R.string.vpn_channel_id),
+				)
-					context.getString(R.string.vpn_channel_name),
+				it.setAutoCancel(true)
-					NotificationManager.IMPORTANCE_HIGH,
-				).apply {
-					description = context.getString(R.string.vpn_channel_description)
-					enableLights(true)
-					lightColor = Color.WHITE
-					enableVibration(false)
-					vibrationPattern = longArrayOf(100, 200, 300)
-				}
-			}
-			NotificationChannels.AUTO_TUNNEL -> {
-				NotificationChannel(
-					context.getString(R.string.auto_tunnel_channel_id),
-					context.getString(R.string.auto_tunnel_channel_name),
-					NotificationManager.IMPORTANCE_HIGH,
-				).apply {
-					description = context.getString(R.string.auto_tunnel_channel_description)
-					enableLights(true)
-					lightColor = Color.WHITE
-					enableVibration(false)
-					vibrationPattern = longArrayOf(100, 200, 300)
-				}
 			}
+			it.setContentTitle(title)
+				.setContentText(description)
+				.setOnlyAlertOnce(onlyAlertOnce)
+				.setContentIntent(pendingIntent)
+				.setOngoing(onGoing)
+				.setPriority(NotificationCompat.PRIORITY_HIGH)
+				.setShowWhen(showTimestamp)
+				.setSmallIcon(R.drawable.ic_launcher)
+				.build()
 		}
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/shortcut/ShortcutsActivity.kt

@@ -4,24 +4,20 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.service.foreground.Action
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.AutoTunnelService
+import com.zaneschepke.wireguardautotunnel.service.foreground.WireGuardConnectivityWatcherService
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import com.zaneschepke.wireguardautotunnel.service.foreground.WireGuardTunnelService
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import timber.log.Timber
 import javax.inject.Inject
-import javax.inject.Provider
 
 @AndroidEntryPoint
 class ShortcutsActivity : ComponentActivity() {
 	@Inject
 	lateinit var appDataRepository: AppDataRepository
 
-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
-
 	@Inject
 	lateinit var serviceManager: ServiceManager
 
@@ -35,26 +31,45 @@ class ShortcutsActivity : ComponentActivity() {
 			val settings = appDataRepository.settings.getSettings()
 			if (settings.isShortcutsEnabled) {
 				when (intent.getStringExtra(CLASS_NAME_EXTRA_KEY)) {
-					LEGACY_TUNNEL_SERVICE_NAME, TunnelService::class.java.simpleName -> {
+					WireGuardTunnelService::class.java.simpleName -> {
 						val tunnelName = intent.getStringExtra(TUNNEL_NAME_EXTRA_KEY)
-						Timber.d("Tunnel name extra: $tunnelName")
+						val tunnelConfig =
-						val tunnelConfig = tunnelName?.let {
+							tunnelName?.let {
-							appDataRepository.tunnels.getAll()
+								appDataRepository.tunnels.getAll().firstOrNull {
-								.firstOrNull { it.name == tunnelName }
+									it.name == tunnelName
-						} ?: appDataRepository.getStartTunnelConfig()
+								}
-						Timber.d("Shortcut action on name: ${tunnelConfig?.name}")
+							}
-						tunnelConfig?.let {
 						when (intent.action) {
-								Action.START.name -> tunnelService.get().startTunnel(it, true)
+							Action.START.name ->
-								Action.STOP.name -> tunnelService.get().stopTunnel()
+								serviceManager.startVpnServiceForeground(
-								else -> Unit
+									this@ShortcutsActivity,
+									tunnelConfig?.id,
+									isManualStart = true,
+								)
+
+							Action.STOP.name ->
+								serviceManager.stopVpnServiceForeground(
+									this@ShortcutsActivity,
+									isManualStop = true,
+								)
 						}
 					}
-					}
+
-					AutoTunnelService::class.java.simpleName, LEGACY_AUTO_TUNNEL_SERVICE_NAME -> {
+					WireGuardConnectivityWatcherService::class.java.simpleName -> {
 						when (intent.action) {
-							Action.START.name -> serviceManager.startAutoTunnel(true)
+							Action.START.name ->
-							Action.STOP.name -> serviceManager.stopAutoTunnel()
+								appDataRepository.settings.save(
+									settings.copy(
+										isAutoTunnelPaused = false,
+									),
+								)
+
+							Action.STOP.name ->
+								appDataRepository.settings.save(
+									settings.copy(
+										isAutoTunnelPaused = true,
+									),
+								)
 						}
 					}
 				}
@@ -63,14 +78,7 @@ class ShortcutsActivity : ComponentActivity() {
 		finish()
 	}
 
-	enum class Action {
-		START,
-		STOP,
-	}
-
 	companion object {
-		const val LEGACY_TUNNEL_SERVICE_NAME = "WireGuardTunnelService"
-		const val LEGACY_AUTO_TUNNEL_SERVICE_NAME = "WireGuardConnectivityWatcherService"
 		const val TUNNEL_NAME_EXTRA_KEY = "tunnelName"
 		const val CLASS_NAME_EXTRA_KEY = "className"
 	}

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

@@ -1,86 +1,104 @@
 package com.zaneschepke.wireguardautotunnel.service.tile
 
+import android.os.Build
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.ServiceLifecycleDispatcher
+import androidx.lifecycle.lifecycleScope
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.cancel
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class AutoTunnelControlTile : TileService() {
+class AutoTunnelControlTile : TileService(), LifecycleOwner {
 	@Inject
 	lateinit var appDataRepository: AppDataRepository
 
 	@Inject
 	lateinit var serviceManager: ServiceManager
 
-	@Inject
+	private val dispatcher = ServiceLifecycleDispatcher(this)
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
 
-	override fun onCreate() {
+	private var manualStartConfig: TunnelConfig? = null
-		super.onCreate()
-		serviceManager.autoTunnelTile.complete(this)
-	}
-
-	override fun onDestroy() {
-		super.onDestroy()
-		serviceManager.autoTunnelTile = CompletableDeferred()
-	}
 
 	override fun onStartListening() {
 		super.onStartListening()
-		serviceManager.autoTunnelTile.complete(this)
+		lifecycleScope.launch {
-		applicationScope.launch {
+			val settings = appDataRepository.settings.getSettings()
-			if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
+			when (settings.isAutoTunnelEnabled) {
-			updateTileState()
+				true -> {
+					if (settings.isAutoTunnelPaused) {
+						setInactive()
+						setTileDescription(this@AutoTunnelControlTile.getString(R.string.paused))
+					} else {
+						setActive()
+						setTileDescription(this@AutoTunnelControlTile.getString(R.string.active))
 					}
 				}
 
-	fun updateTileState() {
+				false -> {
-		serviceManager.autoTunnelActive.value.let {
+					setTileDescription(this@AutoTunnelControlTile.getString(R.string.disabled))
-			if (it) setActive() else setInactive()
+					setUnavailable()
 				}
 			}
+		}
+	}
+
+	override fun onTileAdded() {
+		super.onTileAdded()
+		onStartListening()
+	}
 
 	override fun onClick() {
 		super.onClick()
 		unlockAndRun {
-			applicationScope.launch {
+			lifecycleScope.launch {
-				if (serviceManager.autoTunnelActive.value) {
+				try {
-					serviceManager.stopAutoTunnel()
+					appDataRepository.toggleWatcherServicePause()
-					setInactive()
+					onStartListening()
-				} else {
+				} catch (e: Exception) {
-					serviceManager.startAutoTunnel(true)
+					Timber.e(e.message)
-					setActive()
+				} finally {
+					cancel()
 				}
 			}
 		}
 	}
 
 	private fun setActive() {
-		kotlin.runCatching {
 		qsTile.state = Tile.STATE_ACTIVE
 		qsTile.updateTile()
 	}
-	}
 
 	private fun setInactive() {
-		kotlin.runCatching {
 		qsTile.state = Tile.STATE_INACTIVE
 		qsTile.updateTile()
 	}
-	}
 
 	private fun setUnavailable() {
-		kotlin.runCatching {
+		manualStartConfig = null
 		qsTile.state = Tile.STATE_UNAVAILABLE
 		qsTile.updateTile()
 	}
+
+	private fun setTileDescription(description: String) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+			qsTile.subtitle = description
 		}
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+			qsTile.stateDescription = description
+		}
+		qsTile.updateTile()
+	}
+
+	override val lifecycle: Lifecycle
+		get() = dispatcher.lifecycle
 }

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

@@ -3,100 +3,110 @@ package com.zaneschepke.wireguardautotunnel.service.tile
 import android.os.Build
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.ServiceLifecycleDispatcher
+import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
+import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.cancel
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import timber.log.Timber
 import javax.inject.Inject
-import javax.inject.Provider
 
 @AndroidEntryPoint
-class TunnelControlTile : TileService() {
+class TunnelControlTile : TileService(), LifecycleOwner {
 	@Inject
 	lateinit var appDataRepository: AppDataRepository
 
 	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
+	lateinit var vpnService: VpnService
-
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
 
 	@Inject
 	lateinit var serviceManager: ServiceManager
 
-	override fun onCreate() {
+	private val dispatcher = ServiceLifecycleDispatcher(this)
-		super.onCreate()
-		serviceManager.tunnelControlTile.complete(this)
-	}
 
-	override fun onDestroy() {
+	private var manualStartConfig: TunnelConfig? = null
-		super.onDestroy()
-		serviceManager.tunnelControlTile = CompletableDeferred()
-	}
 
 	override fun onStartListening() {
 		super.onStartListening()
-		serviceManager.tunnelControlTile.complete(this)
+		Timber.d("On start listening called")
-		applicationScope.launch {
+		lifecycleScope.launch {
-			if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
+			when (vpnService.getState()) {
-			updateTileState()
+				TunnelState.UP -> {
+					setActive()
+					setTileDescription(vpnService.name)
+				}
+
+				TunnelState.DOWN -> {
+					setInactive()
+					val config =
+						appDataRepository.getStartTunnelConfig()?.also { config ->
+							manualStartConfig = config
+						} ?: appDataRepository.getPrimaryOrFirstTunnel()
+					config?.let {
+						setTileDescription(it.name)
+					} ?: setUnavailable()
+				}
+
+				else -> setInactive()
+			}
 		}
 	}
 
-	fun updateTileState() = applicationScope.launch {
+	override fun onTileAdded() {
-		val lastActive = appDataRepository.getStartTunnelConfig()
+		super.onTileAdded()
-		lastActive?.let {
+		onStartListening()
-			updateTile(it)
-		}
 	}
 
 	override fun onClick() {
 		super.onClick()
 		unlockAndRun {
-			applicationScope.launch {
+			lifecycleScope.launch {
-				val lastActive = appDataRepository.getStartTunnelConfig()
+				try {
-				lastActive?.let { tunnel ->
+					if (vpnService.getState() == TunnelState.UP) {
-					if (tunnel.isActive) {
+						serviceManager.stopVpnServiceForeground(
-						tunnelService.get().stopTunnel()
+							this@TunnelControlTile,
+							isManualStop = true,
+						)
 					} else {
-						tunnelService.get().startTunnel(tunnel, true)
+						serviceManager.startVpnServiceForeground(
+							this@TunnelControlTile,
+							manualStartConfig?.id,
+							isManualStart = true,
+						)
 					}
-					updateTileState()
+				} catch (e: Exception) {
+					Timber.e(e.message)
+				} finally {
+					cancel()
 				}
 			}
 		}
 	}
 
 	private fun setActive() {
-		kotlin.runCatching {
 		qsTile.state = Tile.STATE_ACTIVE
 		qsTile.updateTile()
 	}
-	}
 
 	private fun setInactive() {
-		kotlin.runCatching {
 		qsTile.state = Tile.STATE_INACTIVE
 		qsTile.updateTile()
 	}
-	}
 
 	private fun setUnavailable() {
-		kotlin.runCatching {
+		manualStartConfig = null
 		qsTile.state = Tile.STATE_UNAVAILABLE
-			setTileDescription("")
 		qsTile.updateTile()
 	}
-	}
 
 	private fun setTileDescription(description: String) {
-		kotlin.runCatching {
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
 			qsTile.subtitle = description
 		}
@@ -105,15 +115,7 @@ class TunnelControlTile : TileService() {
 		}
 		qsTile.updateTile()
 	}
-	}
 
-	private fun updateTile(tunnelConfig: TunnelConfig?) {
+	override val lifecycle: Lifecycle
-		kotlin.runCatching {
+		get() = dispatcher.lifecycle
-			tunnelConfig?.let {
-				setTileDescription(it.name)
-				if (it.isActive) return setActive()
-				setInactive()
-			}
-		}
-	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/tunnel/AlwaysOnVpnService.kt

@@ -1,46 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.tunnel
-
-import android.content.Intent
-import android.os.IBinder
-import androidx.lifecycle.LifecycleService
-import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Provider
-
-@AndroidEntryPoint
-class AlwaysOnVpnService : LifecycleService() {
-
-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
-
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
-
-	override fun onBind(intent: Intent): IBinder? {
-		super.onBind(intent)
-		// We don't provide binding, so return null
-		return null
-	}
-
-	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-		if (intent == null || intent.component == null || intent.component!!.packageName != packageName) {
-			Timber.i("Always-on VPN requested started")
-			lifecycleScope.launch {
-				val settings = appDataRepository.settings.getSettings()
-				if (settings.isAlwaysOnVpnEnabled) {
-					val tunnel = appDataRepository.getPrimaryOrFirstTunnel()
-					tunnel?.let {
-						tunnelService.get().startTunnel(it)
-					}
-				} else {
-					Timber.w("Always-on VPN is not enabled in app settings")
-				}
-			}
-		}
-		return super.onStartCommand(intent, flags, startId)
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/tunnel/BackendState.kt

@@ -1,7 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.tunnel
-
-enum class BackendState {
-	KILL_SWITCH_ACTIVE,
-	SERVICE_ACTIVE,
-	INACTIVE,
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/tunnel/TunnelService.kt

@@ -1,28 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.tunnel
-
-import com.wireguard.android.backend.Tunnel
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import kotlinx.coroutines.flow.StateFlow
-
-interface TunnelService : Tunnel, org.amnezia.awg.backend.Tunnel {
-
-	suspend fun startTunnel(tunnelConfig: TunnelConfig?, background: Boolean = false)
-
-	suspend fun stopTunnel()
-
-	suspend fun bounceTunnel()
-
-	suspend fun getBackendState(): BackendState
-
-	suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>)
-
-	val vpnState: StateFlow<VpnState>
-
-	suspend fun runningTunnelNames(): Set<String>
-
-	suspend fun getState(): TunnelState
-
-	fun cancelActiveTunnelJobs()
-
-	fun startActiveTunnelJobs()
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/tunnel/TunnelState.kt

@@ -24,14 +24,6 @@ enum class TunnelState {
 		}
 	}
 
-	fun isDown(): Boolean {
-		return this == DOWN
-	}
-
-	fun isUp(): Boolean {
-		return this == UP
-	}
-
 	companion object {
 		fun from(state: Tunnel.State): TunnelState {
 			return when (state) {

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/tunnel/VpnService.kt

@@ -0,0 +1,15 @@
+package com.zaneschepke.wireguardautotunnel.service.tunnel
+
+import com.wireguard.android.backend.Tunnel
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import kotlinx.coroutines.flow.StateFlow
+
+interface VpnService : Tunnel, org.amnezia.awg.backend.Tunnel {
+	suspend fun startTunnel(tunnelConfig: TunnelConfig? = null): TunnelState
+
+	suspend fun stopTunnel()
+
+	val vpnState: StateFlow<VpnState>
+
+	fun getState(): TunnelState
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/tunnel/WireGuardTunnel.kt

@@ -1,21 +1,20 @@
 package com.zaneschepke.wireguardautotunnel.service.tunnel
 
 import com.wireguard.android.backend.Backend
+import com.wireguard.android.backend.BackendException
 import com.wireguard.android.backend.Tunnel.State
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
 import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.module.Kernel
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
+import com.zaneschepke.wireguardautotunnel.module.Userspace
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
-import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
 import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.AmneziaStatistics
 import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStatistics
 import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.WireGuardStatistics
-import com.zaneschepke.wireguardautotunnel.util.extensions.asAmBackendState
+import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.asBackendState
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
@@ -23,15 +22,9 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
 import org.amnezia.awg.backend.Tunnel
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationAction
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService.Companion.VPN_NOTIFICATION_ID
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Provider
@@ -39,312 +32,202 @@ import javax.inject.Provider
 class WireGuardTunnel
 @Inject
 constructor(
-	private val amneziaBackend: Provider<org.amnezia.awg.backend.Backend>,
+	private val userspaceAmneziaBackend: Provider<org.amnezia.awg.backend.Backend>,
-	private val tunnelConfigRepository: TunnelConfigRepository,
+	@Userspace private val userspaceBackend: Provider<Backend>,
 	@Kernel private val kernelBackend: Provider<Backend>,
 	private val appDataRepository: AppDataRepository,
 	@ApplicationScope private val applicationScope: CoroutineScope,
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-	private val serviceManager: ServiceManager,
+) : VpnService {
-	private val notificationService: NotificationService,
-) : TunnelService {
-
 	private val _vpnState = MutableStateFlow(VpnState())
 	override val vpnState: StateFlow<VpnState> = _vpnState.asStateFlow()
 
 	private var statsJob: Job? = null
-	private var tunnelChangesJob: Job? = null
 
-	@get:Synchronized @set:Synchronized
+	private var backendIsWgUserspace = true
-	private var isKernelBackend: Boolean? = null
 
-	private val tunnelControlMutex = Mutex()
+	private var backendIsAmneziaUserspace = false
 
 	init {
 		applicationScope.launch(ioDispatcher) {
 			appDataRepository.settings.getSettingsFlow().collect {
-				isKernelBackend = it.isKernelEnabled
+				if (it.isKernelEnabled && (backendIsWgUserspace || backendIsAmneziaUserspace)) {
+					Timber.i("Setting kernel backend")
+					backendIsWgUserspace = false
+					backendIsAmneziaUserspace = false
+				} else if (!it.isKernelEnabled && !it.isAmneziaEnabled && !backendIsWgUserspace) {
+					Timber.i("Setting WireGuard userspace backend")
+					backendIsWgUserspace = true
+					backendIsAmneziaUserspace = false
+				} else if (it.isAmneziaEnabled && !backendIsAmneziaUserspace) {
+					Timber.i("Setting Amnezia userspace backend")
+					backendIsAmneziaUserspace = true
+					backendIsWgUserspace = false
+				}
 			}
 		}
 	}
 
-	private suspend fun backend(): Any {
+	private fun setState(tunnelConfig: TunnelConfig?, tunnelState: TunnelState): TunnelState {
-		val isKernelEnabled = isKernelBackend
+		return if (backendIsAmneziaUserspace) {
-			?: appDataRepository.settings.getSettings().isKernelEnabled
+			Timber.i("Using Amnezia backend")
-		if (isKernelEnabled) return kernelBackend.get()
+			val config =
-		return amneziaBackend.get()
+				tunnelConfig?.let {
-	}
+					if (it.amQuick != "") {
-
+						TunnelConfig.configFromAmQuick(it.amQuick)
-	override suspend fun runningTunnelNames(): Set<String> {
-		return when (val backend = backend()) {
-			is Backend -> backend.runningTunnelNames
-			is org.amnezia.awg.backend.Backend -> backend.runningTunnelNames
-			else -> emptySet()
-		}
-	}
-
-	private suspend fun setState(tunnelConfig: TunnelConfig, tunnelState: TunnelState): Result<TunnelState> {
-		return runCatching {
-			when (val backend = backend()) {
-				is Backend -> backend.setState(this, tunnelState.toWgState(), TunnelConfig.configFromWgQuick(tunnelConfig.wgQuick)).let { TunnelState.from(it) }
-				is org.amnezia.awg.backend.Backend -> {
-					val config = if (tunnelConfig.amQuick.isBlank()) {
-						TunnelConfig.configFromAmQuick(
-							tunnelConfig.wgQuick,
-						)
 					} else {
-						TunnelConfig.configFromAmQuick(tunnelConfig.amQuick)
+						Timber.w(
-					}
+							"Using backwards compatible wg config, amnezia specific config not found.",
-					backend.setState(this, tunnelState.toAmState(), config).let {
+						)
-						TunnelState.from(it)
+						TunnelConfig.configFromAmQuick(it.wgQuick)
 					}
 				}
-				else -> throw NotImplementedError()
+			val state =
-			}
+				userspaceAmneziaBackend.get().setState(this, tunnelState.toAmState(), config)
-		}.onFailure {
+			TunnelState.from(state)
-			Timber.e(it)
+		} else {
+			Timber.i("Using Wg backend")
+			val wgConfig = tunnelConfig?.let { TunnelConfig.configFromWgQuick(it.wgQuick) }
+			val state =
+				backend().setState(
+					this,
+					tunnelState.toWgState(),
+					wgConfig,
+				)
+			TunnelState.from(state)
 		}
 	}
 
-	private fun isTunnelAlreadyRunning(tunnelConfig: TunnelConfig): Boolean {
+	override suspend fun startTunnel(tunnelConfig: TunnelConfig?): TunnelState {
-		val isRunning = tunnelConfig == _vpnState.value.tunnelConfig && _vpnState.value.status.isUp()
+		return withContext(ioDispatcher) {
-		if (isRunning) Timber.w("Tunnel already running")
+			try {
-		return isRunning
+				// TODO we need better error handling here
+				// need to bubble up these errors to the UI
+				val config = tunnelConfig ?: appDataRepository.getPrimaryOrFirstTunnel()
+				if (config != null) {
+					emitTunnelConfig(config)
+					setState(config, TunnelState.UP)
+				} else {
+					throw Exception("No tunnels")
+				}
+			} catch (e: BackendException) {
+				Timber.e("Failed to start tunnel with error: ${e.message}")
+				TunnelState.from(State.DOWN)
+			}
+		}
 	}
 
-	override suspend fun startTunnel(tunnelConfig: TunnelConfig?, background: Boolean) {
+	private fun backend(): Backend {
-		if (tunnelConfig == null) return
+		return when {
-		withContext(ioDispatcher) {
+			backendIsWgUserspace -> {
-			if (isTunnelAlreadyRunning(tunnelConfig)) return@withContext
+				userspaceBackend.get()
-			withServiceActive {
+			}
-				onBeforeStart(background)
+
-				tunnelControlMutex.withLock {
+			!backendIsWgUserspace && !backendIsAmneziaUserspace -> {
-					setState(tunnelConfig, TunnelState.UP).onSuccess {
+				kernelBackend.get()
-						startActiveTunnelJobs()
+			}
-						if (it.isUp()) appDataRepository.tunnels.save(tunnelConfig.copy(isActive = true))
+
-						with(notificationService) {
+			else -> {
-							val notification = createNotification(
+				userspaceBackend.get()
-								WireGuardNotification.NotificationChannels.VPN,
+			}
-								title = "${context.getString(R.string.tunnel_running)} - ${tunnelConfig.name}",
+		}
-								actions = listOf(
+	}
-									notificationService.createNotificationAction(NotificationAction.TUNNEL_OFF),
+
+	private fun emitTunnelState(state: TunnelState) {
+		_vpnState.tryEmit(
+			_vpnState.value.copy(
+				status = state,
 			),
 		)
-							show(VPN_NOTIFICATION_ID, notification)
-						}
-						updateTunnelState(it, tunnelConfig)
-					}
-				}.onFailure {
-					Timber.e(it)
 	}
+
+	private fun emitBackendStatistics(statistics: TunnelStatistics) {
+		_vpnState.tryEmit(
+			_vpnState.value.copy(
+				statistics = statistics,
+			),
+		)
 	}
+
+	private suspend fun emitTunnelConfig(tunnelConfig: TunnelConfig?) {
+		_vpnState.emit(
+			_vpnState.value.copy(
+				tunnelConfig = tunnelConfig,
+			),
+		)
 	}
+
+	private fun resetVpnState() {
+		_vpnState.tryEmit(VpnState())
 	}
 
 	override suspend fun stopTunnel() {
 		withContext(ioDispatcher) {
-			if (_vpnState.value.status.isDown()) return@withContext
+			try {
-			with(_vpnState.value) {
+				if (getState() == TunnelState.UP) {
-				if (tunnelConfig == null) return@withContext
+					val state = setState(null, TunnelState.DOWN)
-				tunnelControlMutex.withLock {
+					resetVpnState()
-					setState(tunnelConfig, TunnelState.DOWN).onSuccess {
+					emitTunnelState(state)
-						updateTunnelState(it, null)
-						onStop(tunnelConfig)
-						notificationService.remove(VPN_NOTIFICATION_ID)
-						stopBackgroundService()
-					}.onFailure {
-						Timber.e(it)
 				}
-				}
+			} catch (e: BackendException) {
-			}
+				Timber.e("Failed to stop wireguard tunnel with error: ${e.message}")
-		}
+			} catch (e: org.amnezia.awg.backend.BackendException) {
-	}
+				Timber.e("Failed to stop amnezia tunnel with error: ${e.message}")
-
-	private suspend fun toggleTunnel(tunnelConfig: TunnelConfig) {
-		withContext(ioDispatcher) {
-			tunnelControlMutex.withLock {
-				setState(tunnelConfig, TunnelState.TOGGLE)
 			}
 		}
 	}
 
-	// utility to keep vpnService alive during rapid changes to prevent bad states
+	override fun getState(): TunnelState {
-	private suspend fun withServiceActive(callback: suspend () -> Unit) {
+		return if (backendIsAmneziaUserspace) {
-		when (val backend = backend()) {
+			TunnelState.from(
-			is org.amnezia.awg.backend.Backend -> {
+				userspaceAmneziaBackend.get().getState(this),
-				val backendState = backend.backendState
+			)
-				if (backendState == org.amnezia.awg.backend.Backend.BackendState.INACTIVE) {
+		} else {
-					backend.setBackendState(org.amnezia.awg.backend.Backend.BackendState.SERVICE_ACTIVE, emptyList())
+			TunnelState.from(backend().getState(this))
 		}
-				callback()
-			}
-			is Backend -> callback()
-		}
-	}
-
-	override suspend fun bounceTunnel() {
-		_vpnState.value.tunnelConfig?.let {
-			withServiceActive {
-				toggleTunnel(it)
-				toggleTunnel(it)
-			}
-		}
-	}
-
-	override suspend fun getBackendState(): BackendState {
-		return when (val backend = backend()) {
-			is org.amnezia.awg.backend.Backend -> {
-				backend.backendState.asBackendState()
-			}
-			is Backend -> BackendState.SERVICE_ACTIVE
-			else -> BackendState.INACTIVE
-		}
-	}
-
-	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
-		kotlin.runCatching {
-			when (val backend = backend()) {
-				is org.amnezia.awg.backend.Backend -> {
-					backend.setBackendState(backendState.asAmBackendState(), allowedIps)
-				}
-				is Backend -> {
-					// TODO not yet implemented
-					Timber.d("Kernel backend state not yet implemented")
-				}
-				else -> Unit
-			}
-		}
-	}
-
-	private suspend fun shutDownActiveTunnel() {
-		with(_vpnState.value) {
-			if (status.isUp()) {
-				stopTunnel()
-			}
-		}
-	}
-
-	private suspend fun startBackgroundService() {
-		serviceManager.startBackgroundService()
-		serviceManager.updateTunnelTile()
-	}
-
-	private fun stopBackgroundService() {
-		serviceManager.stopBackgroundService()
-		serviceManager.updateTunnelTile()
-	}
-
-	private suspend fun onBeforeStart(background: Boolean) {
-		shutDownActiveTunnel()
-		resetBackendStatistics()
-		val settings = appDataRepository.settings.getSettings()
-		if (background || settings.isKernelEnabled) startBackgroundService()
-	}
-
-	private suspend fun onStop(tunnelConfig: TunnelConfig) {
-		appDataRepository.tunnels.save(tunnelConfig.copy(isActive = false))
-		cancelActiveTunnelJobs()
-		resetBackendStatistics()
-	}
-
-	private fun updateTunnelState(state: TunnelState, tunnelConfig: TunnelConfig?) {
-		_vpnState.update {
-			it.copy(status = state, tunnelConfig = tunnelConfig)
-		}
-	}
-
-	private fun updateTunnelConfig(tunnelConfig: TunnelConfig?) {
-		_vpnState.update {
-			it.copy(tunnelConfig = tunnelConfig)
-		}
-	}
-
-	private fun updateBackendStatistics(statistics: TunnelStatistics) {
-		_vpnState.update {
-			it.copy(statistics = statistics)
-		}
-	}
-
-	private fun resetBackendStatistics() {
-		_vpnState.update {
-			it.copy(statistics = null)
-		}
-	}
-
-	override suspend fun getState(): TunnelState {
-		return when (val backend = backend()) {
-			is Backend -> backend.getState(this).let { TunnelState.from(it) }
-			is org.amnezia.awg.backend.Backend -> backend.getState(this).let { TunnelState.from(it) }
-			else -> TunnelState.DOWN
-		}
-	}
-
-	override fun cancelActiveTunnelJobs() {
-		statsJob?.cancel()
-		tunnelChangesJob?.cancel()
-	}
-
-	override fun startActiveTunnelJobs() {
-		statsJob = startTunnelStatisticsJob()
-		tunnelChangesJob = startTunnelConfigChangesJob()
 	}
 
 	override fun getName(): String {
 		return _vpnState.value.tunnelConfig?.name ?: ""
 	}
 
+	override fun onStateChange(newState: Tunnel.State) {
+		handleStateChange(TunnelState.from(newState))
+	}
+
+	private fun handleStateChange(state: TunnelState) {
+		emitTunnelState(state)
+		WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
+		if (state == TunnelState.UP) {
+			statsJob = startTunnelStatisticsJob()
+		}
+		if (state == TunnelState.DOWN) {
+			try {
+				statsJob?.cancel()
+			} catch (e: CancellationException) {
+				Timber.i("Stats job cancelled")
+			}
+		}
+	}
+
 	private fun startTunnelStatisticsJob() = applicationScope.launch(ioDispatcher) {
-		val backend = backend()
-		delay(STATS_START_DELAY)
 		while (true) {
-			when (backend) {
+			if (backendIsAmneziaUserspace) {
-				is Backend -> updateBackendStatistics(
+				emitBackendStatistics(
-					WireGuardStatistics(backend.getStatistics(this@WireGuardTunnel)),
-				)
-				is org.amnezia.awg.backend.Backend -> {
-					updateBackendStatistics(
 					AmneziaStatistics(
-							backend.getStatistics(this@WireGuardTunnel),
+						userspaceAmneziaBackend.get().getStatistics(this@WireGuardTunnel),
 					),
 				)
+			} else {
+				emitBackendStatistics(
+					WireGuardStatistics(backend().getStatistics(this@WireGuardTunnel)),
+				)
 			}
+			delay(Constants.VPN_STATISTIC_CHECK_INTERVAL)
 		}
-			delay(VPN_STATISTIC_CHECK_INTERVAL)
-		}
-	}
-
-	private fun startTunnelConfigChangesJob() = applicationScope.launch(ioDispatcher) {
-		tunnelConfigRepository.getTunnelConfigsFlow().collect {
-			with(_vpnState.value) {
-				if (status.isDown() || tunnelConfig == null) return@collect
-				val vpnConfigFromStorage = it.first { it.id == tunnelConfig.id }
-				val isRestartNeeded = vpnConfigFromStorage.wgQuick != tunnelConfig.wgQuick ||
-					vpnConfigFromStorage.amQuick != tunnelConfig.amQuick
-				updateTunnelConfig(vpnConfigFromStorage)
-				if (isRestartNeeded) {
-					Timber.d("Bouncing tunnel on config change")
-					bounceTunnel()
-				}
-			}
-		}
-	}
-
-	override fun onStateChange(newState: Tunnel.State) {
-		_vpnState.update {
-			it.copy(status = TunnelState.from(newState))
-		}
-		serviceManager.updateTunnelTile()
 	}
 
 	override fun onStateChange(state: State) {
-		_vpnState.update {
+		handleStateChange(TunnelState.from(state))
-			it.copy(status = TunnelState.from(state))
-		}
-		serviceManager.updateTunnelTile()
-	}
-
-	companion object {
-		const val STATS_START_DELAY = 1_000L
-		const val VPN_STATISTIC_CHECK_INTERVAL = 1_000L
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/AppUiState.kt

@@ -1,14 +1,9 @@
 package com.zaneschepke.wireguardautotunnel.ui
 
-import com.zaneschepke.wireguardautotunnel.data.domain.GeneralState
-import com.zaneschepke.wireguardautotunnel.data.domain.Settings
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnState
-
 data class AppUiState(
-	val settings: Settings = Settings(),
+	val snackbarMessage: String = "",
-	val tunnels: List<TunnelConfig> = emptyList(),
+	val snackbarMessageConsumed: Boolean = true,
-	val vpnState: VpnState = VpnState(),
+	val vpnPermissionAccepted: Boolean = false,
-	val generalState: GeneralState = GeneralState(),
+	val notificationPermissionAccepted: Boolean = false,
-	val autoTunnelActive: Boolean = false,
+	val requestPermissions: Boolean = false,
 )

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/AppViewModel.kt

@@ -1,270 +1,123 @@
 package com.zaneschepke.wireguardautotunnel.ui
 
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
+import com.wireguard.android.backend.GoBackend
-import com.wireguard.android.backend.WgQuickBackend
-import com.wireguard.android.util.RootShell
-import com.zaneschepke.logcatter.LogReader
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.module.AppShell
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.BackendState
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
-import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
-import com.zaneschepke.wireguardautotunnel.util.StringValue
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.onCompletion
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.flow.takeWhile
 import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.plus
-import kotlinx.coroutines.withContext
 import timber.log.Timber
-import xyz.teamgravity.pin_lock_compose.PinManager
 import javax.inject.Inject
-import javax.inject.Provider
 
 @HiltViewModel
 class AppViewModel
 @Inject
-constructor(
+constructor() : ViewModel() {
-	private val appDataRepository: AppDataRepository,
+	val vpnIntent: Intent? = GoBackend.VpnService.prepare(WireGuardAutoTunnel.instance)
-	private val tunnelService: Provider<TunnelService>,
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-	@AppShell private val rootShell: Provider<RootShell>,
-	private val serviceManager: ServiceManager,
-	private val logReader: LogReader,
-) : ViewModel() {
 
-	val uiState =
+	private val _appUiState =
-		combine(
+		MutableStateFlow(
-			appDataRepository.settings.getSettingsFlow(),
-			appDataRepository.tunnels.getTunnelConfigsFlow(),
-			tunnelService.get().vpnState,
-			appDataRepository.appState.generalStateFlow,
-			serviceManager.autoTunnelActive,
-		) { settings, tunnels, tunnelState, generalState, autoTunnel ->
 			AppUiState(
-				settings,
+				vpnPermissionAccepted = vpnIntent == null,
-				tunnels,
-				tunnelState,
-				generalState,
-				autoTunnel,
-			)
-		}.stateIn(
-			viewModelScope + ioDispatcher,
-			SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
-			AppUiState(),
-		)
-
-	private val _isAppReady = MutableStateFlow(false)
-	val isAppReady = _isAppReady.asStateFlow()
-
-	private val _configurationChange = MutableStateFlow(false)
-	val configurationChange = _configurationChange.asStateFlow()
-
-	init {
-		viewModelScope.launch {
-			initPin()
-			initServices()
-			initTunnel()
-			appReadyCheck()
-		}
-	}
-
-	private suspend fun appReadyCheck() {
-		val tunnelCount = appDataRepository.tunnels.count()
-		uiState.takeWhile { it.tunnels.size != tunnelCount }.onCompletion {
-			_isAppReady.emit(true)
-		}.collect()
-	}
-
-	private suspend fun initTunnel() {
-		if (tunnelService.get().getState() == TunnelState.UP) tunnelService.get().startActiveTunnelJobs()
-		val activeTunnels = appDataRepository.tunnels.getActive()
-		if (activeTunnels.isNotEmpty() &&
-			tunnelService.get().getState() == TunnelState.DOWN
-		) {
-			tunnelService.get().startTunnel(activeTunnels.first())
-		}
-	}
-
-	private suspend fun initPin() {
-		val isPinEnabled = appDataRepository.appState.isPinLockEnabled()
-		if (isPinEnabled) PinManager.initialize(WireGuardAutoTunnel.instance)
-	}
-
-	private suspend fun initServices() {
-		withContext(ioDispatcher) {
-			val settings = appDataRepository.settings.getSettings()
-			handleVpnKillSwitchChange(settings.isVpnKillSwitchEnabled)
-			if (settings.isAutoTunnelEnabled) serviceManager.startAutoTunnel(false)
-		}
-	}
-
-	fun onPinLockDisabled() = viewModelScope.launch(ioDispatcher) {
-		PinManager.clearPin()
-		appDataRepository.appState.setPinLockEnabled(false)
-	}
-
-	fun onPinLockEnabled() = viewModelScope.launch {
-		appDataRepository.appState.setPinLockEnabled(true)
-	}
-
-	fun setLocationDisclosureShown() = viewModelScope.launch {
-		appDataRepository.appState.setLocationDisclosureShown(true)
-	}
-
-	fun onToggleLocalLogging() = viewModelScope.launch(ioDispatcher) {
-		with(uiState.value.generalState) {
-			val toggledOn = !isLocalLogsEnabled
-			appDataRepository.appState.setLocalLogsEnabled(toggledOn)
-			if (!toggledOn) onLoggerStop()
-			_configurationChange.update {
-				true
-			}
-		}
-	}
-
-	private suspend fun onLoggerStop() {
-		logReader.stop()
-		logReader.deleteAndClearLogs()
-	}
-
-	fun onToggleAlwaysOnVPN() = viewModelScope.launch {
-		with(uiState.value.settings) {
-			appDataRepository.settings.save(
-				copy(
-					isAlwaysOnVpnEnabled = !isAlwaysOnVpnEnabled,
 			),
 		)
-		}
+	val appUiState = _appUiState.asStateFlow()
+
+	fun isRequiredPermissionGranted(): Boolean {
+		val allAccepted =
+			(_appUiState.value.vpnPermissionAccepted && _appUiState.value.vpnPermissionAccepted)
+		if (!allAccepted) requestPermissions()
+		return allAccepted
 	}
 
-	fun onLocaleChange(localeTag: String) = viewModelScope.launch {
+	private fun requestPermissions() {
-		appDataRepository.appState.setLocale(localeTag)
+		_appUiState.update {
-		LocaleUtil.changeLocale(localeTag)
+			it.copy(
-		_configurationChange.update {
+				requestPermissions = true,
-			true
-		}
-	}
-
-	fun onToggleRestartAtBoot() = viewModelScope.launch {
-		with(uiState.value.settings) {
-			appDataRepository.settings.save(
-				copy(
-					isRestoreOnBootEnabled = !isRestoreOnBootEnabled,
-				),
 			)
 		}
 	}
 
-	fun onToggleVpnKillSwitch(enabled: Boolean) = viewModelScope.launch {
+	fun permissionsRequested() {
-		with(uiState.value.settings) {
+		_appUiState.update {
-			appDataRepository.settings.save(
+			it.copy(
-				copy(
+				requestPermissions = false,
-					isVpnKillSwitchEnabled = enabled,
-					isLanOnKillSwitchEnabled = if (enabled) isLanOnKillSwitchEnabled else false,
-				),
-			)
-		}
-		handleVpnKillSwitchChange(enabled)
-	}
-
-	private suspend fun handleVpnKillSwitchChange(enabled: Boolean) {
-		withContext(ioDispatcher) {
-			if (enabled) {
-				Timber.d("Starting kill switch")
-				val allowedIps = if (appDataRepository.settings.getSettings().isLanOnKillSwitchEnabled) {
-					TunnelConfig.IPV4_PUBLIC_NETWORKS
-				} else {
-					emptySet()
-				}
-				tunnelService.get().setBackendState(BackendState.KILL_SWITCH_ACTIVE, allowedIps)
-			} else {
-				Timber.d("Sending shutdown of kill switch")
-				tunnelService.get().setBackendState(BackendState.SERVICE_ACTIVE, emptySet())
-			}
-		}
-	}
-
-	fun onToggleLanOnKillSwitch(enabled: Boolean) = viewModelScope.launch(ioDispatcher) {
-		appDataRepository.settings.save(
-			uiState.value.settings.copy(
-				isLanOnKillSwitchEnabled = enabled,
-			),
-		)
-		val allowedIps = if (enabled) TunnelConfig.IPV4_PUBLIC_NETWORKS else emptySet()
-		Timber.d("Setting allowedIps $allowedIps")
-		tunnelService.get().setBackendState(BackendState.KILL_SWITCH_ACTIVE, allowedIps)
-	}
-
-	fun onToggleShortcutsEnabled() = viewModelScope.launch {
-		with(uiState.value.settings) {
-			appDataRepository.settings.save(
-				copy(
-					isShortcutsEnabled = !isShortcutsEnabled,
-				),
 			)
 		}
 	}
 
-	private fun saveKernelMode(enabled: Boolean) = viewModelScope.launch {
+	fun openWebPage(url: String, context: Context) {
-		with(uiState.value.settings) {
+		try {
-			appDataRepository.settings.save(
+			val webpage: Uri = Uri.parse(url)
-				this.copy(
+			val intent =
-					isKernelEnabled = enabled,
+				Intent(Intent.ACTION_VIEW, webpage).apply {
-				),
+					addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+				}
+			context.startActivity(intent)
+		} catch (e: ActivityNotFoundException) {
+			Timber.e(e)
+			showSnackbarMessage(context.getString(R.string.no_browser_detected))
+		}
+	}
+
+	fun onVpnPermissionAccepted() {
+		_appUiState.update {
+			it.copy(
+				vpnPermissionAccepted = true,
 			)
 		}
 	}
 
-	fun onToggleKernelMode() = viewModelScope.launch {
+	fun launchEmail(context: Context) {
-		with(uiState.value.settings) {
+		try {
-			if (!isKernelEnabled) {
+			val intent =
-				requestRoot().onSuccess {
+				Intent(Intent.ACTION_SENDTO).apply {
-					if (!isKernelSupported()) return@onSuccess SnackbarController.showMessage(StringValue.StringResource(R.string.kernel_not_supported))
+					type = Constants.EMAIL_MIME_TYPE
-					appDataRepository.settings.save(
+					putExtra(Intent.EXTRA_EMAIL, arrayOf(context.getString(R.string.my_email)))
-						copy(
+					putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.email_subject))
-							isKernelEnabled = true,
+					addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-							isAmneziaEnabled = false,
+				}
-						),
+			context.startActivity(
+				Intent.createChooser(intent, context.getString(R.string.email_chooser)).apply {
+					addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+				},
+			)
+		} catch (e: ActivityNotFoundException) {
+			Timber.e(e)
+			showSnackbarMessage(context.getString(R.string.no_email_detected))
+		}
+	}
+
+	fun showSnackbarMessage(message: String) {
+		_appUiState.update {
+			it.copy(
+				snackbarMessage = message,
+				snackbarMessageConsumed = false,
 			)
 		}
-			} else {
-				saveKernelMode(enabled = false)
 	}
+
+	fun snackbarMessageConsumed() {
+		_appUiState.update {
+			it.copy(
+				snackbarMessage = "",
+				snackbarMessageConsumed = true,
+			)
 		}
 	}
 
-	private suspend fun isKernelSupported(): Boolean {
+	fun setNotificationPermissionAccepted(accepted: Boolean) {
-		return withContext(ioDispatcher) {
+		_appUiState.update {
-			WgQuickBackend.hasKernelSupport()
+			it.copy(
-		}
+				notificationPermissionAccepted = accepted,
-	}
+			)
-
-	private suspend fun requestRoot(): Result<Unit> {
-		return withContext(ioDispatcher) {
-			kotlin.runCatching {
-				rootShell.get().start()
-				SnackbarController.showMessage(StringValue.StringResource(R.string.root_accepted))
-			}.onFailure {
-				SnackbarController.showMessage(StringValue.StringResource(R.string.error_root_denied))
-			}
 		}
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/MainActivity.kt

@@ -1,118 +1,209 @@
 package com.zaneschepke.wireguardautotunnel.ui
 
-import android.content.Intent
+import android.Manifest
+import android.os.Build
 import android.os.Bundle
+import androidx.activity.SystemBarStyle
+import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
-import androidx.activity.viewModels
+import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.animation.core.tween
+import androidx.compose.foundation.focusable
-import androidx.compose.animation.fadeIn
+import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.Home
-import androidx.compose.material.icons.rounded.QuestionMark
-import androidx.compose.material.icons.rounded.Settings
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarData
+import androidx.compose.material3.SnackbarDuration
 import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.SnackbarResult
+import androidx.compose.material3.Text
 import androidx.compose.material3.surfaceColorAtElevation
-import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusProperties
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
+import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
-import androidx.navigation.toRoute
+import androidx.navigation.navArgument
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.isGranted
+import com.google.accompanist.permissions.rememberPermissionState
+import com.google.accompanist.permissions.shouldShowRationale
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
+import com.zaneschepke.wireguardautotunnel.ui.common.dialog.InfoDialog
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavBar
-import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavItem
+import com.zaneschepke.wireguardautotunnel.ui.common.prompt.CustomSnackBar
-import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
-import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.CustomSnackBar
-import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarControllerProvider
 import com.zaneschepke.wireguardautotunnel.ui.screens.config.ConfigScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.ConfigType
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.MainScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.options.OptionsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.pinlock.PinLockScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.scanner.ScannerScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.SettingsScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.AppearanceScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.display.DisplayScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.language.LanguageScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.AutoTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.disclosure.LocationDisclosureScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.killswitch.KillSwitchScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.SupportScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.logs.LogsScreen
 import com.zaneschepke.wireguardautotunnel.ui.theme.WireguardAutoTunnelTheme
-import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.StringValue
-import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import javax.inject.Inject
-import kotlin.system.exitProcess
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
-
 	@Inject
 	lateinit var appStateRepository: AppStateRepository
 
 	@Inject
-	lateinit var tunnelService: TunnelService
+	lateinit var settingsRepository: SettingsRepository
 
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
+	@OptIn(
+		ExperimentalPermissionsApi::class,
+	)
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 
-		val viewModel by viewModels<AppViewModel>()
+		val isPinLockEnabled = intent.extras?.getBoolean(SplashActivity.IS_PIN_LOCK_ENABLED_KEY)
 
-		installSplashScreen().apply {
+		enableEdgeToEdge(navigationBarStyle = SystemBarStyle.dark(Color.Transparent.toArgb()))
-			setKeepOnScreenCondition {
+
-				!viewModel.isAppReady.value
+		lifecycleScope.launch {
+			WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
+			val settings = settingsRepository.getSettings()
+			if (settings.isAutoTunnelEnabled) {
+				serviceManager.startWatcherService(application.applicationContext)
 			}
 		}
 
 		setContent {
-			val appUiState by viewModel.uiState.collectAsStateWithLifecycle()
+			val appViewModel = hiltViewModel<AppViewModel>()
-			val configurationChange by viewModel.configurationChange.collectAsStateWithLifecycle()
+			val appUiState by appViewModel.appUiState.collectAsStateWithLifecycle()
 			val navController = rememberNavController()
+			val navBackStackEntry by navController.currentBackStackEntryAsState()
+			var showVpnPermissionDialog by remember { mutableStateOf(false) }
 
-			LaunchedEffect(configurationChange) {
+			val notificationPermissionState =
-				if (configurationChange) {
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-					Intent(this@MainActivity, MainActivity::class.java).also {
+					rememberPermissionState(Manifest.permission.POST_NOTIFICATIONS)
-						startActivity(it)
+				} else {
-						exitProcess(0)
+					null
+				}
+
+			val snackbarHostState = remember { SnackbarHostState() }
+
+			val vpnActivityResultState =
+				rememberLauncherForActivityResult(
+					ActivityResultContracts.StartActivityForResult(),
+					onResult = {
+						val accepted = (it.resultCode == RESULT_OK)
+						if (accepted) {
+							appViewModel.onVpnPermissionAccepted()
+						} else {
+							showVpnPermissionDialog = true
+						}
+					},
+				)
+
+			fun showSnackBarMessage(message: StringValue) {
+				lifecycleScope.launch(Dispatchers.Main) {
+					val result =
+						snackbarHostState.showSnackbar(
+							message = message.asString(this@MainActivity),
+							duration = SnackbarDuration.Short,
+						)
+					when (result) {
+						SnackbarResult.ActionPerformed,
+						SnackbarResult.Dismissed,
+						-> {
+							snackbarHostState.currentSnackbarData?.dismiss()
+						}
 					}
 				}
 			}
 
-			LaunchedEffect(appUiState.autoTunnelActive) {
+			LaunchedEffect(appUiState.requestPermissions) {
-				requestAutoTunnelTileServiceUpdate()
+				if (appUiState.requestPermissions) {
+					appViewModel.permissionsRequested()
+					if (notificationPermissionState != null && !notificationPermissionState.status.isGranted
+					) {
+						notificationPermissionState.launchPermissionRequest()
+						return@LaunchedEffect if (notificationPermissionState.status.shouldShowRationale || !notificationPermissionState.status.isGranted) {
+							showSnackBarMessage(
+								StringValue.StringResource(R.string.notification_permission_required),
+							)
+						} else {
+							Unit
+						}
+					}
+					if (!appUiState.vpnPermissionAccepted) {
+						return@LaunchedEffect appViewModel.vpnIntent?.let {
+							vpnActivityResultState.launch(
+								it,
+							)
+						} ?: Unit
 					}
-
-			with(appUiState.settings) {
-				LaunchedEffect(isAutoTunnelEnabled) {
-					this@MainActivity.requestAutoTunnelTileServiceUpdate()
 				}
 			}
 
-			CompositionLocalProvider(LocalNavController provides navController) {
+			WireguardAutoTunnelTheme {
-				SnackbarControllerProvider { host ->
+				LaunchedEffect(Unit) {
-					WireguardAutoTunnelTheme(theme = appUiState.generalState.theme) {
+					appViewModel.setNotificationPermissionAccepted(
+						notificationPermissionState?.status?.isGranted ?: true,
+					)
+				}
+
+				LaunchedEffect(appUiState.snackbarMessageConsumed) {
+					if (!appUiState.snackbarMessageConsumed) {
+						showSnackBarMessage(StringValue.DynamicString(appUiState.snackbarMessage))
+						appViewModel.snackbarMessageConsumed()
+					}
+				}
+
+				val focusRequester = remember { FocusRequester() }
+
+				if (showVpnPermissionDialog) {
+					InfoDialog(
+						onDismiss = { showVpnPermissionDialog = false },
+						onAttest = { showVpnPermissionDialog = false },
+						title = { Text(text = stringResource(R.string.vpn_denied_dialog_title)) },
+						body = {
+							Column(verticalArrangement = Arrangement.spacedBy(15.dp)) {
+								Text(text = stringResource(R.string.vpn_denied_dialog_message))
+								Text(text = stringResource(R.string.vpn_denied_dialog_message2))
+							}
+						},
+						confirmText = { Text(text = stringResource(R.string.okay)) },
+					)
+				}
+
 				Scaffold(
-							contentWindowInsets = WindowInsets(0.dp),
 					snackbarHost = {
-								SnackbarHost(host) { snackbarData: SnackbarData ->
+						SnackbarHost(snackbarHostState) { snackbarData: SnackbarData ->
 							CustomSnackBar(
 								snackbarData.visuals.message,
 								isRtl = false,
@@ -123,105 +214,114 @@ class MainActivity : AppCompatActivity() {
 							)
 						}
 					},
+					// TODO refactor
+					modifier =
+					Modifier
+						.focusable()
+						.focusProperties {
+							when (navBackStackEntry?.destination?.route) {
+								Screen.Lock.route -> Unit
+								else -> up = focusRequester
+							}
+						},
 					bottomBar = {
 						BottomNavBar(
 							navController,
 							listOf(
-										BottomNavItem(
+								Screen.Main.navItem,
-											name = stringResource(R.string.tunnels),
+								Screen.Settings.navItem,
-											route = Route.Main,
+								Screen.Support.navItem,
-											icon = Icons.Rounded.Home,
-										),
-										BottomNavItem(
-											name = stringResource(R.string.settings),
-											route = Route.Settings,
-											icon = Icons.Rounded.Settings,
-										),
-										BottomNavItem(
-											name = stringResource(R.string.support),
-											route = Route.Support,
-											icon = Icons.Rounded.QuestionMark,
-										),
 							),
 						)
 					},
 				) { padding ->
-							Box(modifier = Modifier.fillMaxSize().padding(padding)) {
 					NavHost(
 						navController,
-									enterTransition = { fadeIn(tween(Constants.TRANSITION_ANIMATION_TIME)) },
+						startDestination = (if (isPinLockEnabled == true) Screen.Lock.route else Screen.Main.route),
-									exitTransition = { fadeOut(tween(Constants.TRANSITION_ANIMATION_TIME)) },
+						modifier =
-									startDestination = (if (appUiState.generalState.isPinLockEnabled) Route.Lock else Route.Main),
+						Modifier
+							.padding(padding)
+							.fillMaxSize(),
+					) {
+						composable(
+							Screen.Main.route,
 						) {
-									composable<Route.Main> {
 							MainScreen(
-											uiState = appUiState,
+								focusRequester = focusRequester,
+								appViewModel = appViewModel,
+								navController = navController,
 							)
 						}
-									composable<Route.Settings> {
+						composable(
+							Screen.Settings.route,
+						) {
 							SettingsScreen(
-											appViewModel = viewModel,
+								appViewModel = appViewModel,
-											uiState = appUiState,
+								navController = navController,
+								focusRequester = focusRequester,
 							)
 						}
-									composable<Route.LocationDisclosure> {
+						composable(
-										LocationDisclosureScreen(viewModel, appUiState)
+							Screen.Support.route,
-									}
+						) {
-									composable<Route.AutoTunnel> {
+							SupportScreen(
-										AutoTunnelScreen(
+								focusRequester = focusRequester,
-											appUiState,
+								appViewModel = appViewModel,
+								navController = navController,
 							)
 						}
-									composable<Route.Appearance> {
+						composable(Screen.Support.Logs.route) {
-										AppearanceScreen()
-									}
-									composable<Route.Language> {
-										LanguageScreen(appUiState, viewModel)
-									}
-									composable<Route.Display> {
-										DisplayScreen(appUiState)
-									}
-									composable<Route.Support> {
-										SupportScreen(appUiState, viewModel)
-									}
-									composable<Route.Logs> {
 							LogsScreen()
 						}
-									composable<Route.Config> {
+						composable(
-										val args = it.toRoute<Route.Config>()
+							"${Screen.Config.route}/{id}?configType={configType}",
+							arguments =
+							listOf(
+								navArgument("id") {
+									type = NavType.StringType
+									defaultValue = "0"
+								},
+								navArgument("configType") {
+									type = NavType.StringType
+									defaultValue = ConfigType.WIREGUARD.name
+								},
+							),
+						) {
+							val id = it.arguments?.getString("id")
+							val configType =
+								ConfigType.valueOf(
+									it.arguments?.getString("configType") ?: ConfigType.WIREGUARD.name,
+								)
+							if (!id.isNullOrBlank()) {
 								ConfigScreen(
-											tunnelId = args.id,
+									navController = navController,
+									tunnelId = id,
+									appViewModel = appViewModel,
+									focusRequester = focusRequester,
+									configType = configType,
 								)
 							}
-									composable<Route.Option> {
+						}
-										val args = it.toRoute<Route.Option>()
+						composable("${Screen.Option.route}/{id}") {
+							val id = it.arguments?.getString("id")
+							if (!id.isNullOrBlank()) {
 								OptionsScreen(
-											tunnelId = args.id,
+									navController = navController,
-											appUiState = appUiState,
+									tunnelId = id,
+									appViewModel = appViewModel,
+									focusRequester = focusRequester,
 								)
 							}
-									composable<Route.Lock> {
+						}
+						composable(Screen.Lock.route) {
 							PinLockScreen(
-											appViewModel = viewModel,
+								navController = navController,
+								appViewModel = appViewModel,
 							)
 						}
-									composable<Route.Scanner> {
-										ScannerScreen()
-									}
-									composable<Route.KillSwitch> {
-										KillSwitchScreen(appUiState, viewModel)
 					}
 				}
 			}
 		}
 	}
 }
-			}
-		}
-	}
-	override fun onDestroy() {
-		super.onDestroy()
-		// save battery by not polling stats while app is closed
-		tunnelService.cancelActiveTunnelJobs()
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/Route.kt

@@ -1,51 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui
-
-import kotlinx.serialization.Serializable
-
-sealed class Route {
-	@Serializable
-	data object Support : Route()
-
-	@Serializable
-	data object Settings : Route()
-
-	@Serializable
-	data object AutoTunnel : Route()
-
-	@Serializable
-	data object LocationDisclosure : Route()
-
-	@Serializable
-	data object Appearance : Route()
-
-	@Serializable
-	data object Display : Route()
-
-	@Serializable
-	data object KillSwitch : Route()
-
-	@Serializable
-	data object Language : Route()
-
-	@Serializable
-	data object Main : Route()
-
-	@Serializable
-	data class Option(
-		val id: Int,
-	) : Route()
-
-	@Serializable
-	data object Lock : Route()
-
-	@Serializable
-	data object Scanner : Route()
-
-	@Serializable
-	data class Config(
-		val id: Int,
-	) : Route()
-
-	@Serializable
-	data object Logs : Route()
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/Screen.kt

@@ -0,0 +1,46 @@
+package com.zaneschepke.wireguardautotunnel.ui
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Home
+import androidx.compose.material.icons.rounded.QuestionMark
+import androidx.compose.material.icons.rounded.Settings
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavItem
+
+sealed class Screen(val route: String) {
+	data object Main : Screen("main") {
+		val navItem =
+			BottomNavItem(
+				name = WireGuardAutoTunnel.instance.getString(R.string.tunnels),
+				route = route,
+				icon = Icons.Rounded.Home,
+			)
+	}
+
+	data object Settings : Screen("settings") {
+		val navItem =
+			BottomNavItem(
+				name = WireGuardAutoTunnel.instance.getString(R.string.settings),
+				route = route,
+				icon = Icons.Rounded.Settings,
+			)
+	}
+
+	data object Support : Screen("support") {
+		val navItem =
+			BottomNavItem(
+				name = WireGuardAutoTunnel.instance.getString(R.string.support),
+				route = route,
+				icon = Icons.Rounded.QuestionMark,
+			)
+
+		data object Logs : Screen("support/logs")
+	}
+
+	data object Config : Screen("config")
+
+	data object Lock : Screen("lock")
+
+	data object Option : Screen("option")
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/SplashActivity.kt

@@ -0,0 +1,67 @@
+package com.zaneschepke.wireguardautotunnel.ui
+
+import android.annotation.SuppressLint
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.zaneschepke.logcatter.LocalLogCollector
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel.Companion.isRunningOnAndroidTv
+import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
+import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import xyz.teamgravity.pin_lock_compose.PinManager
+import javax.inject.Inject
+
+@SuppressLint("CustomSplashScreen")
+@AndroidEntryPoint
+class SplashActivity : ComponentActivity() {
+	@Inject
+	lateinit var appStateRepository: AppStateRepository
+
+	@Inject
+	lateinit var localLogCollector: LocalLogCollector
+
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+			val splashScreen = installSplashScreen()
+			splashScreen.setKeepOnScreenCondition { true }
+		}
+		super.onCreate(savedInstanceState)
+
+		applicationScope.launch {
+			if (!isRunningOnAndroidTv()) localLogCollector.start()
+		}
+
+		lifecycleScope.launch {
+			repeatOnLifecycle(Lifecycle.State.CREATED) {
+				val pinLockEnabled = appStateRepository.isPinLockEnabled()
+				if (pinLockEnabled) {
+					PinManager.initialize(WireGuardAutoTunnel.instance)
+				}
+
+				val intent =
+					Intent(this@SplashActivity, MainActivity::class.java).apply {
+						putExtra(IS_PIN_LOCK_ENABLED_KEY, pinLockEnabled)
+					}
+				startActivity(intent)
+				finish()
+			}
+		}
+	}
+
+	companion object {
+		const val IS_PIN_LOCK_ENABLED_KEY = "is_pin_lock_enabled"
+	}
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/ClickableIconButton.kt

@@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
@@ -13,12 +12,12 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 
 @Composable
-fun ClickableIconButton(onClick: () -> Unit, onIconClick: () -> Unit, text: String, icon: ImageVector, enabled: Boolean = true) {
+fun ClickableIconButton(onClick: () -> Unit, onIconClick: () -> Unit, text: String, icon: ImageVector, enabled: Boolean) {
 	TextButton(
 		onClick = onClick,
 		enabled = enabled,
 	) {
-		Text(text, Modifier.weight(1f, false), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.primary)
+		Text(text, Modifier.weight(1f, false))
 		Spacer(modifier = Modifier.size(ButtonDefaults.IconSpacing))
 		Icon(
 			imageVector = icon,

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/ExpandingRowListItem.kt

@@ -1,65 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common
-
-import androidx.compose.animation.animateContentSize
-import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-
-@OptIn(ExperimentalFoundationApi::class)
-@Composable
-fun ExpandingRowListItem(
-	leading: @Composable () -> Unit,
-	text: String,
-	onHold: () -> Unit = {},
-	onClick: () -> Unit,
-	trailing: @Composable () -> Unit,
-	isExpanded: Boolean,
-	expanded: @Composable () -> Unit = {},
-) {
-	Box(
-		modifier =
-		Modifier
-			.animateContentSize()
-			.clip(RoundedCornerShape(30.dp))
-			.combinedClickable(
-				onClick = { onClick() },
-				onLongClick = { onHold() },
-			),
-	) {
-		Column {
-			Row(
-				modifier =
-				Modifier
-					.fillMaxWidth()
-					.padding(horizontal = 15.dp),
-				verticalAlignment = Alignment.CenterVertically,
-				horizontalArrangement = Arrangement.SpaceBetween,
-			) {
-				Row(
-					verticalAlignment = Alignment.CenterVertically,
-					horizontalArrangement = Arrangement.spacedBy(15.dp),
-					modifier = Modifier.fillMaxWidth(13 / 20f),
-				) {
-					leading()
-					Text(text, maxLines = 1, overflow = TextOverflow.Ellipsis, style = MaterialTheme.typography.labelLarge)
-				}
-				trailing()
-			}
-			if (isExpanded) expanded()
-		}
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/NestedScrollListener.kt

@@ -1,13 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common
-
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
-import androidx.compose.ui.input.nestedscroll.NestedScrollSource
-
-class NestedScrollListener(val onUp: () -> Unit, val onDown: () -> Unit) : NestedScrollConnection {
-	override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
-		if (available.y < -1) onDown()
-		if (available.y > 1) onUp()
-		return Offset.Zero
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/RowListItem.kt

@@ -0,0 +1,99 @@
+package com.zaneschepke.wireguardautotunnel.ui.common
+
+import androidx.compose.animation.animateContentSize
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStatistics
+import com.zaneschepke.wireguardautotunnel.util.NumberUtils
+import com.zaneschepke.wireguardautotunnel.util.toThreeDecimalPlaceString
+
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+fun RowListItem(
+	icon: @Composable () -> Unit,
+	text: String,
+	onHold: () -> Unit,
+	onClick: () -> Unit,
+	rowButton: @Composable () -> Unit,
+	expanded: Boolean,
+	statistics: TunnelStatistics?,
+	focusRequester: FocusRequester,
+) {
+	Box(
+		modifier =
+		Modifier
+			.focusRequester(focusRequester)
+			.animateContentSize()
+			.clip(RoundedCornerShape(30.dp))
+			.combinedClickable(
+				onClick = { onClick() },
+				onLongClick = { onHold() },
+			),
+	) {
+		Column {
+			Row(
+				modifier =
+				Modifier
+					.fillMaxWidth()
+					.padding(horizontal = 15.dp, vertical = 5.dp),
+				verticalAlignment = Alignment.CenterVertically,
+				horizontalArrangement = Arrangement.SpaceBetween,
+			) {
+				Row(
+					verticalAlignment = Alignment.CenterVertically,
+					modifier = Modifier.fillMaxWidth(13 / 20f),
+				) {
+					icon()
+					Text(text, maxLines = 1, overflow = TextOverflow.Ellipsis)
+				}
+				rowButton()
+			}
+			if (expanded) {
+				statistics?.getPeers()?.forEach {
+					Row(
+						modifier =
+						Modifier
+							.fillMaxWidth()
+							.padding(end = 10.dp, bottom = 10.dp, start = 10.dp),
+						verticalAlignment = Alignment.CenterVertically,
+						horizontalArrangement = Arrangement.SpaceEvenly,
+					) {
+						// TODO change these to string resources
+						val handshakeEpoch = statistics.peerStats(it)!!.latestHandshakeEpochMillis
+						val peerTx = statistics.peerStats(it)!!.txBytes
+						val peerRx = statistics.peerStats(it)!!.rxBytes
+						val peerId = it.toBase64().subSequence(0, 3).toString() + "***"
+						val handshakeSec =
+							NumberUtils.getSecondsBetweenTimestampAndNow(handshakeEpoch)
+						val handshake =
+							if (handshakeSec == null) "never" else "$handshakeSec secs ago"
+						val peerTxMB = NumberUtils.bytesToMB(peerTx).toThreeDecimalPlaceString()
+						val peerRxMB = NumberUtils.bytesToMB(peerRx).toThreeDecimalPlaceString()
+						val fontSize = 9.sp
+						Text("peer: $peerId", fontSize = fontSize)
+						Text("handshake: $handshake", fontSize = fontSize)
+						Text("tx: $peerTxMB MB", fontSize = fontSize)
+						Text("rx: $peerRxMB MB", fontSize = fontSize)
+					}
+				}
+			}
+		}
+	}
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/SelectedLabel.kt

@@ -1,37 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
-
-@Composable
-fun SelectedLabel() {
-	Row(
-		modifier = Modifier.fillMaxWidth(),
-		horizontalArrangement = Arrangement.End,
-		verticalAlignment = Alignment.CenterVertically,
-	) {
-		Text(
-			stringResource(id = R.string.selected),
-			modifier =
-			Modifier.padding(
-				horizontal = 24.dp.scaledWidth(),
-				vertical = 16.dp.scaledHeight(),
-			),
-			color =
-			MaterialTheme.colorScheme.onSurfaceVariant,
-			style = MaterialTheme.typography.labelSmall,
-		)
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/button/IconSurfaceButton.kt

@@ -1,99 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.button
-
-import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.IntrinsicSize
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
-
-@androidx.compose.runtime.Composable
-fun IconSurfaceButton(title: String, onClick: () -> Unit, selected: Boolean, leadingIcon: ImageVector? = null, description: String? = null) {
-	val border: BorderStroke? =
-		if (selected) {
-			BorderStroke(
-				1.dp,
-				MaterialTheme.colorScheme.primary,
-			)
-		} else {
-			null
-		}
-	Card(
-		modifier =
-		Modifier
-			.fillMaxWidth()
-			.height(IntrinsicSize.Min),
-		shape = RoundedCornerShape(8.dp),
-		border = border,
-		colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface),
-	) {
-		Box(
-			modifier = Modifier.clickable { onClick() }
-				.fillMaxWidth(),
-		) {
-			Column(
-				modifier =
-				Modifier
-					.padding(horizontal = 8.dp.scaledWidth(), vertical = 10.dp.scaledHeight())
-					.padding(end = 16.dp.scaledWidth()).padding(start = 8.dp.scaledWidth())
-					.fillMaxSize(),
-				verticalArrangement = Arrangement.Center,
-				horizontalAlignment = Alignment.Start,
-			) {
-				Row(
-					verticalAlignment = Alignment.Companion.CenterVertically,
-					horizontalArrangement = Arrangement.spacedBy(16.dp.scaledWidth()),
-				) {
-					Row(
-						horizontalArrangement = Arrangement.spacedBy(
-							16.dp.scaledWidth(),
-						),
-						verticalAlignment = Alignment.Companion.CenterVertically,
-						modifier = Modifier.padding(vertical = if (description == null) 10.dp.scaledHeight() else 0.dp),
-					) {
-						leadingIcon?.let {
-							Icon(
-								leadingIcon,
-								leadingIcon.name,
-								Modifier.size(iconSize),
-								if (selected) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurface,
-							)
-						}
-						Column {
-							Text(
-								title,
-								style = MaterialTheme.typography.titleMedium,
-							)
-							description?.let {
-								Text(
-									description,
-									color = MaterialTheme.colorScheme.onSurfaceVariant,
-									style = MaterialTheme.typography.bodyMedium,
-								)
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/button/ScaledSwitch.kt

@@ -1,18 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.button
-
-import androidx.compose.material3.Switch
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.scale
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
-
-@Composable
-fun ScaledSwitch(checked: Boolean, onClick: (checked: Boolean) -> Unit, enabled: Boolean = true, modifier: Modifier = Modifier) {
-	Switch(
-		checked,
-		{ onClick(it) },
-		modifier.scale((52.dp.scaledHeight() / 52.dp)),
-		enabled = enabled,
-	)
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/button/SelectionItemButton.kt

@@ -1,63 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.button
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.ripple
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
-
-@Composable
-fun SelectionItemButton(
-	leading: (@Composable () -> Unit)? = null,
-	buttonText: String,
-	trailing: (@Composable () -> Unit)? = null,
-	onClick: () -> Unit,
-	ripple: Boolean = true,
-) {
-	Card(
-		modifier =
-		Modifier.clip(RoundedCornerShape(8.dp))
-			.clickable(
-				indication = if (ripple) ripple() else null,
-				interactionSource = remember { MutableInteractionSource() },
-				onClick = { onClick() },
-			)
-			.height(56.dp.scaledHeight()),
-		colors =
-		CardDefaults.cardColors(
-			containerColor = MaterialTheme.colorScheme.background,
-		),
-	) {
-		Row(
-			verticalAlignment = Alignment.CenterVertically,
-			horizontalArrangement = Arrangement.Start,
-			modifier = Modifier.fillMaxSize(),
-		) {
-			leading?.let {
-				it()
-			}
-			Text(
-				buttonText,
-				style = MaterialTheme.typography.bodyLarge,
-				color = MaterialTheme.colorScheme.onSurface,
-			)
-			trailing?.let {
-				it()
-			}
-		}
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/button/surface/SelectionItem.kt

@@ -1,13 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.button.surface
-
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.vector.ImageVector
-
-data class SelectionItem(
-	val leadingIcon: ImageVector? = null,
-	val trailing: (@Composable () -> Unit)? = null,
-	val title: (@Composable () -> Unit),
-	val description: (@Composable () -> Unit)? = null,
-	val onClick: (() -> Unit)? = null,
-	val height: Int = 64,
-)

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/button/surface/SurfaceSelectionGroupButton.kt

@@ -1,86 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.button.surface
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Card
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
-
-@Composable
-fun SurfaceSelectionGroupButton(items: List<SelectionItem>) {
-	Card(
-		modifier = Modifier.fillMaxWidth(),
-		shape = RoundedCornerShape(8.dp),
-		colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface),
-	) {
-		items.mapIndexed { index, item ->
-			Box(
-				contentAlignment = Alignment.Center,
-				modifier = Modifier
-					.then(item.onClick?.let { Modifier.clickable { it() } } ?: Modifier)
-					.fillMaxWidth(),
-			) {
-				Row(
-					verticalAlignment = Alignment.CenterVertically,
-					modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp.scaledHeight()),
-				) {
-					Row(
-						verticalAlignment = Alignment.CenterVertically,
-						modifier = Modifier
-							.padding(start = 16.dp.scaledWidth())
-							.weight(4f, false)
-							.fillMaxWidth(),
-					) {
-						item.leadingIcon?.let { icon ->
-							Icon(
-								icon,
-								icon.name,
-								modifier = Modifier.size(iconSize),
-							)
-						}
-						Column(
-							horizontalAlignment = Alignment.Start,
-							verticalArrangement = Arrangement.spacedBy(2.dp, Alignment.CenterVertically),
-							modifier = Modifier
-								.fillMaxWidth()
-								.padding(start = if (item.leadingIcon != null) 16.dp.scaledWidth() else 0.dp)
-								.padding(vertical = if (item.description == null) 16.dp.scaledHeight() else 6.dp.scaledHeight()),
-						) {
-							item.title()
-							item.description?.let {
-								it()
-							}
-						}
-					}
-					item.trailing?.let {
-						Box(
-							contentAlignment = Alignment.CenterEnd,
-							modifier = Modifier
-								.padding(end = 24.dp.scaledWidth(), start = 16.dp.scaledWidth())
-								.weight(1f),
-						) {
-							it()
-						}
-					}
-				}
-			}
-			if (index + 1 != items.size) HorizontalDivider(color = MaterialTheme.colorScheme.outlineVariant)
-		}
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/config/ConfigurationTextBox.kt

@@ -1,6 +1,5 @@
 package com.zaneschepke.wireguardautotunnel.ui.common.config
 
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.OutlinedTextField
@@ -15,29 +14,23 @@ fun ConfigurationTextBox(
 	value: String,
 	hint: String,
 	onValueChange: (String) -> Unit,
-	keyboardActions: KeyboardActions = KeyboardActions(),
+	keyboardActions: KeyboardActions,
 	label: String,
 	modifier: Modifier,
-	isError: Boolean = false,
-	keyboardOptions: KeyboardOptions = KeyboardOptions(
-		capitalization = KeyboardCapitalization.None,
-		imeAction = ImeAction.Done,
-	),
-	trailing: @Composable () -> Unit = {},
-	interactionSource: MutableInteractionSource? = null,
 ) {
 	OutlinedTextField(
-		isError = isError,
 		modifier = modifier,
 		value = value,
 		singleLine = true,
-		interactionSource = interactionSource,
 		onValueChange = { onValueChange(it) },
 		label = { Text(label) },
 		maxLines = 1,
 		placeholder = { Text(hint) },
-		keyboardOptions = keyboardOptions,
+		keyboardOptions =
+		KeyboardOptions(
+			capitalization = KeyboardCapitalization.None,
+			imeAction = ImeAction.Done,
+		),
 		keyboardActions = keyboardActions,
-		trailingIcon = trailing,
 	)
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/config/ConfigurationToggle.kt

@@ -3,33 +3,28 @@ package com.zaneschepke.wireguardautotunnel.ui.common.config
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.material3.MaterialTheme
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.Dp
 
 @Composable
-fun ConfigurationToggle(
+fun ConfigurationToggle(label: String, enabled: Boolean, checked: Boolean, padding: Dp, onCheckChanged: () -> Unit, modifier: Modifier = Modifier) {
-	label: String,
-	enabled: Boolean = true,
-	checked: Boolean,
-	onCheckChanged: (checked: Boolean) -> Unit,
-	modifier: Modifier = Modifier,
-) {
 	Row(
 		modifier =
 		Modifier
-			.fillMaxWidth(),
+			.fillMaxWidth()
+			.padding(padding),
 		verticalAlignment = Alignment.CenterVertically,
 		horizontalArrangement = Arrangement.SpaceBetween,
 	) {
 		Text(
 			label,
 			textAlign = TextAlign.Start,
-			style = MaterialTheme.typography.labelLarge,
 			modifier =
 			Modifier
 				.weight(
@@ -42,7 +37,7 @@ fun ConfigurationToggle(
 			modifier = modifier,
 			enabled = enabled,
 			checked = checked,
-			onCheckedChange = { onCheckChanged(it) },
+			onCheckedChange = { onCheckChanged() },
 		)
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/config/SubmitConfigurationTextBox.kt

@@ -1,88 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.config
-
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.interaction.collectIsFocusedAsState
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.text.KeyboardActions
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Save
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalFocusManager
-import androidx.compose.ui.platform.LocalSoftwareKeyboardController
-import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.ui.common.textbox.CustomTextField
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
-
-@Composable
-fun SubmitConfigurationTextBox(
-	value: String?,
-	label: String,
-	hint: String,
-	isErrorValue: (value: String?) -> Boolean,
-	onSubmit: (value: String) -> Unit,
-	keyboardOptions: KeyboardOptions = KeyboardOptions(
-		capitalization = KeyboardCapitalization.None,
-		imeAction = ImeAction.Done,
-	),
-) {
-	val focusManager = LocalFocusManager.current
-	val interactionSource = remember { MutableInteractionSource() }
-	val isFocused by interactionSource.collectIsFocusedAsState()
-	val keyboardController = LocalSoftwareKeyboardController.current
-
-	var stateValue by remember { mutableStateOf(value ?: "") }
-
-	CustomTextField(
-		isError = isErrorValue(stateValue),
-		textStyle = MaterialTheme.typography.bodySmall,
-		value = stateValue,
-		onValueChange = { stateValue = it },
-		interactionSource = interactionSource,
-		label = { Text(label) },
-		containerColor = MaterialTheme.colorScheme.surface,
-		placeholder = { Text(hint, style = MaterialTheme.typography.bodySmall) },
-		modifier =
-		Modifier
-			.padding(
-				top = 5.dp,
-				bottom = 10.dp,
-			).fillMaxWidth().padding(end = 16.dp.scaledWidth()),
-		singleLine = true,
-		keyboardOptions = keyboardOptions,
-		keyboardActions = KeyboardActions(
-			onDone = {
-				onSubmit(stateValue)
-				keyboardController?.hide()
-			},
-		),
-		trailing = {
-			if (!isErrorValue(stateValue) && isFocused) {
-				IconButton(onClick = {
-					onSubmit(stateValue)
-					keyboardController?.hide()
-					focusManager.clearFocus()
-				}) {
-					val icon = Icons.Outlined.Save
-					Icon(
-						imageVector = icon,
-						contentDescription = icon.name,
-						tint = MaterialTheme.colorScheme.primary,
-					)
-				}
-			}
-		},
-	)
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/functions/Functions.kt

@@ -1,60 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.functions
-
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.net.Uri
-import android.os.Build
-import androidx.activity.compose.ManagedActivityResultLauncher
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.runtime.Composable
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
-
-@Composable
-fun rememberFileImportLauncherForResult(onNoFileExplorer: () -> Unit, onData: (data: Uri) -> Unit): ManagedActivityResultLauncher<String, Uri?> {
-	return rememberLauncherForActivityResult(
-		object : ActivityResultContracts.GetContent() {
-			override fun createIntent(context: Context, input: String): Intent {
-				val intent = super.createIntent(context, input).apply {
-					type = if (context.isRunningOnTv()) {
-						Constants.ALLOWED_TV_FILE_TYPES
-					} else {
-						Constants.ALL_FILE_TYPES
-					}
-				}
-
-				/* AndroidTV now comes with stubs that do nothing but display a Toast less helpful than
-				 * what we can do, so detect this and throw an exception that we can catch later. */
-				val activitiesToResolveIntent =
-					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-						context.packageManager.queryIntentActivities(
-							intent,
-							PackageManager.ResolveInfoFlags.of(
-								PackageManager.MATCH_DEFAULT_ONLY.toLong(),
-							),
-						)
-					} else {
-						context.packageManager.queryIntentActivities(
-							intent,
-							PackageManager.MATCH_DEFAULT_ONLY,
-						)
-					}
-				if (
-					activitiesToResolveIntent.all {
-						val name = it.activityInfo.packageName
-						name.startsWith(Constants.GOOGLE_TV_EXPLORER_STUB) ||
-							name.startsWith(Constants.ANDROID_TV_EXPLORER_STUB)
-					}
-				) {
-					onNoFileExplorer()
-				}
-				return intent
-			}
-		},
-	) { data ->
-		if (data == null) return@rememberLauncherForActivityResult
-		onData(data)
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/label/GroupLabel.kt

@@ -1,21 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.label
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-
-@Composable
-fun GroupLabel(title: String) {
-	Row(
-		verticalAlignment = Alignment.CenterVertically,
-		horizontalArrangement = Arrangement.Start,
-	) {
-		Text(
-			title,
-			style = MaterialTheme.typography.titleMedium,
-		)
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/label/VersionLabel.kt

@@ -1,33 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.label
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalClipboardManager
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.AnnotatedString
-import com.zaneschepke.wireguardautotunnel.BuildConfig
-import com.zaneschepke.wireguardautotunnel.R
-
-@Composable
-fun VersionLabel() {
-	val clipboardManager = LocalClipboardManager.current
-	Row(
-		verticalAlignment = Alignment.CenterVertically,
-		horizontalArrangement = Arrangement.Start,
-	) {
-		Text(
-			"${stringResource(R.string.version)}: ${BuildConfig.VERSION_NAME}",
-			style = MaterialTheme.typography.labelMedium,
-			color = MaterialTheme.colorScheme.outline,
-			modifier = Modifier.clickable {
-				clipboardManager.setText(AnnotatedString(BuildConfig.VERSION_NAME))
-			},
-		)
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/navigation/BottomNavBar.kt

@@ -10,45 +10,40 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
 import androidx.navigation.NavController
-import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.compose.currentBackStackEntryAsState
+import com.zaneschepke.wireguardautotunnel.ui.Screen
 
 @Composable
 fun BottomNavBar(navController: NavController, bottomNavItems: List<BottomNavItem>) {
+	val backStackEntry = navController.currentBackStackEntryAsState()
+
 	var showBottomBar by rememberSaveable { mutableStateOf(true) }
 	val navBackStackEntry by navController.currentBackStackEntryAsState()
 
-	showBottomBar = bottomNavItems.any {
+	// TODO find a better way to hide nav bar
-		navBackStackEntry?.isCurrentRoute(it.route::class) == true
+	showBottomBar =
+		when (navBackStackEntry?.destination?.route) {
+			Screen.Lock.route -> false
+			else -> true
 		}
 
-	if (showBottomBar) {
 	NavigationBar(
-			containerColor = MaterialTheme.colorScheme.surface,
+		containerColor = if (!showBottomBar) Color.Transparent else MaterialTheme.colorScheme.background,
 	) {
-			bottomNavItems.forEachIndexed { index, item ->
+		if (showBottomBar) {
-				val selected = navBackStackEntry.isCurrentRoute(item.route::class)
+			bottomNavItems.forEach { item ->
+				val selected = item.route == backStackEntry.value?.destination?.route
+
 				NavigationBarItem(
 					selected = selected,
-					onClick = {
+					onClick = { navController.navigate(item.route) },
-						if (selected) return@NavigationBarItem
-						navController.navigate(item.route) {
-							// Pop up to the start destination of the graph to
-							// avoid building up a large stack of destinations
-							// on the back stack as users select items
-							popUpTo(navController.graph.findStartDestination().id) {
-								saveState = true
-							}
-							// Avoid multiple copies of the same destination when
-							// reselecting the same item
-							launchSingleTop = true
-						}
-					},
 					label = {
 						Text(
 							text = item.name,
-							style = MaterialTheme.typography.labelMedium,
+							fontWeight = FontWeight.SemiBold,
 						)
 					},
 					icon = {

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/navigation/BottomNavItem.kt

@@ -1,10 +1,9 @@
 package com.zaneschepke.wireguardautotunnel.ui.common.navigation
 
 import androidx.compose.ui.graphics.vector.ImageVector
-import com.zaneschepke.wireguardautotunnel.ui.Route
 
 data class BottomNavItem(
 	val name: String,
-	val route: Route,
+	val route: String,
 	val icon: ImageVector,
 )

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/navigation/Extensions.kt

@@ -1,15 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.navigation
-
-import android.annotation.SuppressLint
-import androidx.navigation.NavBackStackEntry
-import androidx.navigation.NavDestination.Companion.hasRoute
-import androidx.navigation.NavDestination.Companion.hierarchy
-import com.zaneschepke.wireguardautotunnel.ui.Route
-import kotlin.reflect.KClass
-
-@SuppressLint("RestrictedApi")
-fun <T : Route> NavBackStackEntry?.isCurrentRoute(cls: KClass<T>): Boolean {
-	return this?.destination?.hierarchy?.any {
-		it.hasRoute(route = cls)
-	} == true
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/navigation/LocalNavController.kt

@@ -1,8 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.navigation
-
-import androidx.compose.runtime.compositionLocalOf
-import androidx.navigation.NavHostController
-
-val LocalNavController = compositionLocalOf<NavHostController> {
-	error("NavController was not provided")
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/navigation/TopNavBar.kt

@@ -1,35 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.navigation
-
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.outlined.ArrowBack
-import androidx.compose.material3.CenterAlignedTopAppBar
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun TopNavBar(title: String, trailing: @Composable () -> Unit = {}, showBack: Boolean = true) {
-	val navController = LocalNavController.current
-	CenterAlignedTopAppBar(
-		title = {
-			Text(title)
-		},
-		navigationIcon = {
-			if (showBack) {
-				IconButton(onClick = { navController.popBackStack() }) {
-					val icon = Icons.AutoMirrored.Outlined.ArrowBack
-					Icon(
-						imageVector = icon,
-						contentDescription = icon.name,
-					)
-				}
-			}
-		},
-		actions = {
-			trailing()
-		},
-	)
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/permission/vpn/VpnDeniedDialog.kt

@@ -1,49 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.permission.vpn
-
-import androidx.compose.foundation.text.ClickableText
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.buildAnnotatedString
-import androidx.compose.ui.text.withStyle
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.common.dialog.InfoDialog
-import com.zaneschepke.wireguardautotunnel.util.extensions.launchVpnSettings
-
-@Composable
-fun VpnDeniedDialog(show: Boolean, onDismiss: () -> Unit) {
-	val context = LocalContext.current
-	if (show) {
-		val alwaysOnDescription = buildAnnotatedString {
-			append(stringResource(R.string.always_on_message))
-			append(" ")
-			pushStringAnnotation(tag = "vpnSettings", annotation = "")
-			withStyle(style = SpanStyle(color = MaterialTheme.colorScheme.primary)) {
-				append(stringResource(id = R.string.vpn_settings))
-			}
-			pop()
-			append(" ")
-			append(stringResource(R.string.always_on_message2))
-			append(".")
-		}
-		InfoDialog(
-			onDismiss = { onDismiss() },
-			onAttest = { onDismiss() },
-			title = { Text(text = stringResource(R.string.vpn_denied_dialog_title)) },
-			body = {
-				ClickableText(
-					text = alwaysOnDescription,
-					style = MaterialTheme.typography.bodyMedium.copy(color = MaterialTheme.colorScheme.outline),
-				) {
-					alwaysOnDescription.getStringAnnotations(tag = "vpnSettings", it, it).firstOrNull()?.let {
-						context.launchVpnSettings()
-					}
-				}
-			},
-			confirmText = { Text(text = stringResource(R.string.okay)) },
-		)
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/permission/vpn/withVpnPermission.kt

@@ -1,38 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.permission.vpn
-
-import android.net.VpnService
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AppCompatActivity.RESULT_OK
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.platform.LocalContext
-
-@Composable
-inline fun <T> withVpnPermission(crossinline onSuccess: (t: T) -> Unit): (t: T) -> Unit {
-	val context = LocalContext.current
-
-	var showVpnPermissionDialog by remember { mutableStateOf(false) }
-
-	val vpnActivity =
-		rememberLauncherForActivityResult(
-			ActivityResultContracts.StartActivityForResult(),
-			onResult = {
-				if (it.resultCode != RESULT_OK) showVpnPermissionDialog = true
-			},
-		)
-
-	VpnDeniedDialog(showVpnPermissionDialog, onDismiss = { showVpnPermissionDialog = false })
-
-	return {
-		val intent = VpnService.prepare(context)
-		if (intent != null) {
-			vpnActivity.launch(intent)
-		} else {
-			onSuccess(it)
-		}
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/permission/withIgnoreBatteryOpt.kt

@@ -1,35 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.permission
-
-import android.content.Intent
-import android.net.Uri
-import android.provider.Settings
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.result.ActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalContext
-import com.zaneschepke.wireguardautotunnel.util.extensions.isBatteryOptimizationsDisabled
-
-@Composable
-inline fun withIgnoreBatteryOpt(ignore: Boolean, crossinline callback: () -> Unit): () -> Unit {
-	val context = LocalContext.current
-	val batteryActivity =
-		rememberLauncherForActivityResult(
-			ActivityResultContracts.StartActivityForResult(),
-		) { result: ActivityResult ->
-			// we only ask once
-			callback()
-		}
-	return {
-		if (ignore || context.isBatteryOptimizationsDisabled()) {
-			callback()
-		} else {
-			batteryActivity.launch(
-				Intent().apply {
-					action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
-					data = Uri.parse("package:${context.packageName}")
-				},
-			)
-		}
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/prompt/CustomSnackbar.kt

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.snackbar
+package com.zaneschepke.wireguardautotunnel.ui.common.prompt
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.IntrinsicSize
@@ -19,21 +19,19 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 
 @Composable
 fun CustomSnackBar(message: String, isRtl: Boolean = true, containerColor: Color = MaterialTheme.colorScheme.surface) {
-	val context = LocalContext.current
 	Snackbar(
 		containerColor = containerColor,
 		modifier =
 		Modifier
 			.fillMaxWidth(
-				if (context.isRunningOnTv()) 1 / 3f else 2 / 3f,
+				if (WireGuardAutoTunnel.isRunningOnAndroidTv()) 1 / 3f else 2 / 3f,
 			)
 			.padding(bottom = 100.dp),
 		shape = RoundedCornerShape(16.dp),
@@ -53,10 +51,10 @@ fun CustomSnackBar(message: String, isRtl: Boolean = true, containerColor: Color
 				Icon(
 					icon,
 					contentDescription = icon.name,
-					tint = MaterialTheme.colorScheme.onSurface,
+					tint = Color.White,
 					modifier = Modifier.padding(end = 10.dp),
 				)
-				Text(message, color = MaterialTheme.colorScheme.onSurface, modifier = Modifier.padding(end = 5.dp))
+				Text(message, color = Color.White, modifier = Modifier.padding(end = 5.dp))
 			}
 		}
 	}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/screen/LoadingScreen.kt

@@ -0,0 +1,27 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.screen
+
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun LoadingScreen() {
+	Column(
+		horizontalAlignment = Alignment.CenterHorizontally,
+		verticalArrangement = Arrangement.Top,
+		modifier =
+		Modifier
+			.fillMaxSize()
+			.focusable()
+			.padding(),
+	) {
+		Column(modifier = Modifier.padding(120.dp)) { CircularProgressIndicator() }
+	}
+}