fix: cd

revert some ui changes

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -15,6 +15,7 @@ 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/on-issue.yml

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

.github/workflows/on-publish.yml

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

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: release-android
 
 on:
   schedule:
-    - cron: "4 3 * * *"
+  - cron: "4 3 * * *"
   workflow_dispatch:
     inputs:
       track:
@@ -14,7 +14,7 @@ on:
           - alpha
           - beta
           - production
-        default: alpha
+        default: none
         required: true
       release_type:
         type: choice
@@ -30,13 +30,34 @@ on:
         description: "Tag name for release"
         required: false
         default: nightly
+  workflow_call:
 
 jobs:
-  build:
-    name: Build Signed APK
-    if: ${{ inputs.release_type != 'none' }}
+  check_commits:
     runs-on: ubuntu-latest
+    outputs:
+        new_commits: ${{ steps.check_last_commit.outputs.new_commits }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
 
+      - name: Check for new commits in the last 23 hours
+        id: check_last_commit
+        run: |
+          if git log --since="23 hours ago" --oneline | grep -q .; then
+            echo "New commits found in the last 23 hours."
+            echo "new_commits=true" >> $GITHUB_OUTPUT
+          else
+            echo "No new commits in the last 23 hours."
+            echo "new_commits=false" >> $GITHUB_OUTPUT
+          fi
+  build:
+    needs: check_commits
+    if: needs.check_commits.outputs.new_commits == 'true'
+    name: Build Signed APK
+    runs-on: ubuntu-latest
     env:
       SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
       SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
@@ -110,9 +131,24 @@ 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.3.6
+        uses: actions/upload-artifact@v4.4.3
         with:
           name: wgtunnel
           path: ${{ env.APK_PATH }}
@@ -149,6 +185,7 @@ 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' }}

.gitignore

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

README.md

@@ -55,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 restart after reboot
-* Automatic tunnel restart after reboot
+* Automatic auto-tunneling service and/or tunnel restart after reboot or app update
 * Battery preservation measures
 * Restart tunnel on ping failure (beta)
 

app/build.gradle.kts

@@ -8,6 +8,21 @@ 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
@@ -20,7 +35,7 @@ android {
 		applicationId = Constants.APP_ID
 		minSdk = Constants.MIN_SDK
 		targetSdk = Constants.TARGET_SDK
-		versionCode = determineVersionCode()
+		versionCode = Constants.VERSION_CODE + versionCodeIncrement
 		versionName = determineVersionName()
 
 		ksp { arg("room.schemaLocation", "$projectDir/schemas") }
@@ -57,15 +72,30 @@ 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 {
@@ -103,8 +133,6 @@ android {
 	packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
 }
 
-val generalImplementation by configurations
-
 dependencies {
 
 	implementation(project(":logcatter"))
@@ -134,6 +162,7 @@ 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)
@@ -145,8 +174,6 @@ 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)
@@ -187,16 +214,6 @@ 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 {
@@ -207,3 +224,19 @@ 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

@@ -0,0 +1,225 @@
+{
+  "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/9.json

@@ -0,0 +1,197 @@
+{
+  "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

@@ -10,10 +10,7 @@
         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.ACCESS_WIFI_STATE" />
     <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" />
@@ -31,6 +28,12 @@
     <!--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" />
@@ -60,12 +63,12 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.AppSplashScreen"
+        android:theme="@style/Theme.App.Start"
         tools:targetApi="tiramisu">
         <activity
-            android:name=".ui.SplashActivity"
+            android:name=".ui.MainActivity"
             android:exported="true"
-            android:theme="@style/Theme.AppSplashScreen">
+            android:theme="@style/Theme.WireguardAutoTunnel">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -77,11 +80,6 @@
                 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,12 +95,16 @@
 			android:launchMode="singleInstance"
             android:theme="@android:style/Theme.NoDisplay" />
 
-        <service
-            android:name=".service.foreground.ForegroundService"
-            android:enabled="true"
-            android:exported="false"
-            android:foregroundServiceType="systemExempted"
-            tools:node="merge" />
+		<provider
+			android:name="androidx.core.content.FileProvider"
+			android:authorities="@string/provider"
+			android:exported="false"
+			android:grantUriPermissions="true">
+			<meta-data
+				android:name="android.support.FILE_PROVIDER_PATHS"
+				android:resource="@xml/file_paths" />
+		</provider>
+
         <service
             android:name=".service.tile.TunnelControlTile"
             android:exported="true"
@@ -137,23 +139,23 @@
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
         </service>
+		<service
+			android:name=".service.tunnel.AlwaysOnVpnService"
+			android:enabled="true"
+			android:exported="false"
+			android:foregroundServiceType="systemExempted"
+			android:permission="android.permission.BIND_VPN_SERVICE"
+			android:persistent="true"
+			tools:node="merge">
+			<intent-filter>
+				<action android:name="android.net.VpnService" />
+			</intent-filter>
+			<meta-data
+				android:name="android.net.VpnService.SUPPORTS_ALWAYS_ON"
+				android:value="true" />
+		</service>
         <service
-            android:name=".service.foreground.WireGuardTunnelService"
-            android:enabled="true"
-            android:exported="false"
-            android:foregroundServiceType="systemExempted"
-            android:permission="android.permission.BIND_VPN_SERVICE"
-            android:persistent="true"
-            tools:node="merge">
-            <intent-filter>
-                <action android:name="android.net.VpnService" />
-            </intent-filter>
-            <meta-data
-                android:name="android.net.VpnService.SUPPORTS_ALWAYS_ON"
-                android:value="true" />
-        </service>
-        <service
-            android:name=".service.foreground.WireGuardConnectivityWatcherService"
+            android:name=".service.foreground.AutoTunnelService"
             android:enabled="true"
             android:exported="false"
             android:foregroundServiceType="systemExempted"
@@ -161,6 +163,16 @@
             android:stopWithTask="false"
             tools:node="merge" />
 
+		<service
+			android:name=".service.foreground.TunnelBackgroundService"
+			android:exported="false"
+			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"
@@ -174,8 +186,24 @@
                 <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
             </intent-filter>
         </receiver>
-        <receiver
-            android:name=".receiver.NotificationActionReceiver"
-            android:exported="false" />
+		<receiver
+			android:name=".receiver.BackgroundActionReceiver"
+			android:enabled="true"
+			android:exported="false"/>
+		<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>
     </application>
 </manifest>

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

@@ -1,19 +1,34 @@
 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 android.service.quicksettings.TileService
-import com.zaneschepke.wireguardautotunnel.service.tile.AutoTunnelControlTile
-import com.zaneschepke.wireguardautotunnel.service.tile.TunnelControlTile
+import com.zaneschepke.logcatter.LogReader
+import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 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
+	@IoDispatcher
+	lateinit var ioDispatcher: CoroutineDispatcher
+
 	override fun onCreate() {
 		super.onCreate()
 		instance = this
@@ -30,28 +45,15 @@ class WireGuardAutoTunnel : Application() {
 		} else {
 			Timber.plant(ReleaseTree())
 		}
+		if (!isRunningOnTv()) {
+			applicationScope.launch(ioDispatcher) {
+				logReader.start()
+			}
+		}
 	}
 
 	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 = 8,
+	version = 10,
 	autoMigrations =
 	[
 		AutoMigration(from = 1, to = 2),
@@ -34,6 +34,8 @@ import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 			spec = RemoveLegacySettingColumnsMigration::class,
 		),
 		AutoMigration(7, 8),
+		AutoMigration(8, 9),
+		AutoMigration(9, 10),
 	],
 	exportSchema = true,
 )

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.TunnelConfigs
+import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
 import kotlinx.coroutines.flow.Flow
 
 @Dao
@@ -23,6 +23,9 @@ 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
 

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

@@ -4,7 +4,6 @@ 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
@@ -24,11 +23,9 @@ class DataStoreManager(
 	companion object {
 		val LOCATION_DISCLOSURE_SHOWN = booleanPreferencesKey("LOCATION_DISCLOSURE_SHOWN")
 		val BATTERY_OPTIMIZE_DISABLE_SHOWN = booleanPreferencesKey("BATTERY_OPTIMIZE_DISABLE_SHOWN")
-		val TUNNEL_RUNNING_FROM_MANUAL_START =
-			booleanPreferencesKey("TUNNEL_RUNNING_FROM_MANUAL_START")
-		val ACTIVE_TUNNEL = intPreferencesKey("ACTIVE_TUNNEL")
 		val CURRENT_SSID = stringPreferencesKey("CURRENT_SSID")
 		val IS_PIN_LOCK_ENABLED = booleanPreferencesKey("PIN_LOCK_ENABLED")
+		val IS_TUNNEL_STATS_EXPANDED = booleanPreferencesKey("TUNNEL_STATS_EXPANDED")
 	}
 
 	// preferences
@@ -60,6 +57,18 @@ 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

@@ -3,14 +3,13 @@ package com.zaneschepke.wireguardautotunnel.data.domain
 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 activeTunnelId: Int? = null,
+	val isTunnelStatsExpanded: Boolean = IS_TUNNEL_STATS_EXPANDED,
 ) {
 	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
 	}
 }

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

@@ -32,8 +32,39 @@ 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,
 ) {
+
+	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 {

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

@@ -7,8 +7,6 @@ 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,24 +15,9 @@ constructor(
 	}
 
 	override suspend fun getStartTunnelConfig(): TunnelConfig? {
-		return if (appState.isTunnelRunningFromManualStart()) {
-			appState.getActiveTunnelId()?.let {
-				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,
-				),
-			)
+		tunnels.getActive().let {
+			if (it.isNotEmpty()) return it.first()
+			return getPrimaryOrFirstTunnel()
 		}
 	}
 }

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

@@ -16,17 +16,13 @@ interface AppStateRepository {
 
 	suspend fun setBatteryOptimizationDisableShown(shown: Boolean)
 
-	suspend fun isTunnelRunningFromManualStart(): Boolean
-
-	suspend fun setTunnelRunningFromManualStart(id: Int)
-
-	suspend fun setManualStop()
-
-	suspend fun getActiveTunnelId(): Int?
-
 	suspend fun getCurrentSsid(): String?
 
 	suspend fun setCurrentSsid(ssid: String)
 
+	suspend fun isTunnelStatsExpanded(): Boolean
+
+	suspend fun setTunnelStatsExpanded(expanded: Boolean)
+
 	val generalStateFlow: Flow<GeneralState>
 }

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

@@ -6,7 +6,9 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import timber.log.Timber
 
-class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager) :
+class DataStoreAppStateRepository(
+	private val dataStoreManager: DataStoreManager,
+) :
 	AppStateRepository {
 	override suspend fun isLocationDisclosureShown(): Boolean {
 		return dataStoreManager.getFromStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN)
@@ -35,32 +37,6 @@ class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager
 		dataStoreManager.saveToDataStore(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN, shown)
 	}
 
-	override suspend fun isTunnelRunningFromManualStart(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.TUNNEL_RUNNING_FROM_MANUAL_START)
-			?: GeneralState.TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT
-	}
-
-	override suspend fun setTunnelRunningFromManualStart(id: Int) {
-		setTunnelRunningFromManualStart(true)
-		setActiveTunnelId(id)
-	}
-
-	override suspend fun setManualStop() {
-		setTunnelRunningFromManualStart(false)
-	}
-
-	private suspend fun setTunnelRunningFromManualStart(running: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.TUNNEL_RUNNING_FROM_MANUAL_START, running)
-	}
-
-	override suspend fun getActiveTunnelId(): Int? {
-		return dataStoreManager.getFromStore(DataStoreManager.ACTIVE_TUNNEL)
-	}
-
-	private suspend fun setActiveTunnelId(id: Int) {
-		dataStoreManager.saveToDataStore(DataStoreManager.ACTIVE_TUNNEL, id)
-	}
-
 	override suspend fun getCurrentSsid(): String? {
 		return dataStoreManager.getFromStore(DataStoreManager.CURRENT_SSID)
 	}
@@ -69,6 +45,15 @@ class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager
 		dataStoreManager.saveToDataStore(DataStoreManager.CURRENT_SSID, ssid)
 	}
 
+	override suspend fun isTunnelStatsExpanded(): Boolean {
+		return dataStoreManager.getFromStore(DataStoreManager.IS_TUNNEL_STATS_EXPANDED)
+			?: GeneralState.IS_TUNNEL_STATS_EXPANDED
+	}
+
+	override suspend fun setTunnelStatsExpanded(expanded: Boolean) {
+		dataStoreManager.saveToDataStore(DataStoreManager.IS_TUNNEL_STATS_EXPANDED, expanded)
+	}
+
 	override val generalStateFlow: Flow<GeneralState> =
 		dataStoreManager.preferencesFlow.map { prefs ->
 			prefs?.let { pref ->
@@ -80,12 +65,10 @@ class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager
 						isBatteryOptimizationDisableShown =
 						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.IS_PIN_LOCK_ENABLED]
-							?: GeneralState.TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT,
+							?: GeneralState.PIN_LOCK_ENABLED_DEFAULT,
+						isTunnelStatsExpanded = pref[DataStoreManager.IS_TUNNEL_STATS_EXPANDED] ?: GeneralState.IS_TUNNEL_STATS_EXPANDED,
 					)
 				} catch (e: IllegalArgumentException) {
 					Timber.e(e)

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

@@ -2,11 +2,16 @@ 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) : SettingsRepository {
+class RoomSettingsRepository(private val settingsDoa: SettingsDao, @IoDispatcher private val ioDispatcher: CoroutineDispatcher) : SettingsRepository {
 	override suspend fun save(settings: Settings) {
-		settingsDoa.save(settings)
+		withContext(ioDispatcher) {
+			settingsDoa.save(settings)
+		}
 	}
 
 	override fun getSettingsFlow(): Flow<Settings> {
@@ -14,10 +19,12 @@ class RoomSettingsRepository(private val settingsDoa: SettingsDao) : SettingsRep
 	}
 
 	override suspend fun getSettings(): Settings {
-		return settingsDoa.getAll().firstOrNull() ?: Settings()
+		return withContext(ioDispatcher) {
+			settingsDoa.getAll().firstOrNull() ?: Settings()
+		}
 	}
 
 	override suspend fun getAll(): List<Settings> {
-		return settingsDoa.getAll()
+		return withContext(ioDispatcher) { settingsDoa.getAll() }
 	}
 }

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

@@ -1,71 +1,97 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.data.TunnelConfigDao
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.util.TunnelConfigs
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
+import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.withContext
 
-class RoomTunnelConfigRepository(private val tunnelConfigDao: TunnelConfigDao) :
+class RoomTunnelConfigRepository(
+	private val tunnelConfigDao: TunnelConfigDao,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) :
 	TunnelConfigRepository {
 	override fun getTunnelConfigsFlow(): Flow<TunnelConfigs> {
 		return tunnelConfigDao.getAllFlow()
 	}
 
 	override suspend fun getAll(): TunnelConfigs {
-		return tunnelConfigDao.getAll()
+		return withContext(ioDispatcher) { tunnelConfigDao.getAll() }
 	}
 
 	override suspend fun save(tunnelConfig: TunnelConfig) {
-		tunnelConfigDao.save(tunnelConfig)
+		withContext(ioDispatcher) {
+			tunnelConfigDao.save(tunnelConfig)
+		}.also {
+			WireGuardAutoTunnel.instance.requestTunnelTileServiceStateUpdate()
+		}
 	}
 
 	override suspend fun updatePrimaryTunnel(tunnelConfig: TunnelConfig?) {
-		tunnelConfigDao.resetPrimaryTunnel()
-		tunnelConfig?.let {
-			save(
-				it.copy(
-					isPrimaryTunnel = true,
-				),
-			)
+		withContext(ioDispatcher) {
+			tunnelConfigDao.resetPrimaryTunnel()
+			tunnelConfig?.let {
+				save(
+					it.copy(
+						isPrimaryTunnel = true,
+					),
+				)
+			}
 		}
 	}
 
 	override suspend fun updateMobileDataTunnel(tunnelConfig: TunnelConfig?) {
-		tunnelConfigDao.resetMobileDataTunnel()
-		tunnelConfig?.let {
-			save(
-				it.copy(
-					isMobileDataTunnel = true,
-				),
-			)
+		withContext(ioDispatcher) {
+			tunnelConfigDao.resetMobileDataTunnel()
+			tunnelConfig?.let {
+				save(
+					it.copy(
+						isMobileDataTunnel = true,
+					),
+				)
+			}
 		}
 	}
 
 	override suspend fun delete(tunnelConfig: TunnelConfig) {
-		tunnelConfigDao.delete(tunnelConfig)
+		withContext(ioDispatcher) {
+			tunnelConfigDao.delete(tunnelConfig)
+		}.also {
+			WireGuardAutoTunnel.instance.requestTunnelTileServiceStateUpdate()
+		}
 	}
 
 	override suspend fun getById(id: Int): TunnelConfig? {
-		return tunnelConfigDao.getById(id.toLong())
+		return withContext(ioDispatcher) { tunnelConfigDao.getById(id.toLong()) }
+	}
+
+	override suspend fun getActive(): TunnelConfigs {
+		return withContext(ioDispatcher) {
+			tunnelConfigDao.getActive()
+		}
 	}
 
 	override suspend fun count(): Int {
-		return tunnelConfigDao.count().toInt()
+		return withContext(ioDispatcher) { tunnelConfigDao.count().toInt() }
 	}
 
 	override suspend fun findByTunnelName(name: String): TunnelConfig? {
-		return tunnelConfigDao.getByName(name)
+		return withContext(ioDispatcher) { tunnelConfigDao.getByName(name) }
 	}
 
 	override suspend fun findByTunnelNetworksName(name: String): TunnelConfigs {
-		return tunnelConfigDao.findByTunnelNetworkName(name)
+		return withContext(ioDispatcher) { tunnelConfigDao.findByTunnelNetworkName(name) }
 	}
 
 	override suspend fun findByMobileDataTunnel(): TunnelConfigs {
-		return tunnelConfigDao.findByMobileDataTunnel()
+		return withContext(ioDispatcher) { tunnelConfigDao.findByMobileDataTunnel() }
 	}
 
 	override suspend fun findPrimary(): TunnelConfigs {
-		return tunnelConfigDao.findByPrimary()
+		return withContext(ioDispatcher) { 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.TunnelConfigs
+import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
 import kotlinx.coroutines.flow.Flow
 
 interface TunnelConfigRepository {
@@ -19,6 +19,8 @@ interface TunnelConfigRepository {
 
 	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,8 +1,8 @@
 package com.zaneschepke.wireguardautotunnel.module
 
 import android.content.Context
-import com.zaneschepke.logcatter.LocalLogCollector
-import com.zaneschepke.logcatter.LogcatUtil
+import com.zaneschepke.logcatter.LogReader
+import com.zaneschepke.logcatter.LogcatCollector
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -24,7 +24,7 @@ class AppModule {
 
 	@Singleton
 	@Provides
-	fun provideLogCollect(@ApplicationContext context: Context): LocalLogCollector {
-		return LogcatUtil.init(context = context)
+	fun provideLogCollect(@ApplicationContext context: Context): LogReader {
+		return LogcatCollector.init(context = context)
 	}
 }

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

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

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

@@ -3,12 +3,13 @@ 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.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
+import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.WireGuardTunnel
 import dagger.Module
 import dagger.Provides
@@ -29,49 +30,49 @@ class TunnelModule {
 		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): Backend {
-		return GoBackend(context)
+	fun provideUserspaceBackend(@ApplicationContext context: Context, rootShell: RootShell): Backend {
+		return GoBackend(context, RootTunnelActionHandler(rootShell))
 	}
 
 	@Provides
 	@Singleton
 	@Kernel
 	fun provideKernelBackend(@ApplicationContext context: Context, rootShell: RootShell): Backend {
-		return WgQuickBackend(context, rootShell, ToolsInstaller(context, rootShell))
+		return WgQuickBackend(context, rootShell, ToolsInstaller(context, rootShell), RootTunnelActionHandler(rootShell))
 	}
 
 	@Provides
 	@Singleton
-	fun provideAmneziaBackend(@ApplicationContext context: Context): org.amnezia.awg.backend.Backend {
-		return org.amnezia.awg.backend.GoBackend(context)
+	fun provideAmneziaBackend(@ApplicationContext context: Context, rootShell: org.amnezia.awg.util.RootShell): org.amnezia.awg.backend.Backend {
+		return org.amnezia.awg.backend.GoBackend(context, org.amnezia.awg.backend.RootTunnelActionHandler(rootShell))
 	}
 
 	@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,
-	): VpnService {
+	): TunnelService {
 		return WireGuardTunnel(
 			amneziaBackend,
-			userspaceBackend,
+			tunnelConfigRepository,
 			kernelBackend,
 			appDataRepository,
 			applicationScope,
 			ioDispatcher,
 		)
 	}
-
-	@Provides
-	@Singleton
-	fun provideServiceManager(appDataRepository: AppDataRepository, @IoDispatcher ioDispatcher: CoroutineDispatcher): ServiceManager {
-		return ServiceManager(appDataRepository, ioDispatcher)
-	}
 }

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

@@ -0,0 +1,44 @@
+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 com.zaneschepke.wireguardautotunnel.util.extensions.startTunnelBackground
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class AppUpdateReceiver : BroadcastReceiver() {
+
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
+
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
+
+	@Inject
+	lateinit var tunnelService: TunnelService
+
+	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.startWatcherServiceForeground(context)
+			}
+			if (!settings.isAutoTunnelEnabled || settings.isAutoTunnelPaused) {
+				val tunnels = appDataRepository.tunnels.getAll().filter { it.isActive }
+				if (tunnels.isNotEmpty()) context.startTunnelBackground(tunnels.first().id)
+			}
+		}
+	}
+}

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

@@ -0,0 +1,61 @@
+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 timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Provider
+
+@AndroidEntryPoint
+class BackgroundActionReceiver : BroadcastReceiver() {
+
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
+
+	@Inject
+	lateinit var tunnelService: Provider<TunnelService>
+
+	@Inject
+	lateinit var tunnelConfigRepository: TunnelConfigRepository
+
+	override fun onReceive(context: Context, intent: Intent) {
+		val id = intent.getIntExtra(TUNNEL_ID_EXTRA_KEY, 0)
+		if (id == 0) return
+		when (intent.action) {
+			ACTION_CONNECT -> {
+				Timber.d("Connect actions")
+				applicationScope.launch {
+					val tunnel = tunnelConfigRepository.getById(id)
+					tunnel?.let {
+						ServiceManager.startTunnelBackgroundService(context)
+						tunnelService.get().startTunnel(it)
+					}
+				}
+			}
+			ACTION_DISCONNECT -> {
+				applicationScope.launch {
+					val tunnel = tunnelConfigRepository.getById(id)
+					tunnel?.let {
+						ServiceManager.stopTunnelBackgroundService(context)
+						tunnelService.get().stopTunnel(it)
+					}
+				}
+			}
+		}
+	}
+
+	companion object {
+		const val ACTION_CONNECT = "ACTION_CONNECT"
+		const val ACTION_DISCONNECT = "ACTION_DISCONNECT"
+		const val TUNNEL_ID_EXTRA_KEY = "tunnelId"
+	}
+}

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

@@ -6,11 +6,15 @@ 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 com.zaneschepke.wireguardautotunnel.util.extensions.startTunnelBackground
 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() {
@@ -18,35 +22,26 @@ class BootReceiver : BroadcastReceiver() {
 	lateinit var appDataRepository: AppDataRepository
 
 	@Inject
-	lateinit var serviceManager: ServiceManager
+	lateinit var tunnelService: Provider<TunnelService>
 
 	@Inject
 	@ApplicationScope
 	lateinit var applicationScope: CoroutineScope
 
-	override fun onReceive(context: Context?, intent: Intent?) {
-		if (Intent.ACTION_BOOT_COMPLETED != intent?.action) return
-		context?.run {
-			applicationScope.launch {
-				val settings = appDataRepository.settings.getSettings()
-				if (settings.isRestoreOnBootEnabled) {
-					if (settings.isAutoTunnelEnabled) {
+	override fun onReceive(context: Context, intent: Intent) {
+		if (Intent.ACTION_BOOT_COMPLETED != intent.action) return
+		applicationScope.launch {
+			with(appDataRepository.settings.getSettings()) {
+				if (isRestoreOnBootEnabled) {
+					val activeTunnels = appDataRepository.tunnels.getActive()
+					val tunState = tunnelService.get().vpnState.value.status
+					if (activeTunnels.isNotEmpty() && tunState != TunnelState.UP) {
+						Timber.i("Starting previously active tunnel")
+						context.startTunnelBackground(activeTunnels.first().id)
+					}
+					if (isAutoTunnelEnabled) {
 						Timber.i("Starting watcher service from boot")
-						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)
+						ServiceManager.startWatcherServiceForeground(context)
 					}
 				}
 			}

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

@@ -0,0 +1,48 @@
+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.tunnel.TunnelService
+import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
+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
+
+	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))
+					}
+				}
+				context.requestTunnelTileServiceStateUpdate()
+			}
+		}
+	}
+
+	companion object {
+		const val REFRESH_TUNNELS_ACTION = "com.wireguard.android.action.REFRESH_TUNNEL_STATES"
+	}
+}

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

@@ -1,44 +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.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.util.Constants
-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
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
-
-	override fun onReceive(context: Context, intent: Intent?) {
-		applicationScope.launch {
-			try {
-				// TODO fix for manual start changes when enabled
-				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/AutoTunnelService.kt

@@ -0,0 +1,589 @@
+package com.zaneschepke.wireguardautotunnel.service.foreground
+
+import android.content.Context
+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.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.TunnelService
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.extensions.cancelWithMessage
+import com.zaneschepke.wireguardautotunnel.util.extensions.getCurrentWifiName
+import com.zaneschepke.wireguardautotunnel.util.extensions.isMatchingToWildcardList
+import com.zaneschepke.wireguardautotunnel.util.extensions.isReachable
+import com.zaneschepke.wireguardautotunnel.util.extensions.onNotRunning
+import dagger.hilt.android.AndroidEntryPoint
+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.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+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
+import javax.inject.Provider
+
+@AndroidEntryPoint
+class AutoTunnelService : LifecycleService() {
+	private val foregroundId = 122
+
+	@Inject
+	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: AppDataRepository
+
+	@Inject
+	lateinit var notificationService: NotificationService
+
+	@Inject
+	lateinit var tunnelService: Provider<TunnelService>
+
+	@Inject
+	@IoDispatcher
+	lateinit var ioDispatcher: CoroutineDispatcher
+
+	@Inject
+	@MainImmediateDispatcher
+	lateinit var mainImmediateDispatcher: CoroutineDispatcher
+
+	private val autoTunnelStateFlow = MutableStateFlow(AutoTunnelState())
+
+	private var wakeLock: PowerManager.WakeLock? = null
+
+	private var wifiJob: Job? = null
+	private var mobileDataJob: Job? = null
+	private var ethernetJob: Job? = null
+	private var pingJob: Job? = null
+	private var networkEventJob: Job? = null
+
+	@get:Synchronized @set:Synchronized
+	private var running: Boolean = false
+
+	override fun onCreate() {
+		super.onCreate()
+		lifecycleScope.launch(mainImmediateDispatcher) {
+			kotlin.runCatching {
+				launchNotification()
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
+	}
+
+	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 {
+		Timber.d("onStartCommand executed with startId: $startId")
+		if (intent != null) {
+			val action = intent.action
+			when (action) {
+				Action.START.name,
+				Action.START_FOREGROUND.name,
+				-> startService()
+				Action.STOP.name, Action.STOP_FOREGROUND.name -> stopService()
+			}
+		}
+		return super.onStartCommand(intent, flags, startId)
+	}
+
+	private suspend fun launchNotification() {
+		if (appDataRepository.settings.getSettings().isAutoTunnelPaused) {
+			launchWatcherPausedNotification()
+		} else {
+			launchWatcherNotification()
+		}
+	}
+
+	private fun startService() {
+		if (running) return
+		running = true
+		kotlin.runCatching {
+			lifecycleScope.launch(mainImmediateDispatcher) {
+				launchNotification()
+				initWakeLock()
+			}
+			startSettingsJob()
+			startVpnStateJob()
+		}.onFailure {
+			Timber.e(it)
+		}
+	}
+
+	private fun stopService() {
+		wakeLock?.let {
+			if (it.isHeld) {
+				it.release()
+			}
+		}
+		stopSelf()
+	}
+
+	override fun onDestroy() {
+		cancelAndResetNetworkJobs()
+		cancelAndResetPingJob()
+		super.onDestroy()
+	}
+
+	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 {
+				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 startSettingsJob() = lifecycleScope.launch {
+		watchForSettingsChanges()
+	}
+
+	private fun startVpnStateJob() = lifecycleScope.launch {
+		watchForVpnStateChanges()
+	}
+
+	private fun startWifiJob() = lifecycleScope.launch {
+		watchForWifiConnectivityChanges()
+	}
+
+	private fun startMobileDataJob() = lifecycleScope.launch {
+		watchForMobileDataConnectivityChanges()
+	}
+
+	private fun startEthernetJob() = lifecycleScope.launch {
+		watchForEthernetConnectivityChanges()
+	}
+
+	private fun startPingJob() = lifecycleScope.launch {
+		watchForPingFailure()
+	}
+
+	private fun startNetworkEventJob() = lifecycleScope.launch {
+		handleNetworkEventChanges()
+	}
+
+	private suspend fun watchForMobileDataConnectivityChanges() {
+		withContext(ioDispatcher) {
+			Timber.i("Starting mobile data watcher")
+			mobileDataService.networkStatus.collect { status ->
+				when (status) {
+					is NetworkStatus.Available -> {
+						Timber.i("Gained Mobile data connection")
+						autoTunnelStateFlow.update {
+							it.copy(
+								isMobileDataConnected = true,
+							)
+						}
+					}
+
+					is NetworkStatus.CapabilitiesChanged -> {
+						autoTunnelStateFlow.update {
+							it.copy(
+								isMobileDataConnected = true,
+							)
+						}
+						Timber.i("Mobile data capabilities changed")
+					}
+
+					is NetworkStatus.Unavailable -> {
+						autoTunnelStateFlow.update {
+							it.copy(
+								isMobileDataConnected = false,
+							)
+						}
+						Timber.i("Lost mobile data connection")
+					}
+				}
+			}
+		}
+	}
+
+	private suspend fun watchForPingFailure() {
+		withContext(ioDispatcher) {
+			Timber.i("Starting ping watcher")
+			runCatching {
+				do {
+					val vpnState = tunnelService.get().vpnState.value
+					val settings = appDataRepository.settings.getSettings()
+					if (vpnState.status == TunnelState.UP && !settings.isAutoTunnelPaused) {
+						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
+								tunnelService.get().bounceTunnel(vpnState.tunnelConfig)
+								delay(cooldown ?: Constants.PING_COOLDOWN)
+								continue
+							}
+						}
+					}
+					delay(vpnState.tunnelConfig?.pingInterval ?: Constants.PING_INTERVAL)
+				} while (true)
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
+	}
+
+	private fun onAutoTunnelPause(paused: Boolean) {
+		if (autoTunnelStateFlow.value.settings.isAutoTunnelPaused
+			!= paused
+		) {
+			when (paused) {
+				true -> launchWatcherPausedNotification()
+				false -> launchWatcherNotification()
+			}
+		}
+	}
+
+	private suspend fun watchForSettingsChanges() {
+		Timber.i("Starting settings watcher")
+		withContext(ioDispatcher) {
+			appDataRepository.settings.getSettingsFlow().combine(
+				// ignore isActive changes to allow manual tunnel overrides
+				appDataRepository.tunnels.getTunnelConfigsFlow().distinctUntilChanged { old, new ->
+					old.map { it.isActive } != new.map { it.isActive }
+				},
+			) { settings, tunnels ->
+				autoTunnelStateFlow.value.copy(
+					settings = settings,
+					tunnels = tunnels,
+				)
+			}.collect {
+				onAutoTunnelPause(it.settings.isAutoTunnelPaused)
+				manageJobsBySettings(it.settings)
+				autoTunnelStateFlow.emit(it)
+			}
+		}
+	}
+
+	private suspend fun watchForVpnStateChanges() {
+		Timber.i("Starting vpn state watcher")
+		withContext(ioDispatcher) {
+			tunnelService.get().vpnState.collect { state ->
+				state.tunnelConfig?.let {
+					val settings = appDataRepository.settings.getSettings()
+					if (it.isPingEnabled && !settings.isPingEnabled) {
+						pingJob.onNotRunning { pingJob = startPingJob() }
+					}
+					if (!it.isPingEnabled && !settings.isPingEnabled) {
+						cancelAndResetPingJob()
+					}
+				}
+			}
+		}
+	}
+
+	private fun manageJobsBySettings(settings: Settings) {
+		with(settings) {
+			if (isPingEnabled) {
+				pingJob.onNotRunning { pingJob = startPingJob() }
+			} else {
+				cancelAndResetPingJob()
+			}
+			if (isTunnelOnWifiEnabled || isTunnelOnEthernetEnabled || isTunnelOnMobileDataEnabled) {
+				startNetworkJobs()
+			} else {
+				cancelAndResetNetworkJobs()
+			}
+		}
+	}
+
+	private fun startNetworkJobs() {
+		wifiJob.onNotRunning {
+			Timber.i("Wifi job starting")
+			wifiJob = startWifiJob()
+		}
+		ethernetJob.onNotRunning {
+			ethernetJob = startEthernetJob()
+			Timber.i("Ethernet job starting")
+		}
+		mobileDataJob.onNotRunning {
+			mobileDataJob = startMobileDataJob()
+			Timber.i("Mobile data job starting")
+		}
+		networkEventJob.onNotRunning {
+			Timber.i("Network event job starting")
+			networkEventJob = startNetworkEventJob()
+		}
+	}
+
+	private fun cancelAndResetPingJob() {
+		pingJob?.cancelWithMessage("Ping job canceled")
+		pingJob = null
+	}
+
+	private fun cancelAndResetNetworkJobs() {
+		networkEventJob?.cancelWithMessage("Network event job canceled")
+		wifiJob?.cancelWithMessage("Wifi job canceled")
+		ethernetJob?.cancelWithMessage("Ethernet job canceled")
+		mobileDataJob?.cancelWithMessage("Mobile data job canceled")
+		networkEventJob = null
+		wifiJob = null
+		ethernetJob = null
+		mobileDataJob = null
+	}
+
+	private fun updateEthernet(connected: Boolean) {
+		autoTunnelStateFlow.update {
+			it.copy(
+				isEthernetConnected = connected,
+			)
+		}
+	}
+
+	private fun updateWifi(connected: Boolean) {
+		autoTunnelStateFlow.update {
+			it.copy(
+				isWifiConnected = connected,
+			)
+		}
+	}
+
+	private suspend fun watchForEthernetConnectivityChanges() {
+		withContext(ioDispatcher) {
+			Timber.i("Starting ethernet data watcher")
+			ethernetService.networkStatus.collect { status ->
+				when (status) {
+					is NetworkStatus.Available -> {
+						Timber.i("Gained Ethernet connection")
+						updateEthernet(true)
+					}
+
+					is NetworkStatus.CapabilitiesChanged -> {
+						Timber.i("Ethernet capabilities changed")
+						updateEthernet(true)
+					}
+
+					is NetworkStatus.Unavailable -> {
+						updateEthernet(false)
+						Timber.i("Lost Ethernet connection")
+					}
+				}
+			}
+		}
+	}
+
+	private suspend fun watchForWifiConnectivityChanges() {
+		withContext(ioDispatcher) {
+			Timber.i("Starting wifi watcher")
+			wifiService.networkStatus.collect { status ->
+				when (status) {
+					is NetworkStatus.Available -> {
+						Timber.i("Gained Wi-Fi connection")
+						updateWifi(true)
+					}
+
+					is NetworkStatus.CapabilitiesChanged -> {
+						Timber.i("Wifi capabilities changed")
+						updateWifi(true)
+						val ssid = getWifiSSID(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)
+							autoTunnelStateFlow.update {
+								it.copy(
+									currentNetworkSSID = name,
+								)
+							}
+						} ?: Timber.w("Failed to read ssid")
+					}
+
+					is NetworkStatus.Unavailable -> {
+						updateWifi(false)
+						Timber.i("Lost Wi-Fi connection")
+					}
+				}
+			}
+		}
+	}
+
+	private suspend fun getWifiSSID(networkCapabilities: NetworkCapabilities): String? {
+		return withContext(ioDispatcher) {
+			try {
+				rootShell.get().getCurrentWifiName()
+			} catch (_: Exception) {
+				wifiService.getNetworkName(networkCapabilities)
+			}
+		}
+	}
+
+	private suspend fun getMobileDataTunnel(): TunnelConfig? {
+		return appDataRepository.tunnels.findByMobileDataTunnel().firstOrNull()
+	}
+
+	private fun isTunnelDown(): Boolean {
+		return tunnelService.get().vpnState.value.status == TunnelState.DOWN
+	}
+
+	private suspend fun handleNetworkEventChanges() {
+		withContext(ioDispatcher) {
+			Timber.i("Starting network event watcher")
+			autoTunnelStateFlow.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 activeTunnel = tunnelService.get().vpnState.value.tunnelConfig
+					val defaultTunnel = appDataRepository.getPrimaryOrFirstTunnel()
+					when {
+						watcherState.isEthernetConditionMet() -> {
+							Timber.i("$autoTunnel - tunnel on on ethernet condition met")
+							if (isTunnelDown()) {
+								defaultTunnel?.let {
+									tunnelService.get().startTunnel(it)
+								}
+							}
+						}
+
+						watcherState.isMobileDataConditionMet() -> {
+							Timber.i("$autoTunnel - tunnel on mobile data condition met")
+							val mobileDataTunnel = getMobileDataTunnel()
+							val tunnel =
+								mobileDataTunnel ?: defaultTunnel
+							if (isTunnelDown() || activeTunnel?.isMobileDataTunnel == false) {
+								tunnel?.let {
+									tunnelService.get().startTunnel(it)
+								}
+							}
+						}
+
+						watcherState.isTunnelOffOnMobileDataConditionMet() -> {
+							Timber.i("$autoTunnel - tunnel off on mobile data met, turning vpn off")
+							if (!isTunnelDown()) {
+								activeTunnel?.let {
+									tunnelService.get().stopTunnel(it)
+								}
+							}
+						}
+
+						watcherState.isUntrustedWifiConditionMet() -> {
+							Timber.i("Untrusted wifi condition met")
+							if (activeTunnel?.tunnelNetworks?.isMatchingToWildcardList(watcherState.currentNetworkSSID) == false ||
+								activeTunnel == null || isTunnelDown()
+							) {
+								Timber.i(
+									"$autoTunnel - tunnel on ssid not associated with current tunnel condition met",
+								)
+								watcherState.tunnels.firstOrNull { it.tunnelNetworks.isMatchingToWildcardList(watcherState.currentNetworkSSID) }?.let {
+									Timber.i("Found tunnel associated with this SSID, bringing tunnel up: ${it.name}")
+									if (isTunnelDown() || activeTunnel?.id != it.id) {
+										tunnelService.get().startTunnel(it)
+									}
+								} ?: suspend {
+									Timber.i("No tunnel associated with this SSID, using defaults")
+									val default = appDataRepository.getPrimaryOrFirstTunnel()
+									if (default?.name != tunnelService.get().name || isTunnelDown()) {
+										default?.let {
+											tunnelService.get().startTunnel(it)
+										}
+									}
+								}.invoke()
+							}
+						}
+
+						watcherState.isTrustedWifiConditionMet() -> {
+							Timber.i(
+								"$autoTunnel - tunnel off on trusted wifi condition met, turning vpn off",
+							)
+							if (!isTunnelDown()) activeTunnel?.let { tunnelService.get().stopTunnel(it) }
+						}
+
+						watcherState.isTunnelOffOnWifiConditionMet() -> {
+							Timber.i(
+								"$autoTunnel - tunnel off on wifi condition met, turning vpn off",
+							)
+							if (!isTunnelDown()) activeTunnel?.let { tunnelService.get().stopTunnel(it) }
+						}
+
+						watcherState.isTunnelOffOnNoConnectivityMet() -> {
+							Timber.i(
+								"$autoTunnel - tunnel off on no connectivity met, turning vpn off",
+							)
+							if (!isTunnelDown()) activeTunnel?.let { tunnelService.get().stopTunnel(it) }
+						}
+
+						else -> {
+							Timber.i("$autoTunnel - no condition met")
+						}
+					}
+				}
+			}
+		}
+	}
+}

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

@@ -1,13 +1,16 @@
 package com.zaneschepke.wireguardautotunnel.service.foreground
 
 import com.zaneschepke.wireguardautotunnel.data.domain.Settings
+import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
+import com.zaneschepke.wireguardautotunnel.util.extensions.isMatchingToWildcardList
 
-data class WatcherState(
+data class AutoTunnelState(
 	val isWifiConnected: Boolean = false,
 	val isEthernetConnected: Boolean = false,
 	val isMobileDataConnected: Boolean = false,
 	val currentNetworkSSID: String = "",
 	val settings: Settings = Settings(),
+	val tunnels: TunnelConfigs = emptyList(),
 ) {
 	fun isEthernetConditionMet(): Boolean {
 		return (
@@ -38,7 +41,7 @@ data class WatcherState(
 		return (
 			!isEthernetConnected &&
 				isWifiConnected &&
-				!settings.trustedNetworkSSIDs.contains(currentNetworkSSID) &&
+				!settings.trustedNetworkSSIDs.isMatchingToWildcardList(currentNetworkSSID) &&
 				settings.isTunnelOnWifiEnabled
 			)
 	}
@@ -48,7 +51,7 @@ data class WatcherState(
 			!isEthernetConnected &&
 				(
 					isWifiConnected &&
-						settings.trustedNetworkSSIDs.contains(currentNetworkSSID)
+						settings.trustedNetworkSSIDs.isMatchingToWildcardList(currentNetworkSSID)
 					)
 			)
 	}

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

@@ -1,57 +0,0 @@
-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

@@ -3,18 +3,12 @@ package com.zaneschepke.wireguardautotunnel.service.foreground
 import android.app.Service
 import android.content.Context
 import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.withContext
+import android.net.VpnService
 import timber.log.Timber
 
-class ServiceManager(
-	private val appDataRepository: AppDataRepository,
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-) {
+object ServiceManager {
 	private fun <T : Service> actionOnService(action: Action, context: Context, cls: Class<T>, extras: Map<String, Int>? = null) {
+		if (VpnService.prepare(context) != null) return
 		val intent =
 			Intent(context, cls).also {
 				it.action = action.name
@@ -35,67 +29,11 @@ class ServiceManager(
 		}
 	}
 
-	suspend fun startVpnService(context: Context, tunnelId: Int? = null, isManualStart: Boolean = false) {
-		if (isManualStart) onManualStart(tunnelId)
-		actionOnService(
-			Action.START,
-			context,
-			WireGuardTunnelService::class.java,
-			tunnelId?.let { mapOf(Constants.TUNNEL_EXTRA_KEY to it) },
-		)
-	}
-
-	suspend fun stopVpnServiceForeground(context: Context, isManualStop: Boolean = false) {
-		withContext(ioDispatcher) {
-			if (isManualStop) onManualStop()
-			Timber.i("Stopping vpn service")
-			actionOnService(
-				Action.STOP_FOREGROUND,
-				context,
-				WireGuardTunnelService::class.java,
-			)
-		}
-	}
-
-	suspend fun stopVpnService(context: Context, isManualStop: Boolean = false) {
-		withContext(ioDispatcher) {
-			if (isManualStop) onManualStop()
-			Timber.i("Stopping vpn service")
-			actionOnService(
-				Action.STOP,
-				context,
-				WireGuardTunnelService::class.java,
-			)
-		}
-	}
-
-	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,
+			AutoTunnelService::class.java,
 		)
 	}
 
@@ -103,7 +41,7 @@ class ServiceManager(
 		actionOnService(
 			Action.START,
 			context,
-			WireGuardConnectivityWatcherService::class.java,
+			AutoTunnelService::class.java,
 		)
 	}
 
@@ -111,7 +49,23 @@ class ServiceManager(
 		actionOnService(
 			Action.STOP,
 			context,
-			WireGuardConnectivityWatcherService::class.java,
+			AutoTunnelService::class.java,
+		)
+	}
+
+	fun startTunnelBackgroundService(context: Context) {
+		actionOnService(
+			Action.START_FOREGROUND,
+			context,
+			TunnelBackgroundService::class.java,
+		)
+	}
+
+	fun stopTunnelBackgroundService(context: Context) {
+		actionOnService(
+			Action.STOP,
+			context,
+			TunnelBackgroundService::class.java,
 		)
 	}
 }

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

@@ -0,0 +1,61 @@
+package com.zaneschepke.wireguardautotunnel.service.foreground
+
+import android.app.Notification
+import android.content.Intent
+import android.os.IBinder
+import androidx.lifecycle.LifecycleService
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class TunnelBackgroundService : LifecycleService() {
+
+	@Inject
+	lateinit var notificationService: NotificationService
+
+	private val foregroundId = 123
+
+	override fun onCreate() {
+		super.onCreate()
+		startForeground(foregroundId, createNotification())
+	}
+
+	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) {
+			val action = intent.action
+			when (action) {
+				Action.START.name,
+				Action.START_FOREGROUND.name,
+				-> startService()
+				Action.STOP.name, Action.STOP_FOREGROUND.name -> stopService()
+			}
+		}
+		return super.onStartCommand(intent, flags, startId)
+	}
+
+	private fun startService() {
+		startForeground(foregroundId, createNotification())
+	}
+
+	private fun stopService() {
+		stopForeground(STOP_FOREGROUND_REMOVE)
+		stopSelf()
+	}
+
+	private fun createNotification(): Notification {
+		return notificationService.createNotification(
+			getString(R.string.vpn_channel_id),
+			getString(R.string.vpn_channel_name),
+			getString(R.string.tunnel_start_text),
+			description = "",
+		)
+	}
+}

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

@@ -1,474 +0,0 @@
-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

@@ -1,198 +0,0 @@
-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/network/BaseNetworkService.kt

@@ -5,8 +5,6 @@ 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
@@ -21,7 +19,7 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
 	private val connectivityManager =
 		context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
 
-	private val wifiManager =
+	val wifiManager =
 		context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
 
 	override val networkStatus =
@@ -83,30 +81,6 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
 
 			awaitClose { connectivityManager.unregisterNetworkCallback(networkStatusCallback) }
 		}
-
-	override fun getNetworkName(networkCapabilities: NetworkCapabilities): String? {
-		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(

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

@@ -10,4 +10,9 @@ 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,4 +10,8 @@ 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

@@ -0,0 +1,16 @@
+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,7 +4,11 @@ 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/WifiService.kt

@@ -2,6 +2,8 @@ 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
 
@@ -10,4 +12,21 @@ 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/WireGuardNotification.kt

@@ -9,7 +9,7 @@ import android.content.Intent
 import android.graphics.Color
 import androidx.core.app.NotificationCompat
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.SplashActivity
+import com.zaneschepke.wireguardautotunnel.ui.MainActivity
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
@@ -63,7 +63,7 @@ constructor(
 				}
 		notificationManager.createNotificationChannel(channel)
 		val pendingIntent: PendingIntent =
-			Intent(context, SplashActivity::class.java).let { notificationIntent ->
+			Intent(context, MainActivity::class.java).let { notificationIntent ->
 				PendingIntent.getActivity(
 					context,
 					0,

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

@@ -5,13 +5,16 @@ 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.WireGuardConnectivityWatcherService
-import com.zaneschepke.wireguardautotunnel.service.foreground.WireGuardTunnelService
+import com.zaneschepke.wireguardautotunnel.service.foreground.AutoTunnelService
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import com.zaneschepke.wireguardautotunnel.util.extensions.startTunnelBackground
+import com.zaneschepke.wireguardautotunnel.util.extensions.stopTunnelBackground
 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() {
@@ -19,7 +22,7 @@ class ShortcutsActivity : ComponentActivity() {
 	lateinit var appDataRepository: AppDataRepository
 
 	@Inject
-	lateinit var serviceManager: ServiceManager
+	lateinit var tunnelService: Provider<TunnelService>
 
 	@Inject
 	@ApplicationScope
@@ -31,31 +34,23 @@ class ShortcutsActivity : ComponentActivity() {
 			val settings = appDataRepository.settings.getSettings()
 			if (settings.isShortcutsEnabled) {
 				when (intent.getStringExtra(CLASS_NAME_EXTRA_KEY)) {
-					WireGuardTunnelService::class.java.simpleName -> {
+					LEGACY_TUNNEL_SERVICE_NAME, TunnelService::class.java.simpleName -> {
 						val tunnelName = intent.getStringExtra(TUNNEL_NAME_EXTRA_KEY)
-						val tunnelConfig =
-							tunnelName?.let {
-								appDataRepository.tunnels.getAll().firstOrNull {
-									it.name == tunnelName
-								}
+						Timber.d("Tunnel name extra: $tunnelName")
+						val tunnelConfig = tunnelName?.let {
+							appDataRepository.tunnels.getAll()
+								.firstOrNull { it.name == tunnelName }
+						} ?: appDataRepository.getStartTunnelConfig()
+						Timber.d("Shortcut action on name: ${tunnelConfig?.name}")
+						tunnelConfig?.let {
+							when (intent.action) {
+								Action.START.name -> this@ShortcutsActivity.startTunnelBackground(it.id)
+								Action.STOP.name -> this@ShortcutsActivity.stopTunnelBackground(it.id)
+								else -> Unit
 							}
-						when (intent.action) {
-							Action.START.name ->
-								serviceManager.startVpnServiceForeground(
-									this@ShortcutsActivity,
-									tunnelConfig?.id,
-									isManualStart = true,
-								)
-
-							Action.STOP.name ->
-								serviceManager.stopVpnServiceForeground(
-									this@ShortcutsActivity,
-									isManualStop = true,
-								)
 						}
 					}
-
-					WireGuardConnectivityWatcherService::class.java.simpleName -> {
+					AutoTunnelService::class.java.simpleName, LEGACY_AUTO_TUNNEL_SERVICE_NAME -> {
 						when (intent.action) {
 							Action.START.name ->
 								appDataRepository.settings.save(
@@ -63,7 +58,6 @@ class ShortcutsActivity : ComponentActivity() {
 										isAutoTunnelPaused = false,
 									),
 								)
-
 							Action.STOP.name ->
 								appDataRepository.settings.save(
 									settings.copy(
@@ -79,6 +73,8 @@ class ShortcutsActivity : ComponentActivity() {
 	}
 
 	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,18 +1,19 @@
 package com.zaneschepke.wireguardautotunnel.service.tile
 
+import android.content.Intent
 import android.os.Build
+import android.os.IBinder
 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.LifecycleRegistry
 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.service.foreground.ServiceManager
+import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.cancel
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
@@ -23,82 +24,122 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
 	lateinit var appDataRepository: AppDataRepository
 
 	@Inject
-	lateinit var serviceManager: ServiceManager
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
 
-	private val dispatcher = ServiceLifecycleDispatcher(this)
+	private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
 
-	private var manualStartConfig: TunnelConfig? = null
+	/* This works around an annoying unsolved frameworks bug some people are hitting. */
+	override fun onBind(intent: Intent): IBinder? {
+		var ret: IBinder? = null
+		try {
+			ret = super.onBind(intent)
+		} catch (e: Throwable) {
+			Timber.e("Failed to bind to AutoTunnelTile")
+		}
+		return ret
+	}
 
-	override fun onStartListening() {
-		super.onStartListening()
-		lifecycleScope.launch {
-			val settings = appDataRepository.settings.getSettings()
-			when (settings.isAutoTunnelEnabled) {
-				true -> {
-					if (settings.isAutoTunnelPaused) {
-						setInactive()
-						setTileDescription(this@AutoTunnelControlTile.getString(R.string.paused))
-					} else {
-						setActive()
-						setTileDescription(this@AutoTunnelControlTile.getString(R.string.active))
+	override fun onCreate() {
+		super.onCreate()
+		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+
+		applicationScope.launch {
+			appDataRepository.settings.getSettingsFlow().collect {
+				kotlin.runCatching {
+					when (it.isAutoTunnelEnabled) {
+						true -> {
+							if (it.isAutoTunnelPaused) {
+								setInactive()
+								setTileDescription(this@AutoTunnelControlTile.getString(R.string.paused))
+							} else {
+								setActive()
+								setTileDescription(this@AutoTunnelControlTile.getString(R.string.active))
+							}
+						}
+
+						false -> {
+							setTileDescription(this@AutoTunnelControlTile.getString(R.string.disabled))
+							setUnavailable()
+						}
 					}
-				}
-
-				false -> {
-					setTileDescription(this@AutoTunnelControlTile.getString(R.string.disabled))
-					setUnavailable()
+				}.onFailure {
+					Timber.e(it)
 				}
 			}
 		}
 	}
 
-	override fun onTileAdded() {
-		super.onTileAdded()
-		onStartListening()
+	override fun onStopListening() {
+		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
+	}
+
+	override fun onDestroy() {
+		super.onDestroy()
+		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+	}
+
+	override fun onStartListening() {
+		super.onStartListening()
+		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
 	}
 
 	override fun onClick() {
 		super.onClick()
 		unlockAndRun {
 			lifecycleScope.launch {
-				try {
-					appDataRepository.toggleWatcherServicePause()
-					onStartListening()
-				} catch (e: Exception) {
-					Timber.e(e.message)
-				} finally {
-					cancel()
+				kotlin.runCatching {
+					val settings = appDataRepository.settings.getSettings()
+					if (settings.isAutoTunnelPaused) {
+						return@launch appDataRepository.settings.save(
+							settings.copy(
+								isAutoTunnelPaused = false,
+							),
+						)
+					}
+					appDataRepository.settings.save(
+						settings.copy(
+							isAutoTunnelPaused = true,
+						),
+					)
 				}
 			}
 		}
 	}
 
 	private fun setActive() {
-		qsTile.state = Tile.STATE_ACTIVE
-		qsTile.updateTile()
+		kotlin.runCatching {
+			qsTile.state = Tile.STATE_ACTIVE
+			qsTile.updateTile()
+		}
 	}
 
 	private fun setInactive() {
-		qsTile.state = Tile.STATE_INACTIVE
-		qsTile.updateTile()
+		kotlin.runCatching {
+			qsTile.state = Tile.STATE_INACTIVE
+			qsTile.updateTile()
+		}
 	}
 
 	private fun setUnavailable() {
-		manualStartConfig = null
-		qsTile.state = Tile.STATE_UNAVAILABLE
-		qsTile.updateTile()
+		kotlin.runCatching {
+			qsTile.state = Tile.STATE_UNAVAILABLE
+			qsTile.updateTile()
+		}
 	}
 
 	private fun setTileDescription(description: String) {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-			qsTile.subtitle = description
+		kotlin.runCatching {
+			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()
 		}
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-			qsTile.stateDescription = description
-		}
-		qsTile.updateTile()
 	}
 
 	override val lifecycle: Lifecycle
-		get() = dispatcher.lifecycle
+		get() = lifecycleRegistry
 }

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

@@ -5,18 +5,20 @@ 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.LifecycleRegistry
 import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
-import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
+import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import com.zaneschepke.wireguardautotunnel.util.extensions.startTunnelBackground
+import com.zaneschepke.wireguardautotunnel.util.extensions.stopTunnelBackground
 import dagger.hilt.android.AndroidEntryPoint
-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(), LifecycleOwner {
@@ -24,98 +26,104 @@ class TunnelControlTile : TileService(), LifecycleOwner {
 	lateinit var appDataRepository: AppDataRepository
 
 	@Inject
-	lateinit var vpnService: VpnService
+	lateinit var tunnelService: Provider<TunnelService>
 
 	@Inject
-	lateinit var serviceManager: ServiceManager
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
 
-	private val dispatcher = ServiceLifecycleDispatcher(this)
+	private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
 
-	private var manualStartConfig: TunnelConfig? = null
+	override fun onCreate() {
+		super.onCreate()
+		Timber.d("onCreate for tile service")
+		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+	}
+
+	override fun onStopListening() {
+		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
+	}
+
+	override fun onDestroy() {
+		super.onDestroy()
+		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+	}
 
 	override fun onStartListening() {
 		super.onStartListening()
-		Timber.d("On start listening called")
+		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
 		lifecycleScope.launch {
-			when (vpnService.getState()) {
-				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()
-			}
+			if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
+			updateTileState()
 		}
 	}
 
-	override fun onTileAdded() {
-		super.onTileAdded()
-		onStartListening()
+	private suspend fun updateTileState() {
+		val lastActive = appDataRepository.getStartTunnelConfig()
+		lastActive?.let {
+			updateTile(it)
+		}
 	}
 
 	override fun onClick() {
 		super.onClick()
 		unlockAndRun {
+			Timber.d("Click")
 			lifecycleScope.launch {
-				try {
-					if (vpnService.getState() == TunnelState.UP) {
-						serviceManager.stopVpnServiceForeground(
-							this@TunnelControlTile,
-							isManualStop = true,
-						)
-					} else {
-						serviceManager.startVpnServiceForeground(
-							this@TunnelControlTile,
-							manualStartConfig?.id,
-							isManualStart = true,
-						)
-					}
-				} catch (e: Exception) {
-					Timber.e(e.message)
-				} finally {
-					cancel()
+				val context = this@TunnelControlTile
+				val lastActive = appDataRepository.getStartTunnelConfig()
+				lastActive?.let { tunnel ->
+					if (tunnel.isActive) return@launch context.stopTunnelBackground(tunnel.id)
+					context.startTunnelBackground(tunnel.id)
 				}
 			}
 		}
 	}
 
 	private fun setActive() {
-		qsTile.state = Tile.STATE_ACTIVE
-		qsTile.updateTile()
+		kotlin.runCatching {
+			qsTile.state = Tile.STATE_ACTIVE
+			qsTile.updateTile()
+		}
 	}
 
 	private fun setInactive() {
-		qsTile.state = Tile.STATE_INACTIVE
-		qsTile.updateTile()
+		kotlin.runCatching {
+			qsTile.state = Tile.STATE_INACTIVE
+			qsTile.updateTile()
+		}
 	}
 
 	private fun setUnavailable() {
-		manualStartConfig = null
-		qsTile.state = Tile.STATE_UNAVAILABLE
-		qsTile.updateTile()
+		kotlin.runCatching {
+			qsTile.state = Tile.STATE_UNAVAILABLE
+			setTileDescription("")
+			qsTile.updateTile()
+		}
 	}
 
 	private fun setTileDescription(description: String) {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-			qsTile.subtitle = description
+		kotlin.runCatching {
+			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()
 		}
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-			qsTile.stateDescription = description
+	}
+
+	private fun updateTile(tunnelConfig: TunnelConfig?) {
+		kotlin.runCatching {
+			tunnelConfig?.let {
+				setTileDescription(it.name)
+				if (it.isActive) return setActive()
+				setInactive()
+			}
 		}
-		qsTile.updateTile()
 	}
 
 	override val lifecycle: Lifecycle
-		get() = dispatcher.lifecycle
+		get() = lifecycleRegistry
 }

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

@@ -0,0 +1,46 @@
+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/TunnelService.kt

@@ -0,0 +1,22 @@
+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): Result<TunnelState>
+
+	suspend fun stopTunnel(tunnelConfig: TunnelConfig): Result<TunnelState>
+
+	suspend fun bounceTunnel(tunnelConfig: TunnelConfig): Result<TunnelState>
+
+	val vpnState: StateFlow<VpnState>
+
+	suspend fun runningTunnelNames(): Set<String>
+
+	suspend fun getState(): TunnelState
+
+	fun cancelStatsJob()
+	fun startStatsJob()
+}

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

@@ -1,15 +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 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,27 +1,25 @@
 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.module.Userspace
 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.Constants
-import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.amnezia.awg.backend.Tunnel
@@ -32,107 +30,133 @@ import javax.inject.Provider
 class WireGuardTunnel
 @Inject
 constructor(
-	private val userspaceAmneziaBackend: Provider<org.amnezia.awg.backend.Backend>,
-	@Userspace private val userspaceBackend: Provider<Backend>,
+	private val amneziaBackend: Provider<org.amnezia.awg.backend.Backend>,
+	tunnelConfigRepository: TunnelConfigRepository,
 	@Kernel private val kernelBackend: Provider<Backend>,
 	private val appDataRepository: AppDataRepository,
 	@ApplicationScope private val applicationScope: CoroutineScope,
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-) : VpnService {
+) : TunnelService {
+
 	private val _vpnState = MutableStateFlow(VpnState())
-	override val vpnState: StateFlow<VpnState> = _vpnState.asStateFlow()
+	override val vpnState: StateFlow<VpnState> = _vpnState.combine(
+		tunnelConfigRepository.getTunnelConfigsFlow(),
+	) {
+			vpnState, tunnels ->
+		vpnState.copy(
+			tunnelConfig = tunnels.firstOrNull { it.id == vpnState.tunnelConfig?.id },
+		)
+	}.stateIn(applicationScope, SharingStarted.Lazily, VpnState())
 
 	private var statsJob: Job? = null
 
-	private var backendIsWgUserspace = true
+	private suspend fun backend(): Any {
+		val settings = appDataRepository.settings.getSettings()
+		if (settings.isKernelEnabled) return kernelBackend.get()
+		return amneziaBackend.get()
+	}
 
-	private var backendIsAmneziaUserspace = false
-
-	init {
-		applicationScope.launch(ioDispatcher) {
-			appDataRepository.settings.getSettingsFlow().collect {
-				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
-				}
-			}
+	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 fun setState(tunnelConfig: TunnelConfig?, tunnelState: TunnelState): TunnelState {
-		return if (backendIsAmneziaUserspace) {
-			Timber.i("Using Amnezia backend")
-			val config =
-				tunnelConfig?.let {
-					if (it.amQuick != "") {
-						TunnelConfig.configFromAmQuick(it.amQuick)
-					} else {
-						Timber.w(
-							"Using backwards compatible wg config, amnezia specific config not found.",
+	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,
 						)
-						TunnelConfig.configFromAmQuick(it.wgQuick)
+					} else {
+						TunnelConfig.configFromAmQuick(tunnelConfig.amQuick)
+					}
+					backend.setState(this, tunnelState.toAmState(), config).let {
+						TunnelState.from(it)
 					}
 				}
-			val state =
-				userspaceAmneziaBackend.get().setState(this, tunnelState.toAmState(), config)
-			TunnelState.from(state)
-		} 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)
+				else -> throw NotImplementedError()
+			}
+		}.onFailure {
+			Timber.e(it)
 		}
 	}
 
-	override suspend fun startTunnel(tunnelConfig: TunnelConfig?): TunnelState {
+	override suspend fun startTunnel(tunnelConfig: TunnelConfig): Result<TunnelState> {
 		return withContext(ioDispatcher) {
-			try {
-				// 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)
+			onBeforeStart(tunnelConfig)
+			setState(tunnelConfig, TunnelState.UP).onSuccess {
+				emitTunnelState(it)
+			}.onFailure {
+				Timber.e(it)
+				onStartFailed()
 			}
 		}
 	}
 
-	private fun backend(): Backend {
-		return when {
-			backendIsWgUserspace -> {
-				userspaceBackend.get()
-			}
-
-			!backendIsWgUserspace && !backendIsAmneziaUserspace -> {
-				kernelBackend.get()
-			}
-
-			else -> {
-				userspaceBackend.get()
+	override suspend fun stopTunnel(tunnelConfig: TunnelConfig): Result<TunnelState> {
+		return withContext(ioDispatcher) {
+			onBeforeStop(tunnelConfig)
+			setState(tunnelConfig, TunnelState.DOWN).onSuccess {
+				emitTunnelState(it)
+			}.onFailure {
+				Timber.e(it)
+				onStopFailed()
 			}
 		}
 	}
 
+	// use this when we just want to bounce tunnel and not change tunnelConfig active state
+	override suspend fun bounceTunnel(tunnelConfig: TunnelConfig): Result<TunnelState> {
+		toggleTunnel(tunnelConfig)
+		delay(VPN_RESTART_DELAY)
+		return toggleTunnel(tunnelConfig)
+	}
+
+	private suspend fun toggleTunnel(tunnelConfig: TunnelConfig): Result<TunnelState> {
+		return withContext(ioDispatcher) {
+			setState(tunnelConfig, TunnelState.TOGGLE).onSuccess {
+				emitTunnelState(it)
+				resetBackendStatistics()
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
+	}
+
+	private suspend fun onStopFailed() {
+		_vpnState.value.tunnelConfig?.let {
+			appDataRepository.tunnels.save(it.copy(isActive = true))
+		}
+	}
+
+	private suspend fun onStartFailed() {
+		_vpnState.value.tunnelConfig?.let {
+			appDataRepository.tunnels.save(it.copy(isActive = false))
+		}
+		cancelStatsJob()
+		resetBackendStatistics()
+	}
+
+	private suspend fun onBeforeStart(tunnelConfig: TunnelConfig) {
+		if (_vpnState.value.status == TunnelState.UP) vpnState.value.tunnelConfig?.let { stopTunnel(it) }
+		resetBackendStatistics()
+		appDataRepository.tunnels.save(tunnelConfig.copy(isActive = true))
+		emitVpnStateConfig(tunnelConfig)
+		startStatsJob()
+	}
+
+	private suspend fun onBeforeStop(tunnelConfig: TunnelConfig) {
+		cancelStatsJob()
+		resetBackendStatistics()
+		appDataRepository.tunnels.save(tunnelConfig.copy(isActive = false))
+	}
+
 	private fun emitTunnelState(state: TunnelState) {
 		_vpnState.tryEmit(
 			_vpnState.value.copy(
@@ -149,85 +173,73 @@ constructor(
 		)
 	}
 
-	private suspend fun emitTunnelConfig(tunnelConfig: TunnelConfig?) {
-		_vpnState.emit(
+	private fun emitVpnStateConfig(tunnelConfig: TunnelConfig) {
+		_vpnState.tryEmit(
 			_vpnState.value.copy(
 				tunnelConfig = tunnelConfig,
 			),
 		)
 	}
 
-	private fun resetVpnState() {
-		_vpnState.tryEmit(VpnState())
+	private fun resetBackendStatistics() {
+		_vpnState.tryEmit(
+			_vpnState.value.copy(
+				statistics = null,
+			),
+		)
 	}
 
-	override suspend fun stopTunnel() {
-		withContext(ioDispatcher) {
-			try {
-				if (getState() == TunnelState.UP) {
-					val state = setState(null, TunnelState.DOWN)
-					resetVpnState()
-					emitTunnelState(state)
-				}
-			} 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}")
-			}
+	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 getState(): TunnelState {
-		return if (backendIsAmneziaUserspace) {
-			TunnelState.from(
-				userspaceAmneziaBackend.get().getState(this),
-			)
-		} else {
-			TunnelState.from(backend().getState(this))
-		}
+	override fun cancelStatsJob() {
+		statsJob?.cancel()
+	}
+
+	override fun startStatsJob() {
+		statsJob = startTunnelStatisticsJob()
 	}
 
 	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) {
-			if (backendIsAmneziaUserspace) {
-				emitBackendStatistics(
-					AmneziaStatistics(
-						userspaceAmneziaBackend.get().getStatistics(this@WireGuardTunnel),
-					),
-				)
-			} else {
-				emitBackendStatistics(
-					WireGuardStatistics(backend().getStatistics(this@WireGuardTunnel)),
+			when (backend) {
+				is Backend -> emitBackendStatistics(
+					WireGuardStatistics(backend.getStatistics(this@WireGuardTunnel)),
 				)
+				is org.amnezia.awg.backend.Backend -> {
+					emitBackendStatistics(
+						AmneziaStatistics(
+							backend.getStatistics(this@WireGuardTunnel),
+						),
+					)
+				}
 			}
-			delay(Constants.VPN_STATISTIC_CHECK_INTERVAL)
+			delay(VPN_STATISTIC_CHECK_INTERVAL)
 		}
 	}
 
+	override fun onStateChange(newState: Tunnel.State) {
+		emitTunnelState(TunnelState.from(newState))
+	}
+
 	override fun onStateChange(state: State) {
-		handleStateChange(TunnelState.from(state))
+		emitTunnelState(TunnelState.from(state))
+	}
+
+	companion object {
+		const val STATS_START_DELAY = 5_000L
+		const val VPN_STATISTIC_CHECK_INTERVAL = 1_000L
+		const val VPN_RESTART_DELAY = 1_000L
 	}
 }

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

@@ -1,9 +1,13 @@
 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 snackbarMessage: String = "",
-	val snackbarMessageConsumed: Boolean = true,
-	val vpnPermissionAccepted: Boolean = false,
-	val notificationPermissionAccepted: Boolean = false,
-	val requestPermissions: Boolean = false,
+	val settings: Settings = Settings(),
+	val tunnels: List<TunnelConfig> = emptyList(),
+	val vpnState: VpnState = VpnState(),
+	val generalState: GeneralState = GeneralState(),
 )

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

@@ -1,123 +1,115 @@
 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 com.wireguard.android.backend.GoBackend
-import com.zaneschepke.wireguardautotunnel.R
+import androidx.lifecycle.viewModelScope
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
+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.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
 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.update
-import timber.log.Timber
+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.launch
+import kotlinx.coroutines.plus
+import xyz.teamgravity.pin_lock_compose.PinManager
 import javax.inject.Inject
+import javax.inject.Provider
 
 @HiltViewModel
 class AppViewModel
 @Inject
-constructor() : ViewModel() {
-	val vpnIntent: Intent? = GoBackend.VpnService.prepare(WireGuardAutoTunnel.instance)
+constructor(
+	private val appDataRepository: AppDataRepository,
+	private val tunnelService: Provider<TunnelService>,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) : ViewModel() {
 
-	private val _appUiState =
-		MutableStateFlow(
+	private val _appUiState = MutableStateFlow(AppUiState())
+
+	val uiState =
+		combine(
+			appDataRepository.settings.getSettingsFlow(),
+			appDataRepository.tunnels.getTunnelConfigsFlow(),
+			tunnelService.get().vpnState,
+			appDataRepository.appState.generalStateFlow,
+		) { settings, tunnels, tunnelState, generalState ->
 			AppUiState(
-				vpnPermissionAccepted = vpnIntent == null,
+				settings,
+				tunnels,
+				tunnelState,
+				generalState,
+			)
+		}.stateIn(
+			viewModelScope + ioDispatcher,
+			SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
+			_appUiState.value,
+		)
+
+	private val _isAppReady = MutableStateFlow<Boolean>(false)
+	val isAppReady = _isAppReady.asStateFlow()
+
+	init {
+
+		viewModelScope.launch {
+			initPin()
+			initAutoTunnel()
+			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().startStatsJob()
+		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 initAutoTunnel() {
+		val settings = appDataRepository.settings.getSettings()
+		if (settings.isAutoTunnelEnabled) ServiceManager.startWatcherService(WireGuardAutoTunnel.instance)
+	}
+
+	fun setTunnels(tunnels: TunnelConfigs) = viewModelScope.launch(ioDispatcher) {
+		_appUiState.emit(
+			_appUiState.value.copy(
+				tunnels = tunnels,
 			),
 		)
-	val appUiState = _appUiState.asStateFlow()
-
-	fun isRequiredPermissionGranted(): Boolean {
-		val allAccepted =
-			(_appUiState.value.vpnPermissionAccepted && _appUiState.value.vpnPermissionAccepted)
-		if (!allAccepted) requestPermissions()
-		return allAccepted
 	}
 
-	private fun requestPermissions() {
-		_appUiState.update {
-			it.copy(
-				requestPermissions = true,
-			)
-		}
+	fun onPinLockDisabled() = viewModelScope.launch(ioDispatcher) {
+		PinManager.clearPin()
+		appDataRepository.appState.setPinLockEnabled(false)
 	}
 
-	fun permissionsRequested() {
-		_appUiState.update {
-			it.copy(
-				requestPermissions = false,
-			)
-		}
-	}
-
-	fun openWebPage(url: String, context: Context) {
-		try {
-			val webpage: Uri = Uri.parse(url)
-			val intent =
-				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 launchEmail(context: Context) {
-		try {
-			val intent =
-				Intent(Intent.ACTION_SENDTO).apply {
-					type = Constants.EMAIL_MIME_TYPE
-					putExtra(Intent.EXTRA_EMAIL, arrayOf(context.getString(R.string.my_email)))
-					putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.email_subject))
-					addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-				}
-			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,
-			)
-		}
-	}
-
-	fun snackbarMessageConsumed() {
-		_appUiState.update {
-			it.copy(
-				snackbarMessage = "",
-				snackbarMessageConsumed = true,
-			)
-		}
-	}
-
-	fun setNotificationPermissionAccepted(accepted: Boolean) {
-		_appUiState.update {
-			it.copy(
-				notificationPermissionAccepted = accepted,
-			)
-		}
+	fun onPinLockEnabled() = viewModelScope.launch {
+		appDataRepository.appState.setPinLockEnabled(true)
 	}
 }

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

@@ -1,33 +1,31 @@
 package com.zaneschepke.wireguardautotunnel.ui
 
-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.enableEdgeToEdge
-import androidx.activity.result.contract.ActivityResultContracts
+import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.focusable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Box
 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
@@ -35,40 +33,37 @@ 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.hilt.navigation.compose.hiltViewModel
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 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.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 androidx.navigation.toRoute
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
-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.service.tunnel.TunnelService
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavBar
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavItem
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.isCurrentRoute
 import com.zaneschepke.wireguardautotunnel.ui.common.prompt.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.support.SupportScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.logs.LogsScreen
 import com.zaneschepke.wireguardautotunnel.ui.theme.WireguardAutoTunnelTheme
-import com.zaneschepke.wireguardautotunnel.util.StringValue
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
+import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -77,251 +72,158 @@ class MainActivity : AppCompatActivity() {
 	lateinit var appStateRepository: AppStateRepository
 
 	@Inject
-	lateinit var settingsRepository: SettingsRepository
+	lateinit var tunnelService: TunnelService
 
-	@Inject
-	lateinit var serviceManager: ServiceManager
+	private val viewModel by viewModels<AppViewModel>()
 
-	@OptIn(
-		ExperimentalPermissionsApi::class,
-	)
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
+		enableEdgeToEdge(
+			navigationBarStyle = SystemBarStyle.auto(
+				lightScrim = Color.Transparent.toArgb(),
+				darkScrim = Color.Transparent.toArgb(),
+			),
+		)
 
-		val isPinLockEnabled = intent.extras?.getBoolean(SplashActivity.IS_PIN_LOCK_ENABLED_KEY)
-
-		enableEdgeToEdge(navigationBarStyle = SystemBarStyle.dark(Color.Transparent.toArgb()))
-
-		lifecycleScope.launch {
-			WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
-			val settings = settingsRepository.getSettings()
-			if (settings.isAutoTunnelEnabled) {
-				serviceManager.startWatcherService(application.applicationContext)
+		installSplashScreen().apply {
+			setKeepOnScreenCondition {
+				!viewModel.isAppReady.value
 			}
 		}
 
 		setContent {
-			val appViewModel = hiltViewModel<AppViewModel>()
-			val appUiState by appViewModel.appUiState.collectAsStateWithLifecycle()
+			val appUiState by viewModel.uiState.collectAsStateWithLifecycle(lifecycle = this.lifecycle)
 			val navController = rememberNavController()
 			val navBackStackEntry by navController.currentBackStackEntryAsState()
-			var showVpnPermissionDialog by remember { mutableStateOf(false) }
 
-			val notificationPermissionState =
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-					rememberPermissionState(Manifest.permission.POST_NOTIFICATIONS)
-				} else {
-					null
+			LaunchedEffect(appUiState.vpnState.status) {
+				val context = this@MainActivity
+				when (appUiState.vpnState.status) {
+					TunnelState.DOWN -> ServiceManager.stopTunnelBackgroundService(context)
+					else -> Unit
 				}
+				context.requestTunnelTileServiceStateUpdate()
+			}
 
-			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()
-						}
-					}
+			with(appUiState.settings) {
+				LaunchedEffect(isAutoTunnelPaused, isAutoTunnelEnabled) {
+					this@MainActivity.requestAutoTunnelTileServiceUpdate()
 				}
 			}
 
-			LaunchedEffect(appUiState.requestPermissions) {
-				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
-					}
-				}
-			}
-
-			WireguardAutoTunnelTheme {
-				LaunchedEffect(Unit) {
-					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(
-					snackbarHost = {
-						SnackbarHost(snackbarHostState) { snackbarData: SnackbarData ->
-							CustomSnackBar(
-								snackbarData.visuals.message,
-								isRtl = false,
-								containerColor =
-								MaterialTheme.colorScheme.surfaceColorAtElevation(
-									2.dp,
-								),
-							)
-						}
-					},
-					// TODO refactor
-					modifier =
-					Modifier
-						.focusable()
-						.focusProperties {
-							when (navBackStackEntry?.destination?.route) {
-								Screen.Lock.route -> Unit
-								else -> up = focusRequester
-							}
-						},
-					bottomBar = {
-						BottomNavBar(
-							navController,
-							listOf(
-								Screen.Main.navItem,
-								Screen.Settings.navItem,
-								Screen.Support.navItem,
-							),
-						)
-					},
-				) { padding ->
-					NavHost(
-						navController,
-						startDestination = (if (isPinLockEnabled == true) Screen.Lock.route else Screen.Main.route),
-						modifier =
-						Modifier
-							.padding(padding)
-							.fillMaxSize(),
-					) {
-						composable(
-							Screen.Main.route,
-						) {
-							MainScreen(
-								focusRequester = focusRequester,
-								appViewModel = appViewModel,
-								navController = navController,
-							)
-						}
-						composable(
-							Screen.Settings.route,
-						) {
-							SettingsScreen(
-								appViewModel = appViewModel,
-								navController = navController,
-								focusRequester = focusRequester,
-							)
-						}
-						composable(
-							Screen.Support.route,
-						) {
-							SupportScreen(
-								focusRequester = focusRequester,
-								appViewModel = appViewModel,
-								navController = navController,
-							)
-						}
-						composable(Screen.Support.Logs.route) {
-							LogsScreen()
-						}
-						composable(
-							"${Screen.Config.route}/{id}?configType={configType}",
-							arguments =
-							listOf(
-								navArgument("id") {
-									type = NavType.StringType
-									defaultValue = "0"
+			CompositionLocalProvider(LocalNavController provides navController) {
+				SnackbarControllerProvider { host ->
+					WireguardAutoTunnelTheme {
+						val focusRequester = remember { FocusRequester() }
+						Scaffold(
+							snackbarHost = {
+								SnackbarHost(host) { snackbarData: SnackbarData ->
+									CustomSnackBar(
+										snackbarData.visuals.message,
+										isRtl = false,
+										containerColor =
+										MaterialTheme.colorScheme.surfaceColorAtElevation(
+											2.dp,
+										),
+									)
+								}
+							},
+							modifier =
+							Modifier
+								.focusable()
+								.focusProperties {
+									if (navBackStackEntry?.isCurrentRoute(Route.Lock) == true) {
+										Unit
+									} else {
+										up = focusRequester
+									}
 								},
-								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(
-									navController = navController,
-									tunnelId = id,
-									appViewModel = appViewModel,
-									focusRequester = focusRequester,
-									configType = configType,
+							bottomBar = {
+								BottomNavBar(
+									navController,
+									listOf(
+										BottomNavItem(
+											name = stringResource(R.string.tunnels),
+											route = Route.Main,
+											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)) },
+									exitTransition = { fadeOut(tween(Constants.TRANSITION_ANIMATION_TIME)) },
+									startDestination = (if (appUiState.generalState.isPinLockEnabled == true) Route.Lock else Route.Main),
+								) {
+									composable<Route.Main> {
+										MainScreen(
+											focusRequester = focusRequester,
+											uiState = appUiState,
+										)
+									}
+									composable<Route.Settings> {
+										SettingsScreen(
+											appViewModel = viewModel,
+											uiState = appUiState,
+											focusRequester = focusRequester,
+										)
+									}
+									composable<Route.Support> {
+										SupportScreen(
+											focusRequester = focusRequester,
+											appUiState = appUiState,
+										)
+									}
+									composable<Route.Logs> {
+										LogsScreen()
+									}
+									composable<Route.Config> {
+										val args = it.toRoute<Route.Config>()
+										ConfigScreen(
+											focusRequester = focusRequester,
+											tunnelId = args.id,
+										)
+									}
+									composable<Route.Option> {
+										val args = it.toRoute<Route.Option>()
+										OptionsScreen(
+											tunnelId = args.id,
+											focusRequester = focusRequester,
+											appUiState = appUiState,
+										)
+									}
+									composable<Route.Lock> {
+										PinLockScreen(
+											appViewModel = viewModel,
+										)
+									}
+									composable<Route.Scanner> {
+										ScannerScreen()
+									}
+								}
 							}
 						}
-						composable("${Screen.Option.route}/{id}") {
-							val id = it.arguments?.getString("id")
-							if (!id.isNullOrBlank()) {
-								OptionsScreen(
-									navController = navController,
-									tunnelId = id,
-									appViewModel = appViewModel,
-									focusRequester = focusRequester,
-								)
-							}
-						}
-						composable(Screen.Lock.route) {
-							PinLockScreen(
-								navController = navController,
-								appViewModel = appViewModel,
-							)
-						}
 					}
 				}
 			}
 		}
 	}
+
+	override fun onDestroy() {
+		super.onDestroy()
+		tunnelService.cancelStatsJob()
+	}
 }

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

@@ -0,0 +1,33 @@
+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 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

@@ -1,46 +0,0 @@
-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

@@ -1,67 +0,0 @@
-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

@@ -12,7 +12,7 @@ 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) {
+fun ClickableIconButton(onClick: () -> Unit, onIconClick: () -> Unit, text: String, icon: ImageVector, enabled: Boolean = true) {
 	TextButton(
 		onClick = onClick,
 		enabled = enabled,

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

@@ -0,0 +1,69 @@
+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.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+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 = {},
+	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),
+				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

@@ -0,0 +1,13 @@
+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

@@ -1,99 +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.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/config/ConfigurationTextBox.kt

@@ -1,5 +1,6 @@
 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
@@ -14,23 +15,29 @@ 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(
-			capitalization = KeyboardCapitalization.None,
-			imeAction = ImeAction.Done,
-		),
+		keyboardOptions = keyboardOptions,
 		keyboardActions = keyboardActions,
+		trailingIcon = trailing,
 	)
 }

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

@@ -4,6 +4,7 @@ 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.Switch
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -13,7 +14,14 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.Dp
 
 @Composable
-fun ConfigurationToggle(label: String, enabled: Boolean, checked: Boolean, padding: Dp, onCheckChanged: () -> Unit, modifier: Modifier = Modifier) {
+fun ConfigurationToggle(
+	label: String,
+	enabled: Boolean = true,
+	checked: Boolean,
+	padding: Dp,
+	onCheckChanged: (checked: Boolean) -> Unit,
+	modifier: Modifier = Modifier,
+) {
 	Row(
 		modifier =
 		Modifier
@@ -25,6 +33,7 @@ fun ConfigurationToggle(label: String, enabled: Boolean, checked: Boolean, paddi
 		Text(
 			label,
 			textAlign = TextAlign.Start,
+			style = MaterialTheme.typography.labelLarge,
 			modifier =
 			Modifier
 				.weight(
@@ -37,7 +46,7 @@ fun ConfigurationToggle(label: String, enabled: Boolean, checked: Boolean, paddi
 			modifier = modifier,
 			enabled = enabled,
 			checked = checked,
-			onCheckedChange = { onCheckChanged() },
+			onCheckedChange = { onCheckChanged(it) },
 		)
 	}
 }

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

@@ -0,0 +1,85 @@
+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.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.OutlinedTextField
+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.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import com.zaneschepke.wireguardautotunnel.R
+
+@Composable
+fun SubmitConfigurationTextBox(
+	value: String?,
+	label: String,
+	hint: String,
+	focusRequester: FocusRequester,
+	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 ?: "") }
+
+	OutlinedTextField(
+		isError = isErrorValue(stateValue),
+		modifier = Modifier
+			.fillMaxWidth()
+			.focusRequester(focusRequester),
+		value = stateValue,
+		singleLine = true,
+		interactionSource = interactionSource,
+		onValueChange = { stateValue = it },
+		label = { Text(label) },
+		maxLines = 1,
+		placeholder = { Text(hint) },
+		keyboardOptions = keyboardOptions,
+		keyboardActions = KeyboardActions(
+			onDone = {
+				onSubmit(stateValue)
+				keyboardController?.hide()
+			},
+		),
+		trailingIcon = {
+			if (!isErrorValue(stateValue) && isFocused) {
+				IconButton(onClick = {
+					onSubmit(stateValue)
+					keyboardController?.hide()
+					focusManager.clearFocus()
+				}) {
+					Icon(
+						imageVector = Icons.Outlined.Save,
+						contentDescription = stringResource(R.string.save_changes),
+						tint = MaterialTheme.colorScheme.primary,
+					)
+				}
+			}
+		},
+	)
+}

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

@@ -0,0 +1,60 @@
+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/navigation/BottomNavBar.kt

@@ -10,40 +10,45 @@ 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()
 
-	// TODO find a better way to hide nav bar
-	showBottomBar =
-		when (navBackStackEntry?.destination?.route) {
-			Screen.Lock.route -> false
-			else -> true
-		}
+	showBottomBar = bottomNavItems.any {
+		navBackStackEntry?.isCurrentRoute(it.route) == true
+	}
 
-	NavigationBar(
-		containerColor = if (!showBottomBar) Color.Transparent else MaterialTheme.colorScheme.background,
-	) {
-		if (showBottomBar) {
+	if (showBottomBar) {
+		NavigationBar(
+			containerColor = MaterialTheme.colorScheme.surface,
+		) {
 			bottomNavItems.forEach { item ->
-				val selected = item.route == backStackEntry.value?.destination?.route
-
+				val selected = navBackStackEntry.isCurrentRoute(item.route)
 				NavigationBarItem(
 					selected = selected,
-					onClick = { navController.navigate(item.route) },
+					onClick = {
+						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,
-							fontWeight = FontWeight.SemiBold,
+							style = MaterialTheme.typography.labelMedium,
 						)
 					},
 					icon = {

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

@@ -1,9 +1,10 @@
 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: String,
+	val route: Route,
 	val icon: ImageVector,
 )

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

@@ -0,0 +1,14 @@
+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
+
+@SuppressLint("RestrictedApi")
+fun NavBackStackEntry?.isCurrentRoute(route: Route): Boolean {
+	return this?.destination?.hierarchy?.any {
+		it.hasRoute(route = route::class)
+	} == true
+}

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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,33 @@
+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 = {}) {
+	val navController = LocalNavController.current
+	CenterAlignedTopAppBar(
+		title = {
+			Text(title)
+		},
+		navigationIcon = {
+			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/prompt/CustomSnackbar.kt

@@ -19,19 +19,21 @@ 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.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 
 @Composable
 fun CustomSnackBar(message: String, isRtl: Boolean = true, containerColor: Color = MaterialTheme.colorScheme.surface) {
+	val context = LocalContext.current
 	Snackbar(
 		containerColor = containerColor,
 		modifier =
 		Modifier
 			.fillMaxWidth(
-				if (WireGuardAutoTunnel.isRunningOnAndroidTv()) 1 / 3f else 2 / 3f,
+				if (context.isRunningOnTv()) 1 / 3f else 2 / 3f,
 			)
 			.padding(bottom = 100.dp),
 		shape = RoundedCornerShape(16.dp),
@@ -51,10 +53,10 @@ fun CustomSnackBar(message: String, isRtl: Boolean = true, containerColor: Color
 				Icon(
 					icon,
 					contentDescription = icon.name,
-					tint = Color.White,
+					tint = MaterialTheme.colorScheme.onSurface,
 					modifier = Modifier.padding(end = 10.dp),
 				)
-				Text(message, color = Color.White, modifier = Modifier.padding(end = 5.dp))
+				Text(message, color = MaterialTheme.colorScheme.onSurface, modifier = Modifier.padding(end = 5.dp))
 			}
 		}
 	}

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

@@ -0,0 +1,108 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.snackbar
+
+import androidx.compose.material3.SnackbarDuration
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.SnackbarResult
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.ReadOnlyComposable
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.staticCompositionLocalOf
+import androidx.compose.ui.platform.LocalContext
+import com.zaneschepke.wireguardautotunnel.util.StringValue
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.launch
+import kotlin.coroutines.EmptyCoroutineContext
+
+private val LocalSnackbarController = staticCompositionLocalOf {
+	SnackbarController(
+		host = SnackbarHostState(),
+		scope = CoroutineScope(EmptyCoroutineContext),
+	)
+}
+private val channel = Channel<SnackbarChannelMessage>(capacity = 1)
+
+@Composable
+fun SnackbarControllerProvider(content: @Composable (snackbarHost: SnackbarHostState) -> Unit) {
+	val snackHostState = remember { SnackbarHostState() }
+	val scope = rememberCoroutineScope()
+	val snackController = remember(scope) { SnackbarController(snackHostState, scope) }
+	val context = LocalContext.current
+
+	DisposableEffect(snackController, scope) {
+		val job = scope.launch {
+			for (payload in channel) {
+				snackController.showMessage(
+					message = payload.message.asString(context),
+					duration = payload.duration,
+					action = payload.action,
+				)
+			}
+		}
+
+		onDispose {
+			job.cancel()
+		}
+	}
+
+	CompositionLocalProvider(LocalSnackbarController provides snackController) {
+		content(
+			snackHostState,
+		)
+	}
+}
+
+@Immutable
+class SnackbarController(
+	private val host: SnackbarHostState,
+	private val scope: CoroutineScope,
+) {
+	companion object {
+		val current
+			@Composable
+			@ReadOnlyComposable
+			get() = LocalSnackbarController.current
+
+		fun showMessage(message: StringValue, action: SnackbarAction? = null, duration: SnackbarDuration = SnackbarDuration.Short) {
+			channel.trySend(
+				SnackbarChannelMessage(
+					message = message,
+					duration = duration,
+					action = action,
+				),
+			)
+		}
+	}
+
+	fun showMessage(message: String, action: SnackbarAction? = null, duration: SnackbarDuration = SnackbarDuration.Short) {
+		scope.launch {
+			/**
+			 * note: uncomment this line if you want snackbar to be displayed immediately,
+			 * rather than being enqueued and waiting [duration] * current_queue_size
+			 */
+			host.currentSnackbarData?.dismiss()
+			val result =
+				host.showSnackbar(
+					message = message,
+					actionLabel = action?.title,
+					duration = duration,
+				)
+
+			if (result == SnackbarResult.ActionPerformed) {
+				action?.onActionPress?.invoke()
+			}
+		}
+	}
+}
+
+data class SnackbarChannelMessage(
+	val message: StringValue,
+	val action: SnackbarAction?,
+	val duration: SnackbarDuration = SnackbarDuration.Short,
+)
+
+data class SnackbarAction(val title: String, val onActionPress: () -> Unit)

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

@@ -1,22 +1,20 @@
 package com.zaneschepke.wireguardautotunnel.ui.common.text
 
 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.Modifier
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 
 @Composable
 fun SectionTitle(title: String, padding: Dp) {
 	Text(
 		title,
 		textAlign = TextAlign.Start,
-		style = TextStyle(fontSize = 18.sp, fontWeight = FontWeight.ExtraBold),
+		style = MaterialTheme.typography.titleMedium,
 		modifier = Modifier.padding(padding, bottom = 5.dp, top = 5.dp),
 	)
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/ConfigScreen.kt

@@ -1,36 +1,27 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.config
 
 import android.annotation.SuppressLint
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.focusGroup
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.Android
 import androidx.compose.material.icons.rounded.ContentCopy
 import androidx.compose.material.icons.rounded.Delete
 import androidx.compose.material.icons.rounded.Refresh
 import androidx.compose.material.icons.rounded.Save
-import androidx.compose.material3.BasicAlertDialog
-import androidx.compose.material3.Checkbox
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FabPosition
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
@@ -39,12 +30,11 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
-import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
-import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -53,8 +43,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.ClipboardManager
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
@@ -68,60 +56,70 @@ import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.navigation.NavController
-import com.google.accompanist.drawablepainter.DrawablePainter
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
-import com.zaneschepke.wireguardautotunnel.ui.Screen
-import com.zaneschepke.wireguardautotunnel.ui.common.SearchBar
+import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationTextBox
+import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationToggle
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.prompt.AuthorizationPrompt
-import com.zaneschepke.wireguardautotunnel.ui.common.screen.LoadingScreen
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
 import com.zaneschepke.wireguardautotunnel.ui.common.text.SectionTitle
+import com.zaneschepke.wireguardautotunnel.ui.screens.config.components.ApplicationSelectionDialog
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.ConfigType
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.getMessage
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import kotlinx.coroutines.delay
 
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
-@OptIn(
-	ExperimentalMaterial3Api::class,
-)
 @Composable
-fun ConfigScreen(
-	viewModel: ConfigViewModel = hiltViewModel(),
-	focusRequester: FocusRequester,
-	navController: NavController,
-	appViewModel: AppViewModel,
-	tunnelId: String,
-	configType: ConfigType,
-) {
+fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
+	val viewModel = hiltViewModel<ConfigViewModel, ConfigViewModel.ConfigViewModelFactory> { factory ->
+		factory.create(tunnelId)
+	}
+
 	val context = LocalContext.current
+	val snackbar = SnackbarController.current
 	val clipboardManager: ClipboardManager = LocalClipboardManager.current
 	val keyboardController = LocalSoftwareKeyboardController.current
+	val navController = LocalNavController.current
+
 	var showApplicationsDialog by remember { mutableStateOf(false) }
 	var showAuthPrompt by remember { mutableStateOf(false) }
 	var isAuthenticated by remember { mutableStateOf(false) }
 
 	val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+	var configType by remember { mutableStateOf<ConfigType?>(null) }
+	val derivedConfigType = remember {
+		derivedStateOf<ConfigType> {
+			configType ?: if (!uiState.hasAmneziaProperties()) ConfigType.WIREGUARD else ConfigType.AMNEZIA
+		}
+	}
+	val saved by viewModel.saved.collectAsStateWithLifecycle(null)
 
-	LaunchedEffect(Unit) { viewModel.init(tunnelId) }
-
-	LaunchedEffect(uiState.loading) {
-		if (!uiState.loading && WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-			delay(Constants.FOCUS_REQUEST_DELAY)
-			focusRequester.requestFocus()
+	LaunchedEffect(saved) {
+		if (saved == true) {
+			navController.navigate(Route.Main)
 		}
 	}
 
-	if (uiState.loading) {
-		LoadingScreen()
-		return
+	LaunchedEffect(Unit) {
+		if (!uiState.loading && context.isRunningOnTv()) {
+			delay(Constants.FOCUS_REQUEST_DELAY)
+			kotlin.runCatching {
+				focusRequester.requestFocus()
+			}.onFailure {
+				delay(Constants.FOCUS_REQUEST_DELAY)
+				focusRequester.requestFocus()
+			}
+		}
+	}
+
+	LaunchedEffect(Unit) {
+		delay(2_000L)
+		viewModel.cleanUpUninstalledApps()
 	}
 
 	val keyboardActions = KeyboardActions(onDone = { keyboardController?.hide() })
-
 	val keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done)
 
 	val fillMaxHeight = .85f
@@ -156,13 +154,13 @@ fun ConfigScreen(
 			},
 			onError = {
 				showAuthPrompt = false
-				appViewModel.showSnackbarMessage(
+				snackbar.showMessage(
 					context.getString(R.string.error_authentication_failed),
 				)
 			},
 			onFailure = {
 				showAuthPrompt = false
-				appViewModel.showSnackbarMessage(
+				snackbar.showMessage(
 					context.getString(R.string.error_authorization_failed),
 				)
 			},
@@ -170,188 +168,25 @@ fun ConfigScreen(
 	}
 
 	if (showApplicationsDialog) {
-		val sortedPackages =
-			remember(uiState.packages) {
-				uiState.packages.sortedBy { viewModel.getPackageLabel(it) }
-			}
-		BasicAlertDialog(onDismissRequest = { showApplicationsDialog = false }) {
-			Surface(
-				tonalElevation = 2.dp,
-				shadowElevation = 2.dp,
-				shape = RoundedCornerShape(12.dp),
-				color = MaterialTheme.colorScheme.surface,
-				modifier =
-				Modifier
-					.fillMaxWidth()
-					.fillMaxHeight(if (uiState.isAllApplicationsEnabled) 1 / 5f else 4 / 5f),
-			) {
-				Column(
-					modifier =
-					Modifier
-						.fillMaxWidth(),
-				) {
-					Row(
-						modifier =
-						Modifier
-							.fillMaxWidth()
-							.padding(horizontal = 20.dp, vertical = 7.dp),
-						verticalAlignment = Alignment.CenterVertically,
-						horizontalArrangement = Arrangement.SpaceBetween,
-					) {
-						Text(stringResource(id = R.string.tunnel_all))
-						Switch(
-							checked = uiState.isAllApplicationsEnabled,
-							onCheckedChange = { viewModel.onAllApplicationsChange(it) },
-						)
-					}
-					if (!uiState.isAllApplicationsEnabled) {
-						Row(
-							modifier =
-							Modifier
-								.fillMaxWidth()
-								.padding(horizontal = 20.dp, vertical = 7.dp),
-							verticalAlignment = Alignment.CenterVertically,
-							horizontalArrangement = Arrangement.SpaceBetween,
-						) {
-							Row(
-								verticalAlignment = Alignment.CenterVertically,
-								horizontalArrangement = Arrangement.SpaceBetween,
-							) {
-								Text(stringResource(id = R.string.include))
-								Checkbox(
-									checked = uiState.include,
-									onCheckedChange = {
-										viewModel.onIncludeChange(!uiState.include)
-									},
-								)
-							}
-							Row(
-								verticalAlignment = Alignment.CenterVertically,
-								horizontalArrangement = Arrangement.SpaceBetween,
-							) {
-								Text(stringResource(id = R.string.exclude))
-								Checkbox(
-									checked = !uiState.include,
-									onCheckedChange = {
-										viewModel.onIncludeChange(!uiState.include)
-									},
-								)
-							}
-						}
-						Row(
-							modifier =
-							Modifier
-								.fillMaxWidth()
-								.padding(horizontal = 20.dp, vertical = 7.dp),
-							verticalAlignment = Alignment.CenterVertically,
-							horizontalArrangement = Arrangement.SpaceBetween,
-						) {
-							SearchBar(viewModel::emitQueriedPackages)
-						}
-						Spacer(Modifier.padding(5.dp))
-						LazyColumn(
-							horizontalAlignment = Alignment.Start,
-							verticalArrangement = Arrangement.Top,
-							modifier = Modifier.fillMaxHeight(4 / 5f),
-						) {
-							items(sortedPackages, key = { it.packageName }) { pack ->
-								Row(
-									verticalAlignment = Alignment.CenterVertically,
-									horizontalArrangement = Arrangement.SpaceBetween,
-									modifier =
-									Modifier
-										.fillMaxSize()
-										.padding(5.dp),
-								) {
-									Row(modifier = Modifier.fillMaxWidth(fillMaxWidth)) {
-										val drawable =
-											pack.applicationInfo?.loadIcon(context.packageManager)
-										if (drawable != null) {
-											Image(
-												painter = DrawablePainter(drawable),
-												stringResource(id = R.string.icon),
-												modifier = Modifier.size(50.dp, 50.dp),
-											)
-										} else {
-											val icon = Icons.Rounded.Android
-											Icon(
-												icon,
-												icon.name,
-												modifier = Modifier.size(50.dp, 50.dp),
-											)
-										}
-										Text(
-											viewModel.getPackageLabel(pack),
-											modifier = Modifier.padding(5.dp),
-										)
-									}
-									Checkbox(
-										modifier = Modifier.fillMaxSize(),
-										checked =
-										(
-											uiState.checkedPackageNames.contains(
-												pack.packageName,
-											)
-											),
-										onCheckedChange = {
-											if (it) {
-												viewModel.onAddCheckedPackage(pack.packageName)
-											} else {
-												viewModel.onRemoveCheckedPackage(pack.packageName)
-											}
-										},
-									)
-								}
-							}
-						}
-					}
-					Row(
-						verticalAlignment = Alignment.CenterVertically,
-						modifier =
-						Modifier
-							.fillMaxSize()
-							.padding(top = 5.dp),
-						horizontalArrangement = Arrangement.Center,
-					) {
-						TextButton(onClick = { showApplicationsDialog = false }) {
-							Text(stringResource(R.string.done))
-						}
-					}
-				}
-			}
+		ApplicationSelectionDialog(viewModel, uiState) {
+			showApplicationsDialog = false
 		}
 	}
 
 	Scaffold(
 		floatingActionButtonPosition = FabPosition.End,
 		floatingActionButton = {
-			val secondaryColor = MaterialTheme.colorScheme.secondary
-			val hoverColor = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)
-			var fobColor by remember { mutableStateOf(secondaryColor) }
 			FloatingActionButton(
-				modifier =
-				Modifier.onFocusChanged {
-					if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-						fobColor = if (it.isFocused) hoverColor else secondaryColor
-					}
-				},
 				onClick = {
-					viewModel.onSaveAllChanges(configType).onSuccess {
-						appViewModel.showSnackbarMessage(
-							context.getString(R.string.config_changes_saved),
-						)
-						navController.navigate(Screen.Main.route)
-					}.onFailure {
-						appViewModel.showSnackbarMessage(it.getMessage(context))
-					}
+					viewModel.onSaveAllChanges()
 				},
-				containerColor = fobColor,
+				containerColor = MaterialTheme.colorScheme.primary,
 				shape = RoundedCornerShape(16.dp),
 			) {
 				Icon(
 					imageVector = Icons.Rounded.Save,
 					contentDescription = stringResource(id = R.string.save_changes),
-					tint = Color.DarkGray,
+					tint = MaterialTheme.colorScheme.background,
 				)
 			}
 		},
@@ -373,7 +208,7 @@ fun ConfigScreen(
 					color = MaterialTheme.colorScheme.surface,
 					modifier =
 					(
-						if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+						if (context.isRunningOnTv()) {
 							Modifier
 								.fillMaxHeight(fillMaxHeight)
 								.fillMaxWidth(fillMaxWidth)
@@ -395,16 +230,22 @@ fun ConfigScreen(
 							stringResource(R.string.interface_),
 							padding = screenPadding,
 						)
+						ConfigurationToggle(
+							stringResource(id = R.string.show_amnezia_properties),
+							checked = derivedConfigType.value == ConfigType.AMNEZIA,
+							padding = screenPadding,
+							onCheckChanged = { configType = if (it) ConfigType.AMNEZIA else ConfigType.WIREGUARD },
+							modifier = Modifier.focusRequester(focusRequester),
+						)
 						ConfigurationTextBox(
 							value = uiState.tunnelName,
-							onValueChange = { value -> viewModel.onTunnelNameChange(value) },
+							onValueChange = viewModel::onTunnelNameChange,
 							keyboardActions = keyboardActions,
 							label = stringResource(R.string.name),
 							hint = stringResource(R.string.tunnel_name).lowercase(),
 							modifier =
 							Modifier
-								.fillMaxWidth()
-								.focusRequester(focusRequester),
+								.fillMaxWidth(),
 						)
 						OutlinedTextField(
 							modifier =
@@ -413,12 +254,12 @@ fun ConfigScreen(
 								.clickable { showAuthPrompt = true },
 							value = uiState.interfaceProxy.privateKey,
 							visualTransformation =
-							if ((tunnelId == Constants.MANUAL_TUNNEL_CONFIG_ID) || isAuthenticated) {
+							if ((tunnelId == Constants.MANUAL_TUNNEL_CONFIG_ID.toInt()) || isAuthenticated) {
 								VisualTransformation.None
 							} else {
 								PasswordVisualTransformation()
 							},
-							enabled = (tunnelId == Constants.MANUAL_TUNNEL_CONFIG_ID) || isAuthenticated,
+							enabled = (tunnelId == Constants.MANUAL_TUNNEL_CONFIG_ID.toInt()) || isAuthenticated,
 							onValueChange = { value -> viewModel.onPrivateKeyChange(value) },
 							trailingIcon = {
 								IconButton(
@@ -428,7 +269,7 @@ fun ConfigScreen(
 									Icon(
 										Icons.Rounded.Refresh,
 										stringResource(R.string.rotate_keys),
-										tint = Color.White,
+										tint = MaterialTheme.colorScheme.onSurface,
 									)
 								}
 							},
@@ -458,7 +299,7 @@ fun ConfigScreen(
 									Icon(
 										Icons.Rounded.ContentCopy,
 										stringResource(R.string.copy_public_key),
-										tint = Color.White,
+										tint = MaterialTheme.colorScheme.onSurface,
 									)
 								}
 							},
@@ -468,31 +309,29 @@ fun ConfigScreen(
 							keyboardOptions = keyboardOptions,
 							keyboardActions = keyboardActions,
 						)
-						Row(modifier = Modifier.fillMaxWidth()) {
-							ConfigurationTextBox(
-								value = uiState.interfaceProxy.addresses,
-								onValueChange = { value -> viewModel.onAddressesChanged(value) },
-								keyboardActions = keyboardActions,
-								label = stringResource(R.string.addresses),
-								hint = stringResource(R.string.comma_separated_list),
-								modifier =
-								Modifier
-									.fillMaxWidth(3 / 5f)
-									.padding(end = 5.dp),
-							)
-							ConfigurationTextBox(
-								value = uiState.interfaceProxy.listenPort,
-								onValueChange = { value -> viewModel.onListenPortChanged(value) },
-								keyboardActions = keyboardActions,
-								label = stringResource(R.string.listen_port),
-								hint = stringResource(R.string.random),
-								modifier = Modifier.width(IntrinsicSize.Min),
-							)
-						}
+						ConfigurationTextBox(
+							value = uiState.interfaceProxy.addresses,
+							onValueChange = viewModel::onAddressesChanged,
+							keyboardActions = keyboardActions,
+							label = stringResource(R.string.addresses),
+							hint = stringResource(R.string.comma_separated_list),
+							modifier =
+							Modifier
+								.fillMaxWidth()
+								.padding(end = 5.dp),
+						)
+						ConfigurationTextBox(
+							value = uiState.interfaceProxy.listenPort,
+							onValueChange = viewModel::onListenPortChanged,
+							keyboardActions = keyboardActions,
+							label = stringResource(R.string.listen_port),
+							hint = stringResource(R.string.random),
+							modifier = Modifier.fillMaxWidth(),
+						)
 						Row(modifier = Modifier.fillMaxWidth()) {
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.dnsServers,
-								onValueChange = { value -> viewModel.onDnsServersChanged(value) },
+								onValueChange = viewModel::onDnsServersChanged,
 								keyboardActions = keyboardActions,
 								label = stringResource(R.string.dns_servers),
 								hint = stringResource(R.string.comma_separated_list),
@@ -503,20 +342,17 @@ fun ConfigScreen(
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.mtu,
-								onValueChange = { value -> viewModel.onMtuChanged(value) },
+								onValueChange = viewModel::onMtuChanged,
 								keyboardActions = keyboardActions,
 								label = stringResource(R.string.mtu),
 								hint = stringResource(R.string.auto),
 								modifier = Modifier.width(IntrinsicSize.Min),
 							)
 						}
-						if (configType == ConfigType.AMNEZIA) {
+						if (derivedConfigType.value == ConfigType.AMNEZIA) {
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.junkPacketCount,
-								onValueChange = {
-										value ->
-									viewModel.onJunkPacketCountChanged(value)
-								},
+								onValueChange = viewModel::onJunkPacketCountChanged,
 								keyboardActions = keyboardActions,
 								label = stringResource(R.string.junk_packet_count),
 								hint = stringResource(R.string.junk_packet_count).lowercase(),
@@ -527,11 +363,7 @@ fun ConfigScreen(
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.junkPacketMinSize,
-								onValueChange = { value ->
-									viewModel.onJunkPacketMinSizeChanged(
-										value,
-									)
-								},
+								onValueChange = viewModel::onJunkPacketMinSizeChanged,
 								keyboardActions = keyboardActions,
 								label = stringResource(R.string.junk_packet_minimum_size),
 								hint =
@@ -545,11 +377,7 @@ fun ConfigScreen(
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.junkPacketMaxSize,
-								onValueChange = { value ->
-									viewModel.onJunkPacketMaxSizeChanged(
-										value,
-									)
-								},
+								onValueChange = viewModel::onJunkPacketMaxSizeChanged,
 								keyboardActions = keyboardActions,
 								label = stringResource(R.string.junk_packet_maximum_size),
 								hint =
@@ -563,11 +391,7 @@ fun ConfigScreen(
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.initPacketJunkSize,
-								onValueChange = { value ->
-									viewModel.onInitPacketJunkSizeChanged(
-										value,
-									)
-								},
+								onValueChange = viewModel::onInitPacketJunkSizeChanged,
 								keyboardActions = keyboardActions,
 								label = stringResource(R.string.init_packet_junk_size),
 								hint = stringResource(R.string.init_packet_junk_size).lowercase(),
@@ -578,10 +402,7 @@ fun ConfigScreen(
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.responsePacketJunkSize,
-								onValueChange = {
-										value ->
-									viewModel.onResponsePacketJunkSize(value)
-								},
+								onValueChange = viewModel::onResponsePacketJunkSize,
 								keyboardActions = keyboardActions,
 								label = stringResource(R.string.response_packet_junk_size),
 								hint =
@@ -595,10 +416,7 @@ fun ConfigScreen(
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.initPacketMagicHeader,
-								onValueChange = {
-										value ->
-									viewModel.onInitPacketMagicHeader(value)
-								},
+								onValueChange = viewModel::onInitPacketMagicHeader,
 								keyboardActions = keyboardActions,
 								label = stringResource(R.string.init_packet_magic_header),
 								hint =
@@ -612,11 +430,7 @@ fun ConfigScreen(
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.responsePacketMagicHeader,
-								onValueChange = { value ->
-									viewModel.onResponsePacketMagicHeader(
-										value,
-									)
-								},
+								onValueChange = viewModel::onResponsePacketMagicHeader,
 								keyboardActions = keyboardActions,
 								label = stringResource(R.string.response_packet_magic_header),
 								hint =
@@ -630,11 +444,7 @@ fun ConfigScreen(
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.underloadPacketMagicHeader,
-								onValueChange = { value ->
-									viewModel.onUnderloadPacketMagicHeader(
-										value,
-									)
-								},
+								onValueChange = viewModel::onUnderloadPacketMagicHeader,
 								keyboardActions = keyboardActions,
 								label = stringResource(R.string.underload_packet_magic_header),
 								hint =
@@ -648,11 +458,7 @@ fun ConfigScreen(
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.transportPacketMagicHeader,
-								onValueChange = { value ->
-									viewModel.onTransportPacketMagicHeader(
-										value,
-									)
-								},
+								onValueChange = viewModel::onTransportPacketMagicHeader,
 								keyboardActions = keyboardActions,
 								label = stringResource(R.string.transport_packet_magic_header),
 								hint =
@@ -687,7 +493,7 @@ fun ConfigScreen(
 						color = MaterialTheme.colorScheme.surface,
 						modifier =
 						(
-							if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+							if (context.isRunningOnTv()) {
 								Modifier
 									.fillMaxHeight(fillMaxHeight)
 									.fillMaxWidth(fillMaxWidth)
@@ -733,15 +539,27 @@ fun ConfigScreen(
 								hint = stringResource(R.string.base64_key),
 								modifier = Modifier.fillMaxWidth(),
 							)
-							ConfigurationTextBox(
+							OutlinedTextField(
+								modifier =
+								Modifier
+									.fillMaxWidth()
+									.clickable { showAuthPrompt = true },
 								value = peer.preSharedKey,
+								visualTransformation =
+								if ((tunnelId == Constants.MANUAL_TUNNEL_CONFIG_ID.toInt()) || isAuthenticated) {
+									VisualTransformation.None
+								} else {
+									PasswordVisualTransformation()
+								},
+								enabled = (tunnelId == Constants.MANUAL_TUNNEL_CONFIG_ID.toInt()) || isAuthenticated || peer.preSharedKey.isEmpty(),
 								onValueChange = { value ->
 									viewModel.onPreSharedKeyChange(index, value)
 								},
+								label = { Text(stringResource(R.string.preshared_key)) },
+								singleLine = true,
+								placeholder = { Text(stringResource(R.string.optional)) },
+								keyboardOptions = keyboardOptions,
 								keyboardActions = keyboardActions,
-								label = stringResource(R.string.preshared_key),
-								hint = stringResource(R.string.optional),
-								modifier = Modifier.fillMaxWidth(),
 							)
 							OutlinedTextField(
 								modifier = Modifier.fillMaxWidth(),
@@ -810,9 +628,6 @@ fun ConfigScreen(
 					}
 				}
 			}
-			if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-				Spacer(modifier = Modifier.weight(.17f))
-			}
 		}
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/ConfigUiState.kt

@@ -4,7 +4,7 @@ import com.wireguard.config.Config
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.ui.screens.config.model.InterfaceProxy
 import com.zaneschepke.wireguardautotunnel.ui.screens.config.model.PeerProxy
-import com.zaneschepke.wireguardautotunnel.util.Packages
+import com.zaneschepke.wireguardautotunnel.util.extensions.Packages
 
 data class ConfigUiState(
 	val proxyPeers: List<PeerProxy> = arrayListOf(PeerProxy()),
@@ -15,9 +15,12 @@ data class ConfigUiState(
 	val isAllApplicationsEnabled: Boolean = false,
 	val loading: Boolean = true,
 	val tunnel: TunnelConfig? = null,
-	val tunnelName: String = "",
+	var tunnelName: String = "",
 	val isAmneziaEnabled: Boolean = false,
 ) {
+	fun hasAmneziaProperties(): Boolean {
+		return this.interfaceProxy.junkPacketCount != ""
+	}
 	companion object {
 		fun from(config: Config): ConfigUiState {
 			val proxyPeers = config.peers.map { PeerProxy.from(it) }
@@ -45,7 +48,6 @@ data class ConfigUiState(
 		}
 
 		fun from(config: org.amnezia.awg.config.Config): ConfigUiState {
-			// TODO update with new values
 			val proxyPeers = config.peers.map { PeerProxy.from(it) }
 			val proxyInterface = InterfaceProxy.from(config.`interface`)
 			var include = true
@@ -69,5 +71,13 @@ data class ConfigUiState(
 				isAllApplicationsEnabled,
 			)
 		}
+
+		fun from(tunnel: TunnelConfig): ConfigUiState {
+			val config = tunnel.toAmConfig()
+			return from(config).copy(
+				tunnelName = tunnel.name,
+				tunnel = tunnel,
+			)
+		}
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/ConfigViewModel.kt

@@ -15,100 +15,119 @@ 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.data.repository.SettingsRepository
 import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
 import com.zaneschepke.wireguardautotunnel.ui.screens.config.model.PeerProxy
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.ConfigType
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.NumberUtils
 import com.zaneschepke.wireguardautotunnel.util.StringValue
-import com.zaneschepke.wireguardautotunnel.util.WgTunnelExceptions
-import com.zaneschepke.wireguardautotunnel.util.removeAt
-import com.zaneschepke.wireguardautotunnel.util.update
+import com.zaneschepke.wireguardautotunnel.util.extensions.removeAt
+import com.zaneschepke.wireguardautotunnel.util.extensions.update
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.plus
 import timber.log.Timber
-import javax.inject.Inject
 
-@HiltViewModel
+@HiltViewModel(assistedFactory = ConfigViewModel.ConfigViewModelFactory::class)
 class ConfigViewModel
-@Inject
+@AssistedInject
 constructor(
-	private val settingsRepository: SettingsRepository,
 	private val appDataRepository: AppDataRepository,
+	@Assisted val id: Int,
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : ViewModel() {
 	private val packageManager = WireGuardAutoTunnel.instance.packageManager
 
-	private val _uiState = MutableStateFlow(ConfigUiState())
-	val uiState = _uiState.asStateFlow()
+	private val _saved = MutableSharedFlow<Boolean>()
+	val saved = _saved.asSharedFlow()
 
-	fun init(tunnelId: String) = viewModelScope.launch(ioDispatcher) {
-		val packages = getQueriedPackages("")
-		val state =
-			if (tunnelId != Constants.MANUAL_TUNNEL_CONFIG_ID) {
-				val tunnelConfig =
-					appDataRepository.tunnels.getAll()
-						.firstOrNull { it.id.toString() == tunnelId }
-				val isAmneziaEnabled = settingsRepository.getSettings().isAmneziaEnabled
-				if (tunnelConfig != null) {
-					(
-						if (isAmneziaEnabled) {
-							val amConfig =
-								if (tunnelConfig.amQuick == "") tunnelConfig.wgQuick else tunnelConfig.amQuick
-							ConfigUiState.from(TunnelConfig.configFromAmQuick(amConfig))
-						} else {
-							ConfigUiState.from(
-								TunnelConfig.configFromWgQuick(tunnelConfig.wgQuick),
-							)
-						}
-						).copy(
-						packages = packages,
-						loading = false,
-						tunnel = tunnelConfig,
-						tunnelName = tunnelConfig.name,
-						isAmneziaEnabled = isAmneziaEnabled,
-					)
-				} else {
-					ConfigUiState(loading = false, packages = packages)
-				}
-			} else {
-				ConfigUiState(loading = false, packages = packages)
-			}
-		_uiState.value = state
-	}
+	private val _uiState = MutableStateFlow(ConfigUiState())
+	val uiState = _uiState.onStart {
+		appDataRepository.tunnels.getById(id)?.let {
+			val packages = getQueriedPackages()
+			_uiState.value = ConfigUiState.from(it).copy(
+				packages = packages,
+			)
+		}
+	}.stateIn(
+		viewModelScope + ioDispatcher,
+		SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
+		ConfigUiState(),
+	)
 
 	fun onTunnelNameChange(name: String) {
-		_uiState.value = _uiState.value.copy(tunnelName = name)
+		_uiState.update {
+			it.copy(tunnelName = name)
+		}
 	}
 
 	fun onIncludeChange(include: Boolean) {
-		_uiState.value = _uiState.value.copy(include = include)
+		_uiState.update {
+			it.copy(include = include)
+		}
+	}
+
+	fun cleanUpUninstalledApps() = viewModelScope.launch(ioDispatcher) {
+		uiState.value.tunnel?.let {
+			val config = it.toAmConfig()
+			val packages = getQueriedPackages()
+			val packageSet = packages.map { pack -> pack.packageName }.toSet()
+			val includedApps = config.`interface`.includedApplications.toMutableList()
+			val excludedApps = config.`interface`.excludedApplications.toMutableList()
+			if (includedApps.isEmpty() && excludedApps.isEmpty()) return@launch
+			if (includedApps.retainAll(packageSet) || excludedApps.retainAll(packageSet)) {
+				Timber.i("Removing split tunnel package name that no longer exists on the device")
+				_uiState.update { state ->
+					state.copy(
+						checkedPackageNames = if (_uiState.value.include) includedApps else excludedApps,
+					)
+				}
+				val wgQuick = buildConfig().toWgQuickString(true)
+				val amQuick = buildAmConfig().toAwgQuickString(true)
+				saveConfig(
+					it.copy(
+						amQuick = amQuick,
+						wgQuick = wgQuick,
+					),
+				)
+			}
+		}
 	}
 
 	fun onAddCheckedPackage(packageName: String) {
-		_uiState.value =
-			_uiState.value.copy(
-				checkedPackageNames = _uiState.value.checkedPackageNames + packageName,
+		_uiState.update {
+			it.copy(
+				checkedPackageNames = it.checkedPackageNames + packageName,
 			)
+		}
 	}
 
 	fun onAllApplicationsChange(isAllApplicationsEnabled: Boolean) {
-		_uiState.value = _uiState.value.copy(isAllApplicationsEnabled = isAllApplicationsEnabled)
+		_uiState.update {
+			it.copy(isAllApplicationsEnabled = isAllApplicationsEnabled)
+		}
 	}
 
 	fun onRemoveCheckedPackage(packageName: String) {
-		_uiState.value =
-			_uiState.value.copy(
-				checkedPackageNames = _uiState.value.checkedPackageNames - packageName,
+		_uiState.update {
+			it.copy(
+				checkedPackageNames = it.checkedPackageNames - packageName,
 			)
+		}
 	}
 
-	private fun getQueriedPackages(query: String): List<PackageInfo> {
+	private fun getQueriedPackages(query: String = ""): List<PackageInfo> {
 		return getAllInternetCapablePackages().filter {
 			getPackageLabel(it).lowercase().contains(query.lowercase())
 		}
@@ -137,12 +156,13 @@ constructor(
 		return _uiState.value.isAllApplicationsEnabled
 	}
 
-	private fun saveConfig(tunnelConfig: TunnelConfig) = viewModelScope.launch { appDataRepository.tunnels.save(tunnelConfig) }
+	private fun saveConfig(tunnelConfig: TunnelConfig) = viewModelScope.launch {
+		appDataRepository.tunnels.save(tunnelConfig)
+	}
 
 	private fun updateTunnelConfig(tunnelConfig: TunnelConfig?) = viewModelScope.launch {
 		if (tunnelConfig != null) {
 			saveConfig(tunnelConfig).join()
-			WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
 		}
 	}
 
@@ -175,105 +195,113 @@ constructor(
 	}
 
 	private fun emptyCheckedPackagesList() {
-		_uiState.value = _uiState.value.copy(checkedPackageNames = emptyList())
+		_uiState.update {
+			it.copy(checkedPackageNames = emptyList())
+		}
 	}
 
 	private fun buildInterfaceListFromProxyInterface(): Interface {
 		val builder = Interface.Builder()
-		builder.parsePrivateKey(_uiState.value.interfaceProxy.privateKey.trim())
-		builder.parseAddresses(_uiState.value.interfaceProxy.addresses.trim())
-		if (_uiState.value.interfaceProxy.dnsServers.isNotEmpty()) {
-			builder.parseDnsServers(_uiState.value.interfaceProxy.dnsServers.trim())
-		}
-		if (_uiState.value.interfaceProxy.mtu.isNotEmpty()) {
-			builder.parseMtu(_uiState.value.interfaceProxy.mtu.trim())
-		}
-		if (_uiState.value.interfaceProxy.listenPort.isNotEmpty()) {
-			builder.parseListenPort(_uiState.value.interfaceProxy.listenPort.trim())
-		}
-		if (isAllApplicationsEnabled()) emptyCheckedPackagesList()
-		if (_uiState.value.include) {
-			builder.includeApplications(
-				_uiState.value.checkedPackageNames,
-			)
-		}
-		if (!_uiState.value.include) {
-			builder.excludeApplications(
-				_uiState.value.checkedPackageNames,
-			)
+		with(_uiState.value.interfaceProxy) {
+			builder.parsePrivateKey(this.privateKey.trim())
+			builder.parseAddresses(this.addresses.trim())
+			if (this.dnsServers.isNotEmpty()) {
+				builder.parseDnsServers(this.dnsServers.trim())
+			}
+			if (this.mtu.isNotEmpty()) {
+				builder.parseMtu(this.mtu.trim())
+			}
+			if (this.listenPort.isNotEmpty()) {
+				builder.parseListenPort(this.listenPort.trim())
+			}
+			if (isAllApplicationsEnabled()) emptyCheckedPackagesList()
+			if (_uiState.value.include) {
+				builder.includeApplications(
+					_uiState.value.checkedPackageNames,
+				)
+			}
+			if (!_uiState.value.include) {
+				builder.excludeApplications(
+					_uiState.value.checkedPackageNames,
+				)
+			}
 		}
+
 		return builder.build()
 	}
 
 	private fun buildAmInterfaceListFromProxyInterface(): org.amnezia.awg.config.Interface {
 		val builder = org.amnezia.awg.config.Interface.Builder()
-		builder.parsePrivateKey(_uiState.value.interfaceProxy.privateKey.trim())
-		builder.parseAddresses(_uiState.value.interfaceProxy.addresses.trim())
-		if (_uiState.value.interfaceProxy.dnsServers.isNotEmpty()) {
-			builder.parseDnsServers(_uiState.value.interfaceProxy.dnsServers.trim())
-		}
-		if (_uiState.value.interfaceProxy.mtu.isNotEmpty()) {
-			builder.parseMtu(_uiState.value.interfaceProxy.mtu.trim())
-		}
-		if (_uiState.value.interfaceProxy.listenPort.isNotEmpty()) {
-			builder.parseListenPort(_uiState.value.interfaceProxy.listenPort.trim())
-		}
-		if (isAllApplicationsEnabled()) emptyCheckedPackagesList()
-		if (_uiState.value.include) {
-			builder.includeApplications(
-				_uiState.value.checkedPackageNames,
-			)
-		}
-		if (!_uiState.value.include) {
-			builder.excludeApplications(
-				_uiState.value.checkedPackageNames,
-			)
-		}
-		if (_uiState.value.interfaceProxy.junkPacketCount.isNotEmpty()) {
-			builder.setJunkPacketCount(
-				_uiState.value.interfaceProxy.junkPacketCount.trim().toInt(),
-			)
-		}
-		if (_uiState.value.interfaceProxy.junkPacketMinSize.isNotEmpty()) {
-			builder.setJunkPacketMinSize(
-				_uiState.value.interfaceProxy.junkPacketMinSize.trim().toInt(),
-			)
-		}
-		if (_uiState.value.interfaceProxy.junkPacketMaxSize.isNotEmpty()) {
-			builder.setJunkPacketMaxSize(
-				_uiState.value.interfaceProxy.junkPacketMaxSize.trim().toInt(),
-			)
-		}
-		if (_uiState.value.interfaceProxy.initPacketJunkSize.isNotEmpty()) {
-			builder.setInitPacketJunkSize(
-				_uiState.value.interfaceProxy.initPacketJunkSize.trim().toInt(),
-			)
-		}
-		if (_uiState.value.interfaceProxy.responsePacketJunkSize.isNotEmpty()) {
-			builder.setResponsePacketJunkSize(
-				_uiState.value.interfaceProxy.responsePacketJunkSize.trim().toInt(),
-			)
-		}
-		if (_uiState.value.interfaceProxy.initPacketMagicHeader.isNotEmpty()) {
-			builder.setInitPacketMagicHeader(
-				_uiState.value.interfaceProxy.initPacketMagicHeader.trim().toLong(),
-			)
-		}
-		if (_uiState.value.interfaceProxy.responsePacketMagicHeader.isNotEmpty()) {
-			builder.setResponsePacketMagicHeader(
-				_uiState.value.interfaceProxy.responsePacketMagicHeader.trim().toLong(),
-			)
-		}
-		if (_uiState.value.interfaceProxy.transportPacketMagicHeader.isNotEmpty()) {
-			builder.setTransportPacketMagicHeader(
-				_uiState.value.interfaceProxy.transportPacketMagicHeader.trim().toLong(),
-			)
-		}
-		if (_uiState.value.interfaceProxy.underloadPacketMagicHeader.isNotEmpty()) {
-			builder.setUnderloadPacketMagicHeader(
-				_uiState.value.interfaceProxy.underloadPacketMagicHeader.trim().toLong(),
-			)
+		with(_uiState.value.interfaceProxy) {
+			builder.parsePrivateKey(this.privateKey.trim())
+			builder.parseAddresses(this.addresses.trim())
+			if (this.dnsServers.isNotEmpty()) {
+				builder.parseDnsServers(this.dnsServers.trim())
+			}
+			if (this.mtu.isNotEmpty()) {
+				builder.parseMtu(this.mtu.trim())
+			}
+			if (this.listenPort.isNotEmpty()) {
+				builder.parseListenPort(this.listenPort.trim())
+			}
+			if (isAllApplicationsEnabled()) emptyCheckedPackagesList()
+			if (_uiState.value.include) {
+				builder.includeApplications(
+					_uiState.value.checkedPackageNames,
+				)
+			}
+			if (!_uiState.value.include) {
+				builder.excludeApplications(
+					_uiState.value.checkedPackageNames,
+				)
+			}
+			if (this.junkPacketCount.isNotEmpty()) {
+				builder.setJunkPacketCount(
+					this.junkPacketCount.trim().toInt(),
+				)
+			}
+			if (this.junkPacketMinSize.isNotEmpty()) {
+				builder.setJunkPacketMinSize(
+					this.junkPacketMinSize.trim().toInt(),
+				)
+			}
+			if (this.junkPacketMaxSize.isNotEmpty()) {
+				builder.setJunkPacketMaxSize(
+					this.junkPacketMaxSize.trim().toInt(),
+				)
+			}
+			if (this.initPacketJunkSize.isNotEmpty()) {
+				builder.setInitPacketJunkSize(
+					this.initPacketJunkSize.trim().toInt(),
+				)
+			}
+			if (this.responsePacketJunkSize.isNotEmpty()) {
+				builder.setResponsePacketJunkSize(
+					this.responsePacketJunkSize.trim().toInt(),
+				)
+			}
+			if (this.initPacketMagicHeader.isNotEmpty()) {
+				builder.setInitPacketMagicHeader(
+					this.initPacketMagicHeader.trim().toLong(),
+				)
+			}
+			if (this.responsePacketMagicHeader.isNotEmpty()) {
+				builder.setResponsePacketMagicHeader(
+					this.responsePacketMagicHeader.trim().toLong(),
+				)
+			}
+			if (this.transportPacketMagicHeader.isNotEmpty()) {
+				builder.setTransportPacketMagicHeader(
+					this.transportPacketMagicHeader.trim().toLong(),
+				)
+			}
+			if (this.underloadPacketMagicHeader.isNotEmpty()) {
+				builder.setUnderloadPacketMagicHeader(
+					this.underloadPacketMagicHeader.trim().toLong(),
+				)
+			}
 		}
+
 		return builder.build()
 	}
 
@@ -292,41 +320,33 @@ constructor(
 			.build()
 	}
 
-	fun onSaveAllChanges(configType: ConfigType): Result<Unit> {
-		return try {
-			val wgQuick = buildConfig().toWgQuickString()
-			val amQuick =
-				if (configType == ConfigType.AMNEZIA) {
-					buildAmConfig().toAwgQuickString()
-				} else {
-					TunnelConfig.AM_QUICK_DEFAULT
-				}
-			val tunnelConfig =
-				when (uiState.value.tunnel) {
-					null ->
-						TunnelConfig(
-							name = _uiState.value.tunnelName,
-							wgQuick = wgQuick,
-							amQuick = amQuick,
-						)
-
-					else ->
-						uiState.value.tunnel!!.copy(
-							name = _uiState.value.tunnelName,
-							wgQuick = wgQuick,
-							amQuick = amQuick,
-						)
-				}
+	fun onSaveAllChanges() = viewModelScope.launch {
+		kotlin.runCatching {
+			val wgQuick = buildConfig().toWgQuickString(true)
+			val amQuick = buildAmConfig().toAwgQuickString(true)
+			val tunnelConfig = uiState.value.tunnel?.copy(
+				name = _uiState.value.tunnelName,
+				amQuick = amQuick,
+				wgQuick = wgQuick,
+			) ?: TunnelConfig(
+				name = _uiState.value.tunnelName,
+				wgQuick = wgQuick,
+				amQuick = amQuick,
+			)
 			updateTunnelConfig(tunnelConfig)
-			Result.success(Unit)
-		} catch (e: Exception) {
-			Timber.e(e)
-			val message = e.message?.substringAfter(":", missingDelimiterValue = "")
-			val stringValue =
-				message?.let {
-					StringValue.DynamicString(message)
-				} ?: StringValue.StringResource(R.string.unknown_error)
-			Result.failure(WgTunnelExceptions.ConfigParseError(stringValue))
+			SnackbarController.showMessage(
+				StringValue.StringResource(R.string.config_changes_saved),
+			)
+			_saved.emit(true)
+		}.onFailure {
+			Timber.e(it)
+			val message = it.message?.substringAfter(":", missingDelimiterValue = "")
+			val stringValue = if (message.isNullOrBlank()) {
+				StringValue.StringResource(R.string.unknown_error)
+			} else {
+				StringValue.DynamicString(message)
+			}
+			SnackbarController.showMessage(stringValue)
 		}
 	}
 
@@ -409,7 +429,7 @@ constructor(
 		_uiState.update {
 			it.copy(
 				interfaceProxy =
-				_uiState.value.interfaceProxy.copy(
+				it.interfaceProxy.copy(
 					privateKey = keyPair.privateKey.toBase64(),
 					publicKey = keyPair.publicKey.toBase64(),
 				),
@@ -420,7 +440,7 @@ constructor(
 	fun onAddressesChanged(value: String) {
 		_uiState.update {
 			it.copy(
-				interfaceProxy = _uiState.value.interfaceProxy.copy(addresses = value),
+				interfaceProxy = it.interfaceProxy.copy(addresses = value),
 			)
 		}
 	}
@@ -428,7 +448,7 @@ constructor(
 	fun onListenPortChanged(value: String) {
 		_uiState.update {
 			it.copy(
-				interfaceProxy = _uiState.value.interfaceProxy.copy(listenPort = value),
+				interfaceProxy = it.interfaceProxy.copy(listenPort = value),
 			)
 		}
 	}
@@ -436,21 +456,21 @@ constructor(
 	fun onDnsServersChanged(value: String) {
 		_uiState.update {
 			it.copy(
-				interfaceProxy = _uiState.value.interfaceProxy.copy(dnsServers = value),
+				interfaceProxy = it.interfaceProxy.copy(dnsServers = value),
 			)
 		}
 	}
 
 	fun onMtuChanged(value: String) {
 		_uiState.update {
-			it.copy(interfaceProxy = _uiState.value.interfaceProxy.copy(mtu = value))
+			it.copy(interfaceProxy = it.interfaceProxy.copy(mtu = value))
 		}
 	}
 
 	private fun onInterfacePublicKeyChange(value: String) {
 		_uiState.update {
 			it.copy(
-				interfaceProxy = _uiState.value.interfaceProxy.copy(publicKey = value),
+				interfaceProxy = it.interfaceProxy.copy(publicKey = value),
 			)
 		}
 	}
@@ -458,7 +478,7 @@ constructor(
 	fun onPrivateKeyChange(value: String) {
 		_uiState.update {
 			it.copy(
-				interfaceProxy = _uiState.value.interfaceProxy.copy(privateKey = value),
+				interfaceProxy = it.interfaceProxy.copy(privateKey = value),
 			)
 		}
 		if (NumberUtils.isValidKey(value)) {
@@ -480,7 +500,7 @@ constructor(
 	fun onJunkPacketCountChanged(value: String) {
 		_uiState.update {
 			it.copy(
-				interfaceProxy = _uiState.value.interfaceProxy.copy(junkPacketCount = value),
+				interfaceProxy = it.interfaceProxy.copy(junkPacketCount = value),
 			)
 		}
 	}
@@ -488,7 +508,7 @@ constructor(
 	fun onJunkPacketMinSizeChanged(value: String) {
 		_uiState.update {
 			it.copy(
-				interfaceProxy = _uiState.value.interfaceProxy.copy(junkPacketMinSize = value),
+				interfaceProxy = it.interfaceProxy.copy(junkPacketMinSize = value),
 			)
 		}
 	}
@@ -496,7 +516,7 @@ constructor(
 	fun onJunkPacketMaxSizeChanged(value: String) {
 		_uiState.update {
 			it.copy(
-				interfaceProxy = _uiState.value.interfaceProxy.copy(junkPacketMaxSize = value),
+				interfaceProxy = it.interfaceProxy.copy(junkPacketMaxSize = value),
 			)
 		}
 	}
@@ -504,7 +524,7 @@ constructor(
 	fun onInitPacketJunkSizeChanged(value: String) {
 		_uiState.update {
 			it.copy(
-				interfaceProxy = _uiState.value.interfaceProxy.copy(initPacketJunkSize = value),
+				interfaceProxy = it.interfaceProxy.copy(initPacketJunkSize = value),
 			)
 		}
 	}
@@ -513,7 +533,7 @@ constructor(
 		_uiState.update {
 			it.copy(
 				interfaceProxy =
-				_uiState.value.interfaceProxy.copy(
+				it.interfaceProxy.copy(
 					responsePacketJunkSize = value,
 				),
 			)
@@ -524,7 +544,7 @@ constructor(
 		_uiState.update {
 			it.copy(
 				interfaceProxy =
-				_uiState.value.interfaceProxy.copy(
+				it.interfaceProxy.copy(
 					initPacketMagicHeader = value,
 				),
 			)
@@ -535,7 +555,7 @@ constructor(
 		_uiState.update {
 			it.copy(
 				interfaceProxy =
-				_uiState.value.interfaceProxy.copy(
+				it.interfaceProxy.copy(
 					responsePacketMagicHeader = value,
 				),
 			)
@@ -546,7 +566,7 @@ constructor(
 		_uiState.update {
 			it.copy(
 				interfaceProxy =
-				_uiState.value.interfaceProxy.copy(
+				it.interfaceProxy.copy(
 					transportPacketMagicHeader = value,
 				),
 			)
@@ -557,10 +577,15 @@ constructor(
 		_uiState.update {
 			it.copy(
 				interfaceProxy =
-				_uiState.value.interfaceProxy.copy(
+				it.interfaceProxy.copy(
 					underloadPacketMagicHeader = value,
 				),
 			)
 		}
 	}
+
+	@AssistedFactory
+	interface ConfigViewModelFactory {
+		fun create(id: Int): ConfigViewModel
+	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/components/ApplicationSelectionDialog.kt

@@ -0,0 +1,199 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.config.components
+
+import android.content.pm.PackageInfo
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Android
+import androidx.compose.material3.BasicAlertDialog
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.google.accompanist.drawablepainter.DrawablePainter
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.ui.common.SearchBar
+import com.zaneschepke.wireguardautotunnel.ui.screens.config.ConfigUiState
+import com.zaneschepke.wireguardautotunnel.ui.screens.config.ConfigViewModel
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun ApplicationSelectionDialog(viewModel: ConfigViewModel, uiState: ConfigUiState, onDismiss: () -> Unit) {
+	val context = LocalContext.current
+	val licenseComparator = compareBy<PackageInfo> { viewModel.getPackageLabel(it) }
+
+	val sortedPackages = remember(uiState.packages, licenseComparator) {
+		uiState.packages.sortedWith(licenseComparator)
+	}
+	BasicAlertDialog(
+		onDismissRequest = { onDismiss() },
+	) {
+		Surface(
+			tonalElevation = 2.dp,
+			shadowElevation = 2.dp,
+			shape = RoundedCornerShape(12.dp),
+			color = MaterialTheme.colorScheme.surface,
+			modifier =
+			Modifier
+				.fillMaxWidth()
+				.fillMaxHeight(if (uiState.isAllApplicationsEnabled) 1 / 5f else 4 / 5f),
+		) {
+			Column(
+				modifier =
+				Modifier
+					.fillMaxWidth(),
+			) {
+				Row(
+					modifier =
+					Modifier
+						.fillMaxWidth()
+						.padding(horizontal = 20.dp, vertical = 7.dp),
+					verticalAlignment = Alignment.CenterVertically,
+					horizontalArrangement = Arrangement.SpaceBetween,
+				) {
+					Text(stringResource(id = R.string.tunnel_all))
+					Switch(
+						checked = uiState.isAllApplicationsEnabled,
+						onCheckedChange = viewModel::onAllApplicationsChange,
+					)
+				}
+				if (!uiState.isAllApplicationsEnabled) {
+					Row(
+						modifier =
+						Modifier
+							.fillMaxWidth()
+							.padding(horizontal = 20.dp, vertical = 7.dp),
+						verticalAlignment = Alignment.CenterVertically,
+						horizontalArrangement = Arrangement.SpaceBetween,
+					) {
+						Row(
+							verticalAlignment = Alignment.CenterVertically,
+							horizontalArrangement = Arrangement.SpaceBetween,
+						) {
+							Text(stringResource(id = R.string.include))
+							Checkbox(
+								checked = uiState.include,
+								onCheckedChange = {
+									viewModel.onIncludeChange(!uiState.include)
+								},
+							)
+						}
+						Row(
+							verticalAlignment = Alignment.CenterVertically,
+							horizontalArrangement = Arrangement.SpaceBetween,
+						) {
+							Text(stringResource(id = R.string.exclude))
+							Checkbox(
+								checked = !uiState.include,
+								onCheckedChange = {
+									viewModel.onIncludeChange(!uiState.include)
+								},
+							)
+						}
+					}
+					Row(
+						modifier =
+						Modifier
+							.fillMaxWidth()
+							.padding(horizontal = 20.dp, vertical = 7.dp),
+						verticalAlignment = Alignment.CenterVertically,
+						horizontalArrangement = Arrangement.SpaceBetween,
+					) {
+						SearchBar(viewModel::emitQueriedPackages)
+					}
+					Spacer(Modifier.padding(5.dp))
+					LazyColumn(
+						horizontalAlignment = Alignment.Start,
+						verticalArrangement = Arrangement.Top,
+						modifier = Modifier.fillMaxHeight(19 / 22f),
+					) {
+						items(sortedPackages, key = { it.packageName }) { pack ->
+							Row(
+								verticalAlignment = Alignment.CenterVertically,
+								horizontalArrangement = Arrangement.SpaceBetween,
+								modifier =
+								Modifier
+									.fillMaxSize()
+									.padding(5.dp).padding(end = 25.dp),
+							) {
+								Row(modifier = Modifier.fillMaxWidth().padding(start = 5.dp)) {
+									val drawable =
+										pack.applicationInfo?.loadIcon(context.packageManager)
+									val iconSize = 35.dp
+									if (drawable != null) {
+										Image(
+											painter = DrawablePainter(drawable),
+											stringResource(id = R.string.icon),
+											modifier = Modifier.size(iconSize),
+										)
+									} else {
+										val icon = Icons.Rounded.Android
+										Icon(
+											icon,
+											icon.name,
+											modifier = Modifier.size(iconSize),
+										)
+									}
+									Text(
+										viewModel.getPackageLabel(pack),
+										modifier = Modifier.padding(5.dp),
+									)
+								}
+								Checkbox(
+									modifier = Modifier.fillMaxSize(),
+									checked =
+									(
+										uiState.checkedPackageNames.contains(
+											pack.packageName,
+										)
+										),
+									onCheckedChange = {
+										if (it) {
+											viewModel.onAddCheckedPackage(pack.packageName)
+										} else {
+											viewModel.onRemoveCheckedPackage(pack.packageName)
+										}
+									},
+								)
+							}
+						}
+					}
+				}
+				Row(
+					verticalAlignment = Alignment.CenterVertically,
+					modifier =
+					Modifier
+						.fillMaxSize()
+						.padding(top = 5.dp),
+					horizontalArrangement = Arrangement.Center,
+				) {
+					TextButton(onClick = { onDismiss() }) {
+						Text(stringResource(R.string.done))
+					}
+				}
+			}
+		}
+	}
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/config/model/InterfaceProxy.kt

@@ -25,7 +25,10 @@ data class InterfaceProxy(
 				publicKey = i.keyPair.publicKey.toBase64().trim(),
 				privateKey = i.keyPair.privateKey.toBase64().trim(),
 				addresses = i.addresses.joinToString(", ").trim(),
-				dnsServers = i.dnsServers.joinToString(", ").replace("/", "").trim(),
+				dnsServers = listOf(
+					i.dnsServers.joinToString(", ").replace("/", "").trim(),
+					i.dnsSearchDomains.joinToString(", ").trim(),
+				).filter { it.length > 0 }.joinToString(", "),
 				listenPort =
 				if (i.listenPort.isPresent) {
 					i.listenPort.get().toString().trim()
@@ -41,7 +44,7 @@ data class InterfaceProxy(
 				publicKey = i.keyPair.publicKey.toBase64().trim(),
 				privateKey = i.keyPair.privateKey.toBase64().trim(),
 				addresses = i.addresses.joinToString(", ").trim(),
-				dnsServers = i.dnsServers.joinToString(", ").replace("/", "").trim(),
+				dnsServers = (i.dnsServers + i.dnsSearchDomains).joinToString(", ").replace("/", "").trim(),
 				listenPort =
 				if (i.listenPort.isPresent) {
 					i.listenPort.get().toString().trim()

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/MainScreen.kt

@@ -1,223 +1,116 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.main
 
 import android.annotation.SuppressLint
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.os.Build
+import android.net.VpnService
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.slideInVertically
-import androidx.compose.animation.slideOutVertically
+import androidx.appcompat.app.AppCompatActivity.RESULT_OK
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.focusGroup
-import androidx.compose.foundation.focusable
 import androidx.compose.foundation.gestures.ScrollableDefaults
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.overscroll
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Create
-import androidx.compose.material.icons.filled.FileOpen
-import androidx.compose.material.icons.filled.QrCode
-import androidx.compose.material.icons.rounded.Bolt
-import androidx.compose.material.icons.rounded.Circle
-import androidx.compose.material.icons.rounded.CopyAll
-import androidx.compose.material.icons.rounded.Delete
-import androidx.compose.material.icons.rounded.Info
-import androidx.compose.material.icons.rounded.Settings
-import androidx.compose.material.icons.rounded.Smartphone
-import androidx.compose.material.icons.rounded.Star
-import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material.icons.filled.Add
 import androidx.compose.material3.FabPosition
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.material3.rememberModalBottomSheetState
-import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.hapticfeedback.HapticFeedbackType
-import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
-import androidx.compose.ui.input.nestedscroll.NestedScrollSource
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.buildAnnotatedString
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.text.withStyle
-import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.navigation.NavController
-import com.iamageo.multifablibrary.FabIcon
-import com.iamageo.multifablibrary.FabOption
-import com.iamageo.multifablibrary.MultiFabItem
-import com.iamageo.multifablibrary.MultiFloatingActionButton
-import com.journeyapps.barcodescanner.ScanContract
-import com.journeyapps.barcodescanner.ScanOptions
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.service.tunnel.HandshakeStatus
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
-import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
-import com.zaneschepke.wireguardautotunnel.ui.Screen
-import com.zaneschepke.wireguardautotunnel.ui.common.RowListItem
+import com.zaneschepke.wireguardautotunnel.ui.AppUiState
+import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.ui.common.NestedScrollListener
 import com.zaneschepke.wireguardautotunnel.ui.common.dialog.InfoDialog
-import com.zaneschepke.wireguardautotunnel.ui.common.screen.LoadingScreen
-import com.zaneschepke.wireguardautotunnel.ui.theme.corn
-import com.zaneschepke.wireguardautotunnel.ui.theme.mint
+import com.zaneschepke.wireguardautotunnel.ui.common.functions.rememberFileImportLauncherForResult
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.AutoTunnelRowItem
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.GettingStartedLabel
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.ScrollDismissFab
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.TunnelImportSheet
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.TunnelRowItem
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.VpnDeniedDialog
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.getMessage
-import com.zaneschepke.wireguardautotunnel.util.handshakeStatus
-import com.zaneschepke.wireguardautotunnel.util.mapPeerStats
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
+import com.zaneschepke.wireguardautotunnel.util.extensions.startTunnelBackground
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
-fun MainScreen(
-	viewModel: MainViewModel = hiltViewModel(),
-	appViewModel: AppViewModel,
-	focusRequester: FocusRequester,
-	navController: NavController,
-) {
-	val haptic = LocalHapticFeedback.current
+fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState, focusRequester: FocusRequester) {
 	val context = LocalContext.current
-	val isVisible = rememberSaveable { mutableStateOf(true) }
-	val scope = rememberCoroutineScope()
+	val navController = LocalNavController.current
+	val snackbar = SnackbarController.current
 
-	val sheetState = rememberModalBottomSheetState()
 	var showBottomSheet by remember { mutableStateOf(false) }
-	var configType by remember { mutableStateOf(ConfigType.WIREGUARD) }
-
-	// Nested scroll for control FAB
-	val nestedScrollConnection =
-		remember {
-			object : NestedScrollConnection {
-				override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
-					// Hide FAB
-					if (available.y < -1) {
-						isVisible.value = false
-					}
-					// Show FAB
-					if (available.y > 1) {
-						isVisible.value = true
-					}
-
-					return Offset.Zero
-				}
-			}
-		}
-
+	var showVpnPermissionDialog by remember { mutableStateOf(false) }
+	var isFabVisible by rememberSaveable { mutableStateOf(true) }
 	var showDeleteTunnelAlertDialog by remember { mutableStateOf(false) }
 	var selectedTunnel by remember { mutableStateOf<TunnelConfig?>(null) }
-	val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+
+	val nestedScrollConnection = remember {
+		NestedScrollListener({ isFabVisible = false }, { isFabVisible = true })
+	}
+
+	val vpnActivityResultState =
+		rememberLauncherForActivityResult(
+			ActivityResultContracts.StartActivityForResult(),
+			onResult = {
+				if (it.resultCode != RESULT_OK) showVpnPermissionDialog = true
+			},
+		)
 
 	LaunchedEffect(Unit) {
-		if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+		if (context.isRunningOnTv()) {
 			delay(Constants.FOCUS_REQUEST_DELAY)
-			focusRequester.requestFocus()
+			runCatching {
+				focusRequester.requestFocus()
+			}.onFailure {
+				delay(Constants.FOCUS_REQUEST_DELAY)
+				focusRequester.requestFocus()
+			}
 		}
 	}
 
-	val tunnelFileImportResultLauncher =
-		rememberLauncherForActivityResult(
-			object : ActivityResultContracts.GetContent() {
-				override fun createIntent(context: Context, input: String): Intent {
-					val intent = super.createIntent(context, input)
-
-                    /* 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)
-						}
-					) {
-						appViewModel.showSnackbarMessage(
-							context.getString(R.string.error_no_file_explorer),
-						)
-					}
-					return intent
-				}
-			},
-		) { data ->
-			if (data == null) return@rememberLauncherForActivityResult
-			scope.launch {
-				viewModel.onTunnelFileSelected(data, configType, context).onFailure {
-					appViewModel.showSnackbarMessage(it.getMessage(context))
-				}
-			}
-		}
-	val scanLauncher =
-		rememberLauncherForActivityResult(
-			contract = ScanContract(),
-			onResult = {
-				if (it.contents != null) {
-					scope.launch {
-						viewModel.onTunnelQrResult(it.contents, configType).onFailure { error ->
-							appViewModel.showSnackbarMessage(error.getMessage(context))
-						}
-					}
-				}
-			},
+	val tunnelFileImportResultLauncher = rememberFileImportLauncherForResult(onNoFileExplorer = {
+		snackbar.showMessage(
+			context.getString(R.string.error_no_file_explorer),
 		)
+	}, onData = { data ->
+		viewModel.onTunnelFileSelected(data, context)
+	})
+
+	val requestPermissionLauncher = rememberLauncherForActivityResult(
+		ActivityResultContracts.RequestPermission(),
+	) { isGranted ->
+		if (!isGranted) return@rememberLauncherForActivityResult snackbar.showMessage("Camera permission required")
+		navController.navigate(Route.Scanner)
+	}
+
+	VpnDeniedDialog(showVpnPermissionDialog, onDismiss = { showVpnPermissionDialog = false })
 
 	if (showDeleteTunnelAlertDialog) {
 		InfoDialog(
@@ -234,200 +127,51 @@ fun MainScreen(
 	}
 
 	fun onTunnelToggle(checked: Boolean, tunnel: TunnelConfig) {
-		if (appViewModel.isRequiredPermissionGranted()) {
-			if (checked) {
-				viewModel.onTunnelStart(tunnel, context)
-			} else {
-				viewModel.onTunnelStop(
-					context,
-				)
-			}
+		val intent = if (uiState.settings.isKernelEnabled) null else VpnService.prepare(context)
+		if (intent != null) return vpnActivityResultState.launch(intent)
+		if (!checked) viewModel.onTunnelStop(tunnel).also { return }
+		if (uiState.settings.isKernelEnabled) {
+			context.startTunnelBackground(tunnel.id)
+		} else {
+			viewModel.onTunnelStart(tunnel)
 		}
 	}
 
-	if (uiState.loading) {
-		return LoadingScreen()
-	}
-
-	fun launchQrScanner() {
-		val scanOptions = ScanOptions()
-		scanOptions.setDesiredBarcodeFormats(ScanOptions.QR_CODE)
-		scanOptions.setOrientationLocked(true)
-		scanOptions.setPrompt(
-			context.getString(R.string.scanning_qr),
-		)
-		scanOptions.setBeepEnabled(false)
-		scanLauncher.launch(scanOptions)
-	}
-
 	Scaffold(
 		modifier =
 		Modifier.pointerInput(Unit) {
-			if (uiState.tunnels.isNotEmpty()) {
-				detectTapGestures(
-					onTap = {
-						selectedTunnel = null
-					},
-				)
-			}
+			if (uiState.tunnels.isEmpty()) return@pointerInput
+			detectTapGestures(
+				onTap = {
+					selectedTunnel = null
+				},
+			)
 		},
 		floatingActionButtonPosition = FabPosition.End,
 		floatingActionButton = {
-			AnimatedVisibility(
-				visible = isVisible.value,
-				enter = slideInVertically(initialOffsetY = { it * 2 }),
-				exit = slideOutVertically(targetOffsetY = { it * 2 }),
-				modifier =
-				Modifier
-					.focusRequester(focusRequester)
-					.focusGroup(),
-			) {
-				val secondaryColor = MaterialTheme.colorScheme.secondary
-				val tvFobColor = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)
-				val fobColor =
-					if (WireGuardAutoTunnel.isRunningOnAndroidTv()) tvFobColor else secondaryColor
-				val fobIconColor =
-					if (WireGuardAutoTunnel.isRunningOnAndroidTv()) Color.White else MaterialTheme.colorScheme.background
-				MultiFloatingActionButton(
-					fabIcon =
-					FabIcon(
-						iconRes = R.drawable.add,
-						iconResAfterRotate = R.drawable.close,
-						iconRotate = 180f,
-					),
-					fabOption =
-					FabOption(
-						iconTint = fobIconColor,
-						backgroundTint = fobColor,
-					),
-					itemsMultiFab =
-					listOf(
-						MultiFabItem(
-							label = {
-								Text(
-									stringResource(id = R.string.amnezia),
-									color = Color.White,
-									textAlign = TextAlign.Center,
-									modifier = Modifier.padding(end = 10.dp),
-								)
-							},
-							modifier =
-							Modifier
-								.size(40.dp),
-							icon = R.drawable.add,
-							value = ConfigType.AMNEZIA.name,
-							miniFabOption =
-							FabOption(
-								backgroundTint = fobColor,
-								fobIconColor,
-							),
-						),
-						MultiFabItem(
-							label = {
-								Text(
-									stringResource(id = R.string.wireguard),
-									color = Color.White,
-									textAlign = TextAlign.Center,
-									modifier = Modifier.padding(end = 10.dp),
-								)
-							},
-							icon = R.drawable.add,
-							value = ConfigType.WIREGUARD.name,
-							miniFabOption =
-							FabOption(
-								backgroundTint = fobColor,
-								fobIconColor,
-							),
-						),
-					),
-					onFabItemClicked = {
-						showBottomSheet = true
-						configType = ConfigType.valueOf(it.value)
-					},
-					shape = RoundedCornerShape(16.dp),
+			ScrollDismissFab({
+				val icon = Icons.Filled.Add
+				Icon(
+					imageVector = icon,
+					contentDescription = icon.name,
+					tint = MaterialTheme.colorScheme.onPrimary,
 				)
-			}
+			}, focusRequester, isVisible = isFabVisible, onClick = {
+				showBottomSheet = true
+			})
 		},
 	) {
-		if (showBottomSheet) {
-			ModalBottomSheet(
-				onDismissRequest = {
-					showBottomSheet = false
-				},
-				sheetState = sheetState,
-			) {
-				// Sheet content
-				Row(
-					modifier =
-					Modifier
-						.fillMaxWidth()
-						.clickable {
-							showBottomSheet = false
-							tunnelFileImportResultLauncher.launch(Constants.ALLOWED_FILE_TYPES)
-						}
-						.padding(10.dp),
-				) {
-					Icon(
-						Icons.Filled.FileOpen,
-						contentDescription = stringResource(id = R.string.open_file),
-						modifier = Modifier.padding(10.dp),
-					)
-					Text(
-						stringResource(id = R.string.add_tunnels_text),
-						modifier = Modifier.padding(10.dp),
-					)
-				}
-				if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-					HorizontalDivider()
-					Row(
-						modifier =
-						Modifier
-							.fillMaxWidth()
-							.clickable {
-								scope.launch {
-									showBottomSheet = false
-									launchQrScanner()
-								}
-							}
-							.padding(10.dp),
-					) {
-						Icon(
-							Icons.Filled.QrCode,
-							contentDescription = stringResource(id = R.string.qr_scan),
-							modifier = Modifier.padding(10.dp),
-						)
-						Text(
-							stringResource(id = R.string.add_from_qr),
-							modifier = Modifier.padding(10.dp),
-						)
-					}
-				}
-				HorizontalDivider()
-				Row(
-					modifier =
-					Modifier
-						.fillMaxWidth()
-						.clickable {
-							showBottomSheet = false
-							navController.navigate(
-								"${Screen.Config.route}/${Constants.MANUAL_TUNNEL_CONFIG_ID}?configType=$configType",
-							)
-						}
-						.padding(10.dp),
-				) {
-					Icon(
-						Icons.Filled.Create,
-						contentDescription = stringResource(id = R.string.create_import),
-						modifier = Modifier.padding(10.dp),
-					)
-					Text(
-						stringResource(id = R.string.create_import),
-						modifier = Modifier.padding(10.dp),
-					)
-				}
-			}
-		}
-
+		TunnelImportSheet(
+			showBottomSheet,
+			onDismiss = { showBottomSheet = false },
+			onFileClick = { tunnelFileImportResultLauncher.launch(Constants.ALLOWED_TV_FILE_TYPES) },
+			onQrClick = { requestPermissionLauncher.launch(android.Manifest.permission.CAMERA) },
+			onManualImportClick = {
+				navController.navigate(
+					Route.Config(Constants.MANUAL_TUNNEL_CONFIG_ID),
+				)
+			},
+		)
 		LazyColumn(
 			horizontalAlignment = Alignment.Start,
 			verticalArrangement = Arrangement.Top,
@@ -441,348 +185,37 @@ fun MainScreen(
 			reverseLayout = false,
 			flingBehavior = ScrollableDefaults.flingBehavior(),
 		) {
-			item {
-				AnimatedVisibility(
-					uiState.tunnels.isEmpty(),
-					exit = fadeOut(),
-					enter = fadeIn(),
-				) {
-					Column(
-						horizontalAlignment = Alignment.CenterHorizontally,
-						verticalArrangement = Arrangement.Center,
-						modifier =
-						Modifier
-							.padding(top = 100.dp)
-							.fillMaxSize(),
-					) {
-						val gettingStarted =
-							buildAnnotatedString {
-								append(stringResource(id = R.string.see_the))
-								append(" ")
-								pushStringAnnotation(
-									tag = "gettingStarted",
-									annotation = stringResource(id = R.string.getting_started_url),
-								)
-								withStyle(
-									style = SpanStyle(color = MaterialTheme.colorScheme.primary),
-								) {
-									append(stringResource(id = R.string.getting_started_guide))
-								}
-								pop()
-								append(" ")
-								append(stringResource(R.string.unsure_how))
-								append(".")
-							}
-						Text(
-							text = stringResource(R.string.no_tunnels),
-							fontStyle = FontStyle.Italic,
-						)
-						ClickableText(
-							modifier =
-							Modifier
-								.padding(vertical = 10.dp, horizontal = 24.dp),
-							text = gettingStarted,
-							style =
-							MaterialTheme.typography.bodyMedium.copy(
-								color = MaterialTheme.colorScheme.onSurfaceVariant,
-								textAlign = TextAlign.Center,
-							),
-						) {
-							gettingStarted.getStringAnnotations(tag = "gettingStarted", it, it)
-								.firstOrNull()?.let { annotation ->
-									appViewModel.openWebPage(annotation.item, context)
-								}
-						}
-					}
+			if (uiState.tunnels.isEmpty()) {
+				item {
+					GettingStartedLabel(onClick = { context.openWebUrl(it) })
 				}
 			}
-			item {
-				if (uiState.settings.isAutoTunnelEnabled) {
-					val itemFocusRequester = remember { FocusRequester() }
-					val autoTunnelingLabel =
-						buildAnnotatedString {
-							append(stringResource(id = R.string.auto_tunneling))
-							append(": ")
-							if (uiState.settings.isAutoTunnelPaused) {
-								append(
-									stringResource(id = R.string.paused),
-								)
-							} else {
-								append(
-									stringResource(id = R.string.active),
-								)
-							}
-						}
-					RowListItem(
-						icon = {
-							val icon = Icons.Rounded.Bolt
-							Icon(
-								icon,
-								icon.name,
-								modifier =
-								Modifier
-									.padding(end = 8.5.dp)
-									.size(25.dp),
-								tint =
-								if (uiState.settings.isAutoTunnelPaused) {
-									Color.Gray
-								} else {
-									mint
-								},
-							)
-						},
-						text = autoTunnelingLabel.text,
-						rowButton = {
-							if (uiState.settings.isAutoTunnelPaused) {
-								TextButton(
-									modifier = Modifier.focusRequester(itemFocusRequester),
-									onClick = { viewModel.resumeAutoTunneling() },
-								) {
-									Text(stringResource(id = R.string.resume))
-								}
-							} else {
-								TextButton(
-									modifier = Modifier.focusRequester(itemFocusRequester),
-									onClick = { viewModel.pauseAutoTunneling() },
-								) {
-									Text(stringResource(id = R.string.pause))
-								}
-							}
-						},
-						onClick = {
-							if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-								itemFocusRequester.requestFocus()
-							}
-						},
-						onHold = {},
-						expanded = false,
-						statistics = null,
-						focusRequester = focusRequester,
-					)
+			if (uiState.settings.isAutoTunnelEnabled) {
+				item {
+					AutoTunnelRowItem(uiState.settings, { viewModel.onToggleAutoTunnelingPause() }, focusRequester)
 				}
 			}
 			items(
 				uiState.tunnels,
 				key = { tunnel -> tunnel.id },
 			) { tunnel ->
-				val leadingIconColor =
-					(
-						if (
-							uiState.vpnState.tunnelConfig?.name == tunnel.name &&
-							uiState.vpnState.status == TunnelState.UP
-						) {
-							uiState.vpnState.statistics
-								?.mapPeerStats()
-								?.map { it.value?.handshakeStatus() }
-								.let { statuses ->
-									when {
-										statuses?.all { it == HandshakeStatus.HEALTHY } == true -> mint
-										statuses?.any { it == HandshakeStatus.STALE } == true -> corn
-										statuses?.all { it == HandshakeStatus.NOT_STARTED } == true ->
-											Color.Gray
-
-										else -> {
-											Color.Gray
-										}
-									}
-								}
-						} else {
-							Color.Gray
-						}
-						)
-				val itemFocusRequester = remember { FocusRequester() }
-				val expanded = remember { mutableStateOf(false) }
-				RowListItem(
-					icon = {
-						val circleIcon = Icons.Rounded.Circle
-						val icon =
-							if (tunnel.isPrimaryTunnel) {
-								Icons.Rounded.Star
-							} else if (tunnel.isMobileDataTunnel) {
-								Icons.Rounded.Smartphone
-							} else {
-								circleIcon
-							}
-						Icon(
-							icon,
-							icon.name,
-							tint = leadingIconColor,
-							modifier =
-							Modifier
-								.padding(
-									end = if (icon == circleIcon) 12.5.dp else 10.dp,
-									start = if (icon == circleIcon) 2.5.dp else 0.dp,
-								)
-								.size(if (icon == circleIcon) 15.dp else 20.dp),
-						)
-					},
-					text = tunnel.name,
-					onHold = {
-						if (
-							(uiState.vpnState.status == TunnelState.UP) &&
-							(tunnel.name == uiState.vpnState.tunnelConfig?.name)
-						) {
-							appViewModel.showSnackbarMessage(
-								context.getString(R.string.turn_off_tunnel),
-							)
-							return@RowListItem
-						}
-						haptic.performHapticFeedback(HapticFeedbackType.LongPress)
-						selectedTunnel = tunnel
-					},
-					onClick = {
-						if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-							if (
-								uiState.vpnState.status == TunnelState.UP &&
-								(uiState.vpnState.tunnelConfig?.name == tunnel.name)
-							) {
-								expanded.value = !expanded.value
-							}
-						} else {
-							selectedTunnel = tunnel
-							itemFocusRequester.requestFocus()
-						}
-					},
-					statistics = uiState.vpnState.statistics,
-					expanded = expanded.value,
+				val isActive = uiState.tunnels.any {
+					it.id == tunnel.id &&
+						it.isActive
+				}
+				val expanded = uiState.generalState.isTunnelStatsExpanded
+				TunnelRowItem(
+					isActive,
+					expanded,
+					selectedTunnel?.id == tunnel.id,
+					tunnel,
+					vpnState = uiState.vpnState,
+					{ selectedTunnel = tunnel },
+					{ viewModel.onExpandedChanged(!expanded) },
+					onDelete = { showDeleteTunnelAlertDialog = true },
+					onCopy = { viewModel.onCopyTunnel(tunnel) },
+					onSwitchClick = { onTunnelToggle(it, tunnel) },
 					focusRequester = focusRequester,
-					rowButton = {
-						if (
-							tunnel.id == selectedTunnel?.id &&
-							!WireGuardAutoTunnel.isRunningOnAndroidTv()
-						) {
-							Row {
-								IconButton(
-									onClick = {
-										if (
-											uiState.settings.isAutoTunnelEnabled &&
-											!uiState.settings.isAutoTunnelPaused
-										) {
-											appViewModel.showSnackbarMessage(
-												context.getString(R.string.turn_off_tunnel),
-											)
-										} else {
-											navController.navigate(
-												"${Screen.Option.route}/${selectedTunnel?.id}",
-											)
-										}
-									},
-								) {
-									val icon = Icons.Rounded.Settings
-									Icon(
-										icon,
-										icon.name,
-									)
-								}
-								IconButton(
-									modifier = Modifier.focusable(),
-									onClick = { viewModel.onCopyTunnel(selectedTunnel) },
-								) {
-									val icon = Icons.Rounded.CopyAll
-									Icon(icon, icon.name)
-								}
-								IconButton(
-									modifier = Modifier.focusable(),
-									onClick = { showDeleteTunnelAlertDialog = true },
-								) {
-									val icon = Icons.Rounded.Delete
-									Icon(icon, icon.name)
-								}
-							}
-						} else {
-							val checked by remember {
-								derivedStateOf {
-									(
-										uiState.vpnState.status == TunnelState.UP &&
-											tunnel.name == uiState.vpnState.tunnelConfig?.name
-										)
-								}
-							}
-							if (!checked) expanded.value = false
-
-							@Composable
-							fun TunnelSwitch() = Switch(
-								modifier = Modifier.focusRequester(itemFocusRequester),
-								checked = checked,
-								onCheckedChange = { checked ->
-									if (!checked) expanded.value = false
-									onTunnelToggle(checked, tunnel)
-								},
-							)
-							if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-								Row {
-									IconButton(
-										onClick = {
-											if (uiState.settings.isAutoTunnelEnabled && !uiState.settings.isAutoTunnelPaused) {
-												appViewModel.showSnackbarMessage(
-													context.getString(R.string.turn_off_auto),
-												)
-											} else {
-												selectedTunnel = tunnel
-												navController.navigate(
-													"${Screen.Option.route}/${selectedTunnel?.id}",
-												)
-											}
-										},
-									) {
-										val icon = Icons.Rounded.Settings
-										Icon(
-											icon,
-											icon.name,
-										)
-									}
-									IconButton(
-										modifier = Modifier.focusRequester(focusRequester),
-										onClick = {
-											if (
-												uiState.vpnState.status == TunnelState.UP &&
-												(uiState.vpnState.tunnelConfig?.name == tunnel.name)
-											) {
-												expanded.value = !expanded.value
-											} else {
-												appViewModel.showSnackbarMessage(
-													context.getString(R.string.turn_on_tunnel),
-												)
-											}
-										},
-									) {
-										val icon = Icons.Rounded.Info
-										Icon(icon, icon.name)
-									}
-									IconButton(
-										onClick = { viewModel.onCopyTunnel(tunnel) },
-									) {
-										val icon = Icons.Rounded.CopyAll
-										Icon(icon, icon.name)
-									}
-									IconButton(
-										onClick = {
-											if (
-												uiState.vpnState.status == TunnelState.UP &&
-												tunnel.name == uiState.vpnState.tunnelConfig?.name
-											) {
-												appViewModel.showSnackbarMessage(
-													context.getString(R.string.turn_off_tunnel),
-												)
-											} else {
-												selectedTunnel = tunnel
-												showDeleteTunnelAlertDialog = true
-											}
-										},
-									) {
-										val icon = Icons.Rounded.Delete
-										Icon(
-											icon,
-											icon.name,
-										)
-									}
-									TunnelSwitch()
-								}
-							} else {
-								TunnelSwitch()
-							}
-						}
-					},
 				)
 			}
 		}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/MainUiState.kt

@@ -1,12 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.main
-
-import com.zaneschepke.wireguardautotunnel.data.domain.Settings
-import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnState
-import com.zaneschepke.wireguardautotunnel.util.TunnelConfigs
-
-data class MainUiState(
-	val settings: Settings = Settings(),
-	val tunnels: TunnelConfigs = emptyList(),
-	val vpnState: VpnState = VpnState(),
-	val loading: Boolean = true,
-)

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/MainViewModel.kt

@@ -6,23 +6,24 @@ import android.net.Uri
 import android.provider.OpenableColumns
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.wireguard.config.Config
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+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.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
 import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.FileReadException
+import com.zaneschepke.wireguardautotunnel.util.InvalidFileExtensionException
 import com.zaneschepke.wireguardautotunnel.util.NumberUtils
-import com.zaneschepke.wireguardautotunnel.util.WgTunnelExceptions
-import com.zaneschepke.wireguardautotunnel.util.toWgQuickString
+import com.zaneschepke.wireguardautotunnel.util.StringValue
+import com.zaneschepke.wireguardautotunnel.util.extensions.extractNameAndNumber
+import com.zaneschepke.wireguardautotunnel.util.extensions.hasNumberInParentheses
+import com.zaneschepke.wireguardautotunnel.util.extensions.toWgQuickString
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import timber.log.Timber
@@ -35,26 +36,12 @@ class MainViewModel
 @Inject
 constructor(
 	private val appDataRepository: AppDataRepository,
-	private val serviceManager: ServiceManager,
-	val vpnService: VpnService,
+	val tunnelService: TunnelService,
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : ViewModel() {
-	val uiState =
-		combine(
-			appDataRepository.settings.getSettingsFlow(),
-			appDataRepository.tunnels.getTunnelConfigsFlow(),
-			vpnService.vpnState,
-		) { settings, tunnels, vpnState ->
-			MainUiState(settings, tunnels, vpnState, false)
-		}
-			.stateIn(
-				viewModelScope,
-				SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
-				MainUiState(),
-			)
 
 	private fun stopWatcherService(context: Context) {
-		serviceManager.stopWatcherService(context)
+		ServiceManager.stopWatcherService(context)
 	}
 
 	fun onDelete(tunnel: TunnelConfig, context: Context) {
@@ -66,7 +53,6 @@ constructor(
 				resetTunnelSetting(settings)
 			}
 			appDataRepository.tunnels.delete(tunnel)
-			WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
 		}
 	}
 
@@ -79,46 +65,31 @@ constructor(
 		)
 	}
 
-	fun onTunnelStart(tunnelConfig: TunnelConfig, context: Context) = viewModelScope.launch {
-		Timber.d("On start called!")
-		serviceManager.startVpnService(
-			context,
-			tunnelConfig.id,
-			isManualStart = true,
-		)
+	fun onExpandedChanged(expanded: Boolean) = viewModelScope.launch {
+		appDataRepository.appState.setTunnelStatsExpanded(expanded)
 	}
 
-	fun onTunnelStop(context: Context) = viewModelScope.launch {
+	fun onTunnelStart(tunnelConfig: TunnelConfig) = viewModelScope.launch {
+		Timber.i("Starting tunnel ${tunnelConfig.name}")
+		tunnelService.startTunnel(tunnelConfig)
+	}
+
+	fun onTunnelStop(tunnel: TunnelConfig) = viewModelScope.launch {
 		Timber.i("Stopping active tunnel")
-		serviceManager.stopVpnService(context, isManualStop = true)
+		tunnelService.stopTunnel(tunnel)
 	}
 
-	private fun validateConfigString(config: String, configType: ConfigType) {
-		when (configType) {
-			ConfigType.AMNEZIA -> TunnelConfig.configFromAmQuick(config)
-			ConfigType.WIREGUARD -> TunnelConfig.configFromWgQuick(config)
-		}
-	}
-
-	private fun generateQrCodeDefaultName(config: String, configType: ConfigType): String {
+	private fun generateQrCodeDefaultName(config: String): String {
 		return try {
-			when (configType) {
-				ConfigType.AMNEZIA -> {
-					TunnelConfig.configFromAmQuick(config).peers[0].endpoint.get().host
-				}
-
-				ConfigType.WIREGUARD -> {
-					TunnelConfig.configFromWgQuick(config).peers[0].endpoint.get().host
-				}
-			}
+			TunnelConfig.configFromAmQuick(config).peers[0].endpoint.get().host
 		} catch (e: Exception) {
 			Timber.e(e)
 			NumberUtils.generateRandomTunnelName()
 		}
 	}
 
-	private fun generateQrCodeTunnelName(config: String, configType: ConfigType): String {
-		var defaultName = generateQrCodeDefaultName(config, configType)
+	private fun generateQrCodeTunnelName(config: String): String {
+		var defaultName = generateQrCodeDefaultName(config)
 		val lines = config.lines().toMutableList()
 		val linesIterator = lines.iterator()
 		while (linesIterator.hasNext()) {
@@ -131,193 +102,95 @@ constructor(
 		return defaultName
 	}
 
-	suspend fun onTunnelQrResult(result: String, configType: ConfigType): Result<Unit> {
-		return withContext(ioDispatcher) {
-			try {
-				validateConfigString(result, configType)
-				val tunnelName =
-					makeTunnelNameUnique(generateQrCodeTunnelName(result, configType))
-				val tunnelConfig =
-					when (configType) {
-						ConfigType.AMNEZIA -> {
-							TunnelConfig(
-								name = tunnelName,
-								amQuick = result,
-								wgQuick =
-								TunnelConfig.configFromAmQuick(
-									result,
-								).toWgQuickString(),
-							)
-						}
-
-						ConfigType.WIREGUARD ->
-							TunnelConfig(
-								name = tunnelName,
-								wgQuick = result,
-							)
-					}
-				addTunnel(tunnelConfig)
-				Result.success(Unit)
-			} catch (e: Exception) {
-				Timber.e(e)
-				Result.failure(WgTunnelExceptions.InvalidQrCode())
-			}
-		}
-	}
-
 	private suspend fun makeTunnelNameUnique(name: String): String {
 		return withContext(ioDispatcher) {
 			val tunnels = appDataRepository.tunnels.getAll()
 			var tunnelName = name
 			var num = 1
 			while (tunnels.any { it.name == tunnelName }) {
-				tunnelName = name + "($num)"
+				tunnelName = if (!tunnelName.hasNumberInParentheses()) {
+					"$name($num)"
+				} else {
+					val pair = tunnelName.extractNameAndNumber()
+					"${pair?.first}($num)"
+				}
 				num++
 			}
 			tunnelName
 		}
 	}
 
-	private fun saveTunnelConfigFromStream(stream: InputStream, fileName: String, type: ConfigType) {
-		var amQuick: String? = null
-		val wgQuick =
-			stream.use {
-				when (type) {
-					ConfigType.AMNEZIA -> {
-						val config = org.amnezia.awg.config.Config.parse(it)
-						amQuick = config.toAwgQuickString()
-						config.toWgQuickString()
-					}
-
-					ConfigType.WIREGUARD -> {
-						Config.parse(it).toWgQuickString()
-					}
-				}
-			}
-		viewModelScope.launch {
-			val tunnelName = makeTunnelNameUnique(getNameFromFileName(fileName))
-			addTunnel(
-				TunnelConfig(
-					name = tunnelName,
-					wgQuick = wgQuick,
-					amQuick = amQuick ?: TunnelConfig.AM_QUICK_DEFAULT,
-				),
-			)
-		}
+	private suspend fun saveTunnelConfigFromStream(stream: InputStream, fileName: String) {
+		val amConfig = stream.use { org.amnezia.awg.config.Config.parse(it) }
+		val tunnelName = makeTunnelNameUnique(getNameFromFileName(fileName))
+		saveTunnel(
+			TunnelConfig(
+				name = tunnelName,
+				wgQuick = amConfig.toWgQuickString(),
+				amQuick = amConfig.toAwgQuickString(true),
+			),
+		)
 	}
 
 	private fun getInputStreamFromUri(uri: Uri, context: Context): InputStream? {
 		return context.applicationContext.contentResolver.openInputStream(uri)
 	}
 
-	suspend fun onTunnelFileSelected(uri: Uri, configType: ConfigType, context: Context): Result<Unit> {
-		return withContext(ioDispatcher) {
-			try {
-				if (isValidUriContentScheme(uri)) {
-					val fileName = getFileName(context, uri)
-					return@withContext when (getFileExtensionFromFileName(fileName)) {
-						Constants.CONF_FILE_EXTENSION ->
-							saveTunnelFromConfUri(fileName, uri, configType, context)
-
-						Constants.ZIP_FILE_EXTENSION ->
-							saveTunnelsFromZipUri(
-								uri,
-								configType,
-								context,
-							)
-
-						else -> Result.failure(WgTunnelExceptions.InvalidFileExtension())
-					}
-				} else {
-					Result.failure(WgTunnelExceptions.InvalidFileExtension())
-				}
-			} catch (e: Exception) {
-				Timber.e(e)
-				Result.failure(WgTunnelExceptions.FileReadFailed())
+	fun onTunnelFileSelected(uri: Uri, context: Context) = viewModelScope.launch(ioDispatcher) {
+		kotlin.runCatching {
+			if (!isValidUriContentScheme(uri)) throw InvalidFileExtensionException
+			val fileName = getFileName(context, uri)
+			when (getFileExtensionFromFileName(fileName)) {
+				Constants.CONF_FILE_EXTENSION ->
+					saveTunnelFromConfUri(fileName, uri, context)
+				Constants.ZIP_FILE_EXTENSION ->
+					saveTunnelsFromZipUri(
+						uri,
+						context,
+					)
+				else -> throw InvalidFileExtensionException
 			}
-		}
-	}
-
-	private suspend fun saveTunnelsFromZipUri(uri: Uri, configType: ConfigType, context: Context): Result<Unit> {
-		return withContext(ioDispatcher) {
-			ZipInputStream(getInputStreamFromUri(uri, context)).use { zip ->
-				generateSequence { zip.nextEntry }
-					.filterNot {
-						it.isDirectory ||
-							getFileExtensionFromFileName(it.name) != Constants.CONF_FILE_EXTENSION
-					}
-					.forEach {
-						val name = getNameFromFileName(it.name)
-						withContext(viewModelScope.coroutineContext) {
-							try {
-								var amQuick: String? = null
-								val wgQuick =
-									when (configType) {
-										ConfigType.AMNEZIA -> {
-											val config =
-												org.amnezia.awg.config.Config.parse(
-													zip,
-												)
-											amQuick = config.toAwgQuickString()
-											config.toWgQuickString()
-										}
-
-										ConfigType.WIREGUARD -> {
-											Config.parse(zip).toWgQuickString()
-										}
-									}
-								addTunnel(
-									TunnelConfig(
-										name = makeTunnelNameUnique(name),
-										wgQuick = wgQuick,
-										amQuick = amQuick ?: TunnelConfig.AM_QUICK_DEFAULT,
-									),
-								)
-								Result.success(Unit)
-							} catch (e: Exception) {
-								Result.failure(WgTunnelExceptions.FileReadFailed())
-							}
-						}
-					}
-				Result.success(Unit)
-			}
-		}
-	}
-
-	private suspend fun saveTunnelFromConfUri(name: String, uri: Uri, configType: ConfigType, context: Context): Result<Unit> {
-		return withContext(ioDispatcher) {
-			val stream = getInputStreamFromUri(uri, context)
-			return@withContext if (stream != null) {
-				try {
-					saveTunnelConfigFromStream(stream, name, configType)
-				} catch (e: Exception) {
-					return@withContext Result.failure(WgTunnelExceptions.ConfigParseError())
-				}
-				Result.success(Unit)
+		}.onFailure {
+			Timber.e(it)
+			if (it is InvalidFileExtensionException) {
+				SnackbarController.showMessage(StringValue.StringResource(R.string.error_file_extension))
 			} else {
-				Result.failure(WgTunnelExceptions.FileReadFailed())
+				SnackbarController.showMessage(StringValue.StringResource(R.string.error_file_format))
 			}
 		}
 	}
 
-	private fun addTunnel(tunnelConfig: TunnelConfig) = viewModelScope.launch {
-		val firstTunnel = appDataRepository.tunnels.count() == 0
-		saveTunnel(tunnelConfig)
-		if (firstTunnel) WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
+	private suspend fun saveTunnelsFromZipUri(uri: Uri, context: Context) {
+		ZipInputStream(getInputStreamFromUri(uri, context)).use { zip ->
+			generateSequence { zip.nextEntry }
+				.filterNot {
+					it.isDirectory ||
+						getFileExtensionFromFileName(it.name) != Constants.CONF_FILE_EXTENSION
+				}
+				.forEach { entry ->
+					val name = getNameFromFileName(entry.name)
+					val amConf = org.amnezia.awg.config.Config.parse(zip.bufferedReader())
+					saveTunnel(
+						TunnelConfig(
+							name = makeTunnelNameUnique(name),
+							wgQuick = amConf.toWgQuickString(),
+							amQuick = amConf.toAwgQuickString(true),
+						),
+					)
+				}
+		}
 	}
 
-	fun pauseAutoTunneling() = viewModelScope.launch {
-		appDataRepository.settings.save(
-			uiState.value.settings.copy(isAutoTunnelPaused = true),
-		)
-		WireGuardAutoTunnel.requestAutoTunnelTileServiceUpdate()
+	private suspend fun saveTunnelFromConfUri(name: String, uri: Uri, context: Context) {
+		val stream = getInputStreamFromUri(uri, context) ?: throw FileReadException
+		saveTunnelConfigFromStream(stream, name)
 	}
 
-	fun resumeAutoTunneling() = viewModelScope.launch {
+	fun onToggleAutoTunnelingPause() = viewModelScope.launch {
+		val settings = appDataRepository.settings.getSettings()
 		appDataRepository.settings.save(
-			uiState.value.settings.copy(isAutoTunnelPaused = false),
+			settings.copy(isAutoTunnelPaused = !settings.isAutoTunnelPaused),
 		)
-		WireGuardAutoTunnel.requestAutoTunnelTileServiceUpdate()
 	}
 
 	private fun saveTunnel(tunnelConfig: TunnelConfig) = viewModelScope.launch {
@@ -325,32 +198,23 @@ constructor(
 	}
 
 	private fun getFileNameByCursor(context: Context, uri: Uri): String? {
-		context.contentResolver.query(uri, null, null, null, null)?.use {
-			return getDisplayNameByCursor(it)
+		return context.contentResolver.query(uri, null, null, null, null)?.use {
+			getDisplayNameByCursor(it)
 		}
-		return null
 	}
 
 	private fun getDisplayNameColumnIndex(cursor: Cursor): Int? {
 		val columnIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
-		return if (columnIndex != -1) {
-			return columnIndex
-		} else {
-			null
-		}
+		if (columnIndex == -1) return null
+		return columnIndex
 	}
 
 	private fun getDisplayNameByCursor(cursor: Cursor): String? {
-		return if (cursor.moveToFirst()) {
-			val index = getDisplayNameColumnIndex(cursor)
-			if (index != null) {
-				cursor.getString(index)
-			} else {
-				null
-			}
-		} else {
-			null
-		}
+		val move = cursor.moveToFirst()
+		if (!move) return null
+		val index = getDisplayNameColumnIndex(cursor)
+		if (index == null) return index
+		return cursor.getString(index)
 	}
 
 	private fun isValidUriContentScheme(uri: Uri): Boolean {
@@ -376,14 +240,15 @@ constructor(
 
 	private fun saveSettings(settings: Settings) = viewModelScope.launch { appDataRepository.settings.save(settings) }
 
-	fun onCopyTunnel(tunnel: TunnelConfig?) = viewModelScope.launch {
-		tunnel?.let {
-			saveTunnel(
-				TunnelConfig(
-					name = it.name.plus(NumberUtils.randomThree()),
-					wgQuick = it.wgQuick,
-				),
-			)
-		}
+	fun onCopyTunnel(tunnel: TunnelConfig) = viewModelScope.launch {
+		saveTunnel(
+			tunnel.copy(
+				id = 0,
+				isPrimaryTunnel = false,
+				isMobileDataTunnel = false,
+				isActive = false,
+				name = makeTunnelNameUnique(tunnel.name),
+			),
+		)
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/components/AutoTunnelRowItem.kt

@@ -0,0 +1,78 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.main.components
+
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Bolt
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.scale
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.buildAnnotatedString
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.data.domain.Settings
+import com.zaneschepke.wireguardautotunnel.ui.common.ExpandingRowListItem
+import com.zaneschepke.wireguardautotunnel.ui.theme.SilverTree
+import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+
+@Composable
+fun AutoTunnelRowItem(settings: Settings, onToggle: () -> Unit, focusRequester: FocusRequester) {
+	val context = LocalContext.current
+	val itemFocusRequester = remember { FocusRequester() }
+	val autoTunnelingLabel =
+		buildAnnotatedString {
+			append(stringResource(id = R.string.auto_tunneling))
+			append(": ")
+			if (settings.isAutoTunnelPaused) {
+				append(
+					stringResource(id = R.string.paused),
+				)
+			} else {
+				append(
+					stringResource(id = R.string.active),
+				)
+			}
+		}
+	ExpandingRowListItem(
+		leading = {
+			val icon = Icons.Rounded.Bolt
+			Icon(
+				icon,
+				icon.name,
+				modifier =
+				Modifier
+					.size(iconSize).scale(1.5f),
+				tint =
+				if (settings.isAutoTunnelPaused) {
+					Color.Gray
+				} else {
+					SilverTree
+				},
+			)
+		},
+		text = autoTunnelingLabel.text,
+		trailing = {
+			TextButton(
+				modifier = Modifier.focusRequester(itemFocusRequester),
+				onClick = { onToggle() },
+			) {
+				Text(stringResource(id = if (settings.isAutoTunnelPaused) R.string.resume else R.string.pause))
+			}
+		},
+		onClick = {
+			if (context.isRunningOnTv()) {
+				itemFocusRequester.requestFocus()
+			}
+		},
+		isExpanded = false,
+		focusRequester = focusRequester,
+	)
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/components/GettingStartedLabel.kt

@@ -0,0 +1,71 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.main.components
+
+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.foundation.text.ClickableText
+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.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.withStyle
+import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.R
+
+@Composable
+fun GettingStartedLabel(onClick: (url: String) -> Unit) {
+	Column(
+		horizontalAlignment = Alignment.CenterHorizontally,
+		verticalArrangement = Arrangement.Center,
+		modifier =
+		Modifier
+			.padding(top = 100.dp)
+			.fillMaxSize(),
+	) {
+		val gettingStarted =
+			buildAnnotatedString {
+				append(stringResource(id = R.string.see_the))
+				append(" ")
+				pushStringAnnotation(
+					tag = "gettingStarted",
+					annotation = stringResource(id = R.string.getting_started_url),
+				)
+				withStyle(
+					style = SpanStyle(color = MaterialTheme.colorScheme.primary),
+				) {
+					append(stringResource(id = R.string.getting_started_guide))
+				}
+				pop()
+				append(" ")
+				append(stringResource(R.string.unsure_how))
+				append(".")
+			}
+		Text(
+			text = stringResource(R.string.no_tunnels),
+			fontStyle = FontStyle.Italic,
+		)
+		ClickableText(
+			modifier =
+			Modifier
+				.padding(vertical = 10.dp, horizontal = 24.dp),
+			text = gettingStarted,
+			style =
+			MaterialTheme.typography.bodyMedium.copy(
+				color = MaterialTheme.colorScheme.onSurfaceVariant,
+				textAlign = TextAlign.Center,
+			),
+		) {
+			gettingStarted.getStringAnnotations(tag = "gettingStarted", it, it)
+				.firstOrNull()?.let { annotation ->
+					onClick(annotation.item)
+				}
+		}
+	}
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/components/ScrollDismissMultiFab.kt

@@ -0,0 +1,37 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.main.components
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
+import androidx.compose.foundation.focusGroup
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.unit.dp
+
+@Composable
+fun ScrollDismissFab(icon: @Composable () -> Unit, focusRequester: FocusRequester, isVisible: Boolean, onClick: () -> Unit) {
+	AnimatedVisibility(
+		visible = isVisible,
+		enter = slideInVertically(initialOffsetY = { it * 2 }),
+		exit = slideOutVertically(targetOffsetY = { it * 2 }),
+		modifier =
+		Modifier
+			.focusRequester(focusRequester)
+			.focusGroup(),
+	) {
+		FloatingActionButton(
+			onClick = {
+				onClick()
+			},
+			shape = RoundedCornerShape(16.dp),
+			containerColor = MaterialTheme.colorScheme.primary,
+		) {
+			icon()
+		}
+	}
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/components/TunnelImportSheet.kt

@@ -0,0 +1,104 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.main.components
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Create
+import androidx.compose.material.icons.filled.FileOpen
+import androidx.compose.material.icons.filled.QrCode
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.Text
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun TunnelImportSheet(show: Boolean, onDismiss: () -> Unit, onFileClick: () -> Unit, onQrClick: () -> Unit, onManualImportClick: () -> Unit) {
+	val sheetState = rememberModalBottomSheetState()
+
+	val context = LocalContext.current
+	if (show) {
+		ModalBottomSheet(
+			onDismissRequest = {
+				onDismiss()
+			},
+			sheetState = sheetState,
+		) {
+			Row(
+				modifier =
+				Modifier
+					.fillMaxWidth()
+					.clickable {
+						onDismiss()
+						onFileClick()
+					}
+					.padding(10.dp),
+			) {
+				Icon(
+					Icons.Filled.FileOpen,
+					contentDescription = stringResource(id = R.string.open_file),
+					modifier = Modifier.padding(10.dp),
+				)
+				Text(
+					stringResource(id = R.string.add_tunnels_text),
+					modifier = Modifier.padding(10.dp),
+				)
+			}
+			if (!context.isRunningOnTv()) {
+				HorizontalDivider()
+				Row(
+					modifier =
+					Modifier
+						.fillMaxWidth()
+						.clickable {
+							onDismiss()
+							onQrClick()
+						}
+						.padding(10.dp),
+				) {
+					Icon(
+						Icons.Filled.QrCode,
+						contentDescription = stringResource(id = R.string.qr_scan),
+						modifier = Modifier.padding(10.dp),
+					)
+					Text(
+						stringResource(id = R.string.add_from_qr),
+						modifier = Modifier.padding(10.dp),
+					)
+				}
+			}
+			HorizontalDivider()
+			Row(
+				modifier =
+				Modifier
+					.fillMaxWidth()
+					.clickable {
+						onDismiss()
+						onManualImportClick()
+					}
+					.padding(10.dp),
+			) {
+				Icon(
+					Icons.Filled.Create,
+					contentDescription = stringResource(id = R.string.create_import),
+					modifier = Modifier.padding(10.dp),
+				)
+				Text(
+					stringResource(id = R.string.create_import),
+					modifier = Modifier.padding(10.dp),
+				)
+			}
+		}
+	}
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/components/TunnelRowItem.kt

@@ -0,0 +1,204 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.main.components
+
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Circle
+import androidx.compose.material.icons.rounded.CopyAll
+import androidx.compose.material.icons.rounded.Delete
+import androidx.compose.material.icons.rounded.Info
+import androidx.compose.material.icons.rounded.Settings
+import androidx.compose.material.icons.rounded.Smartphone
+import androidx.compose.material.icons.rounded.Star
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Switch
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalHapticFeedback
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnState
+import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.ui.common.ExpandingRowListItem
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
+import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
+import com.zaneschepke.wireguardautotunnel.util.extensions.asColor
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+
+@Composable
+fun TunnelRowItem(
+	isActive: Boolean,
+	expanded: Boolean,
+	isSelected: Boolean,
+	tunnel: TunnelConfig,
+	vpnState: VpnState,
+	onHold: () -> Unit,
+	onClick: () -> Unit,
+	onCopy: () -> Unit,
+	onDelete: () -> Unit,
+	onSwitchClick: (checked: Boolean) -> Unit,
+	focusRequester: FocusRequester,
+) {
+	val leadingIconColor = if (!isActive) Color.Gray else vpnState.statistics.asColor()
+	val context = LocalContext.current
+	val snackbar = SnackbarController.current
+	val navController = LocalNavController.current
+	val haptic = LocalHapticFeedback.current
+	val itemFocusRequester = remember { FocusRequester() }
+	ExpandingRowListItem(
+		leading = {
+			val circleIcon = Icons.Rounded.Circle
+			val icon =
+				if (tunnel.isPrimaryTunnel) {
+					Icons.Rounded.Star
+				} else if (tunnel.isMobileDataTunnel) {
+					Icons.Rounded.Smartphone
+				} else {
+					circleIcon
+				}
+			Icon(
+				icon,
+				icon.name,
+				tint = leadingIconColor,
+				modifier = Modifier.size(iconSize),
+			)
+		},
+		text = tunnel.name,
+		onHold = {
+			haptic.performHapticFeedback(HapticFeedbackType.LongPress)
+			onHold()
+		},
+		onClick = {
+			if (!context.isRunningOnTv()) {
+				if (isActive) {
+					onClick()
+				}
+			} else {
+				onHold()
+				itemFocusRequester.requestFocus()
+			}
+		},
+		isExpanded = expanded && isActive,
+		expanded = { if (isActive && expanded) TunnelStatisticsRow(vpnState.statistics, tunnel) },
+		focusRequester = focusRequester,
+		trailing = {
+			if (
+				isSelected &&
+				!context.isRunningOnTv()
+			) {
+				Row {
+					IconButton(
+						onClick = {
+							navController.navigate(
+								Route.Option(tunnel.id),
+							)
+						},
+					) {
+						val icon = Icons.Rounded.Settings
+						Icon(
+							icon,
+							icon.name,
+						)
+					}
+					IconButton(
+						modifier = Modifier.focusable(),
+						onClick = { onCopy() },
+					) {
+						val icon = Icons.Rounded.CopyAll
+						Icon(icon, icon.name)
+					}
+					IconButton(
+						enabled = !isActive,
+						modifier = Modifier.focusable(),
+						onClick = { onDelete() },
+					) {
+						val icon = Icons.Rounded.Delete
+						Icon(icon, icon.name)
+					}
+				}
+			} else {
+				if (context.isRunningOnTv()) {
+					Row {
+						IconButton(
+							onClick = {
+								onHold()
+								navController.navigate(
+									Route.Option(tunnel.id),
+								)
+							},
+						) {
+							val icon = Icons.Rounded.Settings
+							Icon(
+								icon,
+								icon.name,
+							)
+						}
+						IconButton(
+							modifier = Modifier.focusRequester(focusRequester),
+							onClick = {
+								if (isActive) {
+									onClick()
+								} else {
+									snackbar.showMessage(
+										context.getString(R.string.turn_on_tunnel),
+									)
+								}
+							},
+						) {
+							val icon = Icons.Rounded.Info
+							Icon(icon, icon.name)
+						}
+						IconButton(
+							onClick = { onCopy() },
+						) {
+							val icon = Icons.Rounded.CopyAll
+							Icon(icon, icon.name)
+						}
+						IconButton(
+							onClick = {
+								if (isActive) {
+									snackbar.showMessage(
+										context.getString(R.string.turn_off_tunnel),
+									)
+								} else {
+									onHold()
+									onDelete()
+								}
+							},
+						) {
+							val icon = Icons.Rounded.Delete
+							Icon(
+								icon,
+								icon.name,
+							)
+						}
+						Switch(
+							modifier = Modifier.focusRequester(itemFocusRequester),
+							checked = isActive,
+							onCheckedChange = { checked ->
+								onSwitchClick(checked)
+							},
+						)
+					}
+				} else {
+					Switch(
+						modifier = Modifier.focusRequester(itemFocusRequester),
+						checked = isActive,
+						onCheckedChange = { checked ->
+							onSwitchClick(checked)
+						},
+					)
+				}
+			}
+		},
+	)
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/components/TunnelStatisticsRow.kt

@@ -0,0 +1,60 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.main.components
+
+import androidx.compose.foundation.layout.Arrangement
+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.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.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStatistics
+import com.zaneschepke.wireguardautotunnel.util.NumberUtils
+import com.zaneschepke.wireguardautotunnel.util.extensions.toThreeDecimalPlaceString
+
+@Composable
+fun TunnelStatisticsRow(statistics: TunnelStatistics?, tunnelConfig: TunnelConfig) {
+	val config = TunnelConfig.configFromAmQuick(tunnelConfig.wgQuick)
+
+	Row(
+		modifier =
+		Modifier
+			.fillMaxWidth()
+			.padding(end = 10.dp, bottom = 10.dp, start = 45.dp),
+		verticalAlignment = Alignment.CenterVertically,
+		horizontalArrangement = Arrangement.spacedBy(30.dp, Alignment.Start),
+	) {
+		config.peers.forEach {
+			val peerId = it.publicKey.toBase64().subSequence(0, 3).toString() + "***"
+			val peerRx = statistics?.peerStats(it.publicKey)?.rxBytes ?: 0
+			val peerTx = statistics?.peerStats(it.publicKey)?.txBytes ?: 0
+			val peerTxMB = NumberUtils.bytesToMB(peerTx).toThreeDecimalPlaceString()
+			val peerRxMB = NumberUtils.bytesToMB(peerRx).toThreeDecimalPlaceString()
+			val handshake = statistics?.peerStats(it.publicKey)?.latestHandshakeEpochMillis?.let {
+				if (it == 0L) {
+					stringResource(R.string.never)
+				} else {
+					"${NumberUtils.getSecondsBetweenTimestampAndNow(it)} ${stringResource(R.string.sec)}"
+				}
+			} ?: stringResource(R.string.never)
+			Column(
+				verticalArrangement = Arrangement.spacedBy(10.dp),
+			) {
+				Text(stringResource(R.string.peer).lowercase() + ": $peerId", style = MaterialTheme.typography.bodySmall)
+				Text("tx: $peerTxMB MB", style = MaterialTheme.typography.bodySmall)
+			}
+			Column(
+				verticalArrangement = Arrangement.spacedBy(10.dp),
+			) {
+				Text(stringResource(R.string.handshake) + ": $handshake", style = MaterialTheme.typography.bodySmall)
+				Text("rx: $peerRxMB MB", style = MaterialTheme.typography.bodySmall)
+			}
+		}
+	}
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/components/VpnDeniedDialog.kt

@@ -0,0 +1,49 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.main.components
+
+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/screens/options/OptionsScreen.kt

@@ -1,11 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.options
 
 import android.annotation.SuppressLint
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.slideInVertically
-import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.focusGroup
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -16,7 +12,6 @@ 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.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardActions
@@ -24,7 +19,9 @@ import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Close
+import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material.icons.outlined.Add
+import androidx.compose.material.icons.outlined.Edit
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -32,63 +29,51 @@ import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
-import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardCapitalization
-import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.navigation.NavController
-import com.iamageo.multifablibrary.FabIcon
-import com.iamageo.multifablibrary.FabOption
-import com.iamageo.multifablibrary.MultiFabItem
-import com.iamageo.multifablibrary.MultiFloatingActionButton
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
-import com.zaneschepke.wireguardautotunnel.ui.Screen
+import com.zaneschepke.wireguardautotunnel.ui.AppUiState
+import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.ClickableIconButton
 import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationToggle
+import com.zaneschepke.wireguardautotunnel.ui.common.config.SubmitConfigurationTextBox
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.text.SectionTitle
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.ConfigType
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.ScrollDismissFab
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.WildcardSupportingLabel
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.getMessage
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+import com.zaneschepke.wireguardautotunnel.util.extensions.isValidIpv4orIpv6Address
+import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
-fun OptionsScreen(
-	optionsViewModel: OptionsViewModel = hiltViewModel(),
-	navController: NavController,
-	appViewModel: AppViewModel,
-	focusRequester: FocusRequester,
-	tunnelId: String,
-) {
+fun OptionsScreen(optionsViewModel: OptionsViewModel = hiltViewModel(), focusRequester: FocusRequester, appUiState: AppUiState, tunnelId: Int) {
 	val scrollState = rememberScrollState()
-	val uiState by optionsViewModel.uiState.collectAsStateWithLifecycle()
 	val context = LocalContext.current
+	val navController = LocalNavController.current
+	val config = appUiState.tunnels.first { it.id == tunnelId }
 
 	val interactionSource = remember { MutableInteractionSource() }
-	val scope = rememberCoroutineScope()
 	val focusManager = LocalFocusManager.current
 	val screenPadding = 5.dp
 	val fillMaxWidth = .85f
@@ -96,103 +81,38 @@ fun OptionsScreen(
 	var currentText by remember { mutableStateOf("") }
 
 	LaunchedEffect(Unit) {
-		optionsViewModel.init(tunnelId)
-		if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+		if (context.isRunningOnTv()) {
 			delay(Constants.FOCUS_REQUEST_DELAY)
-			focusRequester.requestFocus()
+			kotlin.runCatching {
+				focusRequester.requestFocus()
+			}.onFailure {
+				delay(Constants.FOCUS_REQUEST_DELAY)
+				focusRequester.requestFocus()
+			}
 		}
 	}
 
 	fun saveTrustedSSID() {
 		if (currentText.isNotEmpty()) {
-			scope.launch {
-				optionsViewModel.onSaveRunSSID(currentText).onSuccess {
-					currentText = ""
-				}.onFailure {
-					appViewModel.showSnackbarMessage(it.getMessage(context))
-				}
-			}
+			optionsViewModel.onSaveRunSSID(currentText, config)
+			currentText = ""
 		}
 	}
 
 	Scaffold(
 		floatingActionButton = {
-			val secondaryColor = MaterialTheme.colorScheme.secondary
-			val tvFobColor = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)
-			val fobColor =
-				if (WireGuardAutoTunnel.isRunningOnAndroidTv()) tvFobColor else secondaryColor
-			val fobIconColor =
-				if (WireGuardAutoTunnel.isRunningOnAndroidTv()) Color.White else MaterialTheme.colorScheme.background
-			AnimatedVisibility(
-				visible = true,
-				enter = slideInVertically(initialOffsetY = { it * 2 }),
-				exit = slideOutVertically(targetOffsetY = { it * 2 }),
-				modifier =
-				Modifier
-					.focusRequester(focusRequester)
-					.focusGroup(),
-			) {
-				MultiFloatingActionButton(
-					fabIcon =
-					FabIcon(
-						iconRes = R.drawable.edit,
-						iconResAfterRotate = R.drawable.close,
-						iconRotate = 180f,
-					),
-					fabOption =
-					FabOption(
-						iconTint = fobIconColor,
-						backgroundTint = fobColor,
-					),
-					itemsMultiFab =
-					listOf(
-						MultiFabItem(
-							label = {
-								Text(
-									stringResource(id = R.string.amnezia),
-									color = Color.White,
-									textAlign = TextAlign.Center,
-									modifier = Modifier.padding(end = 10.dp),
-								)
-							},
-							modifier =
-							Modifier
-								.size(40.dp),
-							icon = R.drawable.edit,
-							value = ConfigType.AMNEZIA.name,
-							miniFabOption =
-							FabOption(
-								backgroundTint = fobColor,
-								fobIconColor,
-							),
-						),
-						MultiFabItem(
-							label = {
-								Text(
-									stringResource(id = R.string.wireguard),
-									color = Color.White,
-									textAlign = TextAlign.Center,
-									modifier = Modifier.padding(end = 10.dp),
-								)
-							},
-							icon = R.drawable.edit,
-							value = ConfigType.WIREGUARD.name,
-							miniFabOption =
-							FabOption(
-								backgroundTint = fobColor,
-								fobIconColor,
-							),
-						),
-					),
-					onFabItemClicked = {
-						val configType = ConfigType.valueOf(it.value)
-						navController.navigate(
-							"${Screen.Config.route}/$tunnelId?configType=${configType.name}",
-						)
-					},
-					shape = RoundedCornerShape(16.dp),
+			ScrollDismissFab(icon = {
+				val icon = Icons.Filled.Edit
+				Icon(
+					imageVector = icon,
+					contentDescription = icon.name,
+					tint = MaterialTheme.colorScheme.onPrimary,
 				)
-			}
+			}, focusRequester, isVisible = true, onClick = {
+				navController.navigate(
+					Route.Config(config.id),
+				)
+			})
 		},
 	) {
 		Column(
@@ -216,7 +136,7 @@ fun OptionsScreen(
 				color = MaterialTheme.colorScheme.surface,
 				modifier =
 				(
-					if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+					if (context.isRunningOnTv()) {
 						Modifier
 							.height(IntrinsicSize.Min)
 							.fillMaxWidth(fillMaxWidth)
@@ -241,12 +161,12 @@ fun OptionsScreen(
 					ConfigurationToggle(
 						stringResource(R.string.set_primary_tunnel),
 						enabled = true,
-						checked = uiState.isDefaultTunnel,
+						checked = config.isPrimaryTunnel,
 						modifier =
 						Modifier
 							.focusRequester(focusRequester),
 						padding = screenPadding,
-						onCheckChanged = { optionsViewModel.onTogglePrimaryTunnel() },
+						onCheckChanged = { optionsViewModel.onTogglePrimaryTunnel(config) },
 					)
 				}
 			}
@@ -257,7 +177,7 @@ fun OptionsScreen(
 				color = MaterialTheme.colorScheme.surface,
 				modifier =
 				(
-					if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+					if (context.isRunningOnTv()) {
 						Modifier
 							.height(IntrinsicSize.Min)
 							.fillMaxWidth(fillMaxWidth)
@@ -282,9 +202,9 @@ fun OptionsScreen(
 					ConfigurationToggle(
 						stringResource(R.string.mobile_data_tunnel),
 						enabled = true,
-						checked = uiState.tunnel?.isMobileDataTunnel == true,
+						checked = config.isMobileDataTunnel,
 						padding = screenPadding,
-						onCheckChanged = { optionsViewModel.onToggleIsMobileDataTunnel() },
+						onCheckChanged = { optionsViewModel.onToggleIsMobileDataTunnel(config) },
 					)
 					Column {
 						FlowRow(
@@ -294,28 +214,28 @@ fun OptionsScreen(
 								.fillMaxWidth(),
 							horizontalArrangement = Arrangement.spacedBy(5.dp),
 						) {
-							uiState.tunnel?.tunnelNetworks?.forEach { ssid ->
+							config.tunnelNetworks.forEach { ssid ->
 								ClickableIconButton(
 									onClick = {
-										if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+										if (context.isRunningOnTv()) {
 											focusRequester.requestFocus()
-											optionsViewModel.onDeleteRunSSID(ssid)
+											optionsViewModel.onDeleteRunSSID(ssid, config)
 										}
 									},
 									onIconClick = {
-										if (WireGuardAutoTunnel.isRunningOnAndroidTv()) focusRequester.requestFocus()
-										optionsViewModel.onDeleteRunSSID(ssid)
+										if (context.isRunningOnTv()) focusRequester.requestFocus()
+										optionsViewModel.onDeleteRunSSID(ssid, config)
 									},
 									text = ssid,
 									icon = Icons.Filled.Close,
 									enabled = true,
 								)
 							}
-							if (uiState.tunnel == null || uiState.tunnel?.tunnelNetworks?.isEmpty() == true) {
+							if (config.tunnelNetworks.isEmpty()) {
 								Text(
 									stringResource(R.string.no_wifi_names_configured),
 									fontStyle = FontStyle.Italic,
-									color = Color.Gray,
+									color = MaterialTheme.colorScheme.onSurface,
 								)
 							}
 						}
@@ -324,6 +244,7 @@ fun OptionsScreen(
 							value = currentText,
 							onValueChange = { currentText = it },
 							label = { Text(stringResource(id = R.string.use_tunnel_on_wifi_name)) },
+							supportingText = { WildcardSupportingLabel { context.openWebUrl(it) } },
 							modifier =
 							Modifier
 								.padding(
@@ -343,26 +264,68 @@ fun OptionsScreen(
 									IconButton(onClick = { saveTrustedSSID() }) {
 										Icon(
 											imageVector = Icons.Outlined.Add,
-											contentDescription =
-											if (currentText == "") {
-												stringResource(
-													id =
-													R.string
-														.trusted_ssid_empty_description,
-												)
-											} else {
-												stringResource(
-													id =
-													R.string
-														.trusted_ssid_value_description,
-												)
-											},
+											contentDescription = stringResource(R.string.save_changes),
 											tint = MaterialTheme.colorScheme.primary,
 										)
 									}
 								}
 							},
 						)
+						ConfigurationToggle(
+							stringResource(R.string.restart_on_ping),
+							enabled = !appUiState.settings.isPingEnabled,
+							checked = config.isPingEnabled || appUiState.settings.isPingEnabled,
+							padding = screenPadding,
+							onCheckChanged = { optionsViewModel.onToggleRestartOnPing(config) },
+						)
+						if (config.isPingEnabled || appUiState.settings.isPingEnabled) {
+							SubmitConfigurationTextBox(
+								config.pingIp,
+								stringResource(R.string.set_custom_ping_ip),
+								stringResource(R.string.default_ping_ip),
+								focusRequester,
+								isErrorValue = { !it.isNullOrBlank() && !it.isValidIpv4orIpv6Address() },
+								onSubmit = {
+									optionsViewModel.saveTunnelChanges(
+										config.copy(pingIp = it.ifBlank { null }),
+									)
+								},
+							)
+							fun isSecondsError(seconds: String?): Boolean {
+								return seconds?.let { value -> if (value.isBlank()) false else value.toLong() >= Long.MAX_VALUE / 1000 } ?: false
+							}
+							SubmitConfigurationTextBox(
+								config.pingInterval?.let { (it / 1000).toString() },
+								stringResource(R.string.set_custom_ping_internal),
+								"(${stringResource(R.string.optional_default)} ${Constants.PING_INTERVAL / 1000})",
+								focusRequester,
+								keyboardOptions = KeyboardOptions(
+									keyboardType = KeyboardType.Number,
+									imeAction = ImeAction.Done,
+								),
+								isErrorValue = ::isSecondsError,
+								onSubmit = {
+									optionsViewModel.saveTunnelChanges(
+										config.copy(pingInterval = if (it.isBlank()) null else it.toLong() * 1000),
+									)
+								},
+							)
+							SubmitConfigurationTextBox(
+								config.pingCooldown?.let { (it / 1000).toString() },
+								stringResource(R.string.set_custom_ping_cooldown),
+								"(${stringResource(R.string.optional_default)} ${Constants.PING_COOLDOWN / 1000})",
+								focusRequester,
+								keyboardOptions = KeyboardOptions(
+									keyboardType = KeyboardType.Number,
+								),
+								isErrorValue = ::isSecondsError,
+								onSubmit = {
+									optionsViewModel.saveTunnelChanges(
+										config.copy(pingCooldown = if (it.isBlank()) null else it.toLong() * 1000),
+									)
+								},
+							)
+						}
 					}
 				}
 			}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/options/OptionsUiState.kt

@@ -1,9 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.options
-
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-
-data class OptionsUiState(
-	val id: String? = null,
-	val tunnel: TunnelConfig? = null,
-	val isDefaultTunnel: Boolean = false,
-)

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/options/OptionsViewModel.kt

@@ -1,21 +1,14 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.options
 
-import androidx.compose.ui.util.fastFirstOrNull
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.WgTunnelExceptions
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
+import com.zaneschepke.wireguardautotunnel.util.StringValue
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 @HiltViewModel
@@ -24,87 +17,63 @@ class OptionsViewModel
 constructor(
 	private val appDataRepository: AppDataRepository,
 ) : ViewModel() {
-	private val _optionState = MutableStateFlow(OptionsUiState())
 
-	val uiState =
-		combine(
-			appDataRepository.tunnels.getTunnelConfigsFlow(),
-			_optionState,
-		) { tunnels, optionState ->
-			if (optionState.id != null) {
-				val tunnelConfig = tunnels.fastFirstOrNull { it.id.toString() == optionState.id }
-				val isPrimaryTunnel = tunnelConfig?.isPrimaryTunnel == true
-				OptionsUiState(optionState.id, tunnelConfig, isPrimaryTunnel)
-			} else {
-				OptionsUiState()
-			}
-		}.stateIn(
-			viewModelScope,
-			SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
-			OptionsUiState(),
+	fun onDeleteRunSSID(ssid: String, tunnelConfig: TunnelConfig) = viewModelScope.launch {
+		appDataRepository.tunnels.save(
+			tunnelConfig =
+			tunnelConfig.copy(
+				tunnelNetworks = (tunnelConfig.tunnelNetworks - ssid).toMutableList(),
+			),
 		)
-
-	fun init(tunnelId: String) {
-		_optionState.update {
-			it.copy(
-				id = tunnelId,
-			)
-		}
 	}
 
-	fun onDeleteRunSSID(ssid: String) = viewModelScope.launch {
-		uiState.value.tunnel?.let {
-			appDataRepository.tunnels.save(
-				tunnelConfig =
-				it.copy(
-					tunnelNetworks = (uiState.value.tunnel!!.tunnelNetworks - ssid).toMutableList(),
+	fun saveTunnelChanges(tunnelConfig: TunnelConfig) = viewModelScope.launch {
+		appDataRepository.tunnels.save(tunnelConfig)
+	}
+
+	fun onSaveRunSSID(ssid: String, tunnelConfig: TunnelConfig) = viewModelScope.launch {
+		val trimmed = ssid.trim()
+		val tunnelsWithName = appDataRepository.tunnels.findByTunnelNetworksName(trimmed)
+
+		if (!tunnelConfig.tunnelNetworks.contains(trimmed) &&
+			tunnelsWithName.isEmpty()
+		) {
+			saveTunnelChanges(
+				tunnelConfig.copy(
+					tunnelNetworks = (tunnelConfig.tunnelNetworks + ssid).toMutableList(),
+				),
+			)
+		} else {
+			SnackbarController.showMessage(
+				StringValue.StringResource(
+					R.string.error_ssid_exists,
 				),
 			)
 		}
 	}
 
-	private fun saveTunnel(tunnelConfig: TunnelConfig?) = viewModelScope.launch {
-		tunnelConfig?.let {
-			appDataRepository.tunnels.save(it)
-		}
-	}
-
-	suspend fun onSaveRunSSID(ssid: String): Result<Unit> {
-		val trimmed = ssid.trim()
-		val tunnelsWithName =
-			withContext(viewModelScope.coroutineContext) {
-				appDataRepository.tunnels.findByTunnelNetworksName(trimmed)
-			}
-		return if (uiState.value.tunnel?.tunnelNetworks?.contains(trimmed) != true &&
-			tunnelsWithName.isEmpty()
-		) {
-			uiState.value.tunnel?.tunnelNetworks?.add(trimmed)
-			saveTunnel(uiState.value.tunnel)
-			Result.success(Unit)
+	fun onToggleIsMobileDataTunnel(tunnelConfig: TunnelConfig) = viewModelScope.launch {
+		if (tunnelConfig.isMobileDataTunnel) {
+			appDataRepository.tunnels.updateMobileDataTunnel(null)
 		} else {
-			Result.failure(WgTunnelExceptions.SsidConflict())
+			appDataRepository.tunnels.updateMobileDataTunnel(tunnelConfig)
 		}
 	}
 
-	fun onToggleIsMobileDataTunnel() = viewModelScope.launch {
-		uiState.value.tunnel?.let {
-			if (it.isMobileDataTunnel) {
-				appDataRepository.tunnels.updateMobileDataTunnel(null)
-			} else {
-				appDataRepository.tunnels.updateMobileDataTunnel(it)
-			}
-		}
+	fun onTogglePrimaryTunnel(tunnelConfig: TunnelConfig) = viewModelScope.launch {
+		appDataRepository.tunnels.updatePrimaryTunnel(
+			when (tunnelConfig.isPrimaryTunnel) {
+				true -> null
+				false -> tunnelConfig
+			},
+		)
 	}
 
-	fun onTogglePrimaryTunnel() = viewModelScope.launch {
-		if (uiState.value.tunnel != null) {
-			appDataRepository.tunnels.updatePrimaryTunnel(
-				when (uiState.value.isDefaultTunnel) {
-					true -> null
-					false -> uiState.value.tunnel
-				},
-			)
-			WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
-		}
+	fun onToggleRestartOnPing(tunnelConfig: TunnelConfig) = viewModelScope.launch {
+		appDataRepository.tunnels.save(
+			tunnelConfig.copy(
+				isPingEnabled = !tunnelConfig.isPingEnabled,
+			),
+		)
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/pinlock/PinLockScreen.kt

@@ -5,20 +5,24 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import androidx.navigation.NavController
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
-import com.zaneschepke.wireguardautotunnel.ui.Screen
+import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
 import com.zaneschepke.wireguardautotunnel.util.StringValue
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import xyz.teamgravity.pin_lock_compose.PinLock
 
 @Composable
-fun PinLockScreen(navController: NavController, appViewModel: AppViewModel) {
+fun PinLockScreen(appViewModel: AppViewModel) {
 	val context = LocalContext.current
+	val navController = LocalNavController.current
+	val snackbar = SnackbarController.current
 	PinLock(
 		title = { pinExists ->
 			Text(
+				color = MaterialTheme.colorScheme.onSurface,
 				text =
 				if (pinExists) {
 					stringResource(id = R.string.enter_pin)
@@ -29,29 +33,31 @@ fun PinLockScreen(navController: NavController, appViewModel: AppViewModel) {
 				},
 			)
 		},
-		color = MaterialTheme.colorScheme.surface,
+		backgroundColor = MaterialTheme.colorScheme.surface,
+		textColor = MaterialTheme.colorScheme.onSurface,
 		onPinCorrect = {
 			// pin is correct, navigate or hide pin lock
-			if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-				navController.navigate(Screen.Main.route)
+			if (context.isRunningOnTv()) {
+				navController.navigate(Route.Main)
 			} else {
 				val isPopped = navController.popBackStack()
 				if (!isPopped) {
-					navController.navigate(Screen.Main.route)
+					navController.navigate(Route.Main)
 				}
 			}
 		},
 		onPinIncorrect = {
 			// pin is incorrect, show error
-			appViewModel.showSnackbarMessage(
+			snackbar.showMessage(
 				StringValue.StringResource(R.string.incorrect_pin).asString(context),
 			)
 		},
 		onPinCreated = {
 			// pin created for the first time, navigate or hide pin lock
-			appViewModel.showSnackbarMessage(
+			snackbar.showMessage(
 				StringValue.StringResource(R.string.pin_created).asString(context),
 			)
+			appViewModel.onPinLockEnabled()
 		},
 	)
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/scanner/ScannerScreen.kt

@@ -0,0 +1,46 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.scanner
+
+import android.app.Activity
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.viewinterop.AndroidView
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.journeyapps.barcodescanner.CompoundBarcodeView
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
+
+@OptIn(ExperimentalPermissionsApi::class)
+@Composable
+fun ScannerScreen(viewModel: ScannerViewModel = hiltViewModel()) {
+	val context = LocalContext.current
+	val navController = LocalNavController.current
+
+	val success = viewModel.success.collectAsStateWithLifecycle(null)
+
+	LaunchedEffect(success.value) {
+		if (success.value != null) navController.popBackStack()
+	}
+
+	val barcodeView = remember {
+		CompoundBarcodeView(context).apply {
+			this.initializeFromIntent((context as Activity).intent)
+			this.setStatusText("")
+			this.decodeSingle { result ->
+				result.text?.let { barCodeOrQr ->
+					viewModel.onTunnelQrResult(barCodeOrQr)
+				}
+			}
+		}
+	}
+	AndroidView(factory = { barcodeView })
+	DisposableEffect(Unit) {
+		barcodeView.resume()
+		onDispose {
+			barcodeView.pause()
+		}
+	}
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/scanner/ScannerViewModel.kt

@@ -0,0 +1,69 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.scanner
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+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.ui.common.snackbar.SnackbarController
+import com.zaneschepke.wireguardautotunnel.util.NumberUtils
+import com.zaneschepke.wireguardautotunnel.util.StringValue
+import com.zaneschepke.wireguardautotunnel.util.extensions.toWgQuickString
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import javax.inject.Inject
+
+@HiltViewModel
+class ScannerViewModel @Inject
+constructor(
+	private val appDataRepository: AppDataRepository,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) : ViewModel() {
+
+	private val _success = MutableSharedFlow<Boolean>()
+	val success = _success.asSharedFlow()
+
+	private suspend fun makeTunnelNameUnique(name: String): String {
+		return withContext(ioDispatcher) {
+			val tunnels = appDataRepository.tunnels.getAll()
+			var tunnelName = name
+			var num = 1
+			while (tunnels.any { it.name == tunnelName }) {
+				tunnelName = "$name($num)"
+				num++
+			}
+			tunnelName
+		}
+	}
+
+	fun onTunnelQrResult(result: String) = viewModelScope.launch(ioDispatcher) {
+		kotlin.runCatching {
+			val amConfig = TunnelConfig.configFromAmQuick(result)
+			val amQuick = amConfig.toAwgQuickString(true)
+			val wgQuick = amConfig.toWgQuickString()
+			val tunnelName = makeTunnelNameUnique(generateQrCodeDefaultName(result))
+			val tunnelConfig = TunnelConfig(name = tunnelName, wgQuick = wgQuick, amQuick = amQuick)
+			appDataRepository.tunnels.save(tunnelConfig)
+			_success.emit(true)
+		}.onFailure {
+			_success.emit(false)
+			Timber.e(it)
+			SnackbarController.showMessage(StringValue.StringResource(R.string.error_invalid_code))
+		}
+	}
+
+	private fun generateQrCodeDefaultName(config: String): String {
+		return try {
+			TunnelConfig.configFromAmQuick(config).peers[0].endpoint.get().host
+		} catch (e: Exception) {
+			Timber.e(e)
+			NumberUtils.generateRandomTunnelName()
+		}
+	}
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/SettingsUiState.kt

@@ -1,14 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.settings
 
-import com.zaneschepke.wireguardautotunnel.data.domain.Settings
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnState
-
 data class SettingsUiState(
-	val settings: Settings = Settings(),
-	val tunnels: List<TunnelConfig> = emptyList(),
-	val vpnState: VpnState = VpnState(),
-	val isLocationDisclosureShown: Boolean = true,
-	val isBatteryOptimizeDisableShown: Boolean = false,
-	val isPinLockEnabled: Boolean = false,
+	val isRooted: Boolean = false,
+	val isKernelAvailable: Boolean = false,
 )

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/SettingsViewModel.kt

@@ -7,27 +7,24 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.wireguard.android.backend.WgQuickBackend
 import com.wireguard.android.util.RootShell
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.domain.Settings
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.FileUtils
-import com.zaneschepke.wireguardautotunnel.util.WgTunnelExceptions
+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.combine
+import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import timber.log.Timber
-import xyz.teamgravity.pin_lock_compose.PinManager
 import java.io.File
 import javax.inject.Inject
 import javax.inject.Provider
@@ -37,45 +34,37 @@ class SettingsViewModel
 @Inject
 constructor(
 	private val appDataRepository: AppDataRepository,
-	private val serviceManager: ServiceManager,
 	private val rootShell: Provider<RootShell>,
 	private val fileUtils: FileUtils,
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-	vpnService: VpnService,
 ) : ViewModel() {
-	private val _kernelSupport = MutableStateFlow(false)
-	val kernelSupport = _kernelSupport.asStateFlow()
 
-	val uiState =
-		combine(
-			appDataRepository.settings.getSettingsFlow(),
-			appDataRepository.tunnels.getTunnelConfigsFlow(),
-			vpnService.vpnState,
-			appDataRepository.appState.generalStateFlow,
-		) { settings, tunnels, tunnelState, generalState ->
-			SettingsUiState(
-				settings,
-				tunnels,
-				tunnelState,
-				generalState.isLocationDisclosureShown,
-				generalState.isBatteryOptimizationDisableShown,
-				generalState.isPinLockEnabled,
-			)
+	private val _uiState = MutableStateFlow(SettingsUiState())
+	val uiState = _uiState.onStart {
+		_uiState.update {
+			it.copy(isKernelAvailable = isKernelSupported(), isRooted = isRooted())
 		}
-			.stateIn(
-				viewModelScope,
-				SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
-				SettingsUiState(),
-			)
+	}.stateIn(
+		viewModelScope,
+		SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
+		SettingsUiState(),
+	)
+	private val settings = appDataRepository.settings.getSettingsFlow()
+		.stateIn(viewModelScope, SharingStarted.Eagerly, Settings())
 
-	fun onSaveTrustedSSID(ssid: String): Result<Unit> {
+	fun onSaveTrustedSSID(ssid: String) = viewModelScope.launch {
 		val trimmed = ssid.trim()
-		return if (!uiState.value.settings.trustedNetworkSSIDs.contains(trimmed)) {
-			uiState.value.settings.trustedNetworkSSIDs.add(trimmed)
-			saveSettings(uiState.value.settings)
-			Result.success(Unit)
-		} else {
-			Result.failure(WgTunnelExceptions.SsidConflict())
+		with(settings.value) {
+			if (!trustedNetworkSSIDs.contains(trimmed)) {
+				this.trustedNetworkSSIDs.add(ssid)
+				appDataRepository.settings.save(this)
+			} else {
+				SnackbarController.showMessage(
+					StringValue.StringResource(
+						R.string.error_ssid_exists,
+					),
+				)
+			}
 		}
 	}
 
@@ -87,62 +76,70 @@ constructor(
 		appDataRepository.appState.setBatteryOptimizationDisableShown(true)
 	}
 
-	fun onToggleTunnelOnMobileData() {
-		saveSettings(
-			uiState.value.settings.copy(
-				isTunnelOnMobileDataEnabled = !uiState.value.settings.isTunnelOnMobileDataEnabled,
-			),
-		)
+	fun onToggleTunnelOnMobileData() = viewModelScope.launch {
+		with(settings.value) {
+			appDataRepository.settings.save(
+				copy(
+					isTunnelOnMobileDataEnabled = !this.isTunnelOnMobileDataEnabled,
+				),
+			)
+		}
 	}
 
-	fun onDeleteTrustedSSID(ssid: String) {
-		saveSettings(
-			uiState.value.settings.copy(
-				trustedNetworkSSIDs =
-				(uiState.value.settings.trustedNetworkSSIDs - ssid).toMutableList(),
-			),
-		)
+	fun onDeleteTrustedSSID(ssid: String) = viewModelScope.launch {
+		with(settings.value) {
+			appDataRepository.settings.save(
+				copy(
+					trustedNetworkSSIDs = (this.trustedNetworkSSIDs - ssid).toMutableList(),
+				),
+			)
+		}
 	}
 
-	suspend fun onExportTunnels(files: List<File>): Result<Unit> {
-		return fileUtils.saveFilesToZip(files)
+	private fun exportTunnels(files: List<File>) = viewModelScope.launch {
+		fileUtils.saveFilesToZip(files).onSuccess {
+			SnackbarController.showMessage(StringValue.StringResource(R.string.exported_configs_message))
+		}.onFailure {
+			SnackbarController.showMessage(StringValue.StringResource(R.string.export_configs_failed))
+		}
 	}
 
 	fun onToggleAutoTunnel(context: Context) = viewModelScope.launch {
-		val isAutoTunnelEnabled = uiState.value.settings.isAutoTunnelEnabled
-		var isAutoTunnelPaused = uiState.value.settings.isAutoTunnelPaused
-
-		if (isAutoTunnelEnabled) {
-			serviceManager.stopWatcherService(context)
-		} else {
-			serviceManager.startWatcherService(context)
-			isAutoTunnelPaused = false
+		with(settings.value) {
+			var isAutoTunnelPaused = this.isAutoTunnelPaused
+			if (isAutoTunnelEnabled) {
+				ServiceManager.stopWatcherService(context)
+			} else {
+				ServiceManager.startWatcherService(context)
+				isAutoTunnelPaused = false
+			}
+			appDataRepository.settings.save(
+				copy(
+					isAutoTunnelEnabled = !isAutoTunnelEnabled,
+					isAutoTunnelPaused = isAutoTunnelPaused,
+				),
+			)
 		}
-		saveSettings(
-			uiState.value.settings.copy(
-				isAutoTunnelEnabled = !isAutoTunnelEnabled,
-				isAutoTunnelPaused = isAutoTunnelPaused,
-			),
-		)
-		WireGuardAutoTunnel.requestAutoTunnelTileServiceUpdate()
 	}
 
 	fun onToggleAlwaysOnVPN() = viewModelScope.launch {
-		saveSettings(
-			uiState.value.settings.copy(
-				isAlwaysOnVpnEnabled = !uiState.value.settings.isAlwaysOnVpnEnabled,
-			),
-		)
+		with(settings.value) {
+			appDataRepository.settings.save(
+				copy(
+					isAlwaysOnVpnEnabled = !isAlwaysOnVpnEnabled,
+				),
+			)
+		}
 	}
 
-	private fun saveSettings(settings: Settings) = viewModelScope.launch { appDataRepository.settings.save(settings) }
-
-	fun onToggleTunnelOnEthernet() {
-		saveSettings(
-			uiState.value.settings.copy(
-				isTunnelOnEthernetEnabled = !uiState.value.settings.isTunnelOnEthernetEnabled,
-			),
-		)
+	fun onToggleTunnelOnEthernet() = viewModelScope.launch {
+		with(settings.value) {
+			appDataRepository.settings.save(
+				copy(
+					isTunnelOnEthernetEnabled = !isTunnelOnEthernetEnabled,
+				),
+			)
+		}
 	}
 
 	fun isLocationEnabled(context: Context): Boolean {
@@ -153,102 +150,124 @@ constructor(
 		return LocationManagerCompat.isLocationEnabled(locationManager)
 	}
 
-	fun onToggleShortcutsEnabled() {
-		saveSettings(
-			uiState.value.settings.copy(
-				isShortcutsEnabled = !uiState.value.settings.isShortcutsEnabled,
-			),
-		)
+	fun onToggleShortcutsEnabled() = viewModelScope.launch {
+		with(settings.value) {
+			appDataRepository.settings.save(
+				this.copy(
+					isShortcutsEnabled = !isShortcutsEnabled,
+				),
+			)
+		}
 	}
 
-	private fun saveKernelMode(on: Boolean) {
-		saveSettings(
-			uiState.value.settings.copy(
-				isKernelEnabled = on,
-			),
-		)
+	private fun saveKernelMode(enabled: Boolean) = viewModelScope.launch {
+		with(settings.value) {
+			appDataRepository.settings.save(
+				this.copy(
+					isKernelEnabled = enabled,
+				),
+			)
+		}
 	}
 
-	fun onToggleTunnelOnWifi() {
-		saveSettings(
-			uiState.value.settings.copy(
-				isTunnelOnWifiEnabled = !uiState.value.settings.isTunnelOnWifiEnabled,
-			),
-		)
+	fun onToggleTunnelOnWifi() = viewModelScope.launch {
+		with(settings.value) {
+			appDataRepository.settings.save(
+				copy(
+					isTunnelOnWifiEnabled = !isTunnelOnWifiEnabled,
+				),
+			)
+		}
 	}
 
 	fun onToggleAmnezia() = viewModelScope.launch {
-		if (uiState.value.settings.isKernelEnabled) {
-			saveKernelMode(false)
+		with(settings.value) {
+			if (isKernelEnabled) {
+				saveKernelMode(false)
+			}
+			appDataRepository.settings.save(
+				copy(
+					isAmneziaEnabled = !isAmneziaEnabled,
+				),
+			)
 		}
-		saveAmneziaMode(!uiState.value.settings.isAmneziaEnabled)
 	}
 
-	private fun saveAmneziaMode(on: Boolean) {
-		saveSettings(
-			uiState.value.settings.copy(
-				isAmneziaEnabled = on,
-			),
-		)
-	}
-
-	suspend fun onToggleKernelMode(): Result<Unit> {
-		return withContext(ioDispatcher) {
-			if (!uiState.value.settings.isKernelEnabled) {
-				try {
-					rootShell.get().start()
-					Timber.i("Root shell accepted!")
-					saveSettings(
-						uiState.value.settings.copy(
+	fun onToggleKernelMode() = viewModelScope.launch {
+		with(settings.value) {
+			if (!isKernelEnabled) {
+				requestRoot().onSuccess {
+					appDataRepository.settings.save(
+						copy(
 							isKernelEnabled = true,
 							isAmneziaEnabled = false,
 						),
 					)
-				} catch (e: RootShell.RootShellException) {
-					Timber.e(e)
-					saveKernelMode(on = false)
-					return@withContext Result.failure(WgTunnelExceptions.RootDenied())
 				}
 			} else {
-				saveKernelMode(on = false)
+				saveKernelMode(enabled = false)
 			}
-			Result.success(Unit)
 		}
 	}
 
 	fun onToggleRestartOnPing() = viewModelScope.launch {
-		saveSettings(
-			uiState.value.settings.copy(
-				isPingEnabled = !uiState.value.settings.isPingEnabled,
-			),
-		)
-	}
-
-	fun checkKernelSupport() = viewModelScope.launch {
-		val kernelSupport =
-			withContext(ioDispatcher) {
-				WgQuickBackend.hasKernelSupport()
-			}
-		_kernelSupport.update {
-			kernelSupport
+		with(settings.value) {
+			appDataRepository.settings.save(
+				copy(
+					isPingEnabled = !isPingEnabled,
+				),
+			)
 		}
 	}
 
-	fun onPinLockDisabled() = viewModelScope.launch {
-		PinManager.clearPin()
-		appDataRepository.appState.setPinLockEnabled(false)
-	}
-
-	fun onPinLockEnabled() = viewModelScope.launch {
-		PinManager.initialize(WireGuardAutoTunnel.instance)
-		appDataRepository.appState.setPinLockEnabled(true)
+	private suspend fun isKernelSupported(): Boolean {
+		return withContext(ioDispatcher) {
+			WgQuickBackend.hasKernelSupport()
+		}
 	}
 
 	fun onToggleRestartAtBoot() = viewModelScope.launch {
-		saveSettings(
-			uiState.value.settings.copy(
-				isRestoreOnBootEnabled = !uiState.value.settings.isRestoreOnBootEnabled,
-			),
-		)
+		with(settings.value) {
+			appDataRepository.settings.save(
+				copy(
+					isRestoreOnBootEnabled = !isRestoreOnBootEnabled,
+				),
+			)
+		}
+	}
+
+	private suspend fun isRooted(): Boolean {
+		return try {
+			withContext(ioDispatcher) {
+				rootShell.get().start()
+			}
+			true
+		} catch (_: Exception) {
+			false
+		}
+	}
+
+	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))
+			}
+		}
+	}
+
+	fun onRequestRoot() = viewModelScope.launch {
+		requestRoot()
+	}
+
+	fun exportAllConfigs() = viewModelScope.launch {
+		kotlin.runCatching {
+			val tunnels = appDataRepository.tunnels.getAll()
+			val wgFiles = fileUtils.createWgFiles(tunnels)
+			val amFiles = fileUtils.createAmFiles(tunnels)
+			exportTunnels(wgFiles + amFiles)
+		}
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/settings/components/BackgroundLocationDialog.kt

@@ -0,0 +1,49 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings.components
+
+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.launchAppSettings
+
+@Composable
+fun BackgroundLocationDialog(show: Boolean, onDismiss: () -> Unit, onAttest: () -> Unit) {
+	val context = LocalContext.current
+	if (show) {
+		val alwaysOnDescription = buildAnnotatedString {
+			append(stringResource(R.string.background_location_message))
+			append(" ")
+			pushStringAnnotation(tag = "appSettings", annotation = "")
+			withStyle(style = SpanStyle(color = MaterialTheme.colorScheme.primary)) {
+				append(stringResource(id = R.string.app_settings))
+			}
+			pop()
+			append(" ")
+			append(stringResource(R.string.background_location_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 = "appSettings", it, it).firstOrNull()?.let {
+						context.launchAppSettings()
+					}
+				}
+			},
+			confirmText = { Text(text = stringResource(R.string.okay)) },
+		)
+	}
+}