build(deps): bump androidGradlePlugin from 8.6.0-rc01 to 8.7.0-alpha09

Bumps `androidGradlePlugin` from 8.6.0-rc01 to 8.7.0-alpha09.

Updates `com.android.application` from 8.6.0-rc01 to 8.7.0-alpha09

Updates `com.android.library` from 8.6.0-rc01 to 8.7.0-alpha09

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

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

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/workflows/issue-workflow.yml

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

.github/workflows/publish-workflow.yml

@@ -1,4 +1,4 @@
-name: on-publish
+name: Release Updates Workflow
 
 on:
   release:
@@ -7,8 +7,8 @@ on:
 
 jobs:
 
-  on-publish:
-    name: On publish
+  build:
+    name: Build
     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: none
+        default: alpha
         required: true
       release_type:
         type: choice
@@ -30,34 +30,13 @@ on:
         description: "Tag name for release"
         required: false
         default: nightly
-  workflow_call:
 
 jobs:
-  check_commits:
-    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
+    if: ${{ inputs.release_type != 'none' }}
     runs-on: ubuntu-latest
+
     env:
       SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
       SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
@@ -131,24 +110,9 @@ jobs:
           version_code=$(grep "VERSION_CODE" buildSrc/src/main/kotlin/Constants.kt | awk '{print $5}' | tr -d '\n')
           echo "VERSION_CODE=$version_code" >> $GITHUB_ENV
 
-      - name: Commit and push versionCode changes
-        if: ${{ inputs.release_type == '' || inputs.release_type == 'nightly'  || inputs.release_type == 'prerelease' }}
-        run: |
-          git config --global user.name 'GitHub Actions'
-          git config --global user.email 'actions@github.com'
-          git add versionCode.txt
-          git commit -m "Automated build update"
-
-      - name: Push changes
-        if: ${{ inputs.release_type == '' || inputs.release_type == 'nightly'  || inputs.release_type == 'prerelease' }}
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ github.ref }}
-
       # Save the APK after the Build job is complete to publish it as a Github release in the next job
       - name: Upload APK
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.3.6
         with:
           name: wgtunnel
           path: ${{ env.APK_PATH }}

app/build.gradle.kts

@@ -8,21 +8,6 @@ plugins {
 	alias(libs.plugins.grgit)
 }
 
-val versionFile = file("$rootDir/versionCode.txt")
-
-val versionCodeIncrement = with(getBuildTaskName().lowercase()) {
-	when {
-		this.contains(Constants.NIGHTLY) || this.contains(Constants.PRERELEASE) -> {
-			if (versionFile.exists()) {
-				versionFile.readText().toInt() + 1
-			} else {
-				1
-			}
-		}
-		else -> 0
-	}
-}
-
 android {
 	namespace = Constants.APP_ID
 	compileSdk = Constants.TARGET_SDK
@@ -35,7 +20,7 @@ android {
 		applicationId = Constants.APP_ID
 		minSdk = Constants.MIN_SDK
 		targetSdk = Constants.TARGET_SDK
-		versionCode = Constants.VERSION_CODE + versionCodeIncrement
+		versionCode = determineVersionCode()
 		versionName = determineVersionName()
 
 		ksp { arg("room.schemaLocation", "$projectDir/schemas") }
@@ -72,14 +57,12 @@ 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\"")
 		}
 
 		create(Constants.PRERELEASE) {
@@ -87,7 +70,6 @@ android {
 			applicationIdSuffix = ".prerelease"
 			versionNameSuffix = "-pre"
 			resValue("string", "app_name", "WG Tunnel - Pre")
-			resValue("string", "provider", "\"${Constants.APP_NAME}.provider.pre\"")
 		}
 
 		create(Constants.NIGHTLY) {
@@ -95,7 +77,6 @@ android {
 			applicationIdSuffix = ".nightly"
 			versionNameSuffix = "-nightly"
 			resValue("string", "app_name", "WG Tunnel - Nightly")
-			resValue("string", "provider", "\"${Constants.APP_NAME}.provider.nightly\"")
 		}
 
 		applicationVariants.all {
@@ -133,6 +114,8 @@ android {
 	packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
 }
 
+val generalImplementation by configurations
+
 dependencies {
 
 	implementation(project(":logcatter"))
@@ -174,6 +157,8 @@ dependencies {
 	implementation(libs.androidx.navigation.compose)
 	implementation(libs.androidx.hilt.navigation.compose)
 
+	implementation(libs.zaneschepke.multifab)
+
 	// hilt
 	implementation(libs.hilt.android)
 	ksp(libs.hilt.android.compiler)
@@ -214,6 +199,16 @@ dependencies {
 	implementation(libs.androidx.core.splashscreen)
 }
 
+fun determineVersionCode(): Int {
+	return with(getBuildTaskName().lowercase()) {
+		when {
+			contains(Constants.NIGHTLY) -> Constants.VERSION_CODE + Constants.NIGHTLY_CODE
+			contains(Constants.PRERELEASE) -> Constants.VERSION_CODE + Constants.PRERELEASE_CODE
+			else -> Constants.VERSION_CODE
+		}
+	}
+}
+
 fun determineVersionName(): String {
 	return with(getBuildTaskName().lowercase()) {
 		when {
@@ -224,19 +219,3 @@ fun determineVersionName(): String {
 		}
 	}
 }
-
-val incrementVersionCode by tasks.registering {
-	doLast {
-		val versionFile = file("$rootDir/versionCode.txt")
-		if (versionFile.exists()) {
-			versionFile.writeText(versionCodeIncrement.toString())
-			println("Incremented versionCode to $versionCodeIncrement")
-		}
-	}
-}
-
-tasks.whenTaskAdded {
-	if (name.startsWith("assemble") && !name.lowercase().contains("debug")) {
-		dependsOn(incrementVersionCode)
-	}
-}

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

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

app/src/main/AndroidManifest.xml

@@ -10,7 +10,10 @@
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="32"
         tools:ignore="ScopedStorage" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission
+        android:name="android.permission.ACCESS_WIFI_STATE"
+        android:maxSdkVersion="30"
+        tools:ignore="LeanbackUsesWifi" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -63,12 +66,12 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.App.Start"
+        android:theme="@style/Theme.AppSplashScreen"
         tools:targetApi="tiramisu">
         <activity
-            android:name=".ui.MainActivity"
+            android:name=".ui.SplashActivity"
             android:exported="true"
-            android:theme="@style/Theme.WireguardAutoTunnel">
+            android:theme="@style/Theme.AppSplashScreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -80,6 +83,11 @@
                 android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
         </activity>
+        <activity
+            android:name=".ui.MainActivity"
+            android:exported="true"
+            android:theme="@style/Theme.WireguardAutoTunnel">
+        </activity>
         <activity
             android:name="com.journeyapps.barcodescanner.CaptureActivity"
             android:screenOrientation="portrait"
@@ -95,16 +103,12 @@
 			android:launchMode="singleInstance"
             android:theme="@android:style/Theme.NoDisplay" />
 
-		<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.foreground.ForegroundService"
+            android:enabled="true"
+            android:exported="false"
+            android:foregroundServiceType="systemExempted"
+            tools:node="merge" />
         <service
             android:name=".service.tile.TunnelControlTile"
             android:exported="true"

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

@@ -3,7 +3,7 @@ package com.zaneschepke.wireguardautotunnel
 import android.app.Application
 import android.os.StrictMode
 import android.os.StrictMode.ThreadPolicy
-import com.zaneschepke.logcatter.LogReader
+import com.zaneschepke.logcatter.LocalLogCollector
 import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
@@ -23,7 +23,7 @@ class WireGuardAutoTunnel : Application() {
 	lateinit var applicationScope: CoroutineScope
 
 	@Inject
-	lateinit var logReader: LogReader
+	lateinit var localLogCollector: LocalLogCollector
 
 	@Inject
 	@IoDispatcher
@@ -47,7 +47,7 @@ class WireGuardAutoTunnel : Application() {
 		}
 		if (!isRunningOnTv()) {
 			applicationScope.launch(ioDispatcher) {
-				logReader.start()
+				localLogCollector.start()
 			}
 		}
 	}

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 = 10,
+	version = 9,
 	autoMigrations =
 	[
 		AutoMigration(from = 1, to = 2),
@@ -35,7 +35,6 @@ import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 		),
 		AutoMigration(7, 8),
 		AutoMigration(8, 9),
-		AutoMigration(9, 10),
 	],
 	exportSchema = true,
 )

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

@@ -4,6 +4,7 @@ import android.content.Context
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.intPreferencesKey
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
@@ -23,9 +24,9 @@ class DataStoreManager(
 	companion object {
 		val LOCATION_DISCLOSURE_SHOWN = booleanPreferencesKey("LOCATION_DISCLOSURE_SHOWN")
 		val BATTERY_OPTIMIZE_DISABLE_SHOWN = booleanPreferencesKey("BATTERY_OPTIMIZE_DISABLE_SHOWN")
+		val LAST_ACTIVE_TUNNEL = intPreferencesKey("LAST_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
@@ -57,18 +58,6 @@ class DataStoreManager(
 		}
 	}
 
-	suspend fun <T> removeFromDataStore(key: Preferences.Key<T>) {
-		withContext(ioDispatcher) {
-			try {
-				context.dataStore.edit { it.remove(key) }
-			} catch (e: IOException) {
-				Timber.e(e)
-			} catch (e: Exception) {
-				Timber.e(e)
-			}
-		}
-	}
-
 	fun <T> getFromStoreFlow(key: Preferences.Key<T>) = context.dataStore.data.map { it[key] }
 
 	suspend fun <T> getFromStore(key: Preferences.Key<T>): T? {

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

@@ -4,12 +4,11 @@ data class GeneralState(
 	val isLocationDisclosureShown: Boolean = LOCATION_DISCLOSURE_SHOWN_DEFAULT,
 	val isBatteryOptimizationDisableShown: Boolean = BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
 	val isPinLockEnabled: Boolean = PIN_LOCK_ENABLED_DEFAULT,
-	val isTunnelStatsExpanded: Boolean = IS_TUNNEL_STATS_EXPANDED,
+	val lastActiveTunnelId: Int? = null,
 ) {
 	companion object {
 		const val LOCATION_DISCLOSURE_SHOWN_DEFAULT = false
 		const val BATTERY_OPTIMIZATION_DISABLE_SHOWN_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

@@ -37,33 +37,11 @@ data class TunnelConfig(
 		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 findDefault(tunnels: List<TunnelConfig>): TunnelConfig? {
+			return tunnels.find { it.isPrimaryTunnel } ?: tunnels.firstOrNull()
+		}
 
 		fun configFromWgQuick(wgQuick: String): Config {
 			val inputStream: InputStream = wgQuick.byteInputStream()

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

@@ -15,9 +15,8 @@ constructor(
 	}
 
 	override suspend fun getStartTunnelConfig(): TunnelConfig? {
-		tunnels.getActive().let {
-			if (it.isNotEmpty()) return it.first()
-			return getPrimaryOrFirstTunnel()
-		}
+		return appState.getLastActiveTunnelId()?.let {
+			tunnels.getById(it)
+		} ?: getPrimaryOrFirstTunnel()
 	}
 }

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

@@ -16,13 +16,13 @@ interface AppStateRepository {
 
 	suspend fun setBatteryOptimizationDisableShown(shown: Boolean)
 
+	suspend fun getLastActiveTunnelId(): Int?
+
+	suspend fun setLastActiveTunnelId(id: 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

@@ -2,56 +2,65 @@ package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
 import com.zaneschepke.wireguardautotunnel.data.domain.GeneralState
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.withContext
 import timber.log.Timber
 
 class DataStoreAppStateRepository(
 	private val dataStoreManager: DataStoreManager,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) :
 	AppStateRepository {
 	override suspend fun isLocationDisclosureShown(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN)
-			?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT
+		return withContext(ioDispatcher) {
+			dataStoreManager.getFromStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN)
+				?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT
+		}
 	}
 
 	override suspend fun setLocationDisclosureShown(shown: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN, shown)
+		withContext(ioDispatcher) { dataStoreManager.saveToDataStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN, shown) }
 	}
 
 	override suspend fun isPinLockEnabled(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.IS_PIN_LOCK_ENABLED)
-			?: GeneralState.PIN_LOCK_ENABLED_DEFAULT
+		return withContext(ioDispatcher) {
+			dataStoreManager.getFromStore(DataStoreManager.IS_PIN_LOCK_ENABLED)
+				?: GeneralState.PIN_LOCK_ENABLED_DEFAULT
+		}
 	}
 
 	override suspend fun setPinLockEnabled(enabled: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.IS_PIN_LOCK_ENABLED, enabled)
+		withContext(ioDispatcher) { dataStoreManager.saveToDataStore(DataStoreManager.IS_PIN_LOCK_ENABLED, enabled) }
 	}
 
 	override suspend fun isBatteryOptimizationDisableShown(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN)
-			?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT
+		return withContext(ioDispatcher) {
+			dataStoreManager.getFromStore(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN)
+				?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT
+		}
 	}
 
 	override suspend fun setBatteryOptimizationDisableShown(shown: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN, shown)
+		withContext(ioDispatcher) { dataStoreManager.saveToDataStore(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN, shown) }
+	}
+
+	override suspend fun getLastActiveTunnelId(): Int? {
+		return withContext(ioDispatcher) { dataStoreManager.getFromStore(DataStoreManager.LAST_ACTIVE_TUNNEL) }
+	}
+
+	override suspend fun setLastActiveTunnelId(id: Int) {
+		return withContext(ioDispatcher) { dataStoreManager.saveToDataStore(DataStoreManager.LAST_ACTIVE_TUNNEL, id) }
 	}
 
 	override suspend fun getCurrentSsid(): String? {
-		return dataStoreManager.getFromStore(DataStoreManager.CURRENT_SSID)
+		return withContext(ioDispatcher) { dataStoreManager.getFromStore(DataStoreManager.CURRENT_SSID) }
 	}
 
 	override suspend fun setCurrentSsid(ssid: String) {
-		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)
+		withContext(ioDispatcher) { dataStoreManager.saveToDataStore(DataStoreManager.CURRENT_SSID, ssid) }
 	}
 
 	override val generalStateFlow: Flow<GeneralState> =
@@ -68,7 +77,7 @@ class DataStoreAppStateRepository(
 						isPinLockEnabled =
 						pref[DataStoreManager.IS_PIN_LOCK_ENABLED]
 							?: GeneralState.PIN_LOCK_ENABLED_DEFAULT,
-						isTunnelStatsExpanded = pref[DataStoreManager.IS_TUNNEL_STATS_EXPANDED] ?: GeneralState.IS_TUNNEL_STATS_EXPANDED,
+						lastActiveTunnelId = pref[DataStoreManager.LAST_ACTIVE_TUNNEL],
 					)
 				} catch (e: IllegalArgumentException) {
 					Timber.e(e)

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.LogReader
-import com.zaneschepke.logcatter.LogcatCollector
+import com.zaneschepke.logcatter.LocalLogCollector
+import com.zaneschepke.logcatter.LogcatUtil
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -24,7 +24,7 @@ class AppModule {
 
 	@Singleton
 	@Provides
-	fun provideLogCollect(@ApplicationContext context: Context): LogReader {
-		return LogcatCollector.init(context = context)
+	fun provideLogCollect(@ApplicationContext context: Context): LocalLogCollector {
+		return LogcatUtil.init(context = context)
 	}
 }

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

@@ -72,8 +72,8 @@ class RepositoryModule {
 
 	@Provides
 	@Singleton
-	fun provideGeneralStateRepository(dataStoreManager: DataStoreManager): AppStateRepository {
-		return DataStoreAppStateRepository(dataStoreManager)
+	fun provideGeneralStateRepository(dataStoreManager: DataStoreManager, @IoDispatcher ioDispatcher: CoroutineDispatcher): AppStateRepository {
+		return DataStoreAppStateRepository(dataStoreManager, ioDispatcher)
 	}
 
 	@Provides

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

@@ -8,7 +8,7 @@ import com.wireguard.android.backend.WgQuickBackend
 import com.wireguard.android.util.RootShell
 import com.wireguard.android.util.ToolsInstaller
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
+import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.WireGuardTunnel
 import dagger.Module
@@ -60,19 +60,25 @@ class TunnelModule {
 	@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,
 	): TunnelService {
 		return WireGuardTunnel(
 			amneziaBackend,
-			tunnelConfigRepository,
+			userspaceBackend,
 			kernelBackend,
 			appDataRepository,
 			applicationScope,
 			ioDispatcher,
 		)
 	}
+
+	@Provides
+	@Singleton
+	fun provideServiceManager(): ServiceManager {
+		return ServiceManager()
+	}
 }

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

@@ -24,6 +24,9 @@ class AppUpdateReceiver : BroadcastReceiver() {
 	@Inject
 	lateinit var appDataRepository: AppDataRepository
 
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
 	@Inject
 	lateinit var tunnelService: TunnelService
 
@@ -33,7 +36,7 @@ class AppUpdateReceiver : BroadcastReceiver() {
 			val settings = appDataRepository.settings.getSettings()
 			if (settings.isAutoTunnelEnabled) {
 				Timber.i("Restarting services after upgrade")
-				ServiceManager.startWatcherServiceForeground(context)
+				serviceManager.startWatcherServiceForeground(context)
 			}
 			if (!settings.isAutoTunnelEnabled || settings.isAutoTunnelPaused) {
 				val tunnels = appDataRepository.tunnels.getAll().filter { it.isActive }

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

@@ -27,6 +27,9 @@ class BackgroundActionReceiver : BroadcastReceiver() {
 	@Inject
 	lateinit var tunnelConfigRepository: TunnelConfigRepository
 
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
 	override fun onReceive(context: Context, intent: Intent) {
 		val id = intent.getIntExtra(TUNNEL_ID_EXTRA_KEY, 0)
 		if (id == 0) return
@@ -36,7 +39,7 @@ class BackgroundActionReceiver : BroadcastReceiver() {
 				applicationScope.launch {
 					val tunnel = tunnelConfigRepository.getById(id)
 					tunnel?.let {
-						ServiceManager.startTunnelBackgroundService(context)
+						serviceManager.startTunnelBackgroundService(context)
 						tunnelService.get().startTunnel(it)
 					}
 				}
@@ -45,7 +48,7 @@ class BackgroundActionReceiver : BroadcastReceiver() {
 				applicationScope.launch {
 					val tunnel = tunnelConfigRepository.getById(id)
 					tunnel?.let {
-						ServiceManager.stopTunnelBackgroundService(context)
+						serviceManager.stopTunnelBackgroundService(context)
 						tunnelService.get().stopTunnel(it)
 					}
 				}

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

@@ -7,7 +7,6 @@ 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
@@ -24,6 +23,9 @@ class BootReceiver : BroadcastReceiver() {
 	@Inject
 	lateinit var tunnelService: Provider<TunnelService>
 
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
 	@Inject
 	@ApplicationScope
 	lateinit var applicationScope: CoroutineScope
@@ -31,20 +33,16 @@ class BootReceiver : BroadcastReceiver() {
 	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)
-					}
+			val settings = appDataRepository.settings.getSettings()
+			if (settings.isRestoreOnBootEnabled) {
+				appDataRepository.getStartTunnelConfig()?.let {
+					context.startTunnelBackground(it.id)
 				}
 			}
+			if (settings.isAutoTunnelEnabled) {
+				Timber.i("Starting watcher service from boot")
+				serviceManager.startWatcherServiceForeground(context)
+			}
 		}
 	}
 }

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

@@ -1,16 +1,11 @@
 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.Bundle
 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
@@ -24,19 +19,11 @@ import com.zaneschepke.wireguardautotunnel.service.notification.NotificationServ
 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
@@ -46,12 +33,9 @@ import javax.inject.Inject
 import javax.inject.Provider
 
 @AndroidEntryPoint
-class AutoTunnelService : LifecycleService() {
+class AutoTunnelService : ForegroundService() {
 	private val foregroundId = 122
 
-	@Inject
-	lateinit var rootShell: Provider<RootShell>
-
 	@Inject
 	lateinit var wifiService: NetworkService<WifiService>
 
@@ -78,17 +62,11 @@ class AutoTunnelService : LifecycleService() {
 	@MainImmediateDispatcher
 	lateinit var mainImmediateDispatcher: CoroutineDispatcher
 
-	private val autoTunnelStateFlow = MutableStateFlow(AutoTunnelState())
+	private val networkEventsFlow = MutableStateFlow(AutoTunnelState())
 
 	private var wakeLock: PowerManager.WakeLock? = null
+	private val tag = this.javaClass.name
 
-	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() {
@@ -102,26 +80,6 @@ class AutoTunnelService : LifecycleService() {
 		}
 	}
 
-	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()
@@ -130,34 +88,27 @@ class AutoTunnelService : LifecycleService() {
 		}
 	}
 
-	private fun startService() {
+	override fun startService(extras: Bundle?) {
+		super.startService(extras)
 		if (running) return
-		running = true
 		kotlin.runCatching {
 			lifecycleScope.launch(mainImmediateDispatcher) {
 				launchNotification()
 				initWakeLock()
 			}
-			startSettingsJob()
-			startVpnStateJob()
+			startWatcherJob()
 		}.onFailure {
 			Timber.e(it)
 		}
 	}
 
-	private fun stopService() {
+	override fun stopService() {
+		super.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)) {
@@ -183,7 +134,6 @@ class AutoTunnelService : LifecycleService() {
 	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")
@@ -195,42 +145,48 @@ class AutoTunnelService : LifecycleService() {
 			}
 	}
 
-	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 fun startWatcherJob() = 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()
+		}
+		running = true
 	}
 
 	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 {
+						networkEventsFlow.update {
 							it.copy(
 								isMobileDataConnected = true,
 							)
@@ -238,7 +194,7 @@ class AutoTunnelService : LifecycleService() {
 					}
 
 					is NetworkStatus.CapabilitiesChanged -> {
-						autoTunnelStateFlow.update {
+						networkEventsFlow.update {
 							it.copy(
 								isMobileDataConnected = true,
 							)
@@ -247,7 +203,7 @@ class AutoTunnelService : LifecycleService() {
 					}
 
 					is NetworkStatus.Unavailable -> {
-						autoTunnelStateFlow.update {
+						networkEventsFlow.update {
 							it.copy(
 								isMobileDataConnected = false,
 							)
@@ -261,173 +217,92 @@ class AutoTunnelService : LifecycleService() {
 
 	private suspend fun watchForPingFailure() {
 		withContext(ioDispatcher) {
-			Timber.i("Starting ping watcher")
-			runCatching {
+			try {
 				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")
+					if (tunnelService.get().vpnState.value.status == TunnelState.UP) {
+						val tunnelConfig = tunnelService.get().vpnState.value.tunnelConfig
+						tunnelConfig?.let {
+							val config = TunnelConfig.configFromWgQuick(it.wgQuick)
+							val results =
 								config.peers.map { peer ->
-									peer.isReachable()
+									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
 								}
-							}
-							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
+								tunnelService.get().stopTunnel(it)
+								delay(Constants.VPN_RESTART_DELAY)
+								tunnelService.get().startTunnel(it)
+								delay(Constants.PING_COOLDOWN)
 							}
 						}
 					}
-					delay(vpnState.tunnelConfig?.pingInterval ?: Constants.PING_INTERVAL)
+					delay(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()
+			} catch (e: Exception) {
+				Timber.e(e)
 			}
 		}
 	}
 
 	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()
-					}
+		appDataRepository.settings.getSettingsFlow().collect { settings ->
+			if (networkEventsFlow.value.settings.isAutoTunnelPaused
+				!= settings.isAutoTunnelPaused
+			) {
+				when (settings.isAutoTunnelPaused) {
+					true -> launchWatcherPausedNotification()
+					false -> launchWatcherNotification()
 				}
 			}
-		}
-	}
-
-	private fun manageJobsBySettings(settings: Settings) {
-		with(settings) {
-			if (isPingEnabled) {
-				pingJob.onNotRunning { pingJob = startPingJob() }
-			} else {
-				cancelAndResetPingJob()
+			networkEventsFlow.update {
+				it.copy(
+					settings = settings,
+				)
 			}
-			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)
+						networkEventsFlow.update {
+							it.copy(
+								isEthernetConnected = true,
+							)
+						}
 					}
 
 					is NetworkStatus.CapabilitiesChanged -> {
 						Timber.i("Ethernet capabilities changed")
-						updateEthernet(true)
+						networkEventsFlow.update {
+							it.copy(
+								isEthernetConnected = true,
+							)
+						}
 					}
 
 					is NetworkStatus.Unavailable -> {
-						updateEthernet(false)
+						networkEventsFlow.update {
+							it.copy(
+								isEthernetConnected = false,
+							)
+						}
 						Timber.i("Lost Ethernet connection")
 					}
 				}
@@ -437,18 +312,25 @@ class AutoTunnelService : LifecycleService() {
 
 	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)
+						networkEventsFlow.update {
+							it.copy(
+								isWifiConnected = true,
+							)
+						}
 					}
 
 					is NetworkStatus.CapabilitiesChanged -> {
 						Timber.i("Wifi capabilities changed")
-						updateWifi(true)
-						val ssid = getWifiSSID(status.networkCapabilities)
+						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")
@@ -456,7 +338,7 @@ class AutoTunnelService : LifecycleService() {
 								Timber.i("Detected valid SSID")
 							}
 							appDataRepository.appState.setCurrentSsid(name)
-							autoTunnelStateFlow.update {
+							networkEventsFlow.update {
 								it.copy(
 									currentNetworkSSID = name,
 								)
@@ -465,7 +347,11 @@ class AutoTunnelService : LifecycleService() {
 					}
 
 					is NetworkStatus.Unavailable -> {
-						updateWifi(false)
+						networkEventsFlow.update {
+							it.copy(
+								isWifiConnected = false,
+							)
+						}
 						Timber.i("Lost Wi-Fi connection")
 					}
 				}
@@ -473,28 +359,21 @@ class AutoTunnelService : LifecycleService() {
 		}
 	}
 
-	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 suspend fun getSsidTunnel(ssid: String): TunnelConfig? {
+		return appDataRepository.tunnels.findByTunnelNetworksName(ssid).firstOrNull()
+	}
+
 	private fun isTunnelDown(): Boolean {
 		return tunnelService.get().vpnState.value.status == TunnelState.DOWN
 	}
 
-	private suspend fun handleNetworkEventChanges() {
+	private suspend fun manageVpn() {
 		withContext(ioDispatcher) {
-			Timber.i("Starting network event watcher")
-			autoTunnelStateFlow.collectLatest { watcherState ->
+			networkEventsFlow.collectLatest { watcherState ->
 				val autoTunnel = "Auto-tunnel watcher"
 				if (!watcherState.settings.isAutoTunnelPaused) {
 					// delay for rapid network state changes and then collect latest
@@ -533,14 +412,13 @@ class AutoTunnelService : LifecycleService() {
 						}
 
 						watcherState.isUntrustedWifiConditionMet() -> {
-							Timber.i("Untrusted wifi condition met")
-							if (activeTunnel?.tunnelNetworks?.isMatchingToWildcardList(watcherState.currentNetworkSSID) == false ||
-								activeTunnel == null || isTunnelDown()
+							if (activeTunnel?.tunnelNetworks?.contains(watcherState.currentNetworkSSID) == false ||
+								activeTunnel == null
 							) {
 								Timber.i(
 									"$autoTunnel - tunnel on ssid not associated with current tunnel condition met",
 								)
-								watcherState.tunnels.firstOrNull { it.tunnelNetworks.isMatchingToWildcardList(watcherState.currentNetworkSSID) }?.let {
+								getSsidTunnel(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)

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

@@ -1,8 +1,6 @@
 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 AutoTunnelState(
 	val isWifiConnected: Boolean = false,
@@ -10,7 +8,6 @@ data class AutoTunnelState(
 	val isMobileDataConnected: Boolean = false,
 	val currentNetworkSSID: String = "",
 	val settings: Settings = Settings(),
-	val tunnels: TunnelConfigs = emptyList(),
 ) {
 	fun isEthernetConditionMet(): Boolean {
 		return (
@@ -41,7 +38,7 @@ data class AutoTunnelState(
 		return (
 			!isEthernetConnected &&
 				isWifiConnected &&
-				!settings.trustedNetworkSSIDs.isMatchingToWildcardList(currentNetworkSSID) &&
+				!settings.trustedNetworkSSIDs.contains(currentNetworkSSID) &&
 				settings.isTunnelOnWifiEnabled
 			)
 	}
@@ -51,7 +48,7 @@ data class AutoTunnelState(
 			!isEthernetConnected &&
 				(
 					isWifiConnected &&
-						settings.trustedNetworkSSIDs.isMatchingToWildcardList(currentNetworkSSID)
+						settings.trustedNetworkSSIDs.contains(currentNetworkSSID)
 					)
 			)
 	}

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

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

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

@@ -3,12 +3,10 @@ package com.zaneschepke.wireguardautotunnel.service.foreground
 import android.app.Service
 import android.content.Context
 import android.content.Intent
-import android.net.VpnService
 import timber.log.Timber
 
-object ServiceManager {
+class 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

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

@@ -1,16 +1,14 @@
 package com.zaneschepke.wireguardautotunnel.service.foreground
 
 import android.app.Notification
-import android.content.Intent
-import android.os.IBinder
-import androidx.lifecycle.LifecycleService
+import android.os.Bundle
 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() {
+class TunnelBackgroundService : ForegroundService() {
 
 	@Inject
 	lateinit var notificationService: NotificationService
@@ -22,32 +20,14 @@ class TunnelBackgroundService : LifecycleService() {
 		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() {
+	override fun startService(extras: Bundle?) {
+		super.startService(extras)
 		startForeground(foregroundId, createNotification())
 	}
 
-	private fun stopService() {
+	override fun stopService() {
+		super.stopService()
 		stopForeground(STOP_FOREGROUND_REMOVE)
-		stopSelf()
 	}
 
 	private fun createNotification(): Notification {

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

@@ -5,6 +5,8 @@ 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
@@ -19,7 +21,7 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
 	private val connectivityManager =
 		context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
 
-	val wifiManager =
+	private val wifiManager =
 		context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
 
 	override val networkStatus =
@@ -81,6 +83,30 @@ 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,9 +10,4 @@ class EthernetService
 constructor(
 	@ApplicationContext context: Context,
 ) :
-	BaseNetworkService<EthernetService>(context, NetworkCapabilities.TRANSPORT_ETHERNET) {
-
-	override fun isNetworkSecure(): Boolean {
-		return true
-	}
-}
+	BaseNetworkService<EthernetService>(context, NetworkCapabilities.TRANSPORT_ETHERNET)

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

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

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

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

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

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

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

@@ -2,8 +2,6 @@ package com.zaneschepke.wireguardautotunnel.service.network
 
 import android.content.Context
 import android.net.NetworkCapabilities
-import android.net.wifi.SupplicantState
-import android.os.Build
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
@@ -12,21 +10,4 @@ class WifiService
 constructor(
 	@ApplicationContext context: Context,
 ) :
-	BaseNetworkService<WifiService>(context, NetworkCapabilities.TRANSPORT_WIFI) {
-
-	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
-	}
-}
+	BaseNetworkService<WifiService>(context, NetworkCapabilities.TRANSPORT_WIFI)

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.MainActivity
+import com.zaneschepke.wireguardautotunnel.ui.SplashActivity
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
@@ -63,7 +63,7 @@ constructor(
 				}
 		notificationManager.createNotificationChannel(channel)
 		val pendingIntent: PendingIntent =
-			Intent(context, MainActivity::class.java).let { notificationIntent ->
+			Intent(context, SplashActivity::class.java).let { notificationIntent ->
 				PendingIntent.getActivity(
 					context,
 					0,

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

@@ -12,6 +12,7 @@ import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -23,6 +24,9 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
 	@Inject
 	lateinit var appDataRepository: AppDataRepository
 
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
 	@Inject
 	@ApplicationScope
 	lateinit var applicationScope: CoroutineScope

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

@@ -9,8 +9,6 @@ interface TunnelService : Tunnel, org.amnezia.awg.backend.Tunnel {
 
 	suspend fun stopTunnel(tunnelConfig: TunnelConfig): Result<TunnelState>
 
-	suspend fun bounceTunnel(tunnelConfig: TunnelConfig): Result<TunnelState>
-
 	val vpnState: StateFlow<VpnState>
 
 	suspend fun runningTunnelNames(): Set<String>

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

@@ -2,24 +2,25 @@ package com.zaneschepke.wireguardautotunnel.service.tunnel
 
 import com.wireguard.android.backend.Backend
 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 com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
 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.combine
-import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.amnezia.awg.backend.Tunnel
@@ -31,30 +32,14 @@ class WireGuardTunnel
 @Inject
 constructor(
 	private val amneziaBackend: Provider<org.amnezia.awg.backend.Backend>,
-	tunnelConfigRepository: TunnelConfigRepository,
+	@Userspace private val userspaceBackend: Provider<Backend>,
 	@Kernel private val kernelBackend: Provider<Backend>,
 	private val appDataRepository: AppDataRepository,
 	@ApplicationScope private val applicationScope: CoroutineScope,
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : TunnelService {
-
 	private val _vpnState = MutableStateFlow(VpnState())
-	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 suspend fun backend(): Any {
-		val settings = appDataRepository.settings.getSettings()
-		if (settings.isKernelEnabled) return kernelBackend.get()
-		return amneziaBackend.get()
-	}
+	override val vpnState: StateFlow<VpnState> = _vpnState.asStateFlow()
 
 	override suspend fun runningTunnelNames(): Set<String> {
 		return when (val backend = backend()) {
@@ -64,6 +49,8 @@ constructor(
 		}
 	}
 
+	private var statsJob: Job? = null
+
 	private suspend fun setState(tunnelConfig: TunnelConfig, tunnelState: TunnelState): Result<TunnelState> {
 		return runCatching {
 			when (val backend = backend()) {
@@ -87,76 +74,44 @@ constructor(
 		}
 	}
 
+	private suspend fun backend(): Any {
+		val settings = appDataRepository.settings.getSettings()
+		if (settings.isKernelEnabled) return kernelBackend.get()
+		if (settings.isAmneziaEnabled) return amneziaBackend.get()
+		return userspaceBackend.get()
+	}
+
 	override suspend fun startTunnel(tunnelConfig: TunnelConfig): Result<TunnelState> {
 		return withContext(ioDispatcher) {
-			onBeforeStart(tunnelConfig)
+			if (_vpnState.value.status == TunnelState.UP) vpnState.value.tunnelConfig?.let { stopTunnel(it) }
+			appDataRepository.tunnels.save(tunnelConfig.copy(isActive = true))
+			appDataRepository.appState.setLastActiveTunnelId(tunnelConfig.id)
+			emitTunnelConfig(tunnelConfig)
 			setState(tunnelConfig, TunnelState.UP).onSuccess {
 				emitTunnelState(it)
+				WireGuardAutoTunnel.instance.requestTunnelTileServiceStateUpdate()
 			}.onFailure {
-				Timber.e(it)
-				onStartFailed()
+				appDataRepository.tunnels.save(tunnelConfig.copy(isActive = false))
+				WireGuardAutoTunnel.instance.requestTunnelTileServiceStateUpdate()
 			}
 		}
 	}
 
 	override suspend fun stopTunnel(tunnelConfig: TunnelConfig): Result<TunnelState> {
 		return withContext(ioDispatcher) {
-			onBeforeStop(tunnelConfig)
+			appDataRepository.tunnels.save(tunnelConfig.copy(isActive = false))
 			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()
+				WireGuardAutoTunnel.instance.requestTunnelTileServiceStateUpdate()
 			}.onFailure {
 				Timber.e(it)
+				appDataRepository.tunnels.save(tunnelConfig.copy(isActive = true))
+				WireGuardAutoTunnel.instance.requestTunnelTileServiceStateUpdate()
 			}
 		}
 	}
 
-	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(
@@ -173,7 +128,7 @@ constructor(
 		)
 	}
 
-	private fun emitVpnStateConfig(tunnelConfig: TunnelConfig) {
+	private fun emitTunnelConfig(tunnelConfig: TunnelConfig?) {
 		_vpnState.tryEmit(
 			_vpnState.value.copy(
 				tunnelConfig = tunnelConfig,
@@ -209,9 +164,21 @@ constructor(
 		return _vpnState.value.tunnelConfig?.name ?: ""
 	}
 
+	override fun onStateChange(newState: Tunnel.State) {
+		handleStateChange(TunnelState.from(newState))
+	}
+
+	private fun handleStateChange(state: TunnelState) {
+		emitTunnelState(state)
+		WireGuardAutoTunnel.instance.requestTunnelTileServiceStateUpdate()
+		when (state) {
+			TunnelState.UP -> startStatsJob()
+			else -> cancelStatsJob()
+		}
+	}
+
 	private fun startTunnelStatisticsJob() = applicationScope.launch(ioDispatcher) {
 		val backend = backend()
-		delay(STATS_START_DELAY)
 		while (true) {
 			when (backend) {
 				is Backend -> emitBackendStatistics(
@@ -225,21 +192,11 @@ constructor(
 					)
 				}
 			}
-			delay(VPN_STATISTIC_CHECK_INTERVAL)
+			delay(Constants.VPN_STATISTIC_CHECK_INTERVAL)
 		}
 	}
 
-	override fun onStateChange(newState: Tunnel.State) {
-		emitTunnelState(TunnelState.from(newState))
-	}
-
 	override fun onStateChange(state: 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
+		handleStateChange(TunnelState.from(state))
 	}
 }

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

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

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

@@ -2,109 +2,47 @@ package com.zaneschepke.wireguardautotunnel.ui
 
 import androidx.lifecycle.ViewModel
 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.collect
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.onCompletion
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.flow.takeWhile
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.plus
 import xyz.teamgravity.pin_lock_compose.PinManager
 import javax.inject.Inject
-import javax.inject.Provider
 
 @HiltViewModel
 class AppViewModel
 @Inject
 constructor(
 	private val appDataRepository: AppDataRepository,
-	private val tunnelService: Provider<TunnelService>,
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : ViewModel() {
 
-	private val _appUiState = MutableStateFlow(AppUiState())
+	private val _appUiState =
+		MutableStateFlow(
+			AppUiState(),
+		)
+	val appUiState = _appUiState.asStateFlow()
 
-	val uiState =
-		combine(
-			appDataRepository.settings.getSettingsFlow(),
-			appDataRepository.tunnels.getTunnelConfigsFlow(),
-			tunnelService.get().vpnState,
-			appDataRepository.appState.generalStateFlow,
-		) { settings, tunnels, tunnelState, generalState ->
-			AppUiState(
-				settings,
-				tunnels,
-				tunnelState,
-				generalState,
+	fun showSnackbarMessage(message: String) {
+		_appUiState.update {
+			it.copy(
+				snackbarMessage = message,
+				snackbarMessageConsumed = false,
 			)
-		}.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())
+	fun snackbarMessageConsumed() {
+		_appUiState.update {
+			it.copy(
+				snackbarMessage = "",
+				snackbarMessageConsumed = true,
+			)
 		}
 	}
 
-	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,
-			),
-		)
-	}
-
-	fun onPinLockDisabled() = viewModelScope.launch(ioDispatcher) {
+	fun onPinLockDisabled() = viewModelScope.launch {
 		PinManager.clearPin()
 		appDataRepository.appState.setPinLockEnabled(false)
 	}

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

@@ -4,25 +4,22 @@ import android.os.Bundle
 import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-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.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.Surface
 import androidx.compose.material3.surfaceColorAtElevation
-import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
@@ -31,39 +28,34 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusProperties
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
-import androidx.navigation.toRoute
-import com.zaneschepke.wireguardautotunnel.R
+import androidx.navigation.navArgument
 import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
-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.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.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
-import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
+import com.zaneschepke.wireguardautotunnel.util.StringValue
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -74,147 +66,164 @@ class MainActivity : AppCompatActivity() {
 	@Inject
 	lateinit var tunnelService: TunnelService
 
-	private val viewModel by viewModels<AppViewModel>()
-
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
-		enableEdgeToEdge(
-			navigationBarStyle = SystemBarStyle.auto(
-				lightScrim = Color.Transparent.toArgb(),
-				darkScrim = Color.Transparent.toArgb(),
-			),
-		)
 
-		installSplashScreen().apply {
-			setKeepOnScreenCondition {
-				!viewModel.isAppReady.value
-			}
-		}
+		val isPinLockEnabled = intent.extras?.getBoolean(SplashActivity.IS_PIN_LOCK_ENABLED_KEY)
+
+		enableEdgeToEdge(navigationBarStyle = SystemBarStyle.dark(Color.Transparent.toArgb()))
 
 		setContent {
-			val appUiState by viewModel.uiState.collectAsStateWithLifecycle(lifecycle = this.lifecycle)
+			val appViewModel = hiltViewModel<AppViewModel>()
+			val appUiState by appViewModel.appUiState.collectAsStateWithLifecycle()
 			val navController = rememberNavController()
 			val navBackStackEntry by navController.currentBackStackEntryAsState()
 
-			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() }
 
-			with(appUiState.settings) {
-				LaunchedEffect(isAutoTunnelPaused, isAutoTunnelEnabled) {
-					this@MainActivity.requestAutoTunnelTileServiceUpdate()
+			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()
+						}
+					}
 				}
 			}
 
-			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,
-										),
+			WireguardAutoTunnelTheme {
+				LaunchedEffect(appUiState.snackbarMessageConsumed) {
+					if (!appUiState.snackbarMessageConsumed) {
+						showSnackBarMessage(StringValue.DynamicString(appUiState.snackbarMessage))
+						appViewModel.snackbarMessageConsumed()
+					}
+				}
+
+				val focusRequester = remember { FocusRequester() }
+
+				Scaffold(
+					snackbarHost = {
+						SnackbarHost(snackbarHostState) { snackbarData: SnackbarData ->
+							CustomSnackBar(
+								snackbarData.visuals.message,
+								isRtl = false,
+								containerColor =
+								MaterialTheme.colorScheme.surfaceColorAtElevation(
+									2.dp,
+								),
+							)
+						}
+					},
+					containerColor = MaterialTheme.colorScheme.background,
+					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 ->
+					Surface(modifier = Modifier.fillMaxSize().padding(padding)) {
+						NavHost(
+							navController,
+							enterTransition = { fadeIn(tween(Constants.TRANSITION_ANIMATION_TIME)) },
+							exitTransition = { fadeOut(tween(Constants.TRANSITION_ANIMATION_TIME)) },
+							startDestination = (if (isPinLockEnabled == true) Screen.Lock.route else Screen.Main.route),
+						) {
+							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,
+									navController = navController,
+								)
+							}
+							composable(Screen.Support.Logs.route) {
+								LogsScreen()
+							}
+							composable(
+								"${Screen.Config.route}/{id}?configType={configType}",
+								arguments =
+								listOf(
+									navArgument("id") {
+										type = NavType.StringType
+										defaultValue = "0"
+									},
+									navArgument("configType") {
+										type = NavType.StringType
+										defaultValue = ConfigType.WIREGUARD.name
+									},
+								),
+							) {
+								val id = it.arguments?.getString("id")
+								val configType =
+									ConfigType.valueOf(
+										it.arguments?.getString("configType") ?: ConfigType.WIREGUARD.name,
+									)
+								if (!id.isNullOrBlank()) {
+									ConfigScreen(
+										navController = navController,
+										tunnelId = id,
+										appViewModel = appViewModel,
+										focusRequester = focusRequester,
+										configType = configType,
 									)
 								}
-							},
-							modifier =
-							Modifier
-								.focusable()
-								.focusProperties {
-									if (navBackStackEntry?.isCurrentRoute(Route.Lock) == true) {
-										Unit
-									} else {
-										up = focusRequester
-									}
-								},
-							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,
+								)
+							}
 						}
 					}
 				}

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

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

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

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

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

@@ -0,0 +1,75 @@
+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.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
+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.requestAutoTunnelTileServiceUpdate
+import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.launch
+import xyz.teamgravity.pin_lock_compose.PinManager
+import javax.inject.Inject
+import javax.inject.Provider
+
+@SuppressLint("CustomSplashScreen")
+@AndroidEntryPoint
+class SplashActivity : ComponentActivity() {
+	@Inject
+	lateinit var appStateRepository: AppStateRepository
+
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
+
+	@Inject
+	lateinit var tunnelService: Provider<TunnelService>
+
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+			val splashScreen = installSplashScreen()
+			splashScreen.setKeepOnScreenCondition { true }
+		}
+		super.onCreate(savedInstanceState)
+
+		lifecycleScope.launch {
+			repeatOnLifecycle(Lifecycle.State.CREATED) {
+				val pinLockEnabled = appStateRepository.isPinLockEnabled()
+				if (pinLockEnabled) {
+					PinManager.initialize(WireGuardAutoTunnel.instance)
+				}
+				val settings = appDataRepository.settings.getSettings()
+				if (settings.isAutoTunnelEnabled) serviceManager.startWatcherService(application.applicationContext)
+				if (tunnelService.get().getState() == TunnelState.UP) tunnelService.get().startStatsJob()
+				val tunnels = appDataRepository.tunnels.getActive()
+				if (tunnels.isNotEmpty() && tunnelService.get().getState() == TunnelState.DOWN) tunnelService.get().startTunnel(tunnels.first())
+				requestTunnelTileServiceStateUpdate()
+				requestAutoTunnelTileServiceUpdate()
+
+				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 = true) {
+fun ClickableIconButton(onClick: () -> Unit, onIconClick: () -> Unit, text: String, icon: ImageVector, enabled: Boolean) {
 	TextButton(
 		onClick = onClick,
 		enabled = enabled,

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

@@ -1,69 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common
-
-import androidx.compose.animation.animateContentSize
-import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.combinedClickable
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.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

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

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

@@ -0,0 +1,99 @@
+package com.zaneschepke.wireguardautotunnel.ui.common
+
+import androidx.compose.animation.animateContentSize
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStatistics
+import com.zaneschepke.wireguardautotunnel.util.NumberUtils
+import com.zaneschepke.wireguardautotunnel.util.extensions.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,6 +1,5 @@
 package com.zaneschepke.wireguardautotunnel.ui.common.config
 
-import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.text.KeyboardActions
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material3.OutlinedTextField
@@ -15,29 +14,23 @@ fun ConfigurationTextBox(
 	value: String,
 	hint: String,
 	onValueChange: (String) -> Unit,
-	keyboardActions: KeyboardActions = KeyboardActions(),
+	keyboardActions: KeyboardActions,
 	label: String,
 	modifier: Modifier,
-	isError: Boolean = false,
-	keyboardOptions: KeyboardOptions = KeyboardOptions(
-		capitalization = KeyboardCapitalization.None,
-		imeAction = ImeAction.Done,
-	),
-	trailing: @Composable () -> Unit = {},
-	interactionSource: MutableInteractionSource? = null,
 ) {
 	OutlinedTextField(
-		isError = isError,
 		modifier = modifier,
 		value = value,
 		singleLine = true,
-		interactionSource = interactionSource,
 		onValueChange = { onValueChange(it) },
 		label = { Text(label) },
 		maxLines = 1,
 		placeholder = { Text(hint) },
-		keyboardOptions = keyboardOptions,
+		keyboardOptions =
+		KeyboardOptions(
+			capitalization = KeyboardCapitalization.None,
+			imeAction = ImeAction.Done,
+		),
 		keyboardActions = keyboardActions,
-		trailingIcon = trailing,
 	)
 }

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

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

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

@@ -1,85 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.config
-
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.interaction.collectIsFocusedAsState
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.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

@@ -10,20 +10,13 @@ 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
-					}
-				}
+				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. */

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

@@ -10,6 +10,7 @@ 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.text.font.FontWeight
 import androidx.navigation.NavController
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.compose.currentBackStackEntryAsState
@@ -19,20 +20,19 @@ fun BottomNavBar(navController: NavController, bottomNavItems: List<BottomNavIte
 	var showBottomBar by rememberSaveable { mutableStateOf(true) }
 	val navBackStackEntry by navController.currentBackStackEntryAsState()
 
-	showBottomBar = bottomNavItems.any {
-		navBackStackEntry?.isCurrentRoute(it.route) == true
-	}
+	showBottomBar = bottomNavItems.firstOrNull { navBackStackEntry?.destination?.route?.contains(it.route) == true } != null
 
 	if (showBottomBar) {
 		NavigationBar(
 			containerColor = MaterialTheme.colorScheme.surface,
 		) {
 			bottomNavItems.forEach { item ->
-				val selected = navBackStackEntry.isCurrentRoute(item.route)
+				val selected = navBackStackEntry?.destination?.route?.contains(item.route) == true
+
 				NavigationBarItem(
 					selected = selected,
 					onClick = {
-						if (selected) return@NavigationBarItem
+						if (navBackStackEntry?.destination?.route == item.route) return@NavigationBarItem
 						navController.navigate(item.route) {
 							// Pop up to the start destination of the graph to
 							// avoid building up a large stack of destinations
@@ -48,7 +48,7 @@ fun BottomNavBar(navController: NavController, bottomNavItems: List<BottomNavIte
 					label = {
 						Text(
 							text = item.name,
-							style = MaterialTheme.typography.labelMedium,
+							fontWeight = FontWeight.SemiBold,
 						)
 					},
 					icon = {

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

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

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

@@ -1,14 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.navigation
-
-import android.annotation.SuppressLint
-import androidx.navigation.NavBackStackEntry
-import androidx.navigation.NavDestination.Companion.hasRoute
-import androidx.navigation.NavDestination.Companion.hierarchy
-import com.zaneschepke.wireguardautotunnel.ui.Route
-
-@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

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

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

@@ -1,33 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.navigation
-
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.outlined.ArrowBack
-import androidx.compose.material3.CenterAlignedTopAppBar
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun TopNavBar(title: String, trailing: @Composable () -> Unit = {}) {
-	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/snackbar/SnackbarController.kt

@@ -1,108 +0,0 @@
-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,20 +1,22 @@
 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 = MaterialTheme.typography.titleMedium,
+		style = TextStyle(fontSize = 18.sp, fontWeight = FontWeight.ExtraBold),
 		modifier = Modifier.padding(padding, bottom = 5.dp, top = 5.dp),
 	)
 }

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

@@ -1,27 +1,36 @@
 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
@@ -30,11 +39,12 @@ 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
@@ -43,6 +53,7 @@ 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.platform.ClipboardManager
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.platform.LocalContext
@@ -56,53 +67,47 @@ 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.ui.Route
+import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
+import com.zaneschepke.wireguardautotunnel.ui.Screen
+import com.zaneschepke.wireguardautotunnel.ui.common.SearchBar
 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.snackbar.SnackbarController
+import com.zaneschepke.wireguardautotunnel.ui.common.screen.LoadingScreen
 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.extensions.getMessage
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import kotlinx.coroutines.delay
 
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
+@OptIn(
+	ExperimentalMaterial3Api::class,
+)
 @Composable
-fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
-	val viewModel = hiltViewModel<ConfigViewModel, ConfigViewModel.ConfigViewModelFactory> { factory ->
-		factory.create(tunnelId)
-	}
-
+fun ConfigScreen(
+	viewModel: ConfigViewModel = hiltViewModel(),
+	focusRequester: FocusRequester,
+	navController: NavController,
+	appViewModel: AppViewModel,
+	tunnelId: String,
+	configType: ConfigType,
+) {
 	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(saved) {
-		if (saved == true) {
-			navController.navigate(Route.Main)
-		}
-	}
+	LaunchedEffect(Unit) { viewModel.init(tunnelId) }
 
-	LaunchedEffect(Unit) {
+	LaunchedEffect(uiState.loading) {
 		if (!uiState.loading && context.isRunningOnTv()) {
 			delay(Constants.FOCUS_REQUEST_DELAY)
 			kotlin.runCatching {
@@ -114,12 +119,13 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 		}
 	}
 
-	LaunchedEffect(Unit) {
-		delay(2_000L)
-		viewModel.cleanUpUninstalledApps()
+	if (uiState.loading) {
+		LoadingScreen()
+		return
 	}
 
 	val keyboardActions = KeyboardActions(onDone = { keyboardController?.hide() })
+
 	val keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done)
 
 	val fillMaxHeight = .85f
@@ -154,13 +160,13 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 			},
 			onError = {
 				showAuthPrompt = false
-				snackbar.showMessage(
+				appViewModel.showSnackbarMessage(
 					context.getString(R.string.error_authentication_failed),
 				)
 			},
 			onFailure = {
 				showAuthPrompt = false
-				snackbar.showMessage(
+				appViewModel.showSnackbarMessage(
 					context.getString(R.string.error_authorization_failed),
 				)
 			},
@@ -168,19 +174,182 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 	}
 
 	if (showApplicationsDialog) {
-		ApplicationSelectionDialog(viewModel, uiState) {
-			showApplicationsDialog = false
+		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))
+						}
+					}
+				}
+			}
 		}
 	}
 
 	Scaffold(
 		floatingActionButtonPosition = FabPosition.End,
 		floatingActionButton = {
+			val secondaryColor = MaterialTheme.colorScheme.secondary
+			val hoverColor = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)
+			var fobColor by remember { mutableStateOf(secondaryColor) }
 			FloatingActionButton(
-				onClick = {
-					viewModel.onSaveAllChanges()
+				modifier =
+				Modifier.onFocusChanged {
+					if (context.isRunningOnTv()) {
+						fobColor = if (it.isFocused) hoverColor else secondaryColor
+					}
 				},
-				containerColor = MaterialTheme.colorScheme.primary,
+				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))
+					}
+				},
+				containerColor = fobColor,
 				shape = RoundedCornerShape(16.dp),
 			) {
 				Icon(
@@ -230,22 +399,16 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 							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 = viewModel::onTunnelNameChange,
+							onValueChange = { value -> viewModel.onTunnelNameChange(value) },
 							keyboardActions = keyboardActions,
 							label = stringResource(R.string.name),
 							hint = stringResource(R.string.tunnel_name).lowercase(),
 							modifier =
 							Modifier
-								.fillMaxWidth(),
+								.fillMaxWidth()
+								.focusRequester(focusRequester),
 						)
 						OutlinedTextField(
 							modifier =
@@ -254,12 +417,12 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 								.clickable { showAuthPrompt = true },
 							value = uiState.interfaceProxy.privateKey,
 							visualTransformation =
-							if ((tunnelId == Constants.MANUAL_TUNNEL_CONFIG_ID.toInt()) || isAuthenticated) {
+							if ((tunnelId == Constants.MANUAL_TUNNEL_CONFIG_ID) || isAuthenticated) {
 								VisualTransformation.None
 							} else {
 								PasswordVisualTransformation()
 							},
-							enabled = (tunnelId == Constants.MANUAL_TUNNEL_CONFIG_ID.toInt()) || isAuthenticated,
+							enabled = (tunnelId == Constants.MANUAL_TUNNEL_CONFIG_ID) || isAuthenticated,
 							onValueChange = { value -> viewModel.onPrivateKeyChange(value) },
 							trailingIcon = {
 								IconButton(
@@ -309,29 +472,31 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 							keyboardOptions = keyboardOptions,
 							keyboardActions = keyboardActions,
 						)
-						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.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),
+							)
+						}
 						Row(modifier = Modifier.fillMaxWidth()) {
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.dnsServers,
-								onValueChange = viewModel::onDnsServersChanged,
+								onValueChange = { value -> viewModel.onDnsServersChanged(value) },
 								keyboardActions = keyboardActions,
 								label = stringResource(R.string.dns_servers),
 								hint = stringResource(R.string.comma_separated_list),
@@ -342,17 +507,20 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.mtu,
-								onValueChange = viewModel::onMtuChanged,
+								onValueChange = { value -> viewModel.onMtuChanged(value) },
 								keyboardActions = keyboardActions,
 								label = stringResource(R.string.mtu),
 								hint = stringResource(R.string.auto),
 								modifier = Modifier.width(IntrinsicSize.Min),
 							)
 						}
-						if (derivedConfigType.value == ConfigType.AMNEZIA) {
+						if (configType == ConfigType.AMNEZIA) {
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.junkPacketCount,
-								onValueChange = viewModel::onJunkPacketCountChanged,
+								onValueChange = {
+										value ->
+									viewModel.onJunkPacketCountChanged(value)
+								},
 								keyboardActions = keyboardActions,
 								label = stringResource(R.string.junk_packet_count),
 								hint = stringResource(R.string.junk_packet_count).lowercase(),
@@ -363,7 +531,11 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.junkPacketMinSize,
-								onValueChange = viewModel::onJunkPacketMinSizeChanged,
+								onValueChange = { value ->
+									viewModel.onJunkPacketMinSizeChanged(
+										value,
+									)
+								},
 								keyboardActions = keyboardActions,
 								label = stringResource(R.string.junk_packet_minimum_size),
 								hint =
@@ -377,7 +549,11 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.junkPacketMaxSize,
-								onValueChange = viewModel::onJunkPacketMaxSizeChanged,
+								onValueChange = { value ->
+									viewModel.onJunkPacketMaxSizeChanged(
+										value,
+									)
+								},
 								keyboardActions = keyboardActions,
 								label = stringResource(R.string.junk_packet_maximum_size),
 								hint =
@@ -391,7 +567,11 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.initPacketJunkSize,
-								onValueChange = viewModel::onInitPacketJunkSizeChanged,
+								onValueChange = { value ->
+									viewModel.onInitPacketJunkSizeChanged(
+										value,
+									)
+								},
 								keyboardActions = keyboardActions,
 								label = stringResource(R.string.init_packet_junk_size),
 								hint = stringResource(R.string.init_packet_junk_size).lowercase(),
@@ -402,7 +582,10 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.responsePacketJunkSize,
-								onValueChange = viewModel::onResponsePacketJunkSize,
+								onValueChange = {
+										value ->
+									viewModel.onResponsePacketJunkSize(value)
+								},
 								keyboardActions = keyboardActions,
 								label = stringResource(R.string.response_packet_junk_size),
 								hint =
@@ -416,7 +599,10 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.initPacketMagicHeader,
-								onValueChange = viewModel::onInitPacketMagicHeader,
+								onValueChange = {
+										value ->
+									viewModel.onInitPacketMagicHeader(value)
+								},
 								keyboardActions = keyboardActions,
 								label = stringResource(R.string.init_packet_magic_header),
 								hint =
@@ -430,7 +616,11 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.responsePacketMagicHeader,
-								onValueChange = viewModel::onResponsePacketMagicHeader,
+								onValueChange = { value ->
+									viewModel.onResponsePacketMagicHeader(
+										value,
+									)
+								},
 								keyboardActions = keyboardActions,
 								label = stringResource(R.string.response_packet_magic_header),
 								hint =
@@ -444,7 +634,11 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.underloadPacketMagicHeader,
-								onValueChange = viewModel::onUnderloadPacketMagicHeader,
+								onValueChange = { value ->
+									viewModel.onUnderloadPacketMagicHeader(
+										value,
+									)
+								},
 								keyboardActions = keyboardActions,
 								label = stringResource(R.string.underload_packet_magic_header),
 								hint =
@@ -458,7 +652,11 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 							)
 							ConfigurationTextBox(
 								value = uiState.interfaceProxy.transportPacketMagicHeader,
-								onValueChange = viewModel::onTransportPacketMagicHeader,
+								onValueChange = { value ->
+									viewModel.onTransportPacketMagicHeader(
+										value,
+									)
+								},
 								keyboardActions = keyboardActions,
 								label = stringResource(R.string.transport_packet_magic_header),
 								hint =
@@ -539,27 +737,15 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 								hint = stringResource(R.string.base64_key),
 								modifier = Modifier.fillMaxWidth(),
 							)
-							OutlinedTextField(
-								modifier =
-								Modifier
-									.fillMaxWidth()
-									.clickable { showAuthPrompt = true },
+							ConfigurationTextBox(
 								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(),
@@ -628,6 +814,9 @@ fun ConfigScreen(tunnelId: Int, focusRequester: FocusRequester) {
 					}
 				}
 			}
+			if (context.isRunningOnTv()) {
+				Spacer(modifier = Modifier.weight(.17f))
+			}
 		}
 	}
 }

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

@@ -15,12 +15,9 @@ data class ConfigUiState(
 	val isAllApplicationsEnabled: Boolean = false,
 	val loading: Boolean = true,
 	val tunnel: TunnelConfig? = null,
-	var tunnelName: String = "",
+	val 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) }
@@ -48,6 +45,7 @@ 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
@@ -71,13 +69,5 @@ 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,119 +15,100 @@ 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.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.SharingStarted
-import kotlinx.coroutines.flow.asSharedFlow
-import kotlinx.coroutines.flow.onStart
-import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.plus
 import timber.log.Timber
+import javax.inject.Inject
 
-@HiltViewModel(assistedFactory = ConfigViewModel.ConfigViewModelFactory::class)
+@HiltViewModel
 class ConfigViewModel
-@AssistedInject
+@Inject
 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 _saved = MutableSharedFlow<Boolean>()
-	val saved = _saved.asSharedFlow()
-
 	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(),
-	)
+	val uiState = _uiState.asStateFlow()
+
+	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
+	}
 
 	fun onTunnelNameChange(name: String) {
-		_uiState.update {
-			it.copy(tunnelName = name)
-		}
+		_uiState.value = _uiState.value.copy(tunnelName = name)
 	}
 
 	fun onIncludeChange(include: Boolean) {
-		_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,
-					),
-				)
-			}
-		}
+		_uiState.value = _uiState.value.copy(include = include)
 	}
 
 	fun onAddCheckedPackage(packageName: String) {
-		_uiState.update {
-			it.copy(
-				checkedPackageNames = it.checkedPackageNames + packageName,
+		_uiState.value =
+			_uiState.value.copy(
+				checkedPackageNames = _uiState.value.checkedPackageNames + packageName,
 			)
-		}
 	}
 
 	fun onAllApplicationsChange(isAllApplicationsEnabled: Boolean) {
-		_uiState.update {
-			it.copy(isAllApplicationsEnabled = isAllApplicationsEnabled)
-		}
+		_uiState.value = _uiState.value.copy(isAllApplicationsEnabled = isAllApplicationsEnabled)
 	}
 
 	fun onRemoveCheckedPackage(packageName: String) {
-		_uiState.update {
-			it.copy(
-				checkedPackageNames = it.checkedPackageNames - packageName,
+		_uiState.value =
+			_uiState.value.copy(
+				checkedPackageNames = _uiState.value.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())
 		}
@@ -156,9 +137,7 @@ 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) {
@@ -195,113 +174,105 @@ constructor(
 	}
 
 	private fun emptyCheckedPackagesList() {
-		_uiState.update {
-			it.copy(checkedPackageNames = emptyList())
-		}
+		_uiState.value = _uiState.value.copy(checkedPackageNames = emptyList())
 	}
 
 	private fun buildInterfaceListFromProxyInterface(): Interface {
 		val builder = Interface.Builder()
-		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,
-				)
-			}
+		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,
+			)
 		}
-
 		return builder.build()
 	}
 
 	private fun buildAmInterfaceListFromProxyInterface(): org.amnezia.awg.config.Interface {
 		val builder = org.amnezia.awg.config.Interface.Builder()
-		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(),
-				)
-			}
+		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(),
+			)
 		}
-
 		return builder.build()
 	}
 
@@ -320,33 +291,41 @@ constructor(
 			.build()
 	}
 
-	fun onSaveAllChanges() = viewModelScope.launch {
-		kotlin.runCatching {
+	fun onSaveAllChanges(configType: ConfigType): Result<Unit> {
+		return try {
 			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,
-			)
+			val amQuick =
+				if (configType == ConfigType.AMNEZIA) {
+					buildAmConfig().toAwgQuickString(true)
+				} 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,
+						)
+				}
 			updateTunnelConfig(tunnelConfig)
-			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)
+			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))
 		}
 	}
 
@@ -429,7 +408,7 @@ constructor(
 		_uiState.update {
 			it.copy(
 				interfaceProxy =
-				it.interfaceProxy.copy(
+				_uiState.value.interfaceProxy.copy(
 					privateKey = keyPair.privateKey.toBase64(),
 					publicKey = keyPair.publicKey.toBase64(),
 				),
@@ -440,7 +419,7 @@ constructor(
 	fun onAddressesChanged(value: String) {
 		_uiState.update {
 			it.copy(
-				interfaceProxy = it.interfaceProxy.copy(addresses = value),
+				interfaceProxy = _uiState.value.interfaceProxy.copy(addresses = value),
 			)
 		}
 	}
@@ -448,7 +427,7 @@ constructor(
 	fun onListenPortChanged(value: String) {
 		_uiState.update {
 			it.copy(
-				interfaceProxy = it.interfaceProxy.copy(listenPort = value),
+				interfaceProxy = _uiState.value.interfaceProxy.copy(listenPort = value),
 			)
 		}
 	}
@@ -456,21 +435,21 @@ constructor(
 	fun onDnsServersChanged(value: String) {
 		_uiState.update {
 			it.copy(
-				interfaceProxy = it.interfaceProxy.copy(dnsServers = value),
+				interfaceProxy = _uiState.value.interfaceProxy.copy(dnsServers = value),
 			)
 		}
 	}
 
 	fun onMtuChanged(value: String) {
 		_uiState.update {
-			it.copy(interfaceProxy = it.interfaceProxy.copy(mtu = value))
+			it.copy(interfaceProxy = _uiState.value.interfaceProxy.copy(mtu = value))
 		}
 	}
 
 	private fun onInterfacePublicKeyChange(value: String) {
 		_uiState.update {
 			it.copy(
-				interfaceProxy = it.interfaceProxy.copy(publicKey = value),
+				interfaceProxy = _uiState.value.interfaceProxy.copy(publicKey = value),
 			)
 		}
 	}
@@ -478,7 +457,7 @@ constructor(
 	fun onPrivateKeyChange(value: String) {
 		_uiState.update {
 			it.copy(
-				interfaceProxy = it.interfaceProxy.copy(privateKey = value),
+				interfaceProxy = _uiState.value.interfaceProxy.copy(privateKey = value),
 			)
 		}
 		if (NumberUtils.isValidKey(value)) {
@@ -500,7 +479,7 @@ constructor(
 	fun onJunkPacketCountChanged(value: String) {
 		_uiState.update {
 			it.copy(
-				interfaceProxy = it.interfaceProxy.copy(junkPacketCount = value),
+				interfaceProxy = _uiState.value.interfaceProxy.copy(junkPacketCount = value),
 			)
 		}
 	}
@@ -508,7 +487,7 @@ constructor(
 	fun onJunkPacketMinSizeChanged(value: String) {
 		_uiState.update {
 			it.copy(
-				interfaceProxy = it.interfaceProxy.copy(junkPacketMinSize = value),
+				interfaceProxy = _uiState.value.interfaceProxy.copy(junkPacketMinSize = value),
 			)
 		}
 	}
@@ -516,7 +495,7 @@ constructor(
 	fun onJunkPacketMaxSizeChanged(value: String) {
 		_uiState.update {
 			it.copy(
-				interfaceProxy = it.interfaceProxy.copy(junkPacketMaxSize = value),
+				interfaceProxy = _uiState.value.interfaceProxy.copy(junkPacketMaxSize = value),
 			)
 		}
 	}
@@ -524,7 +503,7 @@ constructor(
 	fun onInitPacketJunkSizeChanged(value: String) {
 		_uiState.update {
 			it.copy(
-				interfaceProxy = it.interfaceProxy.copy(initPacketJunkSize = value),
+				interfaceProxy = _uiState.value.interfaceProxy.copy(initPacketJunkSize = value),
 			)
 		}
 	}
@@ -533,7 +512,7 @@ constructor(
 		_uiState.update {
 			it.copy(
 				interfaceProxy =
-				it.interfaceProxy.copy(
+				_uiState.value.interfaceProxy.copy(
 					responsePacketJunkSize = value,
 				),
 			)
@@ -544,7 +523,7 @@ constructor(
 		_uiState.update {
 			it.copy(
 				interfaceProxy =
-				it.interfaceProxy.copy(
+				_uiState.value.interfaceProxy.copy(
 					initPacketMagicHeader = value,
 				),
 			)
@@ -555,7 +534,7 @@ constructor(
 		_uiState.update {
 			it.copy(
 				interfaceProxy =
-				it.interfaceProxy.copy(
+				_uiState.value.interfaceProxy.copy(
 					responsePacketMagicHeader = value,
 				),
 			)
@@ -566,7 +545,7 @@ constructor(
 		_uiState.update {
 			it.copy(
 				interfaceProxy =
-				it.interfaceProxy.copy(
+				_uiState.value.interfaceProxy.copy(
 					transportPacketMagicHeader = value,
 				),
 			)
@@ -577,15 +556,10 @@ constructor(
 		_uiState.update {
 			it.copy(
 				interfaceProxy =
-				it.interfaceProxy.copy(
+				_uiState.value.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

@@ -1,199 +0,0 @@
-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,10 +25,7 @@ data class InterfaceProxy(
 				publicKey = i.keyPair.publicKey.toBase64().trim(),
 				privateKey = i.keyPair.privateKey.toBase64().trim(),
 				addresses = i.addresses.joinToString(", ").trim(),
-				dnsServers = listOf(
-					i.dnsServers.joinToString(", ").replace("/", "").trim(),
-					i.dnsSearchDomains.joinToString(", ").trim(),
-				).filter { it.length > 0 }.joinToString(", "),
+				dnsServers = i.dnsServers.joinToString(", ").replace("/", "").trim(),
 				listenPort =
 				if (i.listenPort.isPresent) {
 					i.listenPort.get().toString().trim()
@@ -44,7 +41,7 @@ data class InterfaceProxy(
 				publicKey = i.keyPair.publicKey.toBase64().trim(),
 				privateKey = i.keyPair.privateKey.toBase64().trim(),
 				addresses = i.addresses.joinToString(", ").trim(),
-				dnsServers = (i.dnsServers + i.dnsSearchDomains).joinToString(", ").replace("/", "").trim(),
+				dnsServers = i.dnsServers.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,92 +1,150 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.main
 
 import android.annotation.SuppressLint
-import android.net.VpnService
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity.RESULT_OK
 import androidx.compose.foundation.ExperimentalFoundationApi
+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.Row
 import androidx.compose.foundation.layout.fillMaxSize
+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.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
+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.FabPosition
 import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 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.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.buildAnnotatedString
+import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation.NavController
+import com.journeyapps.barcodescanner.ScanContract
+import com.journeyapps.barcodescanner.ScanOptions
+import com.wireguard.android.backend.GoBackend
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.ui.AppUiState
-import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.common.NestedScrollListener
+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.common.dialog.InfoDialog
 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.common.screen.LoadingScreen
 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.ScrollDismissMultiFab
 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.ui.theme.corn
+import com.zaneschepke.wireguardautotunnel.ui.theme.mint
 import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.extensions.getMessage
+import com.zaneschepke.wireguardautotunnel.util.extensions.handshakeStatus
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+import com.zaneschepke.wireguardautotunnel.util.extensions.mapPeerStats
 import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
 import com.zaneschepke.wireguardautotunnel.util.extensions.startTunnelBackground
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import timber.log.Timber
 
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
-fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState, focusRequester: FocusRequester) {
+fun MainScreen(
+	viewModel: MainViewModel = hiltViewModel(),
+	appViewModel: AppViewModel,
+	focusRequester: FocusRequester,
+	navController: NavController,
+) {
+	val haptic = LocalHapticFeedback.current
 	val context = LocalContext.current
-	val navController = LocalNavController.current
-	val snackbar = SnackbarController.current
+	val scope = rememberCoroutineScope()
 
 	var showBottomSheet by remember { mutableStateOf(false) }
+	var configType by remember { mutableStateOf(ConfigType.WIREGUARD) }
 	var showVpnPermissionDialog by remember { mutableStateOf(false) }
-	var isFabVisible by rememberSaveable { mutableStateOf(true) }
+	val isVisible = 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 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
+				}
+			}
+		}
 
 	val vpnActivityResultState =
 		rememberLauncherForActivityResult(
 			ActivityResultContracts.StartActivityForResult(),
 			onResult = {
-				if (it.resultCode != RESULT_OK) showVpnPermissionDialog = true
+				val accepted = (it.resultCode == RESULT_OK)
+				if (accepted) {
+					Timber.d("VPN permission granted")
+				} else {
+					showVpnPermissionDialog = true
+				}
 			},
 		)
 
 	LaunchedEffect(Unit) {
 		if (context.isRunningOnTv()) {
 			delay(Constants.FOCUS_REQUEST_DELAY)
-			runCatching {
+			kotlin.runCatching {
 				focusRequester.requestFocus()
 			}.onFailure {
 				delay(Constants.FOCUS_REQUEST_DELAY)
@@ -96,19 +154,30 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState,
 	}
 
 	val tunnelFileImportResultLauncher = rememberFileImportLauncherForResult(onNoFileExplorer = {
-		snackbar.showMessage(
+		appViewModel.showSnackbarMessage(
 			context.getString(R.string.error_no_file_explorer),
 		)
 	}, onData = { data ->
-		viewModel.onTunnelFileSelected(data, context)
+		scope.launch {
+			viewModel.onTunnelFileSelected(data, configType, context).onFailure {
+				appViewModel.showSnackbarMessage(it.getMessage(context))
+			}
+		}
 	})
 
-	val requestPermissionLauncher = rememberLauncherForActivityResult(
-		ActivityResultContracts.RequestPermission(),
-	) { isGranted ->
-		if (!isGranted) return@rememberLauncherForActivityResult snackbar.showMessage("Camera permission required")
-		navController.navigate(Route.Scanner)
-	}
+	val scanLauncher =
+		rememberLauncherForActivityResult(
+			contract = ScanContract(),
+			onResult = {
+				if (it.contents != null) {
+					scope.launch {
+						viewModel.onTunnelQrResult(it.contents, configType).onFailure { error ->
+							appViewModel.showSnackbarMessage(error.getMessage(context))
+						}
+					}
+				}
+			},
+		)
 
 	VpnDeniedDialog(showVpnPermissionDialog, onDismiss = { showVpnPermissionDialog = false })
 
@@ -127,48 +196,61 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState,
 	}
 
 	fun onTunnelToggle(checked: Boolean, tunnel: TunnelConfig) {
-		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)
+		if (checked) {
+			if (uiState.settings.isKernelEnabled) {
+				context.startTunnelBackground(tunnel.id)
+			} else {
+				viewModel.onTunnelStart(tunnel)
+			}
 		} else {
-			viewModel.onTunnelStart(tunnel)
+			viewModel.onTunnelStop(
+				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.isEmpty()) return@pointerInput
-			detectTapGestures(
-				onTap = {
-					selectedTunnel = null
-				},
-			)
+			if (uiState.tunnels.isNotEmpty()) {
+				detectTapGestures(
+					onTap = {
+						selectedTunnel = null
+					},
+				)
+			}
 		},
 		floatingActionButtonPosition = FabPosition.End,
 		floatingActionButton = {
-			ScrollDismissFab({
-				val icon = Icons.Filled.Add
-				Icon(
-					imageVector = icon,
-					contentDescription = icon.name,
-					tint = MaterialTheme.colorScheme.onPrimary,
-				)
-			}, focusRequester, isVisible = isFabVisible, onClick = {
+			ScrollDismissMultiFab(R.drawable.add, focusRequester, isVisible = isVisible.value, onFabItemClicked = {
 				showBottomSheet = true
+				configType = ConfigType.valueOf(it.value)
 			})
 		},
 	) {
 		TunnelImportSheet(
 			showBottomSheet,
 			onDismiss = { showBottomSheet = false },
-			onFileClick = { tunnelFileImportResultLauncher.launch(Constants.ALLOWED_TV_FILE_TYPES) },
-			onQrClick = { requestPermissionLauncher.launch(android.Manifest.permission.CAMERA) },
+			onFileClick = { tunnelFileImportResultLauncher.launch(Constants.ALLOWED_FILE_TYPES) },
+			onQrClick = { launchQrScanner() },
 			onManualImportClick = {
 				navController.navigate(
-					Route.Config(Constants.MANUAL_TUNNEL_CONFIG_ID),
+					"${Screen.Config.route}/${Constants.MANUAL_TUNNEL_CONFIG_ID}?configType=$configType",
 				)
 			},
 		)
@@ -190,32 +272,285 @@ fun MainScreen(viewModel: MainViewModel = hiltViewModel(), uiState: AppUiState,
 					GettingStartedLabel(onClick = { context.openWebUrl(it) })
 				}
 			}
-			if (uiState.settings.isAutoTunnelEnabled) {
-				item {
-					AutoTunnelRowItem(uiState.settings, { viewModel.onToggleAutoTunnelingPause() }, focusRequester)
+			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 (context.isRunningOnTv()) {
+								itemFocusRequester.requestFocus()
+							}
+						},
+						onHold = {},
+						expanded = false,
+						statistics = null,
+						focusRequester = focusRequester,
+					)
 				}
 			}
 			items(
 				uiState.tunnels,
 				key = { tunnel -> tunnel.id },
 			) { tunnel ->
-				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) },
+				val isActive = uiState.tunnels.any { it.id == tunnel.id && it.isActive }
+				val leadingIconColor =
+					(
+						if (
+							isActive
+						) {
+							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 (!context.isRunningOnTv()) {
+							if (
+								isActive
+							) {
+								expanded.value = !expanded.value
+							}
+						} else {
+							selectedTunnel = tunnel
+							itemFocusRequester.requestFocus()
+						}
+					},
+					statistics = uiState.vpnState.statistics,
+					expanded = expanded.value,
 					focusRequester = focusRequester,
+					rowButton = {
+						if (
+							tunnel.id == selectedTunnel?.id &&
+							!context.isRunningOnTv()
+						) {
+							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 {
+							if (!isActive) expanded.value = false
+							@Composable
+							fun TunnelSwitch() = Switch(
+								modifier = Modifier.focusRequester(itemFocusRequester),
+								checked = isActive,
+								onCheckedChange = { checked ->
+									if (!checked) expanded.value = false
+									val intent = if (uiState.settings.isKernelEnabled) null else GoBackend.VpnService.prepare(context)
+									if (intent != null) return@Switch vpnActivityResultState.launch(intent)
+									onTunnelToggle(checked, tunnel)
+								},
+							)
+							if (context.isRunningOnTv()) {
+								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

@@ -0,0 +1,12 @@
+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.extensions.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,24 +6,22 @@ import android.net.Uri
 import android.provider.OpenableColumns
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.zaneschepke.wireguardautotunnel.R
+import com.wireguard.config.Config
 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.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.StringValue
-import com.zaneschepke.wireguardautotunnel.util.extensions.extractNameAndNumber
-import com.zaneschepke.wireguardautotunnel.util.extensions.hasNumberInParentheses
+import com.zaneschepke.wireguardautotunnel.util.WgTunnelExceptions
 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
@@ -36,12 +34,26 @@ class MainViewModel
 @Inject
 constructor(
 	private val appDataRepository: AppDataRepository,
+	private val serviceManager: ServiceManager,
 	val tunnelService: TunnelService,
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : ViewModel() {
+	val uiState =
+		combine(
+			appDataRepository.settings.getSettingsFlow(),
+			appDataRepository.tunnels.getTunnelConfigsFlow(),
+			tunnelService.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) {
@@ -65,10 +77,6 @@ constructor(
 		)
 	}
 
-	fun onExpandedChanged(expanded: Boolean) = viewModelScope.launch {
-		appDataRepository.appState.setTunnelStatsExpanded(expanded)
-	}
-
 	fun onTunnelStart(tunnelConfig: TunnelConfig) = viewModelScope.launch {
 		Timber.i("Starting tunnel ${tunnelConfig.name}")
 		tunnelService.startTunnel(tunnelConfig)
@@ -79,17 +87,32 @@ constructor(
 		tunnelService.stopTunnel(tunnel)
 	}
 
-	private fun generateQrCodeDefaultName(config: String): String {
+	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 {
 		return try {
-			TunnelConfig.configFromAmQuick(config).peers[0].endpoint.get().host
+			when (configType) {
+				ConfigType.AMNEZIA -> {
+					TunnelConfig.configFromAmQuick(config).peers[0].endpoint.get().host
+				}
+
+				ConfigType.WIREGUARD -> {
+					TunnelConfig.configFromWgQuick(config).peers[0].endpoint.get().host
+				}
+			}
 		} catch (e: Exception) {
 			Timber.e(e)
 			NumberUtils.generateRandomTunnelName()
 		}
 	}
 
-	private fun generateQrCodeTunnelName(config: String): String {
-		var defaultName = generateQrCodeDefaultName(config)
+	private fun generateQrCodeTunnelName(config: String, configType: ConfigType): String {
+		var defaultName = generateQrCodeDefaultName(config, configType)
 		val lines = config.lines().toMutableList()
 		val linesIterator = lines.iterator()
 		while (linesIterator.hasNext()) {
@@ -102,94 +125,188 @@ 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 = if (!tunnelName.hasNumberInParentheses()) {
-					"$name($num)"
-				} else {
-					val pair = tunnelName.extractNameAndNumber()
-					"${pair?.first}($num)"
-				}
+				tunnelName = "$name($num)"
 				num++
 			}
 			tunnelName
 		}
 	}
 
-	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 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(true)
+						config.toWgQuickString()
+					}
+
+					ConfigType.WIREGUARD -> {
+						Config.parse(it).toWgQuickString(true)
+					}
+				}
+			}
+		viewModelScope.launch {
+			val tunnelName = makeTunnelNameUnique(getNameFromFileName(fileName))
+			addTunnel(
+				TunnelConfig(
+					name = tunnelName,
+					wgQuick = wgQuick,
+					amQuick = amQuick ?: TunnelConfig.AM_QUICK_DEFAULT,
+				),
+			)
+		}
 	}
 
 	private fun getInputStreamFromUri(uri: Uri, context: Context): InputStream? {
 		return context.applicationContext.contentResolver.openInputStream(uri)
 	}
 
-	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
+	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())
 			}
-		}.onFailure {
-			Timber.e(it)
-			if (it is InvalidFileExtensionException) {
-				SnackbarController.showMessage(StringValue.StringResource(R.string.error_file_extension))
+		}
+	}
+
+	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(true)
+											config.toWgQuickString()
+										}
+
+										ConfigType.WIREGUARD -> {
+											Config.parse(zip).toWgQuickString(true)
+										}
+									}
+								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)
 			} else {
-				SnackbarController.showMessage(StringValue.StringResource(R.string.error_file_format))
+				Result.failure(WgTunnelExceptions.FileReadFailed())
 			}
 		}
 	}
 
-	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),
-						),
-					)
-				}
-		}
+	private fun addTunnel(tunnelConfig: TunnelConfig) = viewModelScope.launch {
+		saveTunnel(tunnelConfig)
 	}
 
-	private suspend fun saveTunnelFromConfUri(name: String, uri: Uri, context: Context) {
-		val stream = getInputStreamFromUri(uri, context) ?: throw FileReadException
-		saveTunnelConfigFromStream(stream, name)
-	}
-
-	fun onToggleAutoTunnelingPause() = viewModelScope.launch {
-		val settings = appDataRepository.settings.getSettings()
+	fun pauseAutoTunneling() = viewModelScope.launch {
 		appDataRepository.settings.save(
-			settings.copy(isAutoTunnelPaused = !settings.isAutoTunnelPaused),
+			uiState.value.settings.copy(isAutoTunnelPaused = true),
+		)
+	}
+
+	fun resumeAutoTunneling() = viewModelScope.launch {
+		appDataRepository.settings.save(
+			uiState.value.settings.copy(isAutoTunnelPaused = false),
 		)
 	}
 
@@ -198,23 +315,32 @@ constructor(
 	}
 
 	private fun getFileNameByCursor(context: Context, uri: Uri): String? {
-		return context.contentResolver.query(uri, null, null, null, null)?.use {
-			getDisplayNameByCursor(it)
+		context.contentResolver.query(uri, null, null, null, null)?.use {
+			return getDisplayNameByCursor(it)
 		}
+		return null
 	}
 
 	private fun getDisplayNameColumnIndex(cursor: Cursor): Int? {
 		val columnIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
-		if (columnIndex == -1) return null
-		return columnIndex
+		return if (columnIndex != -1) {
+			return columnIndex
+		} else {
+			null
+		}
 	}
 
 	private fun getDisplayNameByCursor(cursor: Cursor): String? {
-		val move = cursor.moveToFirst()
-		if (!move) return null
-		val index = getDisplayNameColumnIndex(cursor)
-		if (index == null) return index
-		return cursor.getString(index)
+		return if (cursor.moveToFirst()) {
+			val index = getDisplayNameColumnIndex(cursor)
+			if (index != null) {
+				cursor.getString(index)
+			} else {
+				null
+			}
+		} else {
+			null
+		}
 	}
 
 	private fun isValidUriContentScheme(uri: Uri): Boolean {
@@ -240,15 +366,14 @@ constructor(
 
 	private fun saveSettings(settings: Settings) = viewModelScope.launch { appDataRepository.settings.save(settings) }
 
-	fun onCopyTunnel(tunnel: TunnelConfig) = viewModelScope.launch {
-		saveTunnel(
-			tunnel.copy(
-				id = 0,
-				isPrimaryTunnel = false,
-				isMobileDataTunnel = false,
-				isActive = false,
-				name = makeTunnelNameUnique(tunnel.name),
-			),
-		)
+	fun onCopyTunnel(tunnel: TunnelConfig?) = viewModelScope.launch {
+		tunnel?.let {
+			saveTunnel(
+				TunnelConfig(
+					name = it.name.plus(NumberUtils.randomThree()),
+					wgQuick = it.wgQuick,
+				),
+			)
+		}
 	}
 }

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

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

@@ -1,20 +1,41 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.main.components
 
+import androidx.annotation.DrawableRes
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.focusGroup
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 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.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+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.ui.screens.main.ConfigType
 
 @Composable
-fun ScrollDismissFab(icon: @Composable () -> Unit, focusRequester: FocusRequester, isVisible: Boolean, onClick: () -> Unit) {
+fun ScrollDismissMultiFab(
+	@DrawableRes res: Int,
+	focusRequester: FocusRequester,
+	isVisible: Boolean,
+	onFabItemClicked: (fabItem: MultiFabItem) -> Unit,
+) {
+	// Nested scroll for control FAB
+
+	val context = LocalContext.current
+
 	AnimatedVisibility(
 		visible = isVisible,
 		enter = slideInVertically(initialOffsetY = { it * 2 }),
@@ -24,14 +45,64 @@ fun ScrollDismissFab(icon: @Composable () -> Unit, focusRequester: FocusRequeste
 			.focusRequester(focusRequester)
 			.focusGroup(),
 	) {
-		FloatingActionButton(
-			onClick = {
-				onClick()
+		val fobColor = MaterialTheme.colorScheme.secondary
+		val fobIconColor = MaterialTheme.colorScheme.background
+		MultiFloatingActionButton(
+			fabIcon =
+			FabIcon(
+				iconRes = res,
+				iconResAfterRotate = R.drawable.close,
+				iconRotate = 180f,
+			),
+			fabOption =
+			FabOption(
+				iconTint = fobIconColor,
+				backgroundTint = fobColor,
+			),
+			itemsMultiFab =
+			listOf(
+				MultiFabItem(
+					label = {
+						Text(
+							stringResource(id = R.string.amnezia),
+							color = MaterialTheme.colorScheme.onBackground,
+							textAlign = TextAlign.Center,
+							modifier = Modifier.padding(end = 10.dp),
+						)
+					},
+					modifier =
+					Modifier
+						.size(40.dp),
+					icon = res,
+					value = ConfigType.AMNEZIA.name,
+					miniFabOption =
+					FabOption(
+						backgroundTint = fobColor,
+						fobIconColor,
+					),
+				),
+				MultiFabItem(
+					label = {
+						Text(
+							stringResource(id = R.string.wireguard),
+							color = MaterialTheme.colorScheme.onBackground,
+							textAlign = TextAlign.Center,
+							modifier = Modifier.padding(end = 10.dp),
+						)
+					},
+					icon = res,
+					value = ConfigType.WIREGUARD.name,
+					miniFabOption =
+					FabOption(
+						backgroundTint = fobColor,
+						fobIconColor,
+					),
+				),
+			),
+			onFabItemClicked = {
+				onFabItemClicked(it)
 			},
 			shape = RoundedCornerShape(16.dp),
-			containerColor = MaterialTheme.colorScheme.primary,
-		) {
-			icon()
-		}
+		)
 	}
 }

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

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

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

@@ -19,9 +19,7 @@ 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
@@ -34,6 +32,7 @@ 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
@@ -45,35 +44,40 @@ 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.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.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.AppUiState
-import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
+import com.zaneschepke.wireguardautotunnel.ui.Screen
 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.components.ScrollDismissFab
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.WildcardSupportingLabel
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.ConfigType
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.ScrollDismissMultiFab
 import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.extensions.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(), focusRequester: FocusRequester, appUiState: AppUiState, tunnelId: Int) {
+fun OptionsScreen(
+	optionsViewModel: OptionsViewModel = hiltViewModel(),
+	navController: NavController,
+	appViewModel: AppViewModel,
+	focusRequester: FocusRequester,
+	tunnelId: String,
+) {
 	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
@@ -81,6 +85,7 @@ fun OptionsScreen(optionsViewModel: OptionsViewModel = hiltViewModel(), focusReq
 	var currentText by remember { mutableStateOf("") }
 
 	LaunchedEffect(Unit) {
+		optionsViewModel.init(tunnelId)
 		if (context.isRunningOnTv()) {
 			delay(Constants.FOCUS_REQUEST_DELAY)
 			kotlin.runCatching {
@@ -94,23 +99,22 @@ fun OptionsScreen(optionsViewModel: OptionsViewModel = hiltViewModel(), focusReq
 
 	fun saveTrustedSSID() {
 		if (currentText.isNotEmpty()) {
-			optionsViewModel.onSaveRunSSID(currentText, config)
-			currentText = ""
+			scope.launch {
+				optionsViewModel.onSaveRunSSID(currentText).onSuccess {
+					currentText = ""
+				}.onFailure {
+					appViewModel.showSnackbarMessage(it.getMessage(context))
+				}
+			}
 		}
 	}
 
 	Scaffold(
 		floatingActionButton = {
-			ScrollDismissFab(icon = {
-				val icon = Icons.Filled.Edit
-				Icon(
-					imageVector = icon,
-					contentDescription = icon.name,
-					tint = MaterialTheme.colorScheme.onPrimary,
-				)
-			}, focusRequester, isVisible = true, onClick = {
+			ScrollDismissMultiFab(R.drawable.edit, focusRequester, isVisible = true, onFabItemClicked = {
+				val configType = ConfigType.valueOf(it.value)
 				navController.navigate(
-					Route.Config(config.id),
+					"${Screen.Config.route}/$tunnelId?configType=${configType.name}",
 				)
 			})
 		},
@@ -161,12 +165,12 @@ fun OptionsScreen(optionsViewModel: OptionsViewModel = hiltViewModel(), focusReq
 					ConfigurationToggle(
 						stringResource(R.string.set_primary_tunnel),
 						enabled = true,
-						checked = config.isPrimaryTunnel,
+						checked = uiState.isDefaultTunnel,
 						modifier =
 						Modifier
 							.focusRequester(focusRequester),
 						padding = screenPadding,
-						onCheckChanged = { optionsViewModel.onTogglePrimaryTunnel(config) },
+						onCheckChanged = { optionsViewModel.onTogglePrimaryTunnel() },
 					)
 				}
 			}
@@ -202,9 +206,9 @@ fun OptionsScreen(optionsViewModel: OptionsViewModel = hiltViewModel(), focusReq
 					ConfigurationToggle(
 						stringResource(R.string.mobile_data_tunnel),
 						enabled = true,
-						checked = config.isMobileDataTunnel,
+						checked = uiState.tunnel?.isMobileDataTunnel == true,
 						padding = screenPadding,
-						onCheckChanged = { optionsViewModel.onToggleIsMobileDataTunnel(config) },
+						onCheckChanged = { optionsViewModel.onToggleIsMobileDataTunnel() },
 					)
 					Column {
 						FlowRow(
@@ -214,24 +218,24 @@ fun OptionsScreen(optionsViewModel: OptionsViewModel = hiltViewModel(), focusReq
 								.fillMaxWidth(),
 							horizontalArrangement = Arrangement.spacedBy(5.dp),
 						) {
-							config.tunnelNetworks.forEach { ssid ->
+							uiState.tunnel?.tunnelNetworks?.forEach { ssid ->
 								ClickableIconButton(
 									onClick = {
 										if (context.isRunningOnTv()) {
 											focusRequester.requestFocus()
-											optionsViewModel.onDeleteRunSSID(ssid, config)
+											optionsViewModel.onDeleteRunSSID(ssid)
 										}
 									},
 									onIconClick = {
 										if (context.isRunningOnTv()) focusRequester.requestFocus()
-										optionsViewModel.onDeleteRunSSID(ssid, config)
+										optionsViewModel.onDeleteRunSSID(ssid)
 									},
 									text = ssid,
 									icon = Icons.Filled.Close,
 									enabled = true,
 								)
 							}
-							if (config.tunnelNetworks.isEmpty()) {
+							if (uiState.tunnel == null || uiState.tunnel?.tunnelNetworks?.isEmpty() == true) {
 								Text(
 									stringResource(R.string.no_wifi_names_configured),
 									fontStyle = FontStyle.Italic,
@@ -244,7 +248,6 @@ fun OptionsScreen(optionsViewModel: OptionsViewModel = hiltViewModel(), focusReq
 							value = currentText,
 							onValueChange = { currentText = it },
 							label = { Text(stringResource(id = R.string.use_tunnel_on_wifi_name)) },
-							supportingText = { WildcardSupportingLabel { context.openWebUrl(it) } },
 							modifier =
 							Modifier
 								.padding(
@@ -264,68 +267,26 @@ fun OptionsScreen(optionsViewModel: OptionsViewModel = hiltViewModel(), focusReq
 									IconButton(onClick = { saveTrustedSSID() }) {
 										Icon(
 											imageVector = Icons.Outlined.Add,
-											contentDescription = stringResource(R.string.save_changes),
+											contentDescription =
+											if (currentText == "") {
+												stringResource(
+													id =
+													R.string
+														.trusted_ssid_empty_description,
+												)
+											} else {
+												stringResource(
+													id =
+													R.string
+														.trusted_ssid_value_description,
+												)
+											},
 											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

@@ -0,0 +1,9 @@
+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,14 +1,20 @@
 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.R
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
-import com.zaneschepke.wireguardautotunnel.util.StringValue
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.WgTunnelExceptions
 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
@@ -17,63 +23,86 @@ class OptionsViewModel
 constructor(
 	private val appDataRepository: AppDataRepository,
 ) : ViewModel() {
+	private val _optionState = MutableStateFlow(OptionsUiState())
 
-	fun onDeleteRunSSID(ssid: String, tunnelConfig: TunnelConfig) = viewModelScope.launch {
-		appDataRepository.tunnels.save(
-			tunnelConfig =
-			tunnelConfig.copy(
-				tunnelNetworks = (tunnelConfig.tunnelNetworks - ssid).toMutableList(),
-			),
+	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 init(tunnelId: String) {
+		_optionState.update {
+			it.copy(
+				id = tunnelId,
+			)
+		}
 	}
 
-	fun saveTunnelChanges(tunnelConfig: TunnelConfig) = viewModelScope.launch {
-		appDataRepository.tunnels.save(tunnelConfig)
+	fun onDeleteRunSSID(ssid: String) = viewModelScope.launch {
+		uiState.value.tunnel?.let {
+			appDataRepository.tunnels.save(
+				tunnelConfig =
+				it.copy(
+					tunnelNetworks = (uiState.value.tunnel!!.tunnelNetworks - ssid).toMutableList(),
+				),
+			)
+		}
 	}
 
-	fun onSaveRunSSID(ssid: String, tunnelConfig: TunnelConfig) = viewModelScope.launch {
+	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 = appDataRepository.tunnels.findByTunnelNetworksName(trimmed)
-
-		if (!tunnelConfig.tunnelNetworks.contains(trimmed) &&
+		val tunnelsWithName =
+			withContext(viewModelScope.coroutineContext) {
+				appDataRepository.tunnels.findByTunnelNetworksName(trimmed)
+			}
+		return if (uiState.value.tunnel?.tunnelNetworks?.contains(trimmed) != true &&
 			tunnelsWithName.isEmpty()
 		) {
-			saveTunnelChanges(
-				tunnelConfig.copy(
-					tunnelNetworks = (tunnelConfig.tunnelNetworks + ssid).toMutableList(),
-				),
-			)
+			uiState.value.tunnel?.tunnelNetworks?.add(trimmed)
+			saveTunnel(uiState.value.tunnel)
+			Result.success(Unit)
 		} else {
-			SnackbarController.showMessage(
-				StringValue.StringResource(
-					R.string.error_ssid_exists,
-				),
-			)
+			Result.failure(WgTunnelExceptions.SsidConflict())
 		}
 	}
 
-	fun onToggleIsMobileDataTunnel(tunnelConfig: TunnelConfig) = viewModelScope.launch {
-		if (tunnelConfig.isMobileDataTunnel) {
-			appDataRepository.tunnels.updateMobileDataTunnel(null)
-		} else {
-			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 onToggleRestartOnPing(tunnelConfig: TunnelConfig) = viewModelScope.launch {
-		appDataRepository.tunnels.save(
-			tunnelConfig.copy(
-				isPingEnabled = !tunnelConfig.isPingEnabled,
-			),
-		)
+	fun onTogglePrimaryTunnel() = viewModelScope.launch {
+		if (uiState.value.tunnel != null) {
+			appDataRepository.tunnels.updatePrimaryTunnel(
+				when (uiState.value.isDefaultTunnel) {
+					true -> null
+					false -> uiState.value.tunnel
+				},
+			)
+		}
 	}
 }

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

@@ -5,24 +5,20 @@ 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.ui.AppViewModel
-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.ui.Screen
 import com.zaneschepke.wireguardautotunnel.util.StringValue
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import xyz.teamgravity.pin_lock_compose.PinLock
 
 @Composable
-fun PinLockScreen(appViewModel: AppViewModel) {
+fun PinLockScreen(navController: NavController, 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)
@@ -33,28 +29,27 @@ fun PinLockScreen(appViewModel: AppViewModel) {
 				},
 			)
 		},
-		backgroundColor = MaterialTheme.colorScheme.surface,
-		textColor = MaterialTheme.colorScheme.onSurface,
+		color = MaterialTheme.colorScheme.surface,
 		onPinCorrect = {
 			// pin is correct, navigate or hide pin lock
 			if (context.isRunningOnTv()) {
-				navController.navigate(Route.Main)
+				navController.navigate(Screen.Main.route)
 			} else {
 				val isPopped = navController.popBackStack()
 				if (!isPopped) {
-					navController.navigate(Route.Main)
+					navController.navigate(Screen.Main.route)
 				}
 			}
 		},
 		onPinIncorrect = {
 			// pin is incorrect, show error
-			snackbar.showMessage(
+			appViewModel.showSnackbarMessage(
 				StringValue.StringResource(R.string.incorrect_pin).asString(context),
 			)
 		},
 		onPinCreated = {
 			// pin created for the first time, navigate or hide pin lock
-			snackbar.showMessage(
+			appViewModel.showSnackbarMessage(
 				StringValue.StringResource(R.string.pin_created).asString(context),
 			)
 			appViewModel.onPinLockEnabled()

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

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

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

@@ -1,10 +1,10 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.settings
 
 import android.Manifest
+import android.app.Activity
 import android.content.Context.POWER_SERVICE
 import android.content.Intent
 import android.net.Uri
-import android.net.VpnService
 import android.os.Build
 import android.os.PowerManager
 import android.provider.Settings
@@ -45,6 +45,7 @@ import androidx.compose.runtime.SideEffect
 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
@@ -59,30 +60,28 @@ import androidx.compose.ui.text.input.KeyboardCapitalization
 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.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
-import com.zaneschepke.wireguardautotunnel.ui.AppUiState
 import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
-import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.ui.Screen
 import com.zaneschepke.wireguardautotunnel.ui.common.ClickableIconButton
 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.snackbar.SnackbarController
 import com.zaneschepke.wireguardautotunnel.ui.common.text.SectionTitle
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.components.VpnDeniedDialog
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.BackgroundLocationDialog
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.BackgroundLocationDisclosure
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.LocationServicesDialog
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.components.WildcardSupportingLabel
+import com.zaneschepke.wireguardautotunnel.util.extensions.getMessage
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import com.zaneschepke.wireguardautotunnel.util.extensions.launchAppSettings
-import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
 import com.zaneschepke.wireguardautotunnel.util.extensions.showToast
+import kotlinx.coroutines.launch
 import xyz.teamgravity.pin_lock_compose.PinManager
 
 @OptIn(
@@ -90,39 +89,49 @@ import xyz.teamgravity.pin_lock_compose.PinManager
 	ExperimentalLayoutApi::class,
 )
 @Composable
-fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel(), appViewModel: AppViewModel, uiState: AppUiState, focusRequester: FocusRequester) {
+fun SettingsScreen(
+	viewModel: SettingsViewModel = hiltViewModel(),
+	appViewModel: AppViewModel,
+	navController: NavController,
+	focusRequester: FocusRequester,
+) {
 	val context = LocalContext.current
-	val navController = LocalNavController.current
 	val focusManager = LocalFocusManager.current
-	val snackbar = SnackbarController.current
-
+	val scope = rememberCoroutineScope()
 	val scrollState = rememberScrollState()
 	val interactionSource = remember { MutableInteractionSource() }
-	val isRunningOnTv = context.isRunningOnTv()
 
-	val settingsUiState by viewModel.uiState.collectAsStateWithLifecycle()
+	val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+	val kernelSupport by viewModel.kernelSupport.collectAsStateWithLifecycle()
 
 	val fineLocationState = rememberPermissionState(Manifest.permission.ACCESS_FINE_LOCATION)
 	var currentText by remember { mutableStateOf("") }
 	var isBackgroundLocationGranted by remember { mutableStateOf(true) }
 	var showVpnPermissionDialog by remember { mutableStateOf(false) }
 	var showLocationServicesAlertDialog by remember { mutableStateOf(false) }
-	val didExportFiles by remember { mutableStateOf(false) }
+	var didExportFiles by remember { mutableStateOf(false) }
 	var showAuthPrompt by remember { mutableStateOf(false) }
 	var showLocationDialog by remember { mutableStateOf(false) }
 
 	val screenPadding = 5.dp
 	val fillMaxWidth = .85f
 
-	LaunchedEffect(uiState.settings.trustedNetworkSSIDs) {
-		currentText = ""
+	LaunchedEffect(Unit) {
+		viewModel.checkKernelSupport()
 	}
 
+	val notificationPermissionState =
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+			rememberPermissionState(Manifest.permission.POST_NOTIFICATIONS)
+		} else {
+			null
+		}
+
 	val startForResult =
 		rememberLauncherForActivityResult(
 			ActivityResultContracts.StartActivityForResult(),
 		) { result: ActivityResult ->
-			if (result.resultCode == RESULT_OK) {
+			if (result.resultCode == Activity.RESULT_OK) {
 				result.data
 				// Handle the Intent
 			}
@@ -150,20 +159,22 @@ fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel(), appViewModel:
 	fun requestBatteryOptimizationsDisabled() {
 		val intent =
 			Intent().apply {
-				action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
-				data = Uri.parse("package:${context.packageName}")
+				this.action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
+				data = Uri.fromParts("package", context.packageName, null)
 			}
 		startForResult.launch(intent)
 	}
 
 	fun handleAutoTunnelToggle() {
-		if (!uiState.generalState.isBatteryOptimizationDisableShown &&
-			!isBatteryOptimizationsDisabled() && !context.isRunningOnTv()
-		) {
-			return requestBatteryOptimizationsDisabled()
+		if (!uiState.isBatteryOptimizeDisableShown || !isBatteryOptimizationsDisabled()) return requestBatteryOptimizationsDisabled()
+		if (notificationPermissionState != null && !notificationPermissionState.status.isGranted) {
+			appViewModel.showSnackbarMessage(
+				context.getString(R.string.notification_permission_required),
+			)
+			return notificationPermissionState.launchPermissionRequest()
 		}
 		val intent = if (!uiState.settings.isKernelEnabled) {
-			VpnService.prepare(context)
+			com.wireguard.android.backend.GoBackend.VpnService.prepare(context)
 		} else {
 			null
 		}
@@ -173,7 +184,11 @@ fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel(), appViewModel:
 
 	fun saveTrustedSSID() {
 		if (currentText.isNotEmpty()) {
-			viewModel.onSaveTrustedSSID(currentText)
+			viewModel.onSaveTrustedSSID(currentText).onSuccess {
+				currentText = ""
+			}.onFailure {
+				appViewModel.showSnackbarMessage(it.getMessage(context))
+			}
 		}
 	}
 
@@ -187,9 +202,13 @@ fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel(), appViewModel:
 			}
 	}
 
+	fun onRootDenied() = appViewModel.showSnackbarMessage(context.getString(R.string.error_root_denied))
+
+	fun onRootAccepted() = appViewModel.showSnackbarMessage(context.getString(R.string.root_accepted))
+
 	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
 		if (
-			isRunningOnTv &&
+			context.isRunningOnTv() &&
 			Build.VERSION.SDK_INT == Build.VERSION_CODES.Q
 		) {
 			checkFineLocationGranted()
@@ -209,7 +228,7 @@ fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel(), appViewModel:
 	if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) {
 		checkFineLocationGranted()
 	}
-	if (!uiState.generalState.isLocationDisclosureShown) {
+	if (!uiState.isLocationDisclosureShown) {
 		BackgroundLocationDisclosure(
 			onDismiss = { viewModel.setLocationDisclosureShown() },
 			onAttest = {
@@ -240,364 +259,410 @@ fun SettingsScreen(viewModel: SettingsViewModel = hiltViewModel(), appViewModel:
 		AuthorizationPrompt(
 			onSuccess = {
 				showAuthPrompt = false
-				viewModel.exportAllConfigs()
+				scope.launch {
+					viewModel.exportAllConfigs().onSuccess {
+						appViewModel.showSnackbarMessage(context.getString(R.string.exported_configs_message))
+					}.onFailure {
+						appViewModel.showSnackbarMessage(context.getString(R.string.export_configs_failed))
+					}
+				}
 			},
 			onError = { _ ->
 				showAuthPrompt = false
-				snackbar.showMessage(
+				appViewModel.showSnackbarMessage(
 					context.getString(R.string.error_authentication_failed),
 				)
 			},
 			onFailure = {
 				showAuthPrompt = false
-				snackbar.showMessage(
+				appViewModel.showSnackbarMessage(
 					context.getString(R.string.error_authorization_failed),
 				)
 			},
 		)
 	}
 
-	fun onAutoTunnelWifiChecked() {
-		when (false) {
-			isBackgroundLocationGranted -> showLocationDialog = true
-			fineLocationState.status.isGranted -> showLocationDialog = true
-			viewModel.isLocationEnabled(context) ->
-				showLocationServicesAlertDialog = true
-			else -> {
-				viewModel.onToggleTunnelOnWifi()
-			}
-		}
-	}
-
-	Column(
-		horizontalAlignment = Alignment.CenterHorizontally,
-		verticalArrangement = Arrangement.Top,
-		modifier =
-		Modifier
-			.fillMaxSize()
-			.verticalScroll(scrollState)
-			.clickable(
-				indication = null,
-				interactionSource = interactionSource,
-			) {
-				focusManager.clearFocus()
-			},
-	) {
-		Surface(
-			tonalElevation = 2.dp,
-			shadowElevation = 2.dp,
-			shape = RoundedCornerShape(12.dp),
-			color = MaterialTheme.colorScheme.surface,
+	if (uiState.isLocationDisclosureShown) {
+		Column(
+			horizontalAlignment = Alignment.CenterHorizontally,
+			verticalArrangement = Arrangement.Top,
 			modifier =
-			(
-				if (isRunningOnTv) {
-					Modifier
-						.height(IntrinsicSize.Min)
-						.fillMaxWidth(fillMaxWidth)
-						.padding(top = 10.dp)
-				} else {
-					Modifier
-						.fillMaxWidth(fillMaxWidth)
-						.padding(top = 20.dp)
-				}
-				)
-				.padding(bottom = 10.dp),
+			Modifier
+				.fillMaxSize()
+				.verticalScroll(scrollState)
+				.clickable(
+					indication = null,
+					interactionSource = interactionSource,
+				) {
+					focusManager.clearFocus()
+				},
 		) {
-			Column(
-				horizontalAlignment = Alignment.Start,
-				verticalArrangement = Arrangement.Top,
-				modifier = Modifier.padding(15.dp),
-			) {
-				SectionTitle(
-					title = stringResource(id = R.string.auto_tunneling),
-					padding = screenPadding,
-				)
-				ConfigurationToggle(
-					stringResource(id = R.string.tunnel_on_wifi),
-					enabled = !uiState.settings.isAlwaysOnVpnEnabled,
-					checked = uiState.settings.isTunnelOnWifiEnabled,
-					padding = screenPadding,
-					onCheckChanged = { checked ->
-						if (!checked || settingsUiState.isRooted) viewModel.onToggleTunnelOnWifi().also { return@ConfigurationToggle }
-						onAutoTunnelWifiChecked()
-					},
-					modifier =
-					if (uiState.settings.isAutoTunnelEnabled) {
+			Surface(
+				tonalElevation = 2.dp,
+				shadowElevation = 2.dp,
+				shape = RoundedCornerShape(12.dp),
+				color = MaterialTheme.colorScheme.surface,
+				modifier =
+				(
+					if (context.isRunningOnTv()) {
 						Modifier
+							.height(IntrinsicSize.Min)
+							.fillMaxWidth(fillMaxWidth)
+							.padding(top = 10.dp)
 					} else {
 						Modifier
-							.focusRequester(focusRequester)
-					},
-				)
-				if (uiState.settings.isTunnelOnWifiEnabled) {
-					Column {
-						FlowRow(
-							modifier =
-							Modifier
-								.padding(screenPadding)
-								.fillMaxWidth(),
-							horizontalArrangement = Arrangement.spacedBy(5.dp),
-						) {
-							uiState.settings.trustedNetworkSSIDs.forEach { ssid ->
-								ClickableIconButton(
-									onClick = {
-										if (isRunningOnTv) {
-											focusRequester.requestFocus()
-											viewModel.onDeleteTrustedSSID(ssid)
-										}
-									},
-									onIconClick = {
-										if (isRunningOnTv) focusRequester.requestFocus()
-										viewModel.onDeleteTrustedSSID(ssid)
-									},
-									text = ssid,
-									icon = Icons.Filled.Close,
-								)
-							}
-							if (uiState.settings.trustedNetworkSSIDs.isEmpty()) {
-								Text(
-									stringResource(R.string.none),
-									fontStyle = FontStyle.Italic,
-									style = MaterialTheme.typography.bodySmall,
-									color = MaterialTheme.colorScheme.onSurface,
-								)
-							}
-						}
-						OutlinedTextField(
-							value = currentText,
-							onValueChange = { currentText = it },
-							label = { Text(stringResource(R.string.add_trusted_ssid)) },
-							modifier =
-							Modifier
-								.padding(
-									start = screenPadding,
-									top = 5.dp,
-									bottom = 10.dp,
-								),
-							supportingText = { WildcardSupportingLabel { context.openWebUrl(it) } },
-							maxLines = 1,
-							keyboardOptions =
-							KeyboardOptions(
-								capitalization = KeyboardCapitalization.None,
-								imeAction = ImeAction.Done,
-							),
-							keyboardActions = KeyboardActions(onDone = { saveTrustedSSID() }),
-							trailingIcon = {
-								if (currentText != "") {
-									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,
-												)
-											},
-											tint = MaterialTheme.colorScheme.primary,
-										)
-									}
-								}
-							},
-						)
+							.fillMaxWidth(fillMaxWidth)
+							.padding(top = 20.dp)
 					}
-				}
-				ConfigurationToggle(
-					stringResource(R.string.tunnel_mobile_data),
-					enabled = !uiState.settings.isAlwaysOnVpnEnabled,
-					checked = uiState.settings.isTunnelOnMobileDataEnabled,
-					padding = screenPadding,
-					onCheckChanged = { viewModel.onToggleTunnelOnMobileData() },
-				)
-				ConfigurationToggle(
-					stringResource(id = R.string.tunnel_on_ethernet),
-					enabled = !uiState.settings.isAlwaysOnVpnEnabled,
-					checked = uiState.settings.isTunnelOnEthernetEnabled,
-					padding = screenPadding,
-					onCheckChanged = { viewModel.onToggleTunnelOnEthernet() },
-				)
-				ConfigurationToggle(
-					stringResource(R.string.restart_on_ping),
-					checked = uiState.settings.isPingEnabled,
-					padding = screenPadding,
-					onCheckChanged = { viewModel.onToggleRestartOnPing() },
-				)
-				Row(
-					verticalAlignment = Alignment.CenterVertically,
-					modifier =
-					(
-						if (!uiState.settings.isAutoTunnelEnabled) {
+					)
+					.padding(bottom = 10.dp),
+			) {
+				Column(
+					horizontalAlignment = Alignment.Start,
+					verticalArrangement = Arrangement.Top,
+					modifier = Modifier.padding(15.dp),
+				) {
+					SectionTitle(
+						title = stringResource(id = R.string.auto_tunneling),
+						padding = screenPadding,
+					)
+					ConfigurationToggle(
+						stringResource(id = R.string.tunnel_on_wifi),
+						enabled =
+						!(
+							uiState.settings.isAutoTunnelEnabled ||
+								uiState.settings.isAlwaysOnVpnEnabled
+							),
+						checked = uiState.settings.isTunnelOnWifiEnabled,
+						padding = screenPadding,
+						onCheckChanged = { viewModel.onToggleTunnelOnWifi() },
+						modifier =
+						if (uiState.settings.isAutoTunnelEnabled) {
 							Modifier
 						} else {
-							Modifier.focusRequester(
-								focusRequester,
+							Modifier
+								.focusRequester(focusRequester)
+						},
+					)
+					if (uiState.settings.isTunnelOnWifiEnabled) {
+						Column {
+							FlowRow(
+								modifier =
+								Modifier
+									.padding(screenPadding)
+									.fillMaxWidth(),
+								horizontalArrangement = Arrangement.spacedBy(5.dp),
+							) {
+								uiState.settings.trustedNetworkSSIDs.forEach { ssid ->
+									ClickableIconButton(
+										onClick = {
+											if (context.isRunningOnTv()) {
+												focusRequester.requestFocus()
+												viewModel.onDeleteTrustedSSID(ssid)
+											}
+										},
+										onIconClick = {
+											if (context.isRunningOnTv()) focusRequester.requestFocus()
+											viewModel.onDeleteTrustedSSID(ssid)
+										},
+										text = ssid,
+										icon = Icons.Filled.Close,
+										enabled =
+										!(
+											uiState.settings.isAutoTunnelEnabled ||
+												uiState.settings.isAlwaysOnVpnEnabled
+											),
+									)
+								}
+								if (uiState.settings.trustedNetworkSSIDs.isEmpty()) {
+									Text(
+										stringResource(R.string.none),
+										fontStyle = FontStyle.Italic,
+										style = MaterialTheme.typography.bodySmall,
+										color = MaterialTheme.colorScheme.onSurface,
+									)
+								}
+							}
+							OutlinedTextField(
+								enabled =
+								!(
+									uiState.settings.isAutoTunnelEnabled ||
+										uiState.settings.isAlwaysOnVpnEnabled
+									),
+								value = currentText,
+								onValueChange = { currentText = it },
+								label = { Text(stringResource(R.string.add_trusted_ssid)) },
+								modifier =
+								Modifier
+									.padding(
+										start = screenPadding,
+										top = 5.dp,
+										bottom = 10.dp,
+									),
+								maxLines = 1,
+								keyboardOptions =
+								KeyboardOptions(
+									capitalization = KeyboardCapitalization.None,
+									imeAction = ImeAction.Done,
+								),
+								keyboardActions = KeyboardActions(onDone = { saveTrustedSSID() }),
+								trailingIcon = {
+									if (currentText != "") {
+										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,
+													)
+												},
+												tint = MaterialTheme.colorScheme.primary,
+											)
+										}
+									}
+								},
 							)
 						}
-						)
-						.fillMaxSize()
-						.padding(top = 5.dp),
-					horizontalArrangement = Arrangement.Center,
-				) {
-					TextButton(
-						onClick = {
-							if (uiState.tunnels.isEmpty()) return@TextButton context.showToast(R.string.tunnel_required)
-							handleAutoTunnelToggle()
-						},
-					) {
-						val autoTunnelButtonText =
-							if (uiState.settings.isAutoTunnelEnabled) {
-								stringResource(R.string.disable_auto_tunnel)
-							} else {
-								stringResource(id = R.string.enable_auto_tunnel)
-							}
-						Text(autoTunnelButtonText)
 					}
-				}
-			}
-		}
-		Surface(
-			tonalElevation = 2.dp,
-			shadowElevation = 2.dp,
-			shape = RoundedCornerShape(12.dp),
-			color = MaterialTheme.colorScheme.surface,
-			modifier =
-			Modifier
-				.fillMaxWidth(fillMaxWidth)
-				.padding(vertical = 10.dp),
-		) {
-			Column(
-				horizontalAlignment = Alignment.Start,
-				verticalArrangement = Arrangement.Top,
-				modifier = Modifier.padding(15.dp),
-			) {
-				SectionTitle(
-					title = stringResource(id = R.string.backend),
-					padding = screenPadding,
-				)
-				ConfigurationToggle(
-					stringResource(R.string.use_kernel),
-					enabled =
-					!(
-						uiState.settings.isAutoTunnelEnabled ||
-							uiState.settings.isAlwaysOnVpnEnabled ||
-							(uiState.vpnState.status == TunnelState.UP) ||
-							!settingsUiState.isKernelAvailable
-						),
-					checked = uiState.settings.isKernelEnabled,
-					padding = screenPadding,
-					onCheckChanged = {
-						viewModel.onToggleKernelMode()
-					},
-				)
-				Row(
-					verticalAlignment = Alignment.CenterVertically,
-					modifier =
-					Modifier
-						.fillMaxSize()
-						.padding(top = 5.dp),
-					horizontalArrangement = Arrangement.Center,
-				) {
-					TextButton(
-						onClick = {
-							viewModel.onRequestRoot()
-						},
-					) {
-						Text(stringResource(R.string.request_root))
-					}
-				}
-			}
-		}
-		Surface(
-			tonalElevation = 2.dp,
-			shadowElevation = 2.dp,
-			shape = RoundedCornerShape(12.dp),
-			color = MaterialTheme.colorScheme.surface,
-			modifier =
-			Modifier
-				.fillMaxWidth(fillMaxWidth)
-				.padding(vertical = 10.dp)
-				.padding(bottom = 10.dp),
-		) {
-			Column(
-				horizontalAlignment = Alignment.Start,
-				verticalArrangement = Arrangement.Top,
-				modifier = Modifier.padding(15.dp),
-			) {
-				SectionTitle(
-					title = stringResource(id = R.string.other),
-					padding = screenPadding,
-				)
-				if (!isRunningOnTv) {
 					ConfigurationToggle(
-						stringResource(R.string.always_on_vpn_support),
-						enabled = !(
-							(
-								uiState.settings.isTunnelOnWifiEnabled ||
-									uiState.settings.isTunnelOnEthernetEnabled ||
-									uiState.settings.isTunnelOnMobileDataEnabled
-								) &&
-								uiState.settings.isAutoTunnelEnabled
+						stringResource(R.string.tunnel_mobile_data),
+						enabled =
+						!(
+							uiState.settings.isAutoTunnelEnabled ||
+								uiState.settings.isAlwaysOnVpnEnabled
 							),
-						checked = uiState.settings.isAlwaysOnVpnEnabled,
+						checked = uiState.settings.isTunnelOnMobileDataEnabled,
 						padding = screenPadding,
-						onCheckChanged = { viewModel.onToggleAlwaysOnVPN() },
+						onCheckChanged = { viewModel.onToggleTunnelOnMobileData() },
 					)
 					ConfigurationToggle(
-						stringResource(R.string.enabled_app_shortcuts),
-						enabled = true,
-						checked = uiState.settings.isShortcutsEnabled,
+						stringResource(id = R.string.tunnel_on_ethernet),
+						enabled =
+						!(
+							uiState.settings.isAutoTunnelEnabled ||
+								uiState.settings.isAlwaysOnVpnEnabled
+							),
+						checked = uiState.settings.isTunnelOnEthernetEnabled,
 						padding = screenPadding,
-						onCheckChanged = { viewModel.onToggleShortcutsEnabled() },
+						onCheckChanged = { viewModel.onToggleTunnelOnEthernet() },
+					)
+					ConfigurationToggle(
+						stringResource(R.string.restart_on_ping),
+						enabled =
+						!(
+							uiState.settings.isAutoTunnelEnabled ||
+								uiState.settings.isAlwaysOnVpnEnabled
+							),
+						checked = uiState.settings.isPingEnabled,
+						padding = screenPadding,
+						onCheckChanged = { viewModel.onToggleRestartOnPing() },
 					)
-				}
-				ConfigurationToggle(
-					stringResource(R.string.restart_at_boot),
-					enabled = true,
-					checked = uiState.settings.isRestoreOnBootEnabled,
-					padding = screenPadding,
-					onCheckChanged = {
-						viewModel.onToggleRestartAtBoot()
-					},
-				)
-				ConfigurationToggle(
-					stringResource(R.string.enable_app_lock),
-					enabled = true,
-					checked = uiState.generalState.isPinLockEnabled,
-					padding = screenPadding,
-					onCheckChanged = {
-						if (uiState.generalState.isPinLockEnabled) {
-							appViewModel.onPinLockDisabled()
-						} else {
-							// TODO may want to show a dialog before proceeding in the future
-							PinManager.initialize(WireGuardAutoTunnel.instance)
-							navController.navigate(Route.Lock)
-						}
-					},
-				)
-				if (!isRunningOnTv) {
 					Row(
 						verticalAlignment = Alignment.CenterVertically,
 						modifier =
-						Modifier
+						(
+							if (!uiState.settings.isAutoTunnelEnabled) {
+								Modifier
+							} else {
+								Modifier.focusRequester(
+									focusRequester,
+								)
+							}
+							)
 							.fillMaxSize()
 							.padding(top = 5.dp),
 						horizontalArrangement = Arrangement.Center,
 					) {
 						TextButton(
-							enabled = !didExportFiles,
+							enabled = !uiState.settings.isAlwaysOnVpnEnabled,
 							onClick = {
 								if (uiState.tunnels.isEmpty()) return@TextButton context.showToast(R.string.tunnel_required)
-								showAuthPrompt = true
+								if (
+									uiState.settings.isTunnelOnWifiEnabled &&
+									!uiState.settings.isAutoTunnelEnabled
+								) {
+									when (false) {
+										isBackgroundLocationGranted -> showLocationDialog = true
+										fineLocationState.status.isGranted -> showLocationDialog = true
+										viewModel.isLocationEnabled(context) ->
+											showLocationServicesAlertDialog = true
+
+										else -> {
+											handleAutoTunnelToggle()
+										}
+									}
+								} else {
+									handleAutoTunnelToggle()
+								}
 							},
 						) {
-							Text(stringResource(R.string.export_configs))
+							val autoTunnelButtonText =
+								if (uiState.settings.isAutoTunnelEnabled) {
+									stringResource(R.string.disable_auto_tunnel)
+								} else {
+									stringResource(id = R.string.enable_auto_tunnel)
+								}
+							Text(autoTunnelButtonText)
+						}
+					}
+				}
+			}
+			Surface(
+				tonalElevation = 2.dp,
+				shadowElevation = 2.dp,
+				shape = RoundedCornerShape(12.dp),
+				color = MaterialTheme.colorScheme.surface,
+				modifier =
+				Modifier
+					.fillMaxWidth(fillMaxWidth)
+					.padding(vertical = 10.dp),
+			) {
+				Column(
+					horizontalAlignment = Alignment.Start,
+					verticalArrangement = Arrangement.Top,
+					modifier = Modifier.padding(15.dp),
+				) {
+					SectionTitle(
+						title = stringResource(id = R.string.backend),
+						padding = screenPadding,
+					)
+					ConfigurationToggle(
+						stringResource(R.string.use_amnezia),
+						enabled =
+						!(
+							uiState.settings.isAutoTunnelEnabled ||
+								uiState.settings.isAlwaysOnVpnEnabled ||
+								(uiState.vpnState.status == TunnelState.UP) || uiState.settings.isKernelEnabled
+							),
+						checked = uiState.settings.isAmneziaEnabled,
+						padding = screenPadding,
+						onCheckChanged = {
+							viewModel.onToggleAmnezia()
+						},
+					)
+					if (kernelSupport) {
+						ConfigurationToggle(
+							stringResource(R.string.use_kernel),
+							enabled =
+							!(
+								uiState.settings.isAutoTunnelEnabled ||
+									uiState.settings.isAlwaysOnVpnEnabled ||
+									(uiState.vpnState.status == TunnelState.UP)
+								),
+							checked = uiState.settings.isKernelEnabled,
+							padding = screenPadding,
+							onCheckChanged = {
+								scope.launch {
+									viewModel.onToggleKernelMode({ onRootAccepted() }, { onRootDenied() })
+								}
+							},
+						)
+						Row(
+							verticalAlignment = Alignment.CenterVertically,
+							modifier =
+							Modifier
+								.fillMaxSize()
+								.padding(top = 5.dp),
+							horizontalArrangement = Arrangement.Center,
+						) {
+							TextButton(
+								onClick = {
+									viewModel.requestRoot({ onRootAccepted() }, { onRootDenied() })
+								},
+							) {
+								Text(stringResource(R.string.request_root))
+							}
+						}
+					}
+				}
+			}
+			Surface(
+				tonalElevation = 2.dp,
+				shadowElevation = 2.dp,
+				shape = RoundedCornerShape(12.dp),
+				color = MaterialTheme.colorScheme.surface,
+				modifier =
+				Modifier
+					.fillMaxWidth(fillMaxWidth)
+					.padding(vertical = 10.dp)
+					.padding(bottom = 10.dp),
+			) {
+				Column(
+					horizontalAlignment = Alignment.Start,
+					verticalArrangement = Arrangement.Top,
+					modifier = Modifier.padding(15.dp),
+				) {
+					SectionTitle(
+						title = stringResource(id = R.string.other),
+						padding = screenPadding,
+					)
+					if (!context.isRunningOnTv()) {
+						ConfigurationToggle(
+							stringResource(R.string.always_on_vpn_support),
+							enabled = !uiState.settings.isAutoTunnelEnabled,
+							checked = uiState.settings.isAlwaysOnVpnEnabled,
+							padding = screenPadding,
+							onCheckChanged = { viewModel.onToggleAlwaysOnVPN() },
+						)
+						ConfigurationToggle(
+							stringResource(R.string.enabled_app_shortcuts),
+							enabled = true,
+							checked = uiState.settings.isShortcutsEnabled,
+							padding = screenPadding,
+							onCheckChanged = { viewModel.onToggleShortcutsEnabled() },
+						)
+					}
+					ConfigurationToggle(
+						stringResource(R.string.restart_at_boot),
+						enabled = true,
+						checked = uiState.settings.isRestoreOnBootEnabled,
+						padding = screenPadding,
+						onCheckChanged = {
+							viewModel.onToggleRestartAtBoot()
+						},
+					)
+					ConfigurationToggle(
+						stringResource(R.string.enable_app_lock),
+						enabled = true,
+						checked = uiState.isPinLockEnabled,
+						padding = screenPadding,
+						onCheckChanged = {
+							if (uiState.isPinLockEnabled) {
+								appViewModel.onPinLockDisabled()
+							} else {
+								// TODO may want to show a dialog before proceeding in the future
+								PinManager.initialize(WireGuardAutoTunnel.instance)
+								navController.navigate(Screen.Lock.route)
+							}
+						},
+					)
+					if (!context.isRunningOnTv()) {
+						Row(
+							verticalAlignment = Alignment.CenterVertically,
+							modifier =
+							Modifier
+								.fillMaxSize()
+								.padding(top = 5.dp),
+							horizontalArrangement = Arrangement.Center,
+						) {
+							TextButton(
+								enabled = !didExportFiles,
+								onClick = {
+									if (uiState.tunnels.isEmpty()) return@TextButton context.showToast(R.string.tunnel_required)
+									showAuthPrompt = true
+								},
+							) {
+								Text(stringResource(R.string.export_configs))
+							}
 						}
 					}
 				}

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

@@ -1,6 +1,14 @@
 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 isRooted: Boolean = false,
-	val isKernelAvailable: Boolean = false,
+	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,
 )

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

@@ -7,24 +7,25 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.wireguard.android.backend.WgQuickBackend
 import com.wireguard.android.util.RootShell
-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.ui.common.snackbar.SnackbarController
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.FileUtils
-import com.zaneschepke.wireguardautotunnel.util.StringValue
+import com.zaneschepke.wireguardautotunnel.util.WgTunnelExceptions
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import timber.log.Timber
 import java.io.File
 import javax.inject.Inject
 import javax.inject.Provider
@@ -34,37 +35,45 @@ 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,
+	tunnelService: TunnelService,
 ) : ViewModel() {
+	private val _kernelSupport = MutableStateFlow(false)
+	val kernelSupport = _kernelSupport.asStateFlow()
 
-	private val _uiState = MutableStateFlow(SettingsUiState())
-	val uiState = _uiState.onStart {
-		_uiState.update {
-			it.copy(isKernelAvailable = isKernelSupported(), isRooted = isRooted())
+	val uiState =
+		combine(
+			appDataRepository.settings.getSettingsFlow(),
+			appDataRepository.tunnels.getTunnelConfigsFlow(),
+			tunnelService.vpnState,
+			appDataRepository.appState.generalStateFlow,
+		) { settings, tunnels, tunnelState, generalState ->
+			SettingsUiState(
+				settings,
+				tunnels,
+				tunnelState,
+				generalState.isLocationDisclosureShown,
+				generalState.isBatteryOptimizationDisableShown,
+				generalState.isPinLockEnabled,
+			)
 		}
-	}.stateIn(
-		viewModelScope,
-		SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
-		SettingsUiState(),
-	)
-	private val settings = appDataRepository.settings.getSettingsFlow()
-		.stateIn(viewModelScope, SharingStarted.Eagerly, Settings())
+			.stateIn(
+				viewModelScope,
+				SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
+				SettingsUiState(),
+			)
 
-	fun onSaveTrustedSSID(ssid: String) = viewModelScope.launch {
+	fun onSaveTrustedSSID(ssid: String): Result<Unit> {
 		val trimmed = ssid.trim()
-		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,
-					),
-				)
-			}
+		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())
 		}
 	}
 
@@ -76,70 +85,61 @@ constructor(
 		appDataRepository.appState.setBatteryOptimizationDisableShown(true)
 	}
 
-	fun onToggleTunnelOnMobileData() = viewModelScope.launch {
-		with(settings.value) {
-			appDataRepository.settings.save(
-				copy(
-					isTunnelOnMobileDataEnabled = !this.isTunnelOnMobileDataEnabled,
-				),
-			)
-		}
+	fun onToggleTunnelOnMobileData() {
+		saveSettings(
+			uiState.value.settings.copy(
+				isTunnelOnMobileDataEnabled = !uiState.value.settings.isTunnelOnMobileDataEnabled,
+			),
+		)
 	}
 
-	fun onDeleteTrustedSSID(ssid: String) = viewModelScope.launch {
-		with(settings.value) {
-			appDataRepository.settings.save(
-				copy(
-					trustedNetworkSSIDs = (this.trustedNetworkSSIDs - ssid).toMutableList(),
-				),
-			)
-		}
+	fun onDeleteTrustedSSID(ssid: String) {
+		saveSettings(
+			uiState.value.settings.copy(
+				trustedNetworkSSIDs =
+				(uiState.value.settings.trustedNetworkSSIDs - ssid).toMutableList(),
+			),
+		)
 	}
 
-	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))
-		}
+	suspend fun onExportTunnels(files: List<File>): Result<Unit> {
+		return fileUtils.saveFilesToZip(files)
 	}
 
 	fun onToggleAutoTunnel(context: Context) = viewModelScope.launch {
-		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,
-				),
-			)
+		val isAutoTunnelEnabled = uiState.value.settings.isAutoTunnelEnabled
+		var isAutoTunnelPaused = uiState.value.settings.isAutoTunnelPaused
+
+		if (isAutoTunnelEnabled) {
+			serviceManager.stopWatcherService(context)
+		} else {
+			serviceManager.startWatcherService(context)
+			isAutoTunnelPaused = false
 		}
+		saveSettings(
+			uiState.value.settings.copy(
+				isAutoTunnelEnabled = !isAutoTunnelEnabled,
+				isAutoTunnelPaused = isAutoTunnelPaused,
+			),
+		)
 	}
 
 	fun onToggleAlwaysOnVPN() = viewModelScope.launch {
-		with(settings.value) {
-			appDataRepository.settings.save(
-				copy(
-					isAlwaysOnVpnEnabled = !isAlwaysOnVpnEnabled,
-				),
-			)
-		}
+		saveSettings(
+			uiState.value.settings.copy(
+				isAlwaysOnVpnEnabled = !uiState.value.settings.isAlwaysOnVpnEnabled,
+			),
+		)
 	}
 
-	fun onToggleTunnelOnEthernet() = viewModelScope.launch {
-		with(settings.value) {
-			appDataRepository.settings.save(
-				copy(
-					isTunnelOnEthernetEnabled = !isTunnelOnEthernetEnabled,
-				),
-			)
-		}
+	private fun saveSettings(settings: Settings) = viewModelScope.launch { appDataRepository.settings.save(settings) }
+
+	fun onToggleTunnelOnEthernet() {
+		saveSettings(
+			uiState.value.settings.copy(
+				isTunnelOnEthernetEnabled = !uiState.value.settings.isTunnelOnEthernetEnabled,
+			),
+		)
 	}
 
 	fun isLocationEnabled(context: Context): Boolean {
@@ -150,124 +150,111 @@ constructor(
 		return LocationManagerCompat.isLocationEnabled(locationManager)
 	}
 
-	fun onToggleShortcutsEnabled() = viewModelScope.launch {
-		with(settings.value) {
-			appDataRepository.settings.save(
-				this.copy(
-					isShortcutsEnabled = !isShortcutsEnabled,
-				),
-			)
-		}
+	fun onToggleShortcutsEnabled() {
+		saveSettings(
+			uiState.value.settings.copy(
+				isShortcutsEnabled = !uiState.value.settings.isShortcutsEnabled,
+			),
+		)
 	}
 
-	private fun saveKernelMode(enabled: Boolean) = viewModelScope.launch {
-		with(settings.value) {
-			appDataRepository.settings.save(
-				this.copy(
-					isKernelEnabled = enabled,
-				),
-			)
-		}
+	private fun saveKernelMode(enabled: Boolean) {
+		saveSettings(
+			uiState.value.settings.copy(
+				isKernelEnabled = enabled,
+			),
+		)
 	}
 
-	fun onToggleTunnelOnWifi() = viewModelScope.launch {
-		with(settings.value) {
-			appDataRepository.settings.save(
-				copy(
-					isTunnelOnWifiEnabled = !isTunnelOnWifiEnabled,
-				),
-			)
-		}
+	fun onToggleTunnelOnWifi() {
+		saveSettings(
+			uiState.value.settings.copy(
+				isTunnelOnWifiEnabled = !uiState.value.settings.isTunnelOnWifiEnabled,
+			),
+		)
 	}
 
 	fun onToggleAmnezia() = viewModelScope.launch {
-		with(settings.value) {
-			if (isKernelEnabled) {
-				saveKernelMode(false)
-			}
-			appDataRepository.settings.save(
-				copy(
-					isAmneziaEnabled = !isAmneziaEnabled,
-				),
-			)
+		if (uiState.value.settings.isKernelEnabled) {
+			saveKernelMode(false)
 		}
+		saveAmneziaMode(!uiState.value.settings.isAmneziaEnabled)
 	}
 
-	fun onToggleKernelMode() = viewModelScope.launch {
-		with(settings.value) {
-			if (!isKernelEnabled) {
-				requestRoot().onSuccess {
-					appDataRepository.settings.save(
-						copy(
+	private fun saveAmneziaMode(on: Boolean) {
+		saveSettings(
+			uiState.value.settings.copy(
+				isAmneziaEnabled = on,
+			),
+		)
+	}
+
+	fun onToggleKernelMode(onSuccess: () -> Unit, onFailure: () -> Unit) = viewModelScope.launch {
+		if (!uiState.value.settings.isKernelEnabled) {
+			requestRoot(
+				{
+					onSuccess()
+					saveSettings(
+						uiState.value.settings.copy(
 							isKernelEnabled = true,
 							isAmneziaEnabled = false,
 						),
 					)
-				}
-			} else {
-				saveKernelMode(enabled = false)
-			}
+				},
+				{
+					onFailure()
+					saveKernelMode(enabled = false)
+				},
+			)
+		} else {
+			saveKernelMode(enabled = false)
 		}
 	}
 
 	fun onToggleRestartOnPing() = viewModelScope.launch {
-		with(settings.value) {
-			appDataRepository.settings.save(
-				copy(
-					isPingEnabled = !isPingEnabled,
-				),
-			)
-		}
+		saveSettings(
+			uiState.value.settings.copy(
+				isPingEnabled = !uiState.value.settings.isPingEnabled,
+			),
+		)
 	}
 
-	private suspend fun isKernelSupported(): Boolean {
-		return withContext(ioDispatcher) {
-			WgQuickBackend.hasKernelSupport()
+	fun checkKernelSupport() = viewModelScope.launch {
+		val kernelSupport =
+			withContext(ioDispatcher) {
+				WgQuickBackend.hasKernelSupport()
+			}
+		_kernelSupport.update {
+			kernelSupport
 		}
 	}
 
 	fun onToggleRestartAtBoot() = viewModelScope.launch {
-		with(settings.value) {
-			appDataRepository.settings.save(
-				copy(
-					isRestoreOnBootEnabled = !isRestoreOnBootEnabled,
-				),
-			)
-		}
+		saveSettings(
+			uiState.value.settings.copy(
+				isRestoreOnBootEnabled = !uiState.value.settings.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 {
+	fun requestRoot(onSuccess: () -> Unit, onFailure: () -> Unit) = viewModelScope.launch(ioDispatcher) {
 		kotlin.runCatching {
+			rootShell.get().start()
+			Timber.i("Root shell accepted!")
+			onSuccess()
+		}.onFailure {
+			onFailure()
+		}.onSuccess {
+			onSuccess()
+		}
+	}
+
+	suspend fun exportAllConfigs(): Result<Unit> {
+		return kotlin.runCatching {
 			val tunnels = appDataRepository.tunnels.getAll()
 			val wgFiles = fileUtils.createWgFiles(tunnels)
 			val amFiles = fileUtils.createAmFiles(tunnels)
-			exportTunnels(wgFiles + amFiles)
+			onExportTunnels(wgFiles + amFiles)
 		}
 	}
 }

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

@@ -1,44 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings.components
-
-import androidx.compose.foundation.text.ClickableText
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-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 com.zaneschepke.wireguardautotunnel.R
-
-@Composable
-fun WildcardSupportingLabel(onClick: (url: String) -> Unit) {
-	// TODO update link when docs are fully updated
-	val gettingStarted =
-		buildAnnotatedString {
-			pushStringAnnotation(
-				tag = "details",
-				annotation = stringResource(id = R.string.docs_wildcards),
-			)
-			withStyle(
-				style = SpanStyle(color = MaterialTheme.colorScheme.primary),
-			) {
-				append(stringResource(id = R.string.wildcard_supported))
-			}
-			pop()
-		}
-	ClickableText(
-		text = gettingStarted,
-		style =
-		MaterialTheme.typography.bodySmall.copy(
-			color = MaterialTheme.colorScheme.onSurfaceVariant,
-			textAlign = TextAlign.Start,
-			fontStyle = FontStyle.Italic,
-		),
-	) {
-		gettingStarted.getStringAnnotations(tag = "details", it, it)
-			.firstOrNull()?.let { annotation ->
-				onClick(annotation.item)
-			}
-	}
-}

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

@@ -27,6 +27,7 @@ import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
@@ -42,21 +43,23 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation.NavController
 import com.zaneschepke.wireguardautotunnel.BuildConfig
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.AppUiState
-import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.Screen
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import com.zaneschepke.wireguardautotunnel.util.extensions.launchSupportEmail
 import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
 
 @Composable
-fun SupportScreen(focusRequester: FocusRequester, appUiState: AppUiState) {
+fun SupportScreen(viewModel: SupportViewModel = hiltViewModel(), navController: NavController, focusRequester: FocusRequester) {
 	val context = LocalContext.current
-	val navController = LocalNavController.current
 	val fillMaxWidth = .85f
 
+	val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+
 	Column(
 		horizontalAlignment = Alignment.CenterHorizontally,
 		verticalArrangement = Arrangement.Top,
@@ -245,7 +248,7 @@ fun SupportScreen(focusRequester: FocusRequester, appUiState: AppUiState) {
 						color = MaterialTheme.colorScheme.onBackground,
 					)
 					TextButton(
-						onClick = { navController.navigate(Route.Logs) },
+						onClick = { navController.navigate(Screen.Support.Logs.route) },
 						modifier = Modifier.padding(vertical = 5.dp),
 					) {
 						Row(
@@ -298,7 +301,7 @@ fun SupportScreen(focusRequester: FocusRequester, appUiState: AppUiState) {
 				buildAnnotatedString {
 					append(stringResource(R.string.mode))
 					append(": ")
-					when (appUiState.settings.isKernelEnabled) {
+					when (uiState.settings.isKernelEnabled) {
 						true -> append(stringResource(id = R.string.kernel))
 						false -> append(stringResource(id = R.string.userspace))
 					}

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

@@ -0,0 +1,5 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.support
+
+import com.zaneschepke.wireguardautotunnel.data.domain.Settings
+
+data class SupportUiState(val settings: Settings = Settings())

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

@@ -0,0 +1,27 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.support
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import javax.inject.Inject
+
+@HiltViewModel
+class SupportViewModel
+@Inject
+constructor(settingsRepository: SettingsRepository) :
+	ViewModel() {
+	val uiState =
+		settingsRepository
+			.getSettingsFlow()
+			.map { SupportUiState(it) }
+			.stateIn(
+				viewModelScope,
+				SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
+				SupportUiState(),
+			)
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/support/logs/LogsScreen.kt

@@ -1,6 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.support.logs
 
 import android.annotation.SuppressLint
+import android.widget.Toast
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
@@ -12,7 +13,7 @@ import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Share
+import androidx.compose.material.icons.filled.Save
 import androidx.compose.material3.FloatingActionButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -20,12 +21,8 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.runtime.snapshotFlow
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -38,7 +35,9 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.zaneschepke.logcatter.model.LogMessage
+import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.common.text.LogTypeLabel
+import kotlinx.coroutines.launch
 
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @Composable
@@ -46,52 +45,35 @@ fun LogsScreen(viewModel: LogsViewModel = hiltViewModel()) {
 	val logs = viewModel.logs
 
 	val context = LocalContext.current
-	val clipboardManager: ClipboardManager = LocalClipboardManager.current
 
 	val lazyColumnListState = rememberLazyListState()
-	var isAutoScrolling by remember { mutableStateOf(true) }
-	var lastScrollPosition by remember { mutableIntStateOf(0) }
-
-	LaunchedEffect(isAutoScrolling) {
-		if (isAutoScrolling) {
-			lazyColumnListState.animateScrollToItem(logs.size)
-		}
-	}
+	val clipboardManager: ClipboardManager = LocalClipboardManager.current
+	val scope = rememberCoroutineScope()
 
 	LaunchedEffect(logs.size) {
-		if (isAutoScrolling) {
+		scope.launch {
 			lazyColumnListState.animateScrollToItem(logs.size)
 		}
 	}
 
-	LaunchedEffect(lazyColumnListState) {
-		snapshotFlow { lazyColumnListState.firstVisibleItemIndex }
-			.collect { currentScrollPosition ->
-				if (currentScrollPosition < lastScrollPosition && isAutoScrolling) {
-					isAutoScrolling = false
-				}
-				val visible = lazyColumnListState.layoutInfo.visibleItemsInfo
-				if (visible.isNotEmpty()) {
-					if (visible.last().index
-						== lazyColumnListState.layoutInfo.totalItemsCount - 1 && !isAutoScrolling
-					) {
-						isAutoScrolling = true
-					}
-				}
-				lastScrollPosition = currentScrollPosition
-			}
-	}
-
 	Scaffold(
 		floatingActionButton = {
 			FloatingActionButton(
 				onClick = {
-					viewModel.shareLogs(context)
+					scope.launch {
+						viewModel.saveLogsToFile().onSuccess {
+							Toast.makeText(
+								context,
+								context.getString(R.string.logs_saved),
+								Toast.LENGTH_SHORT,
+							).show()
+						}
+					}
 				},
 				shape = RoundedCornerShape(16.dp),
 				containerColor = MaterialTheme.colorScheme.primary,
 			) {
-				val icon = Icons.Filled.Share
+				val icon = Icons.Filled.Save
 				Icon(
 					imageVector = icon,
 					contentDescription = icon.name,

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/support/logs/LogsViewModel.kt

@@ -1,25 +1,19 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.support.logs
 
-import android.content.Context
 import androidx.compose.runtime.mutableStateListOf
-import androidx.core.content.FileProvider
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.zaneschepke.logcatter.LogReader
+import com.zaneschepke.logcatter.LocalLogCollector
 import com.zaneschepke.logcatter.model.LogMessage
-import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.module.MainDispatcher
 import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.FileUtils
 import com.zaneschepke.wireguardautotunnel.util.extensions.chunked
-import com.zaneschepke.wireguardautotunnel.util.extensions.launchShareFile
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import timber.log.Timber
-import java.io.File
 import java.time.Duration
 import java.time.Instant
 import javax.inject.Inject
@@ -28,7 +22,8 @@ import javax.inject.Inject
 class LogsViewModel
 @Inject
 constructor(
-	private val localLogCollector: LogReader,
+	private val localLogCollector: LocalLogCollector,
+	private val fileUtils: FileUtils,
 	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 	@MainDispatcher private val mainDispatcher: CoroutineDispatcher,
 ) : ViewModel() {
@@ -49,19 +44,13 @@ constructor(
 		}
 	}
 
-	fun shareLogs(context: Context): Job = viewModelScope.launch(ioDispatcher) {
-		runCatching {
-			val sharePath = File(context.filesDir, "external_files")
-			if (sharePath.exists()) sharePath.delete()
-			sharePath.mkdir()
-			val file = File("${sharePath.path + "/" + Constants.BASE_LOG_FILE_NAME}-${Instant.now().epochSecond}.zip")
-			if (file.exists()) file.delete()
-			file.createNewFile()
-			localLogCollector.zipLogFiles(file.absolutePath)
-			val uri = FileProvider.getUriForFile(context, context.getString(R.string.provider), file)
-			context.launchShareFile(uri)
-		}.onFailure {
-			Timber.e(it)
-		}
+	suspend fun saveLogsToFile(): Result<Unit> {
+		val file =
+			localLogCollector.getLogFile().getOrElse {
+				return Result.failure(it)
+			}
+		val fileContent = fileUtils.readBytesFromFile(file)
+		val fileName = "${Constants.BASE_LOG_FILE_NAME}-${Instant.now().epochSecond}.txt"
+		return fileUtils.saveByteArrayToDownloads(fileContent, fileName)
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/theme/Color.kt

@@ -2,37 +2,17 @@ package com.zaneschepke.wireguardautotunnel.ui.theme
 
 import androidx.compose.ui.graphics.Color
 
-val OffWhite = Color(0xFFE5E1E5)
-val LightGrey = Color(0xFF8D9D9F)
-val Aqua = Color(0xFF76BEBD)
-val SilverTree = Color(0xFF6DB58B)
-val Plantation = Color(0xFF264A49)
-val Shark = Color(0xFF21272A)
-val BalticSea = Color(0xFF1C1B1F)
-val Brick = Color(0xFFCE4257)
-val Corn = Color(0xFFFBEC5D)
+val Purple80 = Color(0xFFD0BCFF)
+val PurpleGrey80 = Color(0xFFCCC2DC)
+val Pink80 = Color(0xFF492532)
+val virdigris = Color(0xFF5BC0BE)
 
-sealed class ThemeColors(
-	val background: Color,
-	val surface: Color,
-	val primary: Color,
-	val secondary: Color,
-	val onSurface: Color,
-) {
-	// TODO fix light theme colors
-	data object Light : ThemeColors(
-		background = LightGrey,
-		surface = OffWhite,
-		primary = Plantation,
-		secondary = OffWhite,
-		onSurface = BalticSea,
-	)
+val Purple40 = Color(0xFF6650a4)
+val PurpleGrey40 = Color(0xFF625b71)
+val Pink40 = Color(0xFFFFFFFF)
 
-	data object Dark : ThemeColors(
-		background = BalticSea,
-		surface = Shark,
-		primary = Aqua,
-		secondary = Plantation,
-		onSurface = OffWhite,
-	)
-}
+// status colors
+val brickRed = Color(0xFFCE4257)
+val corn = Color(0xFFFBEC5D)
+val pinkRed = Color(0xFFEF476F)
+val mint = Color(0xFF52B788)

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/theme/Theme.kt

@@ -18,22 +18,30 @@ import androidx.core.view.WindowCompat
 
 private val DarkColorScheme =
 	darkColorScheme(
-		primary = ThemeColors.Dark.primary,
-		surface = ThemeColors.Dark.surface,
-		background = ThemeColors.Dark.background,
-		secondaryContainer = ThemeColors.Dark.secondary,
-		onSurface = ThemeColors.Dark.onSurface,
-		onSecondaryContainer = ThemeColors.Dark.primary,
+		// primary = Purple80,
+		primary = virdigris,
+		secondary = PurpleGrey40,
+		// secondary = PurpleGrey80,
+		tertiary = Pink40,
+		surfaceTint = Pink80,
+		// tertiary = Pink80
 	)
 
 private val LightColorScheme =
 	lightColorScheme(
-		primary = ThemeColors.Light.primary,
-		surface = ThemeColors.Light.surface,
-		background = ThemeColors.Light.background,
-		secondaryContainer = ThemeColors.Light.secondary,
-		onSurface = ThemeColors.Light.onSurface,
-		onSecondaryContainer = ThemeColors.Light.primary,
+		primary = Purple40,
+		secondary = PurpleGrey40,
+		tertiary = Pink40,
+		surfaceTint = Pink80,
+        /* Other default colors to override
+        background = Color(0xFFFFFBFE),
+        surface = Color(0xFFFFFBFE),
+        onPrimary = Color.White,
+        onSecondary = Color.White,
+        onTertiary = Color.White,
+        onBackground = Color(0xFF1C1B1F),
+        onSurface = Color(0xFF1C1B1F),
+         */
 	)
 
 @Composable
@@ -52,8 +60,7 @@ fun WireguardAutoTunnelTheme(
 			}
 		}
 		useDarkTheme -> DarkColorScheme
-		// TODO force dark theme for now until light theme designed
-		else -> DarkColorScheme
+		else -> LightColorScheme
 	}
 	val view = LocalView.current
 	if (!view.isInEditMode) {

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/theme/Type.kt

@@ -2,58 +2,35 @@ package com.zaneschepke.wireguardautotunnel.ui.theme
 
 import androidx.compose.material3.Typography
 import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.zaneschepke.wireguardautotunnel.R
 
 // Set of Material typography styles to start with
-
-val inter = FontFamily(
-	Font(R.font.inter),
-)
-
 val Typography =
 	Typography(
 		bodyLarge =
 		TextStyle(
-			fontFamily = inter,
+			fontFamily = FontFamily.Default,
 			fontWeight = FontWeight.Normal,
 			fontSize = 16.sp,
 			lineHeight = 24.sp,
 			letterSpacing = 0.5.sp,
 		),
-		bodySmall = TextStyle(
-			fontFamily = inter,
-			fontWeight = FontWeight.Normal,
-			fontSize = 13.sp,
-			lineHeight = 20.sp,
-			letterSpacing = 1.sp,
-			color = LightGrey,
-		),
-		labelLarge = TextStyle(
-			fontFamily = inter,
-			fontWeight = FontWeight.Normal,
-			fontSize = 15.sp,
-			lineHeight = 18.sp,
-			letterSpacing = 0.sp,
-		),
-		labelMedium = TextStyle(
-			fontFamily = inter,
-			fontWeight = FontWeight.SemiBold,
-			fontSize = 12.sp,
-			lineHeight = 16.sp,
-			letterSpacing = 0.5.sp,
-		),
-		titleMedium = TextStyle(
-			fontFamily = inter,
-			fontWeight = FontWeight.Bold,
-			fontSize = 17.sp,
-			lineHeight = 21.sp,
-			letterSpacing = 0.sp,
-		),
+        /* Other default text styles to override
+        titleLarge = TextStyle(
+            fontFamily = FontFamily.Default,
+            fontWeight = FontWeight.Normal,
+            fontSize = 22.sp,
+            lineHeight = 28.sp,
+            letterSpacing = 0.sp
+        ),
+        labelSmall = TextStyle(
+            fontFamily = FontFamily.Default,
+            fontWeight = FontWeight.Medium,
+            fontSize = 11.sp,
+            lineHeight = 16.sp,
+            letterSpacing = 0.5.sp
+        )
+         */
 	)
-
-val iconSize = 15.dp

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/Constants.kt

@@ -4,20 +4,21 @@ object Constants {
 	const val BASE_LOG_FILE_NAME = "wg_tunnel_logs"
 	const val LOG_BUFFER_SIZE = 3_000L
 
-	const val MANUAL_TUNNEL_CONFIG_ID = 0
+	const val MANUAL_TUNNEL_CONFIG_ID = "0"
 	const val BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT = 10 * 60 * 1_000L // 10 minutes
+	const val VPN_STATISTIC_CHECK_INTERVAL = 1_000L
 	const val WATCHER_COLLECTION_DELAY = 3_000L
-
 	const val CONF_FILE_EXTENSION = ".conf"
 	const val ZIP_FILE_EXTENSION = ".zip"
 	const val URI_CONTENT_SCHEME = "content"
+	const val ALLOWED_FILE_TYPES = "*/*"
 	const val TEXT_MIME_TYPE = "text/plain"
 	const val ZIP_FILE_MIME_TYPE = "application/zip"
-	const val ALLOWED_TV_FILE_TYPES = "${TEXT_MIME_TYPE}|${ZIP_FILE_MIME_TYPE}"
-	const val ALL_FILE_TYPES = "*/*"
 	const val GOOGLE_TV_EXPLORER_STUB = "com.google.android.tv.frameworkpackagestubs"
 	const val ANDROID_TV_EXPLORER_STUB = "com.android.tv.frameworkpackagestubs"
+	const val ALWAYS_ON_VPN_ACTION = "android.net.VpnService"
 	const val VPN_SETTINGS_PACKAGE = "android.net.vpn.SETTINGS"
+	const val EMAIL_MIME_TYPE = "plain/text"
 	const val SYSTEM_EXEMPT_SERVICE_TYPE_ID = 1024
 
 	const val SUBSCRIPTION_TIMEOUT = 5_000L
@@ -27,11 +28,12 @@ object Constants {
 
 	const val DEFAULT_PING_IP = "1.1.1.1"
 	const val PING_TIMEOUT = 5_000L
+	const val VPN_RESTART_DELAY = 1_000L
 	const val PING_INTERVAL = 60_000L
 	const val PING_COOLDOWN = PING_INTERVAL * 60 // one hour
 
 	const val UNREADABLE_SSID = "<unknown ssid>"
 
-	val amProperties = listOf("Jc", "Jmin", "Jmax", "S1", "S2", "H1", "H2", "H3", "H4")
+	val amneziaProperties = listOf("Jc", "Jmin", "Jmax", "S1", "S2", "H1", "H2", "H3", "H4")
 	const val QR_CODE_NAME_PROPERTY = "# Name ="
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/Exceptions.kt

@@ -1,13 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.util
-
-object InvalidFileExtensionException : Exception() {
-	private fun readResolve(): Any = InvalidFileExtensionException
-}
-
-object FileReadException : Exception() {
-	private fun readResolve(): Any = FileReadException
-}
-
-object ConfigExportException : Exception() {
-	private fun readResolve(): Any = ConfigExportException
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/FileUtils.kt

@@ -12,6 +12,8 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 import java.io.File
+import java.io.FileInputStream
+import java.io.FileOutputStream
 import java.io.OutputStream
 import java.time.Instant
 import java.util.zip.ZipEntry
@@ -21,6 +23,23 @@ class FileUtils(
 	private val context: Context,
 	private val ioDispatcher: CoroutineDispatcher,
 ) {
+	suspend fun readBytesFromFile(file: File): ByteArray {
+		return withContext(ioDispatcher) {
+			FileInputStream(file).use {
+				it.readBytes()
+			}
+		}
+	}
+
+	suspend fun readTextFromFileName(fileName: String): String {
+		return withContext(ioDispatcher) {
+			context.assets.open(fileName).use { stream ->
+				stream.bufferedReader(Charsets.UTF_8).use {
+					it.readText()
+				}
+			}
+		}
+	}
 
 	fun createWgFiles(tunnels: TunnelConfigs): List<File> {
 		return tunnels.map { config ->
@@ -42,6 +61,43 @@ class FileUtils(
 		}
 	}
 
+	suspend fun saveByteArrayToDownloads(content: ByteArray, fileName: String): Result<Unit> {
+		return withContext(ioDispatcher) {
+			try {
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+					val contentValues =
+						ContentValues().apply {
+							put(MediaColumns.DISPLAY_NAME, fileName)
+							put(MediaColumns.MIME_TYPE, Constants.TEXT_MIME_TYPE)
+							put(MediaColumns.RELATIVE_PATH, Environment.DIRECTORY_DOWNLOADS)
+						}
+					val resolver = context.contentResolver
+					val uri =
+						resolver.insert(MediaStore.Downloads.EXTERNAL_CONTENT_URI, contentValues)
+					if (uri != null) {
+						resolver.openOutputStream(uri).use { output ->
+							output?.write(content)
+						}
+					}
+				} else {
+					val target =
+						File(
+							Environment.getExternalStoragePublicDirectory(
+								Environment.DIRECTORY_DOWNLOADS,
+							),
+							fileName,
+						)
+					FileOutputStream(target).use { output ->
+						output.write(content)
+					}
+				}
+				Result.success(Unit)
+			} catch (e: Exception) {
+				Result.failure(e)
+			}
+		}
+	}
+
 	suspend fun saveFilesToZip(files: List<File>): Result<Unit> {
 		return withContext(ioDispatcher) {
 			try {
@@ -62,13 +118,13 @@ class FileUtils(
 				}
 			} catch (e: Exception) {
 				Timber.e(e)
-				Result.failure(ConfigExportException)
+				Result.failure(WgTunnelExceptions.ConfigExportFailed())
 			}
 		}
 	}
 
 	// TODO issue with android 9
-	private fun createDownloadsFileOutputStream(fileName: String, mimeType: String = Constants.ALL_FILE_TYPES): OutputStream? {
+	private fun createDownloadsFileOutputStream(fileName: String, mimeType: String = Constants.ALLOWED_FILE_TYPES): OutputStream? {
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
 			val resolver = context.contentResolver
 			val contentValues =

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/WgTunnelExceptions.kt

@@ -0,0 +1,159 @@
+package com.zaneschepke.wireguardautotunnel.util
+
+import android.content.Context
+import com.zaneschepke.wireguardautotunnel.R
+
+sealed class WgTunnelExceptions : Exception() {
+	abstract fun getMessage(context: Context): String
+
+	data class General(private val userMessage: StringValue) : WgTunnelExceptions() {
+		override fun getMessage(context: Context): String {
+			return userMessage.asString(context)
+		}
+	}
+
+	data class SsidConflict(
+		private val userMessage: StringValue =
+			StringValue.StringResource(
+				R.string.error_ssid_exists,
+			),
+	) :
+		WgTunnelExceptions() {
+		override fun getMessage(context: Context): String {
+			return userMessage.asString(context)
+		}
+	}
+
+	data class ConfigExportFailed(
+		private val userMessage: StringValue =
+			StringValue.StringResource(
+				R.string.export_configs_failed,
+			),
+	) : WgTunnelExceptions() {
+		override fun getMessage(context: Context): String {
+			return userMessage.asString(context)
+		}
+	}
+
+	data class ConfigParseError(private val appendMessage: StringValue = StringValue.Empty) :
+		WgTunnelExceptions() {
+		override fun getMessage(context: Context): String {
+			return StringValue.StringResource(R.string.config_parse_error).asString(context) + (
+				if (appendMessage != StringValue.Empty) ": ${appendMessage.asString(context)}" else ""
+				)
+		}
+	}
+
+	data class RootDenied(
+		private val userMessage: StringValue =
+			StringValue.StringResource(
+				R.string.error_root_denied,
+			),
+	) :
+		WgTunnelExceptions() {
+		override fun getMessage(context: Context): String {
+			return userMessage.asString(context)
+		}
+	}
+
+	data class InvalidQrCode(
+		private val userMessage: StringValue =
+			StringValue.StringResource(
+				R.string.error_invalid_code,
+			),
+	) :
+		WgTunnelExceptions() {
+		override fun getMessage(context: Context): String {
+			return userMessage.asString(context)
+		}
+	}
+
+	data class InvalidFileExtension(
+		private val userMessage: StringValue =
+			StringValue.StringResource(
+				R.string.error_file_extension,
+			),
+	) : WgTunnelExceptions() {
+		override fun getMessage(context: Context): String {
+			return userMessage.asString(context)
+		}
+	}
+
+	data class FileReadFailed(
+		private val userMessage: StringValue =
+			StringValue.StringResource(
+				R.string.error_file_format,
+			),
+	) :
+		WgTunnelExceptions() {
+		override fun getMessage(context: Context): String {
+			return userMessage.asString(context)
+		}
+	}
+
+	data class AuthenticationFailed(
+		private val userMessage: StringValue =
+			StringValue.StringResource(
+				R.string.error_authentication_failed,
+			),
+	) : WgTunnelExceptions() {
+		override fun getMessage(context: Context): String {
+			return userMessage.asString(context)
+		}
+	}
+
+	data class AuthorizationFailed(
+		private val userMessage: StringValue =
+			StringValue.StringResource(
+				R.string.error_authorization_failed,
+			),
+	) : WgTunnelExceptions() {
+		override fun getMessage(context: Context): String {
+			return userMessage.asString(context)
+		}
+	}
+
+	data class BackgroundLocationRequired(
+		private val userMessage: StringValue =
+			StringValue.StringResource(
+				R.string.background_location_required,
+			),
+	) : WgTunnelExceptions() {
+		override fun getMessage(context: Context): String {
+			return userMessage.asString(context)
+		}
+	}
+
+	data class LocationServicesRequired(
+		private val userMessage: StringValue =
+			StringValue.StringResource(
+				R.string.location_services_required,
+			),
+	) : WgTunnelExceptions() {
+		override fun getMessage(context: Context): String {
+			return userMessage.asString(context)
+		}
+	}
+
+	data class PreciseLocationRequired(
+		private val userMessage: StringValue =
+			StringValue.StringResource(
+				R.string.precise_location_required,
+			),
+	) : WgTunnelExceptions() {
+		override fun getMessage(context: Context): String {
+			return userMessage.asString(context)
+		}
+	}
+
+	data class FileExplorerRequired(
+		private val userMessage: StringValue =
+			StringValue.StringResource(
+				R.string.error_no_file_explorer,
+			),
+	) : WgTunnelExceptions() {
+		override fun getMessage(context: Context): String {
+			return userMessage.asString(context)
+		}
+	}
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/extensions/ContextExtensions.kt

@@ -26,16 +26,6 @@ fun Context.openWebUrl(url: String): Result<Unit> {
 	}
 }
 
-fun Context.launchShareFile(file: Uri) {
-	val shareIntent = Intent().apply {
-		setAction(Intent.ACTION_SEND)
-		setType("*/*")
-		putExtra(Intent.EXTRA_STREAM, file)
-		addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-	}
-	this.startActivity(Intent.createChooser(shareIntent, ""))
-}
-
 fun Context.showToast(resId: Int) {
 	Toast.makeText(
 		this,
@@ -44,21 +34,21 @@ fun Context.showToast(resId: Int) {
 	).show()
 }
 
-fun Context.launchSupportEmail() {
-	val intent =
-		Intent(Intent.ACTION_SENDTO).apply {
-			data = Uri.parse("mailto:")
-			putExtra(Intent.EXTRA_EMAIL, arrayOf(getString(R.string.my_email)))
-			putExtra(Intent.EXTRA_SUBJECT, getString(R.string.email_subject))
-			addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-		}
-	if (intent.resolveActivity(packageManager) != null) {
+fun Context.launchSupportEmail(): Result<Unit> {
+	return runCatching {
+		val intent =
+			Intent(Intent.ACTION_SENDTO).apply {
+				type = Constants.EMAIL_MIME_TYPE
+				putExtra(Intent.EXTRA_EMAIL, arrayOf(getString(R.string.my_email)))
+				putExtra(Intent.EXTRA_SUBJECT, getString(R.string.email_subject))
+				addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+			}
 		startActivity(
 			Intent.createChooser(intent, getString(R.string.email_chooser)).apply {
 				addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
 			},
 		)
-	} else {
+	}.onFailure {
 		showToast(R.string.no_email_detected)
 	}
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/extensions/CoroutineExtensions.kt

@@ -3,7 +3,6 @@ package com.zaneschepke.wireguardautotunnel.util.extensions
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.ObsoleteCoroutinesApi
 import kotlinx.coroutines.channels.ClosedReceiveChannelException
 import kotlinx.coroutines.channels.ReceiveChannel
@@ -77,16 +76,3 @@ fun <T> CoroutineScope.asChannel(flow: Flow<T>): ReceiveChannel<T> = produce {
 		channel.send(value)
 	}
 }
-
-fun Job?.onNotRunning(callback: () -> Unit) {
-	if (this == null || this.isCompleted || this.isCompleted) {
-		callback.invoke()
-	}
-}
-
-fun Job.cancelWithMessage(message: String) {
-	kotlin.runCatching {
-		this.cancel()
-		Timber.i(message)
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/extensions/Extensions.kt

@@ -1,7 +1,11 @@
 package com.zaneschepke.wireguardautotunnel.util.extensions
 
+import android.content.Context
 import android.content.pm.PackageInfo
+import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.util.StringValue
+import com.zaneschepke.wireguardautotunnel.util.WgTunnelExceptions
 import java.math.BigDecimal
 import java.text.DecimalFormat
 
@@ -17,3 +21,10 @@ fun <T> List<T>.removeAt(index: Int): List<T> = toMutableList().apply { this.rem
 typealias TunnelConfigs = List<TunnelConfig>
 
 typealias Packages = List<PackageInfo>
+
+fun Throwable.getMessage(context: Context): String {
+	return when (this) {
+		is WgTunnelExceptions -> this.getMessage(context)
+		else -> this.message ?: StringValue.StringResource(R.string.unknown_error).asString(context)
+	}
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/extensions/StringExtensions.kt

@@ -1,44 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.util.extensions
-
-import timber.log.Timber
-import java.util.regex.Pattern
-
-val hasNumberInParentheses = """^(.+?)\((\d+)\)$""".toRegex()
-
-fun String.isValidIpv4orIpv6Address(): Boolean {
-	val ipv4Pattern = Pattern.compile(
-		"^(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\$",
-	)
-	val ipv6Pattern = Pattern.compile(
-		"^([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4}\$",
-	)
-	return ipv4Pattern.matcher(this).matches() || ipv6Pattern.matcher(this).matches()
-}
-
-fun String.hasNumberInParentheses(): Boolean {
-	return hasNumberInParentheses.matches(this)
-}
-
-// Function to extract name and number
-fun String.extractNameAndNumber(): Pair<String, Int>? {
-	val matchResult = hasNumberInParentheses.matchEntire(this)
-	return matchResult?.let {
-		Pair(it.groupValues[1], it.groupValues[2].toInt())
-	}
-}
-
-fun List<String>.isMatchingToWildcardList(value: String): Boolean {
-	val excludeValues = this.filter { it.startsWith("!") }.map { it.removePrefix("!").toRegexWithWildcards() }
-	Timber.d("Excluded values: $excludeValues")
-	val includedValues = this.filter { !it.startsWith("!") }.map { it.toRegexWithWildcards() }
-	Timber.d("Included values: $includedValues")
-	val matches = includedValues.filter { it.matches(value) }
-	val excludedMatches = excludeValues.filter { it.matches(value) }
-	Timber.d("Excluded matches: $excludedMatches")
-	Timber.d("Matches: $matches")
-	return matches.isNotEmpty() && excludedMatches.isEmpty()
-}
-
-fun String.toRegexWithWildcards(): Regex {
-	return this.replace("*", ".*").replace("?", ".").toRegex()
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/extensions/TunnelExtensions.kt

@@ -1,17 +1,10 @@
 package com.zaneschepke.wireguardautotunnel.util.extensions
 
-import androidx.compose.ui.graphics.Color
-import com.wireguard.android.util.RootShell
-import com.wireguard.config.Peer
 import com.zaneschepke.wireguardautotunnel.service.tunnel.HandshakeStatus
 import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStatistics
-import com.zaneschepke.wireguardautotunnel.ui.theme.Corn
-import com.zaneschepke.wireguardautotunnel.ui.theme.SilverTree
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.NumberUtils
 import org.amnezia.awg.config.Config
-import timber.log.Timber
-import java.net.InetAddress
 
 fun TunnelStatistics.mapPeerStats(): Map<org.amnezia.awg.crypto.Key, TunnelStatistics.PeerStats?> {
 	return this.getPeers().associateWith { key -> (this.peerStats(key)) }
@@ -35,43 +28,13 @@ fun TunnelStatistics.PeerStats.handshakeStatus(): HandshakeStatus {
 	}
 }
 
-fun Peer.isReachable(): Boolean {
-	val host =
-		if (this.endpoint.isPresent &&
-			this.endpoint.get().resolved.isPresent
-		) {
-			this.endpoint.get().resolved.get().host
-		} else {
-			Constants.DEFAULT_PING_IP
-		}
-	Timber.i("Checking reachability of peer: $host")
-	val reachable =
-		InetAddress.getByName(host)
-			.isReachable(Constants.PING_TIMEOUT.toInt())
-	Timber.i("Result: reachable - $reachable")
-	return reachable
-}
-
-fun TunnelStatistics?.asColor(): Color {
-	return this?.mapPeerStats()
-		?.map { it.value?.handshakeStatus() }
-		?.let { statuses ->
-			when {
-				statuses.all { it == HandshakeStatus.HEALTHY } -> SilverTree
-				statuses.any { it == HandshakeStatus.STALE } -> Corn
-				statuses.all { it == HandshakeStatus.NOT_STARTED } -> Color.Gray
-				else -> Color.Gray
-			}
-		} ?: Color.Gray
-}
-
 fun Config.toWgQuickString(): String {
 	val amQuick = toAwgQuickString(true)
 	val lines = amQuick.lines().toMutableList()
 	val linesIterator = lines.iterator()
 	while (linesIterator.hasNext()) {
 		val next = linesIterator.next()
-		Constants.amProperties.forEach {
+		Constants.amneziaProperties.forEach {
 			if (next.startsWith(it, ignoreCase = true)) {
 				linesIterator.remove()
 			}
@@ -79,9 +42,3 @@ fun Config.toWgQuickString(): String {
 	}
 	return lines.joinToString(System.lineSeparator())
 }
-
-fun RootShell.getCurrentWifiName(): String? {
-	val response = mutableListOf<String>()
-	this.run(response, "dumpsys wifi | grep -o \"SSID: [^,]*\" | cut -d ' ' -f2- | tr -d '\"'")
-	return response.lastOrNull()
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/extensions/UiExtensions.kt

@@ -1,10 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.util.extensions
-
-import androidx.navigation.NavController
-import com.zaneschepke.wireguardautotunnel.ui.Route
-
-fun NavController.navigateAndForget(route: Route) {
-	navigate(route) {
-		popUpTo(0)
-	}
-}

app/src/main/res/values-nl/strings.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources></resources>