fmt

closes #687

.editorconfig

@@ -1,97 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-indent_size = 4
-indent_style = tab
-max_line_length = 150
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[{*.kt,*.kts}]
-ij_continuation_indent_size = 4
-ij_java_names_count_to_use_import_on_demand = 9999
-ij_kotlin_align_in_columns_case_branch = false
-ij_kotlin_align_multiline_binary_operation = false
-ij_kotlin_align_multiline_extends_list = false
-ij_kotlin_align_multiline_method_parentheses = false
-ij_kotlin_align_multiline_parameters = true
-ij_kotlin_align_multiline_parameters_in_calls = false
-ij_kotlin_assignment_wrap = normal
-ij_kotlin_blank_lines_after_class_header = 0
-ij_kotlin_blank_lines_around_block_when_branches = 0
-ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1
-ij_kotlin_block_comment_at_first_column = true
-ij_kotlin_call_parameters_new_line_after_left_paren = true
-ij_kotlin_call_parameters_right_paren_on_new_line = false
-ij_kotlin_catch_on_new_line = false
-ij_kotlin_continuation_indent_for_chained_calls = true
-ij_kotlin_continuation_indent_for_expression_bodies = true
-ij_kotlin_continuation_indent_in_argument_lists = true
-ij_kotlin_continuation_indent_in_elvis = false
-ij_kotlin_continuation_indent_in_if_conditions = false
-ij_kotlin_continuation_indent_in_parameter_lists = false
-ij_kotlin_continuation_indent_in_supertype_lists = false
-ij_kotlin_else_on_new_line = false
-ij_kotlin_enum_constants_wrap = off
-ij_kotlin_extends_list_wrap = normal
-ij_kotlin_field_annotation_wrap = split_into_lines
-ij_kotlin_finally_on_new_line = false
-ij_kotlin_if_rparen_on_new_line = false
-ij_kotlin_import_nested_classes = false
-ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
-ij_kotlin_keep_blank_lines_before_right_brace = 2
-ij_kotlin_keep_blank_lines_in_code = 2
-ij_kotlin_keep_blank_lines_in_declarations = 2
-ij_kotlin_keep_first_column_comment = true
-ij_kotlin_keep_indents_on_empty_lines = false
-ij_kotlin_keep_line_breaks = true
-ij_kotlin_lbrace_on_next_line = false
-ij_kotlin_line_comment_add_space = false
-ij_kotlin_line_comment_at_first_column = true
-ij_kotlin_method_annotation_wrap = split_into_lines
-ij_kotlin_method_call_chain_wrap = normal
-ij_kotlin_method_parameters_new_line_after_left_paren = true
-ij_kotlin_method_parameters_right_paren_on_new_line = true
-ij_kotlin_name_count_to_use_star_import = 9999
-ij_kotlin_name_count_to_use_star_import_for_members = 9999
-ij_kotlin_parameter_annotation_wrap = off
-ij_kotlin_space_after_comma = true
-ij_kotlin_space_after_extend_colon = true
-ij_kotlin_space_after_type_colon = true
-ij_kotlin_space_before_catch_parentheses = true
-ij_kotlin_space_before_comma = false
-ij_kotlin_space_before_extend_colon = true
-ij_kotlin_space_before_for_parentheses = true
-ij_kotlin_space_before_if_parentheses = true
-ij_kotlin_space_before_lambda_arrow = true
-ij_kotlin_space_before_type_colon = false
-ij_kotlin_space_before_when_parentheses = true
-ij_kotlin_space_before_while_parentheses = true
-ij_kotlin_spaces_around_additive_operators = true
-ij_kotlin_spaces_around_assignment_operators = true
-ij_kotlin_spaces_around_equality_operators = true
-ij_kotlin_spaces_around_function_type_arrow = true
-ij_kotlin_spaces_around_logical_operators = true
-ij_kotlin_spaces_around_multiplicative_operators = true
-ij_kotlin_spaces_around_range = false
-ij_kotlin_spaces_around_relational_operators = true
-ij_kotlin_spaces_around_unary_operator = false
-ij_kotlin_spaces_around_when_arrow = true
-ij_kotlin_variable_annotation_wrap = off
-ij_kotlin_while_on_new_line = false
-ij_kotlin_wrap_elvis_expressions = 1
-ij_kotlin_wrap_expression_body_functions = 1
-ij_kotlin_wrap_first_method_in_call_chain = false
-#compose
-ktlint_standard_filename = disabled
-ktlint_standard_no-wildcard-imports = disabled
-ktlint_standard_function-naming = disabled
-ktlint_standard_property-naming = disabled
-ktlint_standard_package-naming = disabled
-ktlint_function_naming_ignore_when_annotated_with = Composable
-ktlint_code_style = android_studio
-ktlint_standard_import-ordering = disabled
-ktlint_standard_package-naming = disabled
-ij_kotlin_allow_trailing_comma = true
-ij_kotlin_allow_trailing_comma_on_call_site = true

.github/workflows/build.yml

@@ -48,9 +48,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     env:
-      SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
-      SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
-      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
+      SIGNING_KEY_ALIAS: ${{ secrets.ANDROID_SIGNING_KEY_ALIAS }}
+      SIGNING_KEY_PASSWORD: ${{ secrets.ANDROID_SIGNING_KEY_PASSWORD }}
+      SIGNING_STORE_PASSWORD: ${{ secrets.ANDROID_SIGNING_STORE_PASSWORD }}
       KEY_STORE_FILE: 'android_keystore.jks'
       KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
     outputs:
@@ -74,7 +74,7 @@ jobs:
         with:
           fileName: ${{ env.KEY_STORE_FILE }}
           fileDir: ${{ env.KEY_STORE_LOCATION }}
-          encodedString: ${{ secrets.KEYSTORE }}
+          encodedString: ${{ secrets.ANDROID_KEYSTORE }}
 
       # create keystore path for gradle to read
       - name: Create keystore path env var

.github/workflows/on-issue.yml

@@ -1,20 +0,0 @@
-name: on-issue
-
-on:
-  issues:
-    types: [ opened, closed, reopened ]
-
-
-jobs:
-
-  on-issue:
-    name: On new issue
-    runs-on: ubuntu-latest
-    steps:
-      - name: Send Telegram Message
-        run: |
-          msg_text='${{ github.actor }} updated an issue:
-            status: ${{ github.event.issue.state }} - #${{ github.event.issue.number }} ${{ github.event.issue.title }}
-            https://github.com/zaneschepke/wgtunnel/issues/${{ github.event.issue.number }}'
-          curl -s -X POST 'https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage' \
-          -d "chat_id=${{ secrets.TELEGRAM_TO }}&text=${msg_text}&message_thread_id=${{ secrets.TELEGRAM_TOPIC }}"

.github/workflows/on-publish.yml

@@ -1,21 +0,0 @@
-name: on-publish
-
-on:
-  release:
-    types: [ published ]
-
-
-jobs:
-
-  on-publish:
-    name: On publish
-    runs-on: ubuntu-latest
-    steps:
-      - name: Send Telegram Message
-        run: |
-          msg_text='${{ github.actor }} published a new release:
-            Release: ${{ github.event.release.tag_name }}
-            ${{ github.event.release.body }}
-            https://github.com/zaneschepke/wgtunnel/releases/tag/${{ github.event.release.tag_name }}'
-          curl -s -X POST 'https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage' \
-          -d "chat_id=${{ secrets.TELEGRAM_TO }}&text=${msg_text}&message_thread_id=${{ secrets.TELEGRAM_TOPIC }}"

.github/workflows/pr.yml

@@ -19,5 +19,5 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      - name: Run ktlint
-        run: ./gradlew ktlintCheck
+      - name: Run ktfmt
+        run: ./gradlew ktfmtCheck

.github/workflows/publish.yml

@@ -34,6 +34,9 @@ on:
 env:
   UPLOAD_DIR_ANDROID: android_artifacts
 
+permissions:
+  contents: write
+
 jobs:
   check_commits:
     name: Check for New Commits
@@ -43,14 +46,14 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0  # This fetches all history so we can check commits
 
       - name: Check for new commits
         id: check
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.PAT }}
         run: |
           # This script checks for commits newer than 23 hours ago
           NEW_COMMITS=$(git rev-list --count --after="$(date -Iseconds -d '23 hours ago')" ${{ github.sha }})
@@ -71,9 +74,9 @@ jobs:
     name: publish-github
     runs-on: ubuntu-latest
     env:
-      GH_USER: ${{ secrets.GH_USER }}
+      GH_USER: ${{ secrets.PAT_USERNAME }}
       # GH needed for gh cli
-      GH_TOKEN: ${{ secrets.GH_TOKEN }}
+      GH_TOKEN: ${{ secrets.PAT }}
       GH_REPO: ${{ github.repository }}
 
     steps:
@@ -90,6 +93,7 @@ jobs:
           tag: "latest"  # or any tag name you wish to use
           message: "Automated tag for HEAD commit"
           force_push_tag: true
+          github_token: ${{ secrets.GITHUB_TOKEN }}
           tag_exists_error: false
 
       - name: Get latest release
@@ -118,7 +122,7 @@ jobs:
         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 }}
+          github_token: ${{ secrets.PAT }}
           branch: ${{ github.ref }}
 
       - name: Make download dir
@@ -212,13 +216,13 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
-      SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
-      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
+      SIGNING_KEY_ALIAS: ${{ secrets.ANDROID_SIGNING_KEY_ALIAS }}
+      SIGNING_KEY_PASSWORD: ${{ secrets.ANDROID_SIGNING_KEY_PASSWORD }}
+      SIGNING_STORE_PASSWORD: ${{ secrets.ANDROID_SIGNING_STORE_PASSWORD }}
       KEY_STORE_FILE: 'android_keystore.jks'
       KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
-      GH_USER: ${{ secrets.GH_USER }}
-      GH_TOKEN: ${{ secrets.GH_TOKEN }}
+      GH_USER: ${{ secrets.PAT_USERNAME }}
+      GH_TOKEN: ${{ secrets.PAT }}
 
     steps:
       - uses: actions/checkout@v4
@@ -240,7 +244,7 @@ jobs:
         with:
           fileName: ${{ env.KEY_STORE_FILE }}
           fileDir: ${{ env.KEY_STORE_LOCATION }}
-          encodedString: ${{ secrets.KEYSTORE }}
+          encodedString: ${{ secrets.ANDROID_KEYSTORE }}
 
       # create keystore path for gradle to read
       - name: Create keystore path env var

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 WG Auto Tunnel
+Copyright ©  2023-2025 Zane Schepke
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -4,7 +4,7 @@ WG Tunnel
 
 <div align="center">
 
-An alternative Android client app for [WireGuard®](https://www.wireguard.com/)
+An alternative Android client app for [WireGuard](https://www.wireguard.com/)
 and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/)
 <br />
 <br />
@@ -23,14 +23,14 @@ and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/)
 [![Google Play](https://img.shields.io/badge/Google_Play-414141?style=for-the-badge&logo=google-play&logoColor=white)](https://play.google.com/store/apps/details?id=com.zaneschepke.wireguardautotunnel)
 [![F-Droid](https://img.shields.io/static/v1?style=for-the-badge&message=F-Droid&color=1976D2&logo=F-Droid&logoColor=FFFFFF&label=)](https://f-droid.org/packages/com.zaneschepke.wireguardautotunnel/)
 [![Personal](https://img.shields.io/static/v1?style=for-the-badge&message=Personal&color=1976D2&logo=F-Droid&logoColor=FFFFFF&label=)](https://github.com/zaneschepke/fdroid)
+[![Obtainium](https://img.shields.io/badge/Obtainium-414141?style=for-the-badge&logo=Obtainium&logoColor=white)](https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22com.zaneschepke.wireguardautotunnel%22%2C%22url%22%3A%22https%3A%2F%2Fgithub.com%2Fzaneschepke%2Fwgtunnel%22%2C%22author%22%3A%22zaneschepke%22%2C%22name%22%3A%22WG%20Tunnel%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22includePrereleases%5C%22%3Afalse%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22filterReleaseNotesByRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22verifyLatestTag%5C%22%3Atrue%2C%5C%22sortMethodChoice%5C%22%3A%5C%22date%5C%22%2C%5C%22useLatestAssetDateAsReleaseDate%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%2C%5C%22trackOnly%5C%22%3Afalse%2C%5C%22versionExtractionRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22matchGroupToUse%5C%22%3A%5C%22%5C%22%2C%5C%22versionDetection%5C%22%3Atrue%2C%5C%22releaseDateAsVersion%5C%22%3Afalse%2C%5C%22useVersionCodeAsOSVersion%5C%22%3Afalse%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22invertAPKFilter%5C%22%3Afalse%2C%5C%22autoApkFilterByArch%5C%22%3Atrue%2C%5C%22appName%5C%22%3A%5C%22WG%20Tunnel%5C%22%2C%5C%22appAuthor%5C%22%3A%5C%22Zane%20Schepke%5C%22%2C%5C%22shizukuPretendToBeGooglePlay%5C%22%3Afalse%2C%5C%22allowInsecure%5C%22%3Afalse%2C%5C%22exemptFromBackgroundUpdates%5C%22%3Afalse%2C%5C%22skipUpdateNotifications%5C%22%3Afalse%2C%5C%22about%5C%22%3A%5C%22%5C%22%2C%5C%22refreshBeforeDownload%5C%22%3Afalse%7D%22%2C%22overrideSource%22%3Anull%7D)
 
 </div>
 
 <div align="center">
 
-[![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/rbRRNh6H7V)
-[![Telegram](https://img.shields.io/badge/Telegram-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)](https://t.me/wgtunnel)
-
+[<img  src="https://img.shields.io/badge/Telegram-26A5E4.svg?style=for-the-badge&logo=Telegram&logoColor=white">](https://t.me/wgtunnel)
+[<img src="https://img.shields.io/badge/Matrix-000000.svg?style=for-the-badge&logo=Matrix&logoColor=white">](https://matrix.to/#/#wg-tunnel-space:matrix.org)
 </div>
 
 <details open="open">
@@ -49,7 +49,7 @@ and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/)
 <div style="text-align: left;">
 
 ## About
-Inspired by the official [wireguard-android](https://github.com/WireGuard/wireguard-android) app, WG Tunnel was created to address features and support missing from the official app. This app combines support for both [WireGuard®](https://www.wireguard.com/)
+Inspired by the official [wireguard-android](https://github.com/WireGuard/wireguard-android) app, WG Tunnel was created to address features and support missing from the official app. This app combines support for both [WireGuard](https://www.wireguard.com/)
 and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/), with its primary feature of auto-tunneling (on-demand tunneling).
 
 </div>
@@ -61,14 +61,14 @@ and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/), with its pr
 Thank you to the following:
 
 - All of the users that have helped contribute to the project with ideas, translations, feedback, bug reports, testing, and donations.
-- [WireGuard®](https://www.wireguard.com/) - © Jason A. Donenfeld (https://github.com/WireGuard/wireguard-android)
+- [WireGuard](https://www.wireguard.com/) - Jason A. Donenfeld (https://github.com/WireGuard/wireguard-android)
 
 - [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) - Amnezia Team (https://github.com/amnezia-vpn/amneziawg-android)
 
 ## Screenshots
 
 </div>
-<div style="display: flex; flex-wrap: wrap; justify-content: center; gap: 10px;">
+<div style="display: flex; flex-wrap: wrap; justify-content: left; gap: 10px;">
  <img label="Main" src="fastlane/metadata/android/en-US/images/phoneScreenshots/main_screen.png" width="200" />
  <img label="Settings" src="fastlane/metadata/android/en-US/images/phoneScreenshots/settings_screen.png" width="200" />
   <img label="Auto" src="fastlane/metadata/android/en-US/images/phoneScreenshots/auto_screen.png" width="200" />

app/build.gradle.kts

@@ -1,255 +1,253 @@
 plugins {
-	alias(libs.plugins.android.application)
-	alias(libs.plugins.kotlin.android)
-	alias(libs.plugins.hilt.android)
-	alias(libs.plugins.kotlinxSerialization)
-	alias(libs.plugins.ksp)
-	alias(libs.plugins.compose.compiler)
-	alias(libs.plugins.grgit)
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.hilt.android)
+    alias(libs.plugins.kotlinxSerialization)
+    alias(libs.plugins.ksp)
+    alias(libs.plugins.compose.compiler)
+    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().trim().toInt() + 1
-			} else {
-				1
-			}
-		}
-		else -> 0
-	}
-}
+val versionCodeIncrement =
+    with(getBuildTaskName().lowercase()) {
+        when {
+            this.contains(Constants.NIGHTLY) || this.contains(Constants.PRERELEASE) -> {
+                if (versionFile.exists()) {
+                    versionFile.readText().trim().toInt() + 1
+                } else {
+                    1
+                }
+            }
+            else -> 0
+        }
+    }
 
 android {
-	namespace = Constants.APP_ID
-	compileSdk = Constants.TARGET_SDK
+    namespace = Constants.APP_ID
+    compileSdk = Constants.TARGET_SDK
 
-	androidResources {
-		generateLocaleConfig = true
-	}
+    androidResources { generateLocaleConfig = true }
 
-	// reproducibility
-	dependenciesInfo {
-		// Disables dependency metadata when building APKs.
-		includeInApk = false
-		// Disables dependency metadata when building Android App Bundles.
-		includeInBundle = false
-	}
+    // reproducibility
+    dependenciesInfo {
+        // Disables dependency metadata when building APKs.
+        includeInApk = false
+        // Disables dependency metadata when building Android App Bundles.
+        includeInBundle = false
+    }
 
-	defaultConfig {
-		applicationId = Constants.APP_ID
-		minSdk = Constants.MIN_SDK
-		targetSdk = Constants.TARGET_SDK
-		versionCode = Constants.VERSION_CODE + versionCodeIncrement
-		versionName = determineVersionName()
+    defaultConfig {
+        applicationId = Constants.APP_ID
+        minSdk = Constants.MIN_SDK
+        targetSdk = Constants.TARGET_SDK
+        versionCode = Constants.VERSION_CODE + versionCodeIncrement
+        versionName = determineVersionName()
 
-		ksp { arg("room.schemaLocation", "$projectDir/schemas") }
+        ksp { arg("room.schemaLocation", "$projectDir/schemas") }
 
-		sourceSets {
-			getByName("debug").assets.srcDirs(files("$projectDir/schemas")) // Room
-		}
+        sourceSets {
+            getByName("debug").assets.srcDirs(files("$projectDir/schemas")) // Room
+        }
 
-		buildConfigField("String[]", "LANGUAGES", "new String[]{ ${languageList().joinToString(separator = ", ") { "\"$it\"" }} }")
+        buildConfigField(
+            "String[]",
+            "LANGUAGES",
+            "new String[]{ ${languageList().joinToString(separator = ", ") { "\"$it\"" }} }",
+        )
 
-		testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-		vectorDrawables { useSupportLibrary = true }
-	}
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables { useSupportLibrary = true }
+    }
 
-	signingConfigs {
-		create(Constants.RELEASE) {
-			storeFile = getStoreFile()
-			storePassword = getSigningProperty(Constants.STORE_PASS_VAR)
-			keyAlias = getSigningProperty(Constants.KEY_ALIAS_VAR)
-			keyPassword = getSigningProperty(Constants.KEY_PASS_VAR)
-		}
-	}
+    signingConfigs {
+        create(Constants.RELEASE) {
+            storeFile = getStoreFile()
+            storePassword = getSigningProperty(Constants.STORE_PASS_VAR)
+            keyAlias = getSigningProperty(Constants.KEY_ALIAS_VAR)
+            keyPassword = getSigningProperty(Constants.KEY_PASS_VAR)
+        }
+    }
 
-	buildTypes {
-		// don't strip
-		packaging.jniLibs.keepDebugSymbols.addAll(
-			listOf("libwg-go.so", "libwg-quick.so", "libwg.so"),
-		)
+    buildTypes {
+        // don't strip
+        packaging.jniLibs.keepDebugSymbols.addAll(
+            listOf("libwg-go.so", "libwg-quick.so", "libwg.so")
+        )
 
-		release {
-			isDebuggable = false
-			isMinifyEnabled = true
-			isShrinkResources = true
-			proguardFiles(
-				getDefaultProguardFile("proguard-android-optimize.txt"),
-				"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\"")
-		}
+        release {
+            isDebuggable = false
+            isMinifyEnabled = true
+            isShrinkResources = true
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro",
+            )
+            signingConfig = signingConfigs.getByName(Constants.RELEASE)
+            resValue("string", "provider", "\"${Constants.APP_NAME}.provider\"")
+        }
+        debug {
+            applicationIdSuffix = ".debug"
+            resValue("string", "app_name", "WG Tunnel - Debug")
+            isDebuggable = true
+            resValue("string", "provider", "\"${Constants.APP_NAME}.provider.debug\"")
+        }
 
-		create(Constants.PRERELEASE) {
-			initWith(buildTypes.getByName(Constants.RELEASE))
-			applicationIdSuffix = ".prerelease"
-			versionNameSuffix = "-pre"
-			resValue("string", "app_name", "WG Tunnel - Pre")
-			resValue("string", "provider", "\"${Constants.APP_NAME}.provider.pre\"")
-		}
+        create(Constants.PRERELEASE) {
+            initWith(buildTypes.getByName(Constants.RELEASE))
+            applicationIdSuffix = ".prerelease"
+            resValue("string", "app_name", "WG Tunnel - Pre")
+            resValue("string", "provider", "\"${Constants.APP_NAME}.provider.pre\"")
+        }
 
-		create(Constants.NIGHTLY) {
-			initWith(buildTypes.getByName(Constants.RELEASE))
-			applicationIdSuffix = ".nightly"
-			versionNameSuffix = "-nightly"
-			resValue("string", "app_name", "WG Tunnel - Nightly")
-			resValue("string", "provider", "\"${Constants.APP_NAME}.provider.nightly\"")
-		}
+        create(Constants.NIGHTLY) {
+            initWith(buildTypes.getByName(Constants.RELEASE))
+            applicationIdSuffix = ".nightly"
+            resValue("string", "app_name", "WG Tunnel - Nightly")
+            resValue("string", "provider", "\"${Constants.APP_NAME}.provider.nightly\"")
+        }
 
-		applicationVariants.all {
-			val variant = this
-			variant.outputs
-				.map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
-				.forEach { output ->
-					val outputFileName =
-						"${Constants.APP_NAME}-${variant.flavorName}-" +
-							"${variant.buildType.name}-${variant.versionName}.apk"
-					output.outputFileName = outputFileName
-				}
-		}
-	}
-	flavorDimensions.add(Constants.TYPE)
-	productFlavors {
-		create("fdroid") {
-			dimension = Constants.TYPE
-			proguardFile("fdroid-rules.pro")
-		}
-		create("general") {
-			dimension = Constants.TYPE
-		}
-	}
-	compileOptions {
-		sourceCompatibility = JavaVersion.VERSION_17
-		targetCompatibility = JavaVersion.VERSION_17
-		isCoreLibraryDesugaringEnabled = true
-	}
-	kotlinOptions { jvmTarget = Constants.JVM_TARGET }
-	buildFeatures {
-		compose = true
-		buildConfig = true
-	}
-	packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
+        applicationVariants.all {
+            val variant = this
+            variant.outputs
+                .map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
+                .forEach { output ->
+                    val outputFileName =
+                        "${Constants.APP_NAME}-${variant.flavorName}-" +
+                            "${variant.buildType.name}-${variant.versionName}.apk"
+                    output.outputFileName = outputFileName
+                }
+        }
+    }
+    flavorDimensions.add(Constants.TYPE)
+    productFlavors {
+        create("fdroid") {
+            dimension = Constants.TYPE
+            proguardFile("fdroid-rules.pro")
+        }
+        create("general") { dimension = Constants.TYPE }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+        isCoreLibraryDesugaringEnabled = true
+    }
+    kotlinOptions { jvmTarget = Constants.JVM_TARGET }
+    buildFeatures {
+        compose = true
+        buildConfig = true
+    }
+    packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
 }
 
 dependencies {
-	implementation(project(":logcatter"))
-	implementation(project(":networkmonitor"))
+    implementation(project(":logcatter"))
+    implementation(project(":networkmonitor"))
 
-	implementation(libs.androidx.core.ktx)
-	implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
 
-	// helpers for implementing LifecycleOwner in a Service
-	implementation(libs.androidx.lifecycle.service)
-	implementation(libs.androidx.activity.compose)
-	implementation(platform(libs.androidx.compose.bom))
-	implementation(libs.androidx.compose.ui)
-	implementation(libs.androidx.compose.ui.graphics)
-	implementation(libs.androidx.compose.ui.tooling.preview)
-	implementation(libs.androidx.material3)
-	implementation(libs.androidx.appcompat)
-	implementation(libs.material)
+    // helpers for implementing LifecycleOwner in a Service
+    implementation(libs.androidx.lifecycle.service)
+    implementation(libs.androidx.activity.compose)
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.compose.ui)
+    implementation(libs.androidx.compose.ui.graphics)
+    implementation(libs.androidx.compose.ui.tooling.preview)
+    implementation(libs.androidx.material3)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.material)
+    implementation(libs.androidx.storage)
 
-	// test
-	testImplementation(libs.junit)
-	testImplementation(libs.androidx.junit)
-	androidTestImplementation(libs.androidx.junit)
-	androidTestImplementation(libs.androidx.espresso.core)
-	androidTestImplementation(platform(libs.androidx.compose.bom))
-	androidTestImplementation(libs.androidx.compose.ui.test)
-	androidTestImplementation(libs.androidx.room.testing)
-	debugImplementation(libs.androidx.compose.ui.tooling)
-	debugImplementation(libs.androidx.compose.manifest)
+    // test
+    testImplementation(libs.junit)
+    testImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+    androidTestImplementation(platform(libs.androidx.compose.bom))
+    androidTestImplementation(libs.androidx.compose.ui.test)
+    androidTestImplementation(libs.androidx.room.testing)
+    debugImplementation(libs.androidx.compose.ui.tooling)
+    debugImplementation(libs.androidx.compose.manifest)
 
-	// tunnel
-	implementation(libs.tunnel)
-	implementation(libs.amneziawg.android)
-	coreLibraryDesugaring(libs.desugar.jdk.libs)
+    // tunnel
+    implementation(libs.tunnel)
+    implementation(libs.amneziawg.android)
+    coreLibraryDesugaring(libs.desugar.jdk.libs)
 
-	// logging
-	implementation(libs.timber)
+    // logging
+    implementation(libs.timber)
 
-	// compose navigation
-	implementation(libs.androidx.navigation.compose)
-	implementation(libs.androidx.hilt.navigation.compose)
+    // compose navigation
+    implementation(libs.androidx.navigation.compose)
+    implementation(libs.androidx.hilt.navigation.compose)
 
-	// hilt
-	implementation(libs.hilt.android)
-	ksp(libs.hilt.android.compiler)
-	ksp(libs.androidx.hilt.compiler)
+    // hilt
+    implementation(libs.hilt.android)
+    ksp(libs.hilt.android.compiler)
+    ksp(libs.androidx.hilt.compiler)
 
-	// accompanist
-	implementation(libs.accompanist.permissions)
-	implementation(libs.accompanist.drawablepainter)
+    // accompanist
+    implementation(libs.accompanist.permissions)
+    implementation(libs.accompanist.drawablepainter)
 
-	// storage
-	implementation(libs.androidx.room.runtime)
-	ksp(libs.androidx.room.compiler)
-	implementation(libs.androidx.room.ktx)
-	implementation(libs.androidx.datastore.preferences)
+    // storage
+    implementation(libs.androidx.room.runtime)
+    ksp(libs.androidx.room.compiler)
+    implementation(libs.androidx.room.ktx)
+    implementation(libs.androidx.datastore.preferences)
 
-	// lifecycle
-	implementation(libs.lifecycle.runtime.compose)
-	implementation(libs.androidx.lifecycle.runtime.ktx)
-	implementation(libs.androidx.lifecycle.process)
+    // lifecycle
+    implementation(libs.lifecycle.runtime.compose)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.lifecycle.process)
 
-	// icons
-	implementation(libs.material.icons.extended)
-	// serialization
-	implementation(libs.kotlinx.serialization.json)
+    // serialization
+    implementation(libs.kotlinx.serialization.json)
 
-	// barcode scanning
-	implementation(libs.zxing.android.embedded)
+    // ui
+    implementation(libs.zxing.android.embedded)
+    implementation(libs.material.icons.extended)
 
-	// bio
-	implementation(libs.androidx.biometric.ktx)
-	implementation(libs.pin.lock.compose)
+    // bio
+    implementation(libs.androidx.biometric.ktx)
+    implementation(libs.pin.lock.compose)
 
-	// shortcuts
-	implementation(libs.androidx.core)
+    // shortcuts
+    implementation(libs.androidx.core)
 
-	// splash
-	implementation(libs.androidx.core.splashscreen)
+    // splash
+    implementation(libs.androidx.core.splashscreen)
 
-	// worker
-	implementation(libs.androidx.work.runtime)
-	implementation(libs.androidx.hilt.work)
+    // worker
+    implementation(libs.androidx.work.runtime)
+    implementation(libs.androidx.hilt.work)
 }
 
 fun determineVersionName(): String {
-	return with(getBuildTaskName().lowercase()) {
-		when {
-			contains(Constants.NIGHTLY) || contains(Constants.PRERELEASE) ->
-				Constants.VERSION_NAME +
-					"-${grgitService.service.get().grgit.head().abbreviatedId}"
-			else -> Constants.VERSION_NAME
-		}
-	}
+    return with(getBuildTaskName().lowercase()) {
+        when {
+            contains(Constants.NIGHTLY) || contains(Constants.PRERELEASE) ->
+                Constants.VERSION_NAME + "-${grgitService.service.get().grgit.head().abbreviatedId}"
+            else -> Constants.VERSION_NAME
+        }
+    }
 }
 
-val incrementVersionCode by tasks.registering {
-	doLast {
-		val versionFile = file("$rootDir/versionCode.txt")
-		if (versionFile.exists()) {
-			versionFile.writeText(versionCodeIncrement.toString())
-			println("Incremented versionCode to $versionCodeIncrement")
-		}
-	}
-}
+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)
-	}
+    if (name.startsWith("assemble") && !name.lowercase().contains("debug")) {
+        dependsOn(incrementVersionCode)
+    }
 }

app/fdroid-rules.pro

@@ -1,42 +0,0 @@
--dontwarn com.google.errorprone.annotations.**
-
--keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
-    <fields>;
-}
-
-# Keep all classes in the org.xbill.DNS package and subpackages
--keep class org.xbill.DNS.** { *; }
--dontwarn org.xbill.DNS.**
-
-# Preserve JNA classes if used (e.g., for IPHlpAPI on Windows)
--keep class com.sun.jna.** { *; }
--dontwarn com.sun.jna.**
-
-# Keep DNS resolver configuration classes that might be loaded dynamically
--keep class org.xbill.DNS.config.** { *; }
--dontwarn org.xbill.DNS.config.**
-
--keep class org.xbill.DNS.** { *; }
-
-# Prevent optimization issues with native or reflection-based calls
--dontoptimize
--dontshrink
-# Uncomment the above if errors persist, but use sparingly as they’re broad
-
-# Suppress warnings about missing classes if not all features are used
--dontwarn java.lang.management.**
--dontwarn sun.nio.ch.**
-
--dontwarn com.google.api.client.http.GenericUrl
--dontwarn com.google.api.client.http.HttpHeaders
--dontwarn com.google.api.client.http.HttpRequest
--dontwarn com.google.api.client.http.HttpRequestFactory
--dontwarn com.google.api.client.http.HttpResponse
--dontwarn com.google.api.client.http.HttpTransport
--dontwarn com.google.api.client.http.javanet.NetHttpTransport$Builder
--dontwarn com.google.api.client.http.javanet.NetHttpTransport
--dontwarn javax.lang.model.element.Modifier
--dontwarn org.joda.time.Instant
--dontwarn org.slf4j.impl.StaticLoggerBinder
--dontwarn org.slf4j.impl.StaticMDCBinder
--dontwarn org.slf4j.impl.StaticMarkerBinder

app/proguard-rules.pro

@@ -1,61 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
--keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
-    <fields>;
-}
-
-# Keep all classes in the org.xbill.DNS package and subpackages
--keep class org.xbill.DNS.** { *; }
--dontwarn org.xbill.DNS.**
-
-# Preserve JNA classes if used (e.g., for IPHlpAPI on Windows)
--keep class com.sun.jna.** { *; }
--dontwarn com.sun.jna.**
-
-# Keep DNS resolver configuration classes that might be loaded dynamically
--keep class org.xbill.DNS.config.** { *; }
--dontwarn org.xbill.DNS.config.**
-
--keep class org.xbill.DNS.** { *; }
-
-# Prevent optimization issues with native or reflection-based calls
--dontoptimize
--dontshrink
-# Uncomment the above if errors persist, but use sparingly as they’re broad
-
-# Suppress warnings about missing classes if not all features are used
--dontwarn java.lang.management.**
--dontwarn sun.nio.ch.**
-
--dontwarn com.google.api.client.http.GenericUrl
--dontwarn com.google.api.client.http.HttpHeaders
--dontwarn com.google.api.client.http.HttpRequest
--dontwarn com.google.api.client.http.HttpRequestFactory
--dontwarn com.google.api.client.http.HttpResponse
--dontwarn com.google.api.client.http.HttpTransport
--dontwarn com.google.api.client.http.javanet.NetHttpTransport$Builder
--dontwarn com.google.api.client.http.javanet.NetHttpTransport
--dontwarn javax.lang.model.element.Modifier
--dontwarn org.joda.time.Instant
--dontwarn org.slf4j.impl.StaticLoggerBinder
--dontwarn org.slf4j.impl.StaticMDCBinder
--dontwarn org.slf4j.impl.StaticMarkerBinder

app/src/androidTest/java/com/zaneschepke/wireguardautotunnel/ExampleInstrumentedTest.kt

@@ -13,10 +13,10 @@ import org.junit.runner.RunWith
  */
 @RunWith(AndroidJUnit4::class)
 class ExampleInstrumentedTest {
-	@Test
-	fun useAppContext() {
-		// Context of the app under test.
-		val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-		assertEquals("com.zaneschepke.wireguardautotunnel", appContext.packageName)
-	}
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("com.zaneschepke.wireguardautotunnel", appContext.packageName)
+    }
 }

app/src/androidTest/java/com/zaneschepke/wireguardautotunnel/MigrationTest.kt

@@ -5,40 +5,35 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
 import com.zaneschepke.wireguardautotunnel.data.Queries
+import java.io.IOException
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.io.IOException
 
 @RunWith(AndroidJUnit4::class)
 class MigrationTest {
-	private val dbName = "migration-test"
+    private val dbName = "migration-test"
 
-	@get:Rule
-	val helper: MigrationTestHelper =
-		MigrationTestHelper(
-			InstrumentationRegistry.getInstrumentation(),
-			AppDatabase::class.java,
-		)
+    @get:Rule
+    val helper: MigrationTestHelper =
+        MigrationTestHelper(InstrumentationRegistry.getInstrumentation(), AppDatabase::class.java)
 
-	@Test
-	@Throws(IOException::class)
-	fun migrate6To7() {
-		helper.createDatabase(dbName, 6).apply {
-			// Database has schema version 1. Insert some data using SQL queries.
-			// You can't use DAO classes because they expect the latest schema.
-			execSQL(Queries.createDefaultSettings())
-			execSQL(
-				Queries.createTunnelConfig(),
-			)
-			// Prepare for the next version.
-			close()
-		}
+    @Test
+    @Throws(IOException::class)
+    fun migrate6To7() {
+        helper.createDatabase(dbName, 6).apply {
+            // Database has schema version 1. Insert some data using SQL queries.
+            // You can't use DAO classes because they expect the latest schema.
+            execSQL(Queries.createDefaultSettings())
+            execSQL(Queries.createTunnelConfig())
+            // Prepare for the next version.
+            close()
+        }
 
-		// Re-open the database with version 2 and provide
-		// MIGRATION_1_2 as the migration process.
-		helper.runMigrationsAndValidate(dbName, 7, true)
-		// MigrationTestHelper automatically verifies the schema changes,
-		// but you need to validate that the data was migrated properly.
-	}
+        // Re-open the database with version 2 and provide
+        // MIGRATION_1_2 as the migration process.
+        helper.runMigrationsAndValidate(dbName, 7, true)
+        // MigrationTestHelper automatically verifies the schema changes,
+        // but you need to validate that the data was migrated properly.
+    }
 }

app/src/main/AndroidManifest.xml

@@ -20,6 +20,8 @@
 
 	<permission
 		android:name="${applicationId}.permission.CONTROL_TUNNELS"
+		android:label="@string/app_permission_title"
+		android:description="@string/app_permission_description"
 		android:icon="@mipmap/ic_launcher"
 		android:protectionLevel="dangerous" />
 
@@ -45,6 +47,7 @@
     <queries>
         <intent>
             <action android:name="android.intent.action.MAIN" />
+			<category android:name="android.intent.category.LAUNCHER" />
         </intent>
     </queries>
     <application
@@ -63,7 +66,8 @@
         <activity
             android:name=".MainActivity"
             android:exported="true"
-			android:windowSoftInputMode="adjustResize"
+			android:banner="@mipmap/ic_banner"
+			android:windowSoftInputMode="adjustNothing"
             android:theme="@style/Theme.WireguardAutoTunnel"
 			android:configChanges="orientation|screenSize|keyboardHidden"
 			>
@@ -84,7 +88,7 @@
         <activity
             android:name=".core.shortcut.ShortcutsActivity"
             android:enabled="true"
-            android:exported="true"
+            android:exported="false"
 			android:noHistory="true"
 			android:excludeFromRecents="true"
 			android:finishOnTaskLaunch="true"
@@ -111,7 +115,7 @@
         <service
             android:name=".core.service.tile.TunnelControlTile"
             android:exported="true"
-            android:icon="@drawable/ic_launcher"
+            android:icon="@drawable/ic_notification"
             android:label="@string/tunnel_control"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <meta-data
@@ -128,7 +132,7 @@
         <service
             android:name=".core.service.tile.AutoTunnelControlTile"
             android:exported="true"
-            android:icon="@drawable/ic_launcher"
+            android:icon="@drawable/ic_notification"
             android:label="@string/auto_tunnel"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <meta-data
@@ -161,16 +165,17 @@
 				<action android:name="android.net.VpnService" />
 			</intent-filter>
 		</service>
-
         <receiver
             android:name=".core.broadcast.RestartReceiver"
             android:enabled="true"
-            android:exported="true">
+            android:exported="false"
+			android:directBootAware="true">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
                 <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
+				<action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
 				<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
             </intent-filter>
         </receiver>
@@ -182,6 +187,20 @@
 				<action android:name="com.wireguard.android.action.REFRESH_TUNNEL_STATES" />
 			</intent-filter>
 		</receiver>
+		<!--custom security solution for easier user integration-->
+		<receiver
+			android:name=".core.broadcast.RemoteControlReceiver"
+			android:enabled="true"
+			android:exported="true" tools:ignore="ExportedReceiver">
+			<intent-filter>
+				<action android:name="com.zaneschepke.wireguardautotunnel.START_TUNNEL" />
+				<action android:name="com.zaneschepke.wireguardautotunnel.STOP_TUNNEL" />
+				<action android:name="com.zaneschepke.wireguardautotunnel.START_AUTO_TUNNEL" />
+				<action android:name="com.zaneschepke.wireguardautotunnel.STOP_AUTO_TUNNEL" />
+				<action android:name="com.zaneschepke.wireguardautotunnel.START_KILL_SWITCH" />
+				<action android:name="com.zaneschepke.wireguardautotunnel.STOP_KILL_SWITCH" />
+			</intent-filter>
+		</receiver>
 		<receiver
 			android:name=".core.broadcast.NotificationActionReceiver"
 			android:exported="false"

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

@@ -1,23 +1,34 @@
 package com.zaneschepke.wireguardautotunnel
 
+import android.Manifest
+import android.annotation.SuppressLint
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.graphics.Color
+import android.net.Uri
 import android.os.Build
 import android.os.Bundle
+import android.provider.Settings
 import androidx.activity.SystemBarStyle
-import androidx.activity.compose.BackHandler
+import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
+import androidx.compose.foundation.background
+import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Bolt
 import androidx.compose.material.icons.rounded.Home
 import androidx.compose.material.icons.rounded.QuestionMark
 import androidx.compose.material.icons.rounded.Settings
@@ -25,235 +36,359 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarData
 import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.core.content.ContextCompat
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 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.core.shortcut.ShortcutManager
+import com.zaneschepke.networkmonitor.NetworkMonitor
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavBar
+import com.zaneschepke.wireguardautotunnel.ui.common.dialog.VpnDeniedDialog
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavItem
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.CustomBottomNavbar
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.DynamicTopAppBar
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.currentNavBackStackEntryAsNavBarState
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.CustomSnackBar
-import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarControllerProvider
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.ConfigScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.AutoTunnelScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.advanced.AutoTunnelAdvancedScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.MainScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.OptionsScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.PinLockScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.ScannerScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.SplitTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.TunnelAutoTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.AdvancedScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.AppearanceScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.DisplayScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.KillSwitchScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.LanguageScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.LocationDisclosureScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.autotunnel.TunnelAutoTunnelScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.ConfigScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.scanner.ScannerScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.SplitTunnelScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.tunneloptions.TunnelOptionsScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.pin.PinLockScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.SettingsScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.AutoTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.support.LogsScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.advanced.SettingsAdvancedScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.AppearanceScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.display.DisplayScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.language.LanguageScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.disclosure.LocationDisclosureScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.killswitch.KillSwitchScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.logs.LogsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.SupportScreen
 import com.zaneschepke.wireguardautotunnel.ui.theme.WireguardAutoTunnelTheme
-import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.extensions.goFromRoot
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlin.system.exitProcess
+import org.amnezia.awg.backend.GoBackend.VpnService
+import timber.log.Timber
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
 
-	@Inject
-	lateinit var appStateRepository: AppStateRepository
+    @Inject lateinit var appStateRepository: AppStateRepository
 
-	@Inject
-	lateinit var tunnelManager: TunnelManager
+    @Inject lateinit var tunnelManager: TunnelManager
 
-	@Inject
-	lateinit var shortcutManager: ShortcutManager
+    @Inject lateinit var networkMonitor: NetworkMonitor
 
-	override fun onCreate(savedInstanceState: Bundle?) {
-		enableEdgeToEdge(
-			statusBarStyle = SystemBarStyle.Companion.auto(Color.TRANSPARENT, Color.TRANSPARENT),
-			navigationBarStyle = SystemBarStyle.Companion.auto(Color.TRANSPARENT, Color.TRANSPARENT),
-		)
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-			window.isNavigationBarContrastEnforced = false
-		}
-		super.onCreate(savedInstanceState)
+    private var lastLocationPermissionState: Boolean? = null
 
-		val viewModel by viewModels<AppViewModel>()
+    @SuppressLint("BatteryLife")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge(
+            statusBarStyle = SystemBarStyle.Companion.auto(Color.TRANSPARENT, Color.TRANSPARENT),
+            navigationBarStyle = SystemBarStyle.Companion.auto(Color.TRANSPARENT, Color.TRANSPARENT),
+        )
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            window.isNavigationBarContrastEnforced = false
+        }
+        super.onCreate(savedInstanceState)
 
-		installSplashScreen().apply {
-			setKeepOnScreenCondition {
-				!viewModel.isAppReady.value
-			}
-		}
+        val viewModel by viewModels<AppViewModel>()
 
-		setContent {
-			val appUiState by viewModel.uiState.collectAsStateWithLifecycle()
-			val configurationChange by viewModel.configurationChange.collectAsStateWithLifecycle()
-			val navController = rememberNavController()
+        installSplashScreen().apply {
+            setKeepOnScreenCondition { !viewModel.appViewState.value.isAppReady }
+        }
 
-			LaunchedEffect(configurationChange) {
-				if (configurationChange) {
-					Intent(this@MainActivity, MainActivity::class.java).also {
-						startActivity(it)
-						exitProcess(0)
-					}
-				}
-			}
+        setContent {
+            val appUiState by viewModel.uiState.collectAsStateWithLifecycle()
+            val appViewState by viewModel.appViewState.collectAsStateWithLifecycle()
 
-			LaunchedEffect(Unit) {
-				viewModel.getEmitSplitTunnelApps(this@MainActivity)
-			}
+            val navController = rememberNavController()
+            val backStackEntry by navController.currentBackStackEntryAsState()
+            val navBarState by
+                currentNavBackStackEntryAsNavBarState(
+                    navController,
+                    backStackEntry,
+                    viewModel,
+                    appUiState,
+                )
+            val snackbar = remember { SnackbarHostState() }
+            var showVpnPermissionDialog by remember { mutableStateOf(false) }
+            var vpnPermissionDenied by remember { mutableStateOf(false) }
 
-			with(appUiState.appSettings) {
-				LaunchedEffect(isShortcutsEnabled) {
-					if (!isShortcutsEnabled) return@LaunchedEffect shortcutManager.removeShortcuts()
-					shortcutManager.addShortcuts()
-				}
-			}
+            val vpnActivity =
+                rememberLauncherForActivityResult(
+                    ActivityResultContracts.StartActivityForResult(),
+                    onResult = {
+                        if (it.resultCode != RESULT_OK) {
+                            showVpnPermissionDialog = true
+                            vpnPermissionDenied = true
+                        } else {
+                            vpnPermissionDenied = false
+                        }
+                    },
+                )
 
-			CompositionLocalProvider(LocalNavController provides navController) {
-				SnackbarControllerProvider { host ->
-					WireguardAutoTunnelTheme(theme = appUiState.generalState.theme) {
-						Scaffold(
-							contentWindowInsets = WindowInsets(0),
-							snackbarHost = {
-								SnackbarHost(host) { snackbarData: SnackbarData ->
-									CustomSnackBar(
-										snackbarData.visuals.message,
-										isRtl = false,
-										containerColor =
-										MaterialTheme.colorScheme.surfaceColorAtElevation(
-											2.dp,
-										),
-									)
-								}
-							},
-							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.Companion.fillMaxSize().padding(padding)) {
-								NavHost(
-									navController,
-									enterTransition = { fadeIn(tween(Constants.TRANSITION_ANIMATION_TIME)) },
-									exitTransition = { fadeOut(tween(Constants.TRANSITION_ANIMATION_TIME)) },
-									startDestination = (if (appUiState.generalState.isPinLockEnabled) Route.Lock else Route.Main),
-								) {
-									composable<Route.Main> {
-										MainScreen(
-											uiState = appUiState,
-										)
-									}
-									composable<Route.Settings> {
-										SettingsScreen(
-											appViewModel = viewModel,
-											uiState = appUiState,
-										)
-									}
-									composable<Route.LocationDisclosure> {
-										LocationDisclosureScreen(viewModel, appUiState)
-									}
-									composable<Route.AutoTunnel> {
-										AutoTunnelScreen(
-											appUiState.appSettings,
-										)
-									}
-									composable<Route.Appearance> {
-										AppearanceScreen()
-									}
-									composable<Route.Language> {
-										LanguageScreen(appUiState, viewModel)
-									}
-									composable<Route.Display> {
-										DisplayScreen(appUiState)
-									}
-									composable<Route.Support> {
-										SupportScreen(appUiState, viewModel)
-									}
-									composable<Route.AutoTunnelAdvanced> {
-										AdvancedScreen(appUiState.appSettings, viewModel)
-									}
-									composable<Route.Logs> {
-										LogsScreen()
-									}
-									composable<Route.Config> { backStack ->
-										val args = backStack.toRoute<Route.Config>()
-										val config =
-											appUiState.tunnels.firstOrNull { it.id == args.id }
-										ConfigScreen(config, viewModel)
-									}
-									composable<Route.TunnelOptions> { backStack ->
-										val args = backStack.toRoute<Route.TunnelOptions>()
-										appUiState.tunnels.firstOrNull { it.id == args.id }?.let { config ->
-											OptionsScreen(config, appUiState)
-										}
-									}
-									composable<Route.Lock> {
-										PinLockScreen(viewModel)
-									}
-									composable<Route.Scanner> {
-										ScannerScreen()
-									}
-									composable<Route.KillSwitch> {
-										KillSwitchScreen(appUiState, viewModel)
-									}
-									composable<Route.SplitTunnel> { backStack ->
-										val args = backStack.toRoute<Route.SplitTunnel>()
-										appUiState.tunnels.firstOrNull { it.id == args.id }?.let {
-											SplitTunnelScreen(it, viewModel)
-										}
-									}
-									composable<Route.TunnelAutoTunnel> { backStack ->
-										val args = backStack.toRoute<Route.TunnelOptions>()
-										appUiState.tunnels.firstOrNull { it.id == args.id }?.let {
-											TunnelAutoTunnelScreen(it, appUiState.appSettings)
-										}
-									}
-								}
-								BackHandler {
-									if (navController.previousBackStackEntry == null || !navController.popBackStack()) {
-										this@MainActivity.finish()
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
+            LaunchedEffect(appUiState.tunnels) {
+                if (!appViewState.isAppReady) {
+                    viewModel.handleEvent(AppEvent.AppReadyCheck(appUiState.tunnels))
+                }
+            }
+
+            val batteryActivity =
+                rememberLauncherForActivityResult(
+                    ActivityResultContracts.StartActivityForResult()
+                ) { _: ActivityResult ->
+                    viewModel.handleEvent(AppEvent.SetBatteryOptimizeDisableShown)
+                }
+
+            with(appViewState) {
+                LaunchedEffect(isConfigChanged) {
+                    if (isConfigChanged) {
+                        Intent(this@MainActivity, MainActivity::class.java).also {
+                            startActivity(it)
+                            exitProcess(0)
+                        }
+                    }
+                }
+                LaunchedEffect(errorMessage) {
+                    errorMessage?.let {
+                        snackbar.showSnackbar(it.asString(this@MainActivity))
+                        viewModel.handleEvent(AppEvent.MessageShown)
+                    }
+                }
+                LaunchedEffect(appUiState.activeTunnels) {
+                    appUiState.activeTunnels.mapNotNull { (tunnelConf, tunnelState) ->
+                        (tunnelState.status as? TunnelStatus.Error)?.let { error ->
+                            val message = error.error.toStringRes()
+                            val context = this@MainActivity
+                            snackbar.showSnackbar(
+                                context.getString(
+                                    R.string.tunnel_error_template,
+                                    context.getString(message),
+                                )
+                            )
+                            viewModel.handleEvent(AppEvent.ClearTunnelError(tunnelConf))
+                        }
+                    }
+                }
+                LaunchedEffect(popBackStack) {
+                    if (popBackStack) {
+                        navController.popBackStack()
+                        viewModel.handleEvent(AppEvent.PopBackStack(false))
+                    }
+                }
+                LaunchedEffect(requestVpnPermission) {
+                    if (requestVpnPermission) {
+                        if (!vpnPermissionDenied) {
+                            vpnActivity.launch(VpnService.prepare(this@MainActivity))
+                        } else {
+                            showVpnPermissionDialog = true
+                        }
+                        viewModel.handleEvent(AppEvent.VpnPermissionRequested)
+                    }
+                }
+                LaunchedEffect(requestBatteryPermission) {
+                    if (requestBatteryPermission) {
+                        batteryActivity.launch(
+                            Intent().apply {
+                                action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
+                                data = Uri.parse("package:${this@MainActivity.packageName}")
+                            }
+                        )
+                    }
+                }
+            }
+
+            CompositionLocalProvider(LocalNavController provides navController) {
+                WireguardAutoTunnelTheme(theme = appUiState.appState.theme) {
+                    VpnDeniedDialog(
+                        showVpnPermissionDialog,
+                        onDismiss = { showVpnPermissionDialog = false },
+                    )
+
+                    Scaffold(
+                        modifier =
+                            Modifier.pointerInput(Unit) {
+                                detectTapGestures {
+                                    viewModel.handleEvent(AppEvent.SetSelectedTunnel(null))
+                                }
+                            },
+                        snackbarHost = {
+                            SnackbarHost(snackbar) { snackbarData: SnackbarData ->
+                                CustomSnackBar(
+                                    snackbarData.visuals.message,
+                                    isRtl = false,
+                                    containerColor =
+                                        MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp),
+                                )
+                            }
+                        },
+                        topBar = { DynamicTopAppBar(navBarState) },
+                        bottomBar = {
+                            AnimatedVisibility(
+                                visible = navBarState.showBottom,
+                                enter = slideInVertically(initialOffsetY = { it }),
+                                exit = slideOutVertically(targetOffsetY = { it }),
+                            ) {
+                                CustomBottomNavbar(
+                                    listOf(
+                                        BottomNavItem(
+                                            name = stringResource(R.string.tunnels),
+                                            route = Route.Main,
+                                            icon = Icons.Rounded.Home,
+                                            onClick = { navController.goFromRoot(Route.Main) },
+                                        ),
+                                        BottomNavItem(
+                                            name = stringResource(R.string.auto_tunnel),
+                                            route = Route.AutoTunnel,
+                                            icon = Icons.Rounded.Bolt,
+                                            onClick = {
+                                                val route =
+                                                    if (
+                                                        appUiState.appState
+                                                            .isLocationDisclosureShown
+                                                    )
+                                                        Route.AutoTunnel
+                                                    else Route.LocationDisclosure
+                                                navController.goFromRoot(route)
+                                            },
+                                            active = appUiState.isAutoTunnelActive,
+                                        ),
+                                        BottomNavItem(
+                                            name = stringResource(R.string.settings),
+                                            route = Route.Settings,
+                                            icon = Icons.Rounded.Settings,
+                                            onClick = { navController.goFromRoot(Route.Settings) },
+                                        ),
+                                        BottomNavItem(
+                                            name = stringResource(R.string.support),
+                                            route = Route.Support,
+                                            icon = Icons.Rounded.QuestionMark,
+                                            onClick = { navController.goFromRoot(Route.Support) },
+                                        ),
+                                    ),
+                                    navBarState = navBarState,
+                                )
+                            }
+                        },
+                    ) { padding ->
+                        Box(
+                            modifier =
+                                Modifier.fillMaxSize()
+                                    .background(MaterialTheme.colorScheme.surface)
+                                    .padding(padding)
+                                    .consumeWindowInsets(padding)
+                                    .imePadding()
+                        ) {
+                            NavHost(
+                                navController,
+                                startDestination =
+                                    (if (appUiState.appState.isPinLockEnabled) Route.Lock
+                                    else Route.Main),
+                            ) {
+                                composable<Route.Main> {
+                                    MainScreen(appUiState, appViewState, viewModel)
+                                }
+                                composable<Route.Settings> {
+                                    SettingsScreen(appUiState, appViewState, viewModel)
+                                }
+                                composable<Route.SettingsAdvanced> {
+                                    SettingsAdvancedScreen(appUiState, viewModel)
+                                }
+                                composable<Route.LocationDisclosure> {
+                                    LocationDisclosureScreen(appUiState, viewModel)
+                                }
+                                composable<Route.AutoTunnel> {
+                                    AutoTunnelScreen(appUiState, viewModel)
+                                }
+                                composable<Route.Appearance> { AppearanceScreen() }
+                                composable<Route.Language> { LanguageScreen(appUiState, viewModel) }
+                                composable<Route.Display> { DisplayScreen(appUiState, viewModel) }
+                                composable<Route.Support> { SupportScreen() }
+                                composable<Route.AutoTunnelAdvanced> {
+                                    AutoTunnelAdvancedScreen(appUiState, viewModel)
+                                }
+                                composable<Route.Logs> { LogsScreen(appViewState, viewModel) }
+                                composable<Route.Config> { backStack ->
+                                    val args = backStack.toRoute<Route.Config>()
+                                    val config = appUiState.tunnels.firstOrNull { it.id == args.id }
+                                    ConfigScreen(config, viewModel)
+                                }
+                                composable<Route.TunnelOptions> { backStack ->
+                                    val args = backStack.toRoute<Route.TunnelOptions>()
+                                    appUiState.tunnels
+                                        .firstOrNull { it.id == args.id }
+                                        ?.let { config ->
+                                            TunnelOptionsScreen(config, appUiState, viewModel)
+                                        }
+                                }
+                                composable<Route.Lock> { PinLockScreen(viewModel) }
+                                composable<Route.Scanner> { ScannerScreen(viewModel) }
+                                composable<Route.KillSwitch> {
+                                    KillSwitchScreen(appUiState, viewModel)
+                                }
+                                composable<Route.SplitTunnel> { SplitTunnelScreen(viewModel) }
+                                composable<Route.TunnelAutoTunnel> { backStack ->
+                                    val args = backStack.toRoute<Route.TunnelOptions>()
+                                    appUiState.tunnels
+                                        .firstOrNull { it.id == args.id }
+                                        ?.let {
+                                            TunnelAutoTunnelScreen(
+                                                it,
+                                                appUiState.appSettings,
+                                                viewModel,
+                                            )
+                                        }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        checkPermissionAndNotify()
+    }
+
+    private fun checkPermissionAndNotify() {
+        val hasLocation =
+            ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) ==
+                PackageManager.PERMISSION_GRANTED
+        if (lastLocationPermissionState != hasLocation) {
+            Timber.d("Location permission changed to: $hasLocation")
+            if (hasLocation) {
+                networkMonitor.sendLocationPermissionsGrantedBroadcast()
+            }
+            lastLocationPermissionState = hasLocation
+        }
+    }
 }

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

@@ -19,123 +19,116 @@ import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
 import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
-import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import dagger.hilt.android.HiltAndroidApp
+import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import timber.log.Timber
-import javax.inject.Inject
 
 @HiltAndroidApp
 class WireGuardAutoTunnel : Application(), Configuration.Provider {
 
-	@Inject
-	lateinit var workerFactory: HiltWorkerFactory
+    @Inject lateinit var workerFactory: HiltWorkerFactory
 
-	override val workManagerConfiguration: Configuration
-		get() = Configuration.Builder()
-			.setWorkerFactory(workerFactory)
-			.build()
+    override val workManagerConfiguration: Configuration
+        get() = Configuration.Builder().setWorkerFactory(workerFactory).build()
 
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
+    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
 
-	@Inject
-	lateinit var logReader: LogReader
+    @Inject lateinit var logReader: LogReader
 
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
+    @Inject lateinit var appDataRepository: AppDataRepository
 
-	@Inject
-	@IoDispatcher
-	lateinit var ioDispatcher: CoroutineDispatcher
+    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
 
-	@Inject
-	@MainDispatcher
-	lateinit var mainDispatcher: CoroutineDispatcher
+    @Inject @MainDispatcher lateinit var mainDispatcher: CoroutineDispatcher
 
-	@Inject
-	lateinit var tunnelManager: TunnelManager
+    @Inject lateinit var tunnelManager: TunnelManager
 
-	override fun onCreate() {
-		super.onCreate()
-		instance = this
-		ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifecycleObserver())
-		if (BuildConfig.DEBUG) {
-			Timber.plant(Timber.DebugTree())
-			StrictMode.setThreadPolicy(
-				ThreadPolicy.Builder()
-					.detectDiskReads()
-					.detectDiskWrites()
-					.detectNetwork()
-					.penaltyLog()
-					.build(),
-			)
-		} else {
-			Timber.plant(ReleaseTree())
-		}
+    override fun onCreate() {
+        super.onCreate()
+        instance = this
+        ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifecycleObserver())
+        if (BuildConfig.DEBUG) {
+            Timber.plant(Timber.DebugTree())
+            StrictMode.setThreadPolicy(
+                ThreadPolicy.Builder()
+                    .detectDiskReads()
+                    .detectDiskWrites()
+                    .detectNetwork()
+                    .penaltyLog()
+                    .build()
+            )
+        } else {
+            Timber.plant(ReleaseTree())
+        }
 
-		GoBackend.setAlwaysOnCallback {
-			applicationScope.launch {
-				val settings = appDataRepository.settings.get()
-				if (settings.isAlwaysOnVpnEnabled) {
-					val tunnel = appDataRepository.getPrimaryOrFirstTunnel()
-					tunnel?.let {
-						tunnelManager.startTunnel(it)
-					}
-				} else {
-					Timber.Forest.w("Always-on VPN is not enabled in app settings")
-				}
-			}
-		}
+        GoBackend.setAlwaysOnCallback {
+            applicationScope.launch {
+                val settings = appDataRepository.settings.get()
+                if (settings.isAlwaysOnVpnEnabled) {
+                    val tunnel = appDataRepository.getPrimaryOrFirstTunnel()
+                    tunnel?.let { tunnelManager.startTunnel(it) }
+                } else {
+                    Timber.w("Always-on VPN is not enabled in app settings")
+                }
+            }
+        }
 
-		ServiceWorker.start(this)
+        ServiceWorker.start(this)
 
-		applicationScope.launch {
-			withContext(mainDispatcher) {
-				if (appDataRepository.appState.isLocalLogsEnabled() && !isRunningOnTv()) logReader.start()
-			}
-			if (!appDataRepository.settings.get().isKernelEnabled) {
-				tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
-			}
-			appDataRepository.appState.getLocale()?.let {
-				withContext(mainDispatcher) {
-					LocaleUtil.changeLocale(it)
-				}
-			}
-		}
-	}
+        applicationScope.launch {
+            appDataRepository.appState.getLocale()?.let {
+                withContext(mainDispatcher) { LocaleUtil.changeLocale(it) }
+            }
+            appDataRepository.appState.isLocalLogsEnabled().let { enabled ->
+                if (enabled) logReader.start()
+            }
+        }
+    }
 
-	override fun onTerminate() {
-		applicationScope.launch {
-			tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
-		}
-		super.onTerminate()
-	}
+    override fun onTerminate() {
+        applicationScope.launch {
+            tunnelManager.setBackendState(BackendState.INACTIVE, emptyList())
+        }
+        super.onTerminate()
+    }
 
-	class AppLifecycleObserver : DefaultLifecycleObserver {
+    class AppLifecycleObserver : DefaultLifecycleObserver {
 
-		override fun onStart(owner: LifecycleOwner) {
-			Timber.d("Application entered foreground")
-			foreground = true
-		}
-		override fun onPause(owner: LifecycleOwner) {
-			Timber.d("Application entered background")
-			foreground = false
-		}
-	}
+        override fun onStart(owner: LifecycleOwner) {
+            Timber.d("Application entered foreground")
+            foreground = true
+        }
 
-	companion object {
-		private var foreground = false
+        override fun onPause(owner: LifecycleOwner) {
+            Timber.d("Application entered background")
+            foreground = false
+        }
+    }
 
-		fun isForeground(): Boolean {
-			return foreground
-		}
+    companion object {
+        private var foreground = false
 
-		lateinit var instance: WireGuardAutoTunnel
-			private set
-	}
+        fun isForeground(): Boolean {
+            return foreground
+        }
+
+        @Volatile private var lastActiveTunnels: List<Int> = emptyList()
+
+        @Synchronized
+        fun getLastActiveTunnels(): List<Int> {
+            return lastActiveTunnels
+        }
+
+        @Synchronized
+        fun setLastActiveTunnels(newTunnels: List<Int>) {
+            lastActiveTunnels = newTunnels
+        }
+
+        lateinit var instance: WireGuardAutoTunnel
+            private set
+    }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/broadcast/KernelReceiver.kt

@@ -3,47 +3,40 @@ package com.zaneschepke.wireguardautotunnel.core.broadcast
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class KernelReceiver : BroadcastReceiver() {
 
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
+    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
 
-	@Inject
-	lateinit var tunnelRepository: TunnelRepository
+    @Inject lateinit var tunnelRepository: TunnelRepository
 
-	@Inject
-	lateinit var serviceManager: ServiceManager
+    @Inject lateinit var serviceManager: ServiceManager
 
-	@Inject
-	lateinit var tunnelManager: TunnelManager
+    @Inject lateinit var tunnelManager: TunnelManager
 
-	override fun onReceive(context: Context, intent: Intent) {
-		val action = intent.action ?: return
-		applicationScope.launch {
-			if (action == REFRESH_TUNNELS_ACTION) {
-				tunnelManager.runningTunnelNames().forEach { name ->
-					val tunnel = tunnelRepository.findByTunnelName(name)
-					tunnel?.let {
-						tunnelRepository.save(it.copy(isActive = true))
-					}
-				}
-				serviceManager.updateTunnelTile()
-			}
-		}
-	}
+    override fun onReceive(context: Context, intent: Intent) {
+        val action = intent.action ?: return
+        applicationScope.launch {
+            if (action == REFRESH_TUNNELS_ACTION) {
+                tunnelManager.runningTunnelNames().forEach { name ->
+                    val tunnel = tunnelRepository.findByTunnelName(name)
+                    tunnel?.let { tunnelRepository.save(it.copy(isActive = true)) }
+                }
+                serviceManager.updateTunnelTile()
+            }
+        }
+    }
 
-	companion object {
-		const val REFRESH_TUNNELS_ACTION = "com.wireguard.android.action.REFRESH_TUNNEL_STATES"
-	}
+    companion object {
+        const val REFRESH_TUNNELS_ACTION = "com.wireguard.android.action.REFRESH_TUNNEL_STATES"
+    }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/broadcast/NotificationActionReceiver.kt

@@ -4,43 +4,42 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class NotificationActionReceiver : BroadcastReceiver() {
 
-	@Inject
-	lateinit var serviceManager: ServiceManager
+    @Inject lateinit var serviceManager: ServiceManager
 
-	@Inject
-	lateinit var tunnelManager: TunnelManager
+    @Inject lateinit var tunnelManager: TunnelManager
 
-	@Inject
-	lateinit var tunnelRepository: TunnelRepository
+    @Inject lateinit var tunnelRepository: TunnelRepository
 
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
+    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
 
-	override fun onReceive(context: Context, intent: Intent) {
-		applicationScope.launch {
-			when (intent.action) {
-				NotificationAction.AUTO_TUNNEL_OFF.name -> serviceManager.stopAutoTunnel()
-				NotificationAction.TUNNEL_OFF.name -> {
-					val tunnelId = intent.getIntExtra(NotificationManager.EXTRA_ID, 0)
-					if (tunnelId == 0) return@launch tunnelManager.stopTunnel()
-					val tunnel = tunnelRepository.getById(tunnelId)
-					tunnelManager.stopTunnel(tunnel)
-				}
-			}
-		}
-	}
+    override fun onReceive(context: Context, intent: Intent) {
+        applicationScope.launch {
+            when (intent.action) {
+                NotificationAction.AUTO_TUNNEL_OFF.name -> serviceManager.stopAutoTunnel()
+                NotificationAction.TUNNEL_OFF.name -> {
+                    val tunnelId = intent.getIntExtra(NotificationManager.EXTRA_ID, 0)
+                    if (tunnelId == STOP_ALL_TUNNELS_ID) return@launch tunnelManager.stopTunnel()
+                    val tunnel = tunnelRepository.getById(tunnelId)
+                    tunnelManager.stopTunnel(tunnel)
+                }
+            }
+        }
+    }
+
+    companion object {
+        const val STOP_ALL_TUNNELS_ID = 0
+    }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/broadcast/RemoteControlReceiver.kt

@@ -0,0 +1,96 @@
+package com.zaneschepke.wireguardautotunnel.core.broadcast
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+@AndroidEntryPoint
+class RemoteControlReceiver : BroadcastReceiver() {
+
+    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
+
+    @Inject lateinit var appDataRepository: AppDataRepository
+
+    @Inject lateinit var serviceManager: ServiceManager
+
+    @Inject lateinit var tunnelManager: TunnelManager
+
+    enum class Action(private val suffix: String) {
+        START_TUNNEL("START_TUNNEL"),
+        STOP_TUNNEL("STOP_TUNNEL"),
+        START_AUTO_TUNNEL("START_AUTO_TUNNEL"),
+        STOP_AUTO_TUNNEL("STOP_AUTO_TUNNEL");
+
+        fun getFullAction(): String {
+            return "${Constants.BASE_PACKAGE}.$suffix"
+        }
+
+        companion object {
+            fun fromAction(action: String): Action? {
+                for (a in entries) {
+                    if (a.getFullAction() == action) {
+                        return a
+                    }
+                }
+                return null
+            }
+        }
+    }
+
+    override fun onReceive(context: Context, intent: Intent) {
+        Timber.i("onReceive")
+        val action = intent.action ?: return
+        val appAction = Action.fromAction(action) ?: return Timber.w("Unknown action $action")
+        applicationScope.launch {
+            if (!appDataRepository.appState.isRemoteControlEnabled())
+                return@launch Timber.w("Remote control disabled")
+            val key =
+                appDataRepository.appState.getRemoteKey()
+                    ?: return@launch Timber.w("Remote control key missing")
+            if (key != intent.getStringExtra(EXTRA_KEY)?.trim())
+                return@launch Timber.w("Invalid remote control key")
+            when (appAction) {
+                Action.START_TUNNEL -> {
+                    val tunnelName =
+                        intent.getStringExtra(EXTRA_TUN_NAME) ?: return@launch startDefaultTunnel()
+                    val tunnel =
+                        appDataRepository.tunnels.findByTunnelName(tunnelName)
+                            ?: return@launch startDefaultTunnel()
+                    tunnelManager.startTunnel(tunnel)
+                }
+                Action.STOP_TUNNEL -> {
+                    val tunnelName =
+                        intent.getStringExtra(EXTRA_TUN_NAME)
+                            ?: return@launch tunnelManager.stopTunnel()
+                    val tunnel =
+                        appDataRepository.tunnels.findByTunnelName(tunnelName)
+                            ?: return@launch tunnelManager.stopTunnel()
+                    tunnelManager.stopTunnel(tunnel)
+                }
+                Action.START_AUTO_TUNNEL -> serviceManager.startAutoTunnel()
+                Action.STOP_AUTO_TUNNEL -> serviceManager.stopAutoTunnel()
+            }
+        }
+    }
+
+    private suspend fun startDefaultTunnel() {
+        appDataRepository.getPrimaryOrFirstTunnel()?.let { tunnel ->
+            tunnelManager.startTunnel(tunnel)
+        }
+    }
+
+    companion object {
+        const val EXTRA_TUN_NAME = "tunnelName"
+        const val EXTRA_KEY = "key"
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/broadcast/RestartReceiver.kt

@@ -3,62 +3,47 @@ package com.zaneschepke.wireguardautotunnel.core.broadcast
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class RestartReceiver : BroadcastReceiver() {
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
+    @Inject lateinit var appDataRepository: AppDataRepository
 
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
+    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
 
-	@Inject
-	lateinit var serviceManager: ServiceManager
+    @Inject lateinit var serviceManager: ServiceManager
 
-	@Inject
-	lateinit var tunnelManager: TunnelManager
+    @Inject lateinit var tunnelManager: TunnelManager
 
-	@Inject
-	@IoDispatcher
-	lateinit var ioDispatcher: CoroutineDispatcher
+    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
 
-	override fun onReceive(context: Context, intent: Intent) {
-		val action = intent.action ?: return
-		if (action != Intent.ACTION_BOOT_COMPLETED &&
-			action != Intent.ACTION_MY_PACKAGE_REPLACED &&
-			action != "com.htc.intent.action.QUICKBOOT_POWERON"
-		) {
-			return
-		}
-
-		Timber.d("RestartReceiver triggered with action: ${intent.action}")
-		applicationScope.launch(ioDispatcher) {
-			serviceManager.updateTunnelTile()
-			serviceManager.updateAutoTunnelTile()
-			val settings = appDataRepository.settings.get()
-			if (settings.isRestoreOnBootEnabled) {
-				if (settings.isAutoTunnelEnabled && !serviceManager.autoTunnelActive.value) {
-					Timber.d("Starting auto-tunnel on boot/update")
-					serviceManager.startAutoTunnel(true)
-				} else {
-					Timber.d("Restoring previous tunnel state")
-					tunnelManager.restorePreviousState()
-				}
-			} else {
-				Timber.d("Restore on boot disabled, skipping")
-			}
-		}
-	}
+    override fun onReceive(context: Context, intent: Intent) {
+        Timber.d("RestartReceiver triggered with action: ${intent.action}")
+        serviceManager.updateTunnelTile()
+        serviceManager.updateAutoTunnelTile()
+        applicationScope.launch(ioDispatcher) {
+            val settings = appDataRepository.settings.get()
+            if (settings.isRestoreOnBootEnabled) {
+                if (settings.isAutoTunnelEnabled && !serviceManager.autoTunnelActive.value) {
+                    Timber.d("Starting auto-tunnel on boot/update")
+                    serviceManager.startAutoTunnel()
+                } else {
+                    Timber.d("Restoring previous tunnel state")
+                    tunnelManager.restorePreviousState()
+                }
+            } else {
+                Timber.d("Restore on boot disabled, skipping")
+            }
+        }
+    }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/notification/NotificationManager.kt

@@ -4,44 +4,47 @@ import android.app.Notification
 import android.app.NotificationManager
 import android.content.Context
 import androidx.core.app.NotificationCompat
-import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification.NotificationChannels
+import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.util.StringValue
 
 interface NotificationManager {
-	val context: Context
-	fun createNotification(
-		channel: NotificationChannels,
-		title: String = "",
-		actions: Collection<NotificationCompat.Action> = emptyList(),
-		description: String = "",
-		showTimestamp: Boolean = false,
-		importance: Int = NotificationManager.IMPORTANCE_HIGH,
-		onGoing: Boolean = true,
-		onlyAlertOnce: Boolean = true,
-	): Notification
+    val context: Context
 
-	fun createNotification(
-		channel: NotificationChannels,
-		title: StringValue,
-		actions: Collection<NotificationCompat.Action> = emptyList(),
-		description: StringValue,
-		showTimestamp: Boolean = false,
-		importance: Int = NotificationManager.IMPORTANCE_HIGH,
-		onGoing: Boolean = true,
-		onlyAlertOnce: Boolean = true,
-	): Notification
+    fun createNotification(
+        channel: NotificationChannels,
+        title: String = "",
+        actions: Collection<NotificationCompat.Action> = emptyList(),
+        description: String = "",
+        showTimestamp: Boolean = false,
+        importance: Int = NotificationManager.IMPORTANCE_HIGH,
+        onGoing: Boolean = true,
+        onlyAlertOnce: Boolean = true,
+    ): Notification
 
-	fun createNotificationAction(notificationAction: NotificationAction, extraId: Int? = null): NotificationCompat.Action
+    fun createNotification(
+        channel: NotificationChannels,
+        title: StringValue,
+        actions: Collection<NotificationCompat.Action> = emptyList(),
+        description: StringValue,
+        showTimestamp: Boolean = false,
+        importance: Int = NotificationManager.IMPORTANCE_HIGH,
+        onGoing: Boolean = true,
+        onlyAlertOnce: Boolean = true,
+    ): Notification
 
-	fun remove(notificationId: Int)
+    fun createNotificationAction(
+        notificationAction: NotificationAction,
+        extraId: Int? = null,
+    ): NotificationCompat.Action
 
-	fun show(notificationId: Int, notification: Notification)
+    fun remove(notificationId: Int)
 
-	companion object {
-		const val KERNEL_SERVICE_NOTIFICATION_ID = 123
-		const val AUTO_TUNNEL_NOTIFICATION_ID = 122
-		const val VPN_NOTIFICATION_ID = 100
-		const val EXTRA_ID = "id"
-	}
+    fun show(notificationId: Int, notification: Notification)
+
+    companion object {
+        const val AUTO_TUNNEL_NOTIFICATION_ID = 122
+        const val VPN_NOTIFICATION_ID = 100
+        const val EXTRA_ID = "id"
+    }
 }

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

@@ -12,158 +12,165 @@ import android.graphics.Color
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
+import com.zaneschepke.wireguardautotunnel.MainActivity
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.core.broadcast.NotificationActionReceiver
-import com.zaneschepke.wireguardautotunnel.MainActivity
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager.Companion.EXTRA_ID
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.util.StringValue
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
-class WireGuardNotification
-@Inject
-constructor(
-	@ApplicationContext override val context: Context,
-) : com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager {
+class WireGuardNotification @Inject constructor(@ApplicationContext override val context: Context) :
+    com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager {
 
-	enum class NotificationChannels {
-		VPN,
-		AUTO_TUNNEL,
-	}
+    enum class NotificationChannels {
+        VPN,
+        AUTO_TUNNEL,
+    }
 
-	private val notificationManager = NotificationManagerCompat.from(context)
+    private val notificationManager = NotificationManagerCompat.from(context)
 
-	override fun createNotification(
-		channel: NotificationChannels,
-		title: String,
-		actions: Collection<NotificationCompat.Action>,
-		description: String,
-		showTimestamp: Boolean,
-		importance: Int,
-		onGoing: Boolean,
-		onlyAlertOnce: Boolean,
-	): Notification {
-		notificationManager.createNotificationChannel(channel.asChannel())
-		return channel.asBuilder().apply {
-			actions.forEach {
-				addAction(it)
-			}
-			setContentTitle(title)
-			setContentIntent(
-				PendingIntent.getActivity(
-					context,
-					0,
-					Intent(context, MainActivity::class.java),
-					PendingIntent.FLAG_IMMUTABLE,
-				),
-			)
-			setContentText(description)
-			setOnlyAlertOnce(onlyAlertOnce)
-			setOngoing(onGoing)
-			setPriority(NotificationCompat.PRIORITY_HIGH)
-			setShowWhen(showTimestamp)
-			setSmallIcon(R.drawable.ic_launcher)
-		}.build()
-	}
+    override fun createNotification(
+        channel: NotificationChannels,
+        title: String,
+        actions: Collection<NotificationCompat.Action>,
+        description: String,
+        showTimestamp: Boolean,
+        importance: Int,
+        onGoing: Boolean,
+        onlyAlertOnce: Boolean,
+    ): Notification {
+        notificationManager.createNotificationChannel(channel.asChannel())
+        return channel
+            .asBuilder()
+            .apply {
+                actions.forEach { addAction(it) }
+                setContentTitle(title)
+                setContentIntent(
+                    PendingIntent.getActivity(
+                        context,
+                        0,
+                        Intent(context, MainActivity::class.java),
+                        PendingIntent.FLAG_IMMUTABLE,
+                    )
+                )
+                setContentText(description)
+                setOnlyAlertOnce(onlyAlertOnce)
+                setOngoing(onGoing)
+                setPriority(NotificationCompat.PRIORITY_HIGH)
+                setShowWhen(showTimestamp)
+                setSmallIcon(R.drawable.ic_notification)
+            }
+            .build()
+    }
 
-	override fun createNotification(
-		channel: NotificationChannels,
-		title: StringValue,
-		actions: Collection<NotificationCompat.Action>,
-		description: StringValue,
-		showTimestamp: Boolean,
-		importance: Int,
-		onGoing: Boolean,
-		onlyAlertOnce: Boolean,
-	): Notification {
-		return createNotification(
-			channel,
-			title.asString(context),
-			actions,
-			description.asString(context),
-			showTimestamp,
-			importance,
-			onGoing,
-			onlyAlertOnce,
-		)
-	}
+    override fun createNotification(
+        channel: NotificationChannels,
+        title: StringValue,
+        actions: Collection<NotificationCompat.Action>,
+        description: StringValue,
+        showTimestamp: Boolean,
+        importance: Int,
+        onGoing: Boolean,
+        onlyAlertOnce: Boolean,
+    ): Notification {
+        return createNotification(
+            channel,
+            title.asString(context),
+            actions,
+            description.asString(context),
+            showTimestamp,
+            importance,
+            onGoing,
+            onlyAlertOnce,
+        )
+    }
 
-	override fun createNotificationAction(notificationAction: NotificationAction, extraId: Int?): NotificationCompat.Action {
-		val pendingIntent = PendingIntent.getBroadcast(
-			context,
-			0,
-			Intent(context, NotificationActionReceiver::class.java).apply {
-				action = notificationAction.name
-				if (extraId != null) putExtra(EXTRA_ID, extraId)
-			},
-			PendingIntent.FLAG_IMMUTABLE,
-		)
-		return NotificationCompat.Action.Builder(
-			R.drawable.ic_launcher,
-			notificationAction.title(context).uppercase(),
-			pendingIntent,
-		).build()
-	}
+    override fun createNotificationAction(
+        notificationAction: NotificationAction,
+        extraId: Int?,
+    ): NotificationCompat.Action {
+        val pendingIntent =
+            PendingIntent.getBroadcast(
+                context,
+                0,
+                Intent(context, NotificationActionReceiver::class.java).apply {
+                    action = notificationAction.name
+                    if (extraId != null) putExtra(EXTRA_ID, extraId)
+                },
+                PendingIntent.FLAG_IMMUTABLE,
+            )
+        return NotificationCompat.Action.Builder(
+                R.drawable.ic_notification,
+                notificationAction.title(context).uppercase(),
+                pendingIntent,
+            )
+            .build()
+    }
 
-	override fun remove(notificationId: Int) {
-		notificationManager.cancel(notificationId)
-	}
+    override fun remove(notificationId: Int) {
+        notificationManager.cancel(notificationId)
+    }
 
-	override fun show(notificationId: Int, notification: Notification) {
-		with(notificationManager) {
-			if (ActivityCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
-				return
-			}
-			notify(notificationId, notification)
-		}
-	}
+    override fun show(notificationId: Int, notification: Notification) {
+        with(notificationManager) {
+            if (
+                ActivityCompat.checkSelfPermission(
+                    context,
+                    Manifest.permission.POST_NOTIFICATIONS,
+                ) != PackageManager.PERMISSION_GRANTED
+            ) {
+                return
+            }
+            notify(notificationId, notification)
+        }
+    }
 
-	private fun NotificationChannels.asBuilder(): NotificationCompat.Builder {
-		return when (this) {
-			NotificationChannels.AUTO_TUNNEL -> {
-				NotificationCompat.Builder(
-					context,
-					context.getString(R.string.auto_tunnel_channel_id),
-				)
-			}
-			NotificationChannels.VPN -> {
-				NotificationCompat.Builder(
-					context,
-					context.getString(R.string.vpn_channel_id),
-				)
-			}
-		}
-	}
+    private fun NotificationChannels.asBuilder(): NotificationCompat.Builder {
+        return when (this) {
+            NotificationChannels.AUTO_TUNNEL -> {
+                NotificationCompat.Builder(
+                    context,
+                    context.getString(R.string.auto_tunnel_channel_id),
+                )
+            }
+            NotificationChannels.VPN -> {
+                NotificationCompat.Builder(context, context.getString(R.string.vpn_channel_id))
+            }
+        }
+    }
 
-	private fun NotificationChannels.asChannel(): NotificationChannel {
-		return when (this) {
-			NotificationChannels.VPN -> {
-				NotificationChannel(
-					context.getString(R.string.vpn_channel_id),
-					context.getString(R.string.vpn_channel_name),
-					NotificationManager.IMPORTANCE_HIGH,
-				).apply {
-					description = context.getString(R.string.vpn_channel_description)
-					enableLights(true)
-					lightColor = Color.WHITE
-					enableVibration(false)
-					vibrationPattern = longArrayOf(100, 200, 300)
-				}
-			}
-			NotificationChannels.AUTO_TUNNEL -> {
-				NotificationChannel(
-					context.getString(R.string.auto_tunnel_channel_id),
-					context.getString(R.string.auto_tunnel_channel_name),
-					NotificationManager.IMPORTANCE_HIGH,
-				).apply {
-					description = context.getString(R.string.auto_tunnel_channel_description)
-					enableLights(true)
-					lightColor = Color.WHITE
-					enableVibration(false)
-					vibrationPattern = longArrayOf(100, 200, 300)
-				}
-			}
-		}
-	}
+    private fun NotificationChannels.asChannel(): NotificationChannel {
+        return when (this) {
+            NotificationChannels.VPN -> {
+                NotificationChannel(
+                        context.getString(R.string.vpn_channel_id),
+                        context.getString(R.string.vpn_channel_name),
+                        NotificationManager.IMPORTANCE_HIGH,
+                    )
+                    .apply {
+                        description = context.getString(R.string.vpn_channel_description)
+                        enableLights(true)
+                        lightColor = Color.WHITE
+                        enableVibration(false)
+                        vibrationPattern = longArrayOf(100, 200, 300)
+                    }
+            }
+            NotificationChannels.AUTO_TUNNEL -> {
+                NotificationChannel(
+                        context.getString(R.string.auto_tunnel_channel_id),
+                        context.getString(R.string.auto_tunnel_channel_name),
+                        NotificationManager.IMPORTANCE_HIGH,
+                    )
+                    .apply {
+                        description = context.getString(R.string.auto_tunnel_channel_description)
+                        enableLights(true)
+                        lightColor = Color.WHITE
+                        enableVibration(false)
+                        vibrationPattern = longArrayOf(100, 200, 300)
+                    }
+            }
+        }
+    }
 }

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

@@ -3,12 +3,12 @@ package com.zaneschepke.wireguardautotunnel.core.service
 import android.app.Service
 import android.content.Context
 import android.content.Intent
+import android.net.VpnService
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelService
-import com.zaneschepke.wireguardautotunnel.core.service.tile.AutoTunnelControlTile
-import com.zaneschepke.wireguardautotunnel.core.service.tile.TunnelControlTile
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.di.MainDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
 import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
@@ -20,141 +20,115 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
-import kotlinx.coroutines.withTimeoutOrNull
 import timber.log.Timber
 
-class ServiceManager @Inject constructor(
-	private val context: Context,
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-	@ApplicationScope private val applicationScope: CoroutineScope,
-	private val appDataRepository: AppDataRepository,
+class ServiceManager
+@Inject
+constructor(
+    private val context: Context,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+    @ApplicationScope private val applicationScope: CoroutineScope,
+    @MainDispatcher private val mainDispatcher: CoroutineDispatcher,
+    private val appDataRepository: AppDataRepository,
 ) {
 
-	private val _autoTunnelActive = MutableStateFlow(false)
-	val autoTunnelActive = _autoTunnelActive.asStateFlow()
+    private val autoTunnelMutex = Mutex()
 
-	var autoTunnelService = CompletableDeferred<AutoTunnelService>()
-	var backgroundService = CompletableDeferred<TunnelForegroundService>()
-	var autoTunnelTile = CompletableDeferred<AutoTunnelControlTile>()
-	var tunnelControlTile = CompletableDeferred<TunnelControlTile>()
+    private val _autoTunnelActive = MutableStateFlow(false)
+    val autoTunnelActive = _autoTunnelActive.asStateFlow()
 
-	private fun <T : Service> startService(cls: Class<T>, background: Boolean) {
-		runCatching {
-			val intent = Intent(context, cls)
-			if (background) {
-				context.startForegroundService(intent)
-			} else {
-				context.startService(intent)
-			}
-		}.onFailure { Timber.e(it) }
-	}
+    var autoTunnelService = CompletableDeferred<AutoTunnelService>()
+    var backgroundService = CompletableDeferred<TunnelForegroundService>()
 
-	fun startAutoTunnel(background: Boolean) {
-		applicationScope.launch(ioDispatcher) {
-			val settings = appDataRepository.settings.get()
-			appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = true))
-			if (autoTunnelService.isCompleted) {
-				_autoTunnelActive.update { true }
-				return@launch
-			}
-			runCatching {
-				autoTunnelService = CompletableDeferred()
-				startService(AutoTunnelService::class.java, background)
-				val service = withTimeoutOrNull(SERVICE_START_TIMEOUT) { autoTunnelService.await() }
-					?: throw IllegalStateException("AutoTunnelService start timed out")
-				service.start()
-				_autoTunnelActive.update { true }
-				updateAutoTunnelTile()
-			}.onFailure {
-				Timber.e(it)
-				_autoTunnelActive.update { false }
-			}
-		}
-	}
+    private fun <T : Service> startService(cls: Class<T>, background: Boolean) {
+        runCatching {
+                val intent = Intent(context, cls)
+                if (background) {
+                    context.startForegroundService(intent)
+                } else {
+                    context.startService(intent)
+                }
+            }
+            .onFailure { Timber.e(it) }
+    }
 
-	fun startBackgroundService(tunnelConf: TunnelConf) {
-		applicationScope.launch(ioDispatcher) {
-			if (backgroundService.isCompleted) return@launch
-			runCatching {
-				backgroundService = CompletableDeferred()
-				startService(TunnelForegroundService::class.java, true)
-				val service = withTimeoutOrNull(SERVICE_START_TIMEOUT) { backgroundService.await() }
-					?: throw IllegalStateException("Background service start timed out")
-				service.start(tunnelConf)
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
-	}
+    fun hasVpnPermission(): Boolean {
+        return VpnService.prepare(context) == null
+    }
 
-	fun stopBackgroundService() {
-		applicationScope.launch(ioDispatcher) {
-			if (!backgroundService.isCompleted) return@launch
-			runCatching {
-				val service = backgroundService.await()
-				service.stop()
-				backgroundService = CompletableDeferred()
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
-	}
+    suspend fun startAutoTunnel() {
+        autoTunnelMutex.withLock {
+            val settings = appDataRepository.settings.get()
+            appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = true))
+            if (autoTunnelService.isCompleted) {
+                _autoTunnelActive.update { true }
+                return
+            }
+            runCatching {
+                    autoTunnelService = CompletableDeferred()
+                    startService(AutoTunnelService::class.java, !WireGuardAutoTunnel.isForeground())
+                    _autoTunnelActive.update { true }
+                }
+                .onFailure {
+                    Timber.e(it)
+                    _autoTunnelActive.update { false }
+                }
+            withContext(mainDispatcher) { updateAutoTunnelTile() }
+        }
+    }
 
-	fun toggleAutoTunnel(background: Boolean) {
-		applicationScope.launch(ioDispatcher) {
-			if (_autoTunnelActive.value) stopAutoTunnel() else startAutoTunnel(background)
-		}
-	}
+    suspend fun stopAutoTunnel() {
+        autoTunnelMutex.withLock {
+            val settings = appDataRepository.settings.get()
+            appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = false))
+            if (!autoTunnelService.isCompleted) return
+            runCatching {
+                    val service = autoTunnelService.await()
+                    service.stop()
+                    _autoTunnelActive.update { false }
+                    autoTunnelService = CompletableDeferred()
+                }
+                .onFailure { Timber.e(it) }
+            withContext(mainDispatcher) { updateAutoTunnelTile() }
+        }
+    }
 
-	suspend fun updateAutoTunnelTile() {
-		withContext(ioDispatcher) {
-			runCatching {
-				val service = withTimeoutOrNull(SERVICE_START_TIMEOUT) { autoTunnelTile.await() }
-					?: run {
-						context.requestAutoTunnelTileServiceUpdate()
-						return@withContext
-					}
-				service.updateTileState()
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
-	}
+    fun startTunnelForegroundService() {
+        if (backgroundService.isCompleted) return
+        runCatching {
+                backgroundService = CompletableDeferred()
+                startService(
+                    TunnelForegroundService::class.java,
+                    !WireGuardAutoTunnel.isForeground(),
+                )
+            }
+            .onFailure { Timber.e(it) }
+    }
 
-	suspend fun updateTunnelTile() {
-		withContext(ioDispatcher) {
-			runCatching {
-				val service = withTimeoutOrNull(SERVICE_START_TIMEOUT) { tunnelControlTile.await() }
-					?: run {
-						context.requestTunnelTileServiceStateUpdate()
-						return@withContext
-					}
-				service.updateTileState()
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
-	}
+    suspend fun stopTunnelForegroundService() {
+        if (!backgroundService.isCompleted) return
+        runCatching {
+                val service = backgroundService.await()
+                service.stop()
+                backgroundService = CompletableDeferred()
+            }
+            .onFailure { Timber.e(it) }
+    }
 
-	fun stopAutoTunnel() {
-		applicationScope.launch(ioDispatcher) {
-			val settings = appDataRepository.settings.get()
-			appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = false))
-			if (!autoTunnelService.isCompleted) return@launch
-			runCatching {
-				val service = autoTunnelService.await()
-				service.stop()
-				_autoTunnelActive.update { false }
-				autoTunnelService = CompletableDeferred()
-				updateAutoTunnelTile()
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
-	}
+    fun toggleAutoTunnel() {
+        applicationScope.launch(ioDispatcher) {
+            if (_autoTunnelActive.value) stopAutoTunnel() else startAutoTunnel()
+        }
+    }
 
-	companion object {
-		const val SERVICE_START_TIMEOUT = 5_000L
-	}
+    fun updateAutoTunnelTile() {
+        context.requestAutoTunnelTileServiceUpdate()
+    }
+
+    fun updateTunnelTile() {
+        context.requestTunnelTileServiceStateUpdate()
+    }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/service/TunnelForegroundService.kt

@@ -5,66 +5,318 @@ import android.content.Intent
 import android.os.IBinder
 import androidx.core.app.ServiceCompat
 import androidx.lifecycle.LifecycleService
+import androidx.lifecycle.lifecycleScope
+import com.zaneschepke.networkmonitor.NetworkMonitor
+import com.zaneschepke.networkmonitor.NetworkStatus
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.extensions.distinctByKeys
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CompletableDeferred
+import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withContext
+import timber.log.Timber
 
 @AndroidEntryPoint
 class TunnelForegroundService : LifecycleService() {
 
-	@Inject
-	lateinit var notificationManager: NotificationManager
+    @Inject lateinit var notificationManager: NotificationManager
 
-	@Inject
-	lateinit var serviceManager: ServiceManager
+    @Inject lateinit var serviceManager: ServiceManager
 
-	override fun onCreate() {
-		super.onCreate()
-		serviceManager.backgroundService.complete(this)
-	}
+    @Inject lateinit var networkMonitor: NetworkMonitor
 
-	override fun onBind(intent: Intent): IBinder? {
-		super.onBind(intent)
-		return null
-	}
+    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
 
-	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-		serviceManager.backgroundService.complete(this)
-		return super.onStartCommand(intent, flags, startId)
-	}
+    @Inject lateinit var tunnelRepo: TunnelRepository
 
-	fun start(tunnelConf: TunnelConf) {
-		ServiceCompat.startForeground(
-			this@TunnelForegroundService,
-			NotificationManager.KERNEL_SERVICE_NOTIFICATION_ID,
-			createNotification(tunnelConf),
-			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
-		)
-	}
+    @Inject lateinit var tunnelManager: TunnelManager
 
-	fun stop() {
-		stopForeground(STOP_FOREGROUND_REMOVE)
-		stopSelf()
-	}
+    private val isNetworkConnected = MutableStateFlow(true)
 
-	override fun onDestroy() {
-		serviceManager.backgroundService = CompletableDeferred()
-		super.onDestroy()
-	}
+    private val tunnelJobs = ConcurrentHashMap<TunnelConf, Job>()
+    private val pingJobs = ConcurrentHashMap<TunnelConf, Job>()
 
-	private fun createNotification(tunnelConf: TunnelConf): Notification {
-		return notificationManager.createNotification(
-			WireGuardNotification.NotificationChannels.VPN,
-			title = "${getString(R.string.tunnel_running)} - ${tunnelConf.tunName}",
-			actions = listOf(
-				notificationManager.createNotificationAction(NotificationAction.TUNNEL_OFF, tunnelConf.id),
-			),
-		)
-	}
+    private val jobsMutex = Mutex()
+
+    override fun onCreate() {
+        super.onCreate()
+        serviceManager.backgroundService.complete(this)
+        ServiceCompat.startForeground(
+            this@TunnelForegroundService,
+            NotificationManager.VPN_NOTIFICATION_ID,
+            onCreateNotification(),
+            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+        )
+    }
+
+    override fun onBind(intent: Intent): IBinder? {
+        super.onBind(intent)
+        return null
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        super.onStartCommand(intent, flags, startId)
+        serviceManager.backgroundService.complete(this)
+        ServiceCompat.startForeground(
+            this@TunnelForegroundService,
+            NotificationManager.VPN_NOTIFICATION_ID,
+            onCreateNotification(),
+            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+        )
+        start()
+        return START_STICKY
+    }
+
+    fun start() =
+        lifecycleScope.launch(ioDispatcher) {
+            tunnelManager.activeTunnels.distinctByKeys().collect { activeTunnels ->
+                // No active tunnels and no jobs: nothing to do
+                if (activeTunnels.isEmpty() && tunnelJobs.isEmpty()) return@collect
+
+                // Synchronize jobs with active tunnels
+                synchronizeJobs(activeTunnels)
+                updateServiceNotification()
+            }
+        }
+
+    private suspend fun synchronizeJobs(activeTunnels: Map<TunnelConf, TunnelState>) {
+        jobsMutex.withLock {
+            // Stop jobs for tunnels that are no longer active
+            stopInactiveJobs(activeTunnels)
+            // Start jobs for new tunnels
+            startNewJobs(activeTunnels)
+        }
+    }
+
+    private fun stopInactiveJobs(activeTunnels: Map<TunnelConf, TunnelState>) {
+        // If no active tunnels, clear all jobs
+        if (activeTunnels.isEmpty()) {
+            clearAllJobs()
+            return
+        }
+        // Stop jobs for tunnels not in activeTunnels
+        val tunnelsToStop = tunnelJobs.keys - activeTunnels.keys
+        tunnelsToStop.forEach { tun -> stopTunnelJobs(tun) }
+    }
+
+    private fun clearAllJobs() {
+        tunnelJobs.forEach { (tun, job) ->
+            Timber.d("Stopping tunnel job for ${tun.tunName}")
+            job.cancel()
+        }
+        tunnelJobs.clear()
+
+        pingJobs.forEach { (tun, job) ->
+            if (isPingBounce(tun)) {
+                Timber.d("Preserving ping job for ${tun.tunName} due to PING bounce")
+                return@forEach
+            }
+            Timber.d("Stopping ping job for ${tun.tunName}")
+            job.cancel()
+        }
+        pingJobs.entries.removeIf { (tun, _) -> !isPingBounce(tun) }
+    }
+
+    private fun stopTunnelJobs(tun: TunnelConf) {
+        tunnelJobs.remove(tun)?.cancel()
+        Timber.d("Stopped tunnel job for ${tun.tunName}")
+        if (isPingBounce(tun))
+            return Timber.d("Preserving ${tun.tunName} ping job due to ping bounce")
+        pingJobs.remove(tun)?.cancel()
+        Timber.d("Stopped ping job for ${tun.tunName}")
+    }
+
+    private fun startNewJobs(activeTunnels: Map<TunnelConf, TunnelState>) {
+        val tunnelsToStart = activeTunnels.keys - tunnelJobs.keys
+        tunnelsToStart.forEach { tun ->
+            tunnelJobs[tun] = startTunnelJobs(tun)
+            Timber.d("Started tunnel job for ${tun.tunName}")
+
+            if (pingJobs[tun]?.isActive == true) {
+                Timber.d("Reusing active ping job for ${tun.tunName}")
+            } else {
+                pingJobs[tun]?.cancel() // Cancel any stale job
+                if (tun.isPingEnabled) {
+                    pingJobs[tun] = startPingJob(tun)
+                    Timber.d("Started ping job for ${tun.tunName}")
+                }
+            }
+        }
+    }
+
+    private fun isPingBounce(tun: TunnelConf): Boolean =
+        tunnelManager.bouncingTunnelIds[tun.id] == TunnelStatus.StopReason.PING
+
+    // TODO Would be cool to have this include kill switch
+    // TODO also we need to include errors
+    private fun updateServiceNotification() {
+        val notification =
+            when (tunnelJobs.size) {
+                0 -> onCreateNotification()
+                1 -> createTunnelNotification(tunnelJobs.keys.first())
+                else -> createTunnelsNotification()
+            }
+        ServiceCompat.startForeground(
+            this@TunnelForegroundService,
+            NotificationManager.VPN_NOTIFICATION_ID,
+            notification,
+            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+        )
+    }
+
+    // use same scope so we can cancel all of these
+    private fun startTunnelJobs(tunnelConf: TunnelConf) =
+        lifecycleScope.launch(ioDispatcher) {
+            // monitor if we have internet connectivity
+            launch { startNetworkMonitorJob() }
+            // job to trigger stats emit on interval
+            launch { startTunnelStatsJob(tunnelConf) }
+            // monitor changes to the tunnel config
+            launch { startTunnelConfChangesJob(tunnelConf) }
+        }
+
+    private suspend fun startTunnelConfChangesJob(tunnelConf: TunnelConf) {
+        tunnelRepo.flow
+            .flowOn(ioDispatcher)
+            .map { storedTunnels -> storedTunnels.firstOrNull { it.id == tunnelConf.id } }
+            .filterNotNull()
+            // only emit when one of these 3 values change
+            .distinctUntilChanged { old, new -> old == new }
+            .collect { storedTunnel ->
+                if (tunnelConf != storedTunnel) {
+                    Timber.d("Config changed for ${storedTunnel.tunName}, bouncing")
+                    // let this complete, even after cancel
+                    withContext(NonCancellable) {
+                        tunnelManager.bounceTunnel(
+                            storedTunnel,
+                            TunnelStatus.StopReason.CONFIG_CHANGED,
+                        )
+                    }
+                }
+            }
+    }
+
+    private suspend fun startNetworkMonitorJob() {
+        networkMonitor.networkStatusFlow.flowOn(ioDispatcher).collectLatest { status ->
+            val isAvailable = status !is NetworkStatus.Disconnected
+            isNetworkConnected.value = isAvailable
+            Timber.d("Network available: $status")
+        }
+    }
+
+    private suspend fun startTunnelStatsJob(tunnel: TunnelConf) = coroutineScope {
+        while (isActive) {
+            tunnelManager.updateTunnelStatistics(tunnel)
+            delay(STATS_DELAY)
+        }
+    }
+
+    private fun startPingJob(tunnel: TunnelConf) =
+        lifecycleScope.launch(ioDispatcher) {
+            // delay for initial duration
+            delay(tunnel.pingInterval ?: Constants.PING_INTERVAL)
+            while (isActive) {
+                val shouldBounce = shouldBounceTunnel(tunnel)
+                val delayMs =
+                    if (shouldBounce) {
+                        // let this complete, even after cancel
+                        withContext(NonCancellable) {
+                            tunnelManager.bounceTunnel(tunnel, TunnelStatus.StopReason.PING)
+                        }
+                        tunnel.pingCooldown ?: Constants.PING_COOLDOWN
+                    } else {
+                        tunnel.pingInterval ?: Constants.PING_INTERVAL
+                    }
+                delay(delayMs)
+            }
+        }
+
+    private suspend fun shouldBounceTunnel(tunnel: TunnelConf): Boolean {
+        if (!isNetworkConnected.value) {
+            Timber.d("Network disconnected, skipping ping for ${tunnel.tunName}")
+            return false
+        }
+        return runCatching { !tunnel.isTunnelPingable(ioDispatcher) }
+            .onFailure { e -> Timber.e(e, "Ping check failed for ${tunnel.tunName}") }
+            .getOrDefault(true)
+    }
+
+    fun stop() {
+        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
+        stopSelf()
+    }
+
+    override fun onDestroy() {
+        serviceManager.backgroundService = CompletableDeferred()
+        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
+        super.onDestroy()
+    }
+
+    private fun createTunnelNotification(tunnelConf: TunnelConf): Notification {
+        return notificationManager.createNotification(
+            WireGuardNotification.NotificationChannels.VPN,
+            title = "${getString(R.string.tunnel_running)} - ${tunnelConf.tunName}",
+            actions =
+                listOf(
+                    notificationManager.createNotificationAction(
+                        NotificationAction.TUNNEL_OFF,
+                        tunnelConf.id,
+                    )
+                ),
+        )
+    }
+
+    private fun createTunnelsNotification(): Notification {
+        return notificationManager.createNotification(
+            WireGuardNotification.NotificationChannels.VPN,
+            title = "${getString(R.string.tunnel_running)} - ${getString(R.string.multiple)}",
+            actions =
+                listOf(
+                    notificationManager.createNotificationAction(NotificationAction.TUNNEL_OFF, 0)
+                ),
+        )
+    }
+
+    private fun onCreateNotification(): Notification {
+        return notificationManager.createNotification(
+            WireGuardNotification.NotificationChannels.VPN,
+            title = getString(R.string.tunnel_starting),
+        )
+    }
+
+    // TODO add notification handling and optional log reading for restart on handshake failures
+    companion object {
+        const val STATS_DELAY = 1_000L
+        // ipv6 disabled or block on network
+        // Failed to send handshake initiation: write udp [::]"
+        // Failed to send data packets: write udp [::]
+        // Failed to send data packets: write udp 0.0.0.0:51820
+        // Handshake did not complete after 5 seconds, retrying
+    }
 }

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

@@ -14,8 +14,8 @@ import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotificati
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.di.MainImmediateDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
@@ -26,10 +26,13 @@ import com.zaneschepke.wireguardautotunnel.domain.state.NetworkState
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.extensions.Tunnels
 import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+import javax.inject.Provider
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
@@ -41,213 +44,233 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Provider
 
 @AndroidEntryPoint
 class AutoTunnelService : LifecycleService() {
 
-	@Inject
-	lateinit var networkMonitor: NetworkMonitor
+    @Inject lateinit var networkMonitor: NetworkMonitor
 
-	@Inject
-	lateinit var appDataRepository: Provider<AppDataRepository>
+    @Inject lateinit var appDataRepository: Provider<AppDataRepository>
 
-	@Inject
-	lateinit var notificationManager: NotificationManager
+    @Inject lateinit var notificationManager: NotificationManager
 
-	@Inject
-	@IoDispatcher
-	lateinit var ioDispatcher: CoroutineDispatcher
+    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
 
-	@Inject
-	lateinit var serviceManager: ServiceManager
+    @Inject lateinit var serviceManager: ServiceManager
 
-	@Inject
-	@MainImmediateDispatcher
-	lateinit var mainImmediateDispatcher: CoroutineDispatcher
+    @Inject lateinit var tunnelManager: TunnelManager
 
-	@Inject
-	lateinit var tunnelManager: TunnelManager
+    private val defaultState = AutoTunnelState()
 
-	private val defaultState = AutoTunnelState()
+    private val autoTunnelStateFlow = MutableStateFlow(defaultState)
 
-	private val autoTunnelStateFlow = MutableStateFlow(defaultState)
+    private var wakeLock: PowerManager.WakeLock? = null
 
-	private var wakeLock: PowerManager.WakeLock? = null
+    private var killSwitchJob: Job? = null
 
-	override fun onCreate() {
-		super.onCreate()
-		serviceManager.autoTunnelService.complete(this)
-		lifecycleScope.launch(mainImmediateDispatcher) {
-			runCatching {
-				launchWatcherNotification()
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
-	}
+    override fun onCreate() {
+        super.onCreate()
+        serviceManager.autoTunnelService.complete(this)
+        launchWatcherNotification()
+    }
 
-	override fun onBind(intent: Intent): IBinder? {
-		super.onBind(intent)
-		return null
-	}
+    override fun onBind(intent: Intent): IBinder? {
+        super.onBind(intent)
+        return null
+    }
 
-	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-		Timber.d("onStartCommand executed with startId: $startId")
-		serviceManager.autoTunnelService.complete(this)
-		return super.onStartCommand(intent, flags, startId)
-	}
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        super.onStartCommand(intent, flags, startId)
+        Timber.d("onStartCommand executed with startId: $startId")
+        serviceManager.autoTunnelService.complete(this)
+        start()
+        return START_STICKY
+    }
 
-	fun start() {
-		kotlin.runCatching {
-			lifecycleScope.launch(mainImmediateDispatcher) {
-				launchWatcherNotification()
-				initWakeLock()
-			}
-			startAutoTunnelJob()
-			startAutoTunnelStateJob()
-			startKillSwitchJob()
-		}.onFailure {
-			Timber.e(it)
-		}
-	}
+    fun start() {
+        kotlin
+            .runCatching {
+                launchWatcherNotification()
+                initWakeLock()
+                startAutoTunnelJob()
+                startAutoTunnelStateJob()
+                killSwitchJob = startKillSwitchJob()
+            }
+            .onFailure { Timber.e(it) }
+    }
 
-	fun stop() {
-		wakeLock?.let { if (it.isHeld) it.release() }
-		stopSelf()
-	}
+    fun stop() {
+        wakeLock?.let { if (it.isHeld) it.release() }
+        stopSelf()
+    }
 
-	override fun onDestroy() {
-		serviceManager.autoTunnelService = CompletableDeferred()
-		super.onDestroy()
-	}
+    override fun onDestroy() {
+        serviceManager.autoTunnelService = CompletableDeferred()
+        restoreVpnKillSwitch()
+        super.onDestroy()
+    }
 
-	private fun launchWatcherNotification(description: String = getString(R.string.monitoring_state_changes)) {
-		val notification =
-			notificationManager.createNotification(
-				WireGuardNotification.NotificationChannels.AUTO_TUNNEL,
-				title = getString(R.string.auto_tunnel_title),
-				description = description,
-				actions = listOf(
-					notificationManager.createNotificationAction(NotificationAction.AUTO_TUNNEL_OFF),
-				),
-			)
-		ServiceCompat.startForeground(
-			this,
-			NotificationManager.AUTO_TUNNEL_NOTIFICATION_ID,
-			notification,
-			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
-		)
-	}
+    private fun restoreVpnKillSwitch() {
+        with(autoTunnelStateFlow.value) {
+            if (
+                settings.isVpnKillSwitchEnabled &&
+                    tunnelManager.getBackendState() != BackendState.KILL_SWITCH_ACTIVE
+            ) {
+                killSwitchJob?.cancel()
+                val allowedIps =
+                    if (settings.isLanOnKillSwitchEnabled) TunnelConf.LAN_BYPASS_ALLOWED_IPS
+                    else emptyList()
+                tunnelManager.setBackendState(BackendState.KILL_SWITCH_ACTIVE, allowedIps)
+            }
+        }
+    }
 
-	private fun initWakeLock() {
-		wakeLock = (getSystemService(POWER_SERVICE) as PowerManager).run {
-			val tag = this.javaClass.name
-			newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "$tag::lock").apply {
-				try {
-					Timber.i("Initiating wakelock with 10 min timeout")
-					acquire(Constants.BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT)
-				} finally {
-					release()
-				}
-			}
-		}
-	}
+    private fun launchWatcherNotification(
+        description: String = getString(R.string.monitoring_state_changes)
+    ) {
+        val notification =
+            notificationManager.createNotification(
+                WireGuardNotification.NotificationChannels.AUTO_TUNNEL,
+                title = getString(R.string.auto_tunnel_title),
+                description = description,
+                actions =
+                    listOf(
+                        notificationManager.createNotificationAction(
+                            NotificationAction.AUTO_TUNNEL_OFF
+                        )
+                    ),
+            )
+        ServiceCompat.startForeground(
+            this,
+            NotificationManager.AUTO_TUNNEL_NOTIFICATION_ID,
+            notification,
+            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+        )
+    }
 
-	private fun buildNetworkState(networkStatus: NetworkStatus): NetworkState {
-		return with(autoTunnelStateFlow.value.networkState) {
-			val wifiName = when (networkStatus) {
-				is NetworkStatus.Connected -> {
-					networkStatus.wifiSsid
-				}
-				else -> null
-			}
-			copy(
-				isWifiConnected = networkStatus.wifiConnected,
-				isMobileDataConnected = networkStatus.cellularConnected,
-				isEthernetConnected = networkStatus.ethernetConnected,
-				wifiName = wifiName,
-			)
-		}
-	}
+    private fun initWakeLock() {
+        wakeLock =
+            (getSystemService(POWER_SERVICE) as PowerManager).run {
+                val tag = this.javaClass.name
+                newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "$tag::lock").apply {
+                    try {
+                        Timber.i("Initiating wakelock with 10 min timeout")
+                        acquire(Constants.BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT)
+                    } finally {
+                        release()
+                    }
+                }
+            }
+    }
 
-	@OptIn(ExperimentalCoroutinesApi::class)
-	private fun startAutoTunnelStateJob() = lifecycleScope.launch(ioDispatcher) {
-		combine(
-			combineSettings(),
-			appDataRepository.get().settings.flow
-				.distinctUntilChanged { old, new -> old.isKernelEnabled == new.isKernelEnabled } // Only emit when isKernelEnabled changes
-				.flatMapLatest { settings ->
-					networkMonitor.getNetworkStatusFlow(true, settings.isKernelEnabled)
-						.flowOn(ioDispatcher)
-						.map { buildNetworkState(it) }
-				}
-				.distinctUntilChanged(),
-		) { double, networkState ->
-			AutoTunnelState(
-				tunnelManager.activeTunnels.value,
-				networkState,
-				double.first,
-				double.second,
-			)
-		}.collect { state ->
-			autoTunnelStateFlow.update {
-				it.copy(
-					activeTunnels = state.activeTunnels,
-					networkState = state.networkState,
-					settings = state.settings,
-					tunnels = state.tunnels,
-				)
-			}
-		}
-	}
+    private fun buildNetworkState(networkStatus: NetworkStatus): NetworkState {
+        return with(autoTunnelStateFlow.value.networkState) {
+            val wifiName =
+                when (networkStatus) {
+                    is NetworkStatus.Connected -> {
+                        networkStatus.wifiSsid
+                    }
+                    else -> null
+                }
+            copy(
+                isWifiConnected = networkStatus.wifiConnected,
+                isMobileDataConnected = networkStatus.cellularConnected,
+                isEthernetConnected = networkStatus.ethernetConnected,
+                wifiName = wifiName,
+            )
+        }
+    }
 
-	private fun combineSettings(): Flow<Pair<AppSettings, Tunnels>> {
-		return combine(
-			appDataRepository.get().settings.flow,
-			appDataRepository.get().tunnels.flow.map { tunnels ->
-				// isActive is ignored for equality checks so user can manually toggle off tunnel with auto-tunnel
-				tunnels.map { it.copy(isActive = false) }
-			},
-		) { settings, tunnels ->
-			Pair(settings, tunnels)
-		}.distinctUntilChanged()
-	}
+    @OptIn(ExperimentalCoroutinesApi::class)
+    private fun startAutoTunnelStateJob() =
+        lifecycleScope.launch(ioDispatcher) {
+            combine(
+                    combineSettings(),
+                    appDataRepository
+                        .get()
+                        .settings
+                        .flow
+                        .distinctUntilChanged { old, new ->
+                            old.isKernelEnabled == new.isKernelEnabled
+                        } // Only emit when isKernelEnabled changes
+                        .flatMapLatest {
+                            networkMonitor.networkStatusFlow.flowOn(ioDispatcher).map {
+                                buildNetworkState(it)
+                            }
+                        }
+                        .distinctUntilChanged(),
+                ) { double, networkState ->
+                    AutoTunnelState(
+                        tunnelManager.activeTunnels.value,
+                        networkState,
+                        double.first,
+                        double.second,
+                    )
+                }
+                .collect { state ->
+                    autoTunnelStateFlow.update {
+                        it.copy(
+                            activeTunnels = state.activeTunnels,
+                            networkState = state.networkState,
+                            settings = state.settings,
+                            tunnels = state.tunnels,
+                        )
+                    }
+                }
+        }
 
-	private fun startKillSwitchJob() = lifecycleScope.launch(ioDispatcher) {
-		autoTunnelStateFlow.collect {
-			if (it == defaultState) return@collect
-			when (val event = it.asKillSwitchEvent()) {
-				KillSwitchEvent.DoNothing -> Unit
-				is KillSwitchEvent.Start -> {
-					Timber.d("Starting kill switch")
-					tunnelManager.setBackendState(BackendState.KILL_SWITCH_ACTIVE, event.allowedIps)
-				}
-				KillSwitchEvent.Stop -> {
-					Timber.d("Stopping kill switch")
-					tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, emptySet())
-				}
-			}
-		}
-	}
+    private fun combineSettings(): Flow<Pair<AppSettings, Tunnels>> {
+        return combine(
+                appDataRepository.get().settings.flow,
+                appDataRepository.get().tunnels.flow.map { tunnels ->
+                    // isActive is ignored for equality checks so user can manually toggle off
+                    // tunnel with auto-tunnel
+                    tunnels.map { it.copy(isActive = false) }
+                },
+            ) { settings, tunnels ->
+                Pair(settings, tunnels)
+            }
+            .distinctUntilChanged()
+    }
 
-	@OptIn(FlowPreview::class)
-	private fun startAutoTunnelJob() = lifecycleScope.launch(ioDispatcher) {
-		Timber.i("Starting auto-tunnel network event watcher")
-		val settings = appDataRepository.get().settings.get()
-		Timber.d("Starting with debounce delay of: ${settings.debounceDelaySeconds} seconds")
-		autoTunnelStateFlow.debounce(settings.debounceDelayMillis()).collect { watcherState ->
-			if (watcherState == defaultState) return@collect
-			Timber.d("New auto tunnel state emitted ${watcherState.networkState}")
-			when (val event = watcherState.asAutoTunnelEvent()) {
-				is AutoTunnelEvent.Start -> (event.tunnelConf ?: appDataRepository.get().getPrimaryOrFirstTunnel())?.let {
-					tunnelManager.startTunnel(it)
-				}
-				// TODO improve this to target specific tunnels to better support multi-tunnel
-				is AutoTunnelEvent.Stop -> tunnelManager.stopTunnel()
-				AutoTunnelEvent.DoNothing -> Timber.i("Auto-tunneling: no condition met")
-			}
-		}
-	}
+    private fun startKillSwitchJob() =
+        lifecycleScope.launch(ioDispatcher) {
+            autoTunnelStateFlow.collect {
+                if (it == defaultState) return@collect
+                when (val event = it.asKillSwitchEvent()) {
+                    KillSwitchEvent.DoNothing -> Unit
+                    is KillSwitchEvent.Start -> {
+                        Timber.d("Starting kill switch")
+                        tunnelManager.setBackendState(
+                            BackendState.KILL_SWITCH_ACTIVE,
+                            event.allowedIps,
+                        )
+                    }
+                    KillSwitchEvent.Stop -> {
+                        Timber.d("Stopping kill switch")
+                        tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, emptySet())
+                    }
+                }
+            }
+        }
+
+    @OptIn(FlowPreview::class)
+    private fun startAutoTunnelJob() =
+        lifecycleScope.launch(ioDispatcher) {
+            Timber.i("Starting auto-tunnel network event watcher")
+            val settings = appDataRepository.get().settings.get()
+            Timber.d("Starting with debounce delay of: ${settings.debounceDelaySeconds} seconds")
+            autoTunnelStateFlow.debounce(settings.debounceDelayMillis()).collect { watcherState ->
+                if (watcherState == defaultState) return@collect
+                Timber.d("New auto tunnel state emitted ${watcherState.networkState}")
+                when (val event = watcherState.asAutoTunnelEvent()) {
+                    is AutoTunnelEvent.Start ->
+                        (event.tunnelConf ?: appDataRepository.get().getPrimaryOrFirstTunnel())
+                            ?.let { tunnelManager.startTunnel(it) }
+                    // TODO improve this to target specific tunnels to better support multi-tunnel
+                    is AutoTunnelEvent.Stop -> tunnelManager.stopTunnel()
+                    AutoTunnelEvent.DoNothing -> Timber.i("Auto-tunneling: no condition met")
+                }
+            }
+        }
 }

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

@@ -4,97 +4,101 @@ import android.content.Intent
 import android.os.IBinder
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineScope
+import javax.inject.Inject
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 @AndroidEntryPoint
-class AutoTunnelControlTile : TileService() {
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
+class AutoTunnelControlTile : TileService(), LifecycleOwner {
+    @Inject lateinit var appDataRepository: AppDataRepository
 
-	@Inject
-	lateinit var serviceManager: ServiceManager
+    @Inject lateinit var serviceManager: ServiceManager
 
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
+    private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
 
-	override fun onCreate() {
-		super.onCreate()
-		serviceManager.autoTunnelTile.complete(this)
-	}
+    override fun onCreate() {
+        super.onCreate()
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+    }
 
-	override fun onDestroy() {
-		super.onDestroy()
-		serviceManager.autoTunnelTile = CompletableDeferred()
-	}
+    override fun onDestroy() {
+        super.onDestroy()
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+    }
 
-	override fun onStartListening() {
-		super.onStartListening()
-		serviceManager.autoTunnelTile.complete(this)
-		applicationScope.launch {
-			if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
-			updateTileState()
-		}
-	}
+    override fun onStartListening() {
+        super.onStartListening()
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
+        Timber.d("Start listening called for auto tunnel tile")
+        lifecycleScope.launch {
+            serviceManager.autoTunnelActive.collect {
+                if (it) return@collect setActive()
+                setInactive()
+            }
+        }
+        lifecycleScope.launch {
+            appDataRepository.tunnels.flow.collect {
+                if (it.isEmpty()) {
+                    setUnavailable()
+                }
+            }
+        }
+    }
 
-	fun updateTileState() {
-		serviceManager.autoTunnelActive.value.let {
-			if (it) setActive() else setInactive()
-		}
-	}
+    override fun onClick() {
+        super.onClick()
+        unlockAndRun {
+            lifecycleScope.launch {
+                if (serviceManager.autoTunnelActive.value) {
+                    serviceManager.stopAutoTunnel()
+                    setInactive()
+                } else {
+                    serviceManager.startAutoTunnel()
+                    setActive()
+                }
+            }
+        }
+    }
 
-	override fun onClick() {
-		super.onClick()
-		unlockAndRun {
-			applicationScope.launch {
-				if (serviceManager.autoTunnelActive.value) {
-					serviceManager.stopAutoTunnel()
-					setInactive()
-				} else {
-					serviceManager.startAutoTunnel(true)
-					setActive()
-				}
-			}
-		}
-	}
+    private fun setActive() {
+        runCatching {
+            qsTile.state = Tile.STATE_ACTIVE
+            qsTile.updateTile()
+        }
+    }
 
-	private fun setActive() {
-		runCatching {
-			qsTile.state = Tile.STATE_ACTIVE
-			qsTile.updateTile()
-		}
-	}
+    private fun setInactive() {
+        runCatching {
+            qsTile.state = Tile.STATE_INACTIVE
+            qsTile.updateTile()
+        }
+    }
 
-	private fun setInactive() {
-		runCatching {
-			qsTile.state = Tile.STATE_INACTIVE
-			qsTile.updateTile()
-		}
-	}
+    /* This works around an annoying unsolved frameworks bug some people are hitting. */
+    override fun onBind(intent: Intent): IBinder? {
+        var ret: IBinder? = null
+        try {
+            ret = super.onBind(intent)
+        } catch (_: Throwable) {
+            Timber.e("Failed to bind to TunnelControlTile")
+        }
+        return ret
+    }
 
-	/* This works around an annoying unsolved frameworks bug some people are hitting. */
-	override fun onBind(intent: Intent): IBinder? {
-		var ret: IBinder? = null
-		try {
-			ret = super.onBind(intent)
-		} catch (_: Throwable) {
-			Timber.e("Failed to bind to TunnelControlTile")
-		}
-		return ret
-	}
+    private fun setUnavailable() {
+        runCatching {
+            qsTile.state = Tile.STATE_UNAVAILABLE
+            qsTile.updateTile()
+        }
+    }
 
-	private fun setUnavailable() {
-		runCatching {
-			qsTile.state = Tile.STATE_UNAVAILABLE
-			qsTile.updateTile()
-		}
-	}
+    override val lifecycle: Lifecycle
+        get() = lifecycleRegistry
 }

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

@@ -5,131 +5,180 @@ import android.os.Build
 import android.os.IBinder
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineScope
+import javax.inject.Inject
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 @AndroidEntryPoint
-class TunnelControlTile : TileService() {
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
+class TunnelControlTile : TileService(), LifecycleOwner {
+    @Inject lateinit var appDataRepository: AppDataRepository
 
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
+    @Inject lateinit var serviceManager: ServiceManager
 
-	@Inject
-	lateinit var serviceManager: ServiceManager
+    @Inject lateinit var tunnelManager: TunnelManager
 
-	@Inject
-	lateinit var tunnelManager: TunnelManager
+    private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
 
-	override fun onCreate() {
-		super.onCreate()
-		serviceManager.tunnelControlTile.complete(this)
-	}
+    private var isCollecting = false
 
-	override fun onDestroy() {
-		super.onDestroy()
-		serviceManager.tunnelControlTile = CompletableDeferred()
-	}
+    override fun onCreate() {
+        super.onCreate()
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+    }
 
-	override fun onStartListening() {
-		super.onStartListening()
-		Timber.d("Start listening called")
-		serviceManager.tunnelControlTile.complete(this)
-		applicationScope.launch {
-			updateTileState()
-		}
-	}
+    override fun onDestroy() {
+        super.onDestroy()
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+    }
 
-	fun updateTileState() = applicationScope.launch {
-		val tunnels = appDataRepository.tunnels.getAll()
-		if (tunnels.isEmpty()) return@launch setUnavailable()
-		with(tunnelManager.activeTunnels.value) {
-			if (isNotEmpty()) if (size == 1) {
-				tunnels.firstOrNull { it.id == keys.first() }?.let { return@launch updateTile(it.tunName, true) }
-			} else {
-				return@launch updateTile(getString(R.string.multiple), true)
-			}
-		}
-		appDataRepository.getStartTunnelConfig()?.let {
-			updateTile(it.tunName, false)
-		}
-	}
+    override fun onStartListening() {
+        super.onStartListening()
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
+        Timber.d("Start listening called for tunnel tile")
+        if (isCollecting) return
+        isCollecting = true
+        lifecycleScope.launch { tunnelManager.activeTunnels.collect { updateTileState() } }
+    }
 
-	override fun onClick() {
-		super.onClick()
-		unlockAndRun {
-			applicationScope.launch {
-				if (tunnelManager.activeTunnels.value.isNotEmpty()) return@launch tunnelManager.stopTunnel()
-				appDataRepository.getStartTunnelConfig()?.let {
-					tunnelManager.startTunnel(it)
-				}
-			}
-		}
-	}
+    private suspend fun updateTileState() {
+        try {
+            val tunnels = appDataRepository.tunnels.getAll()
+            if (tunnels.isEmpty()) {
+                setUnavailable()
+                return
+            }
 
-	private fun setActive() {
-		runCatching {
-			qsTile.state = Tile.STATE_ACTIVE
-			qsTile.updateTile()
-		}
-	}
+            val activeTunnels =
+                tunnelManager.activeTunnels.value.filter { it.value.status.isUpOrStarting() }
 
-	private fun setInactive() {
-		runCatching {
-			qsTile.state = Tile.STATE_INACTIVE
-			qsTile.updateTile()
-		}
-	}
+            when {
+                activeTunnels.isNotEmpty() -> {
+                    val activeIds = activeTunnels.map { it.key.id }
+                    // TODO improvements would be needed to make this work well with toggling
+                    // multiple tunnels
+                    // this would be better managed elsewhere
+                    WireGuardAutoTunnel.setLastActiveTunnels(activeIds)
+                    updateTileForActiveTunnels(activeTunnels)
+                }
+                else -> updateTileForLastActiveTunnels()
+            }
+        } catch (e: Exception) {
+            setUnavailable()
+        }
+    }
 
-	private fun setUnavailable() {
-		runCatching {
-			qsTile.state = Tile.STATE_UNAVAILABLE
-			setTileDescription("")
-			qsTile.updateTile()
-		}
-	}
+    private fun updateTileForActiveTunnels(activeTunnels: Map<TunnelConf, TunnelState>) {
+        val tileName =
+            when (activeTunnels.size) {
+                1 -> activeTunnels.keys.first().tunName
+                else -> getString(R.string.multiple)
+            }
+        updateTile(tileName, true)
+    }
 
-	private fun setTileDescription(description: String) {
-		runCatching {
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-				qsTile.subtitle = description
-			}
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-				qsTile.stateDescription = description
-			}
-			qsTile.updateTile()
-		}
-	}
+    private suspend fun updateTileForLastActiveTunnels() {
+        val lastActiveIds = WireGuardAutoTunnel.getLastActiveTunnels()
+        when {
+            lastActiveIds.isEmpty() -> {
+                appDataRepository.getStartTunnelConfig()?.let { config ->
+                    updateTile(config.tunName, false)
+                } ?: setUnavailable()
+            }
+            lastActiveIds.size > 1 -> updateTile(getString(R.string.multiple), false)
+            else -> {
+                val tunnelId = lastActiveIds.first()
+                appDataRepository.tunnels.getById(tunnelId)?.let { tunnel ->
+                    updateTile(tunnel.tunName, false)
+                } ?: setUnavailable()
+            }
+        }
+    }
 
-	/* This works around an annoying unsolved frameworks bug some people are hitting. */
-	override fun onBind(intent: Intent): IBinder? {
-		var ret: IBinder? = null
-		try {
-			ret = super.onBind(intent)
-		} catch (_: Throwable) {
-			Timber.e("Failed to bind to TunnelControlTile")
-		}
-		return ret
-	}
+    override fun onClick() {
+        super.onClick()
+        unlockAndRun {
+            lifecycleScope.launch {
+                if (tunnelManager.activeTunnels.value.isNotEmpty())
+                    return@launch tunnelManager.stopTunnel()
+                val lastActive = WireGuardAutoTunnel.getLastActiveTunnels()
+                if (lastActive.isEmpty()) {
+                    appDataRepository.getStartTunnelConfig()?.let { tunnelManager.startTunnel(it) }
+                } else {
+                    lastActive.forEach { id ->
+                        appDataRepository.tunnels.getById(id)?.let { tunnelManager.startTunnel(it) }
+                    }
+                }
+            }
+        }
+    }
 
-	private fun updateTile(name: String, active: Boolean) {
-		runCatching {
-			setTileDescription(name)
-			if (active) return setActive()
-			setInactive()
-		}.onFailure {
-			Timber.e(it)
-		}
-	}
+    private fun setActive() {
+        runCatching {
+            qsTile.state = Tile.STATE_ACTIVE
+            qsTile.updateTile()
+        }
+    }
+
+    private fun setInactive() {
+        runCatching {
+            qsTile.state = Tile.STATE_INACTIVE
+            qsTile.updateTile()
+        }
+    }
+
+    private fun setUnavailable() {
+        runCatching {
+            qsTile.state = Tile.STATE_UNAVAILABLE
+            setTileDescription("")
+            qsTile.updateTile()
+        }
+    }
+
+    private fun setTileDescription(description: String) {
+        runCatching {
+            if (qsTile == null) return@runCatching
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                qsTile.subtitle = description
+                qsTile.stateDescription = description
+            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                qsTile.subtitle = description
+            }
+            qsTile.updateTile()
+        }
+    }
+
+    /* This works around an annoying unsolved frameworks bug some people are hitting. */
+    override fun onBind(intent: Intent): IBinder? {
+        var ret: IBinder? = null
+        try {
+            ret = super.onBind(intent)
+        } catch (_: Throwable) {
+            Timber.e("Failed to bind to TunnelControlTile")
+        }
+        return ret
+    }
+
+    private fun updateTile(name: String, active: Boolean) {
+        runCatching {
+                setTileDescription(name)
+                if (active) return setActive()
+                setInactive()
+            }
+            .onFailure { Timber.e(it) }
+    }
+
+    override val lifecycle: Lifecycle
+        get() = lifecycleRegistry
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/shortcut/DynamicShortcutManager.kt

@@ -10,70 +10,83 @@ import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 
-class DynamicShortcutManager(private val context: Context, @IoDispatcher private val ioDispatcher: CoroutineDispatcher) : ShortcutManager {
-	override suspend fun addShortcuts() {
-		withContext(ioDispatcher) {
-			ShortcutManagerCompat.setDynamicShortcuts(context, createShortcuts())
-		}
-	}
+class DynamicShortcutManager(
+    private val context: Context,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) : ShortcutManager {
+    override suspend fun addShortcuts() {
+        withContext(ioDispatcher) {
+            ShortcutManagerCompat.setDynamicShortcuts(context, createShortcuts())
+        }
+    }
 
-	override suspend fun removeShortcuts() {
-		withContext(ioDispatcher) {
-			ShortcutManagerCompat.removeDynamicShortcuts(context, createShortcuts().map { it.id })
-		}
-	}
+    override suspend fun removeShortcuts() {
+        withContext(ioDispatcher) {
+            ShortcutManagerCompat.removeDynamicShortcuts(context, createShortcuts().map { it.id })
+        }
+    }
 
-	private fun createShortcuts(): List<ShortcutInfoCompat> {
-		return listOf(
-			buildShortcut(
-				context.getString(R.string.vpn_off),
-				context.getString(R.string.vpn_off),
-				context.getString(R.string.vpn_off),
-				intent = Intent(context, ShortcutsActivity::class.java).apply {
-					putExtra("className", "WireGuardTunnelService")
-					action = ShortcutsActivity.Action.STOP.name
-				},
-				shortcutIcon = R.drawable.vpn_off,
-			),
-			buildShortcut(
-				context.getString(R.string.vpn_on),
-				context.getString(R.string.vpn_on),
-				context.getString(R.string.vpn_on),
-				intent = Intent(context, ShortcutsActivity::class.java).apply {
-					putExtra("className", "WireGuardTunnelService")
-					action = ShortcutsActivity.Action.START.name
-				},
-				shortcutIcon = R.drawable.vpn_on,
-			),
-			buildShortcut(
-				context.getString(R.string.start_auto),
-				context.getString(R.string.start_auto),
-				context.getString(R.string.start_auto),
-				intent = Intent(context, ShortcutsActivity::class.java).apply {
-					putExtra("className", "WireGuardConnectivityWatcherService")
-					action = ShortcutsActivity.Action.START.name
-				},
-				shortcutIcon = R.drawable.auto_play,
-			),
-			buildShortcut(
-				context.getString(R.string.stop_auto),
-				context.getString(R.string.stop_auto),
-				context.getString(R.string.stop_auto),
-				intent = Intent(context, ShortcutsActivity::class.java).apply {
-					putExtra("className", "WireGuardConnectivityWatcherService")
-					action = ShortcutsActivity.Action.STOP.name
-				},
-				shortcutIcon = R.drawable.auto_pause,
-			),
-		)
-	}
+    private fun createShortcuts(): List<ShortcutInfoCompat> {
+        return listOf(
+            buildShortcut(
+                context.getString(R.string.vpn_off),
+                context.getString(R.string.vpn_off),
+                context.getString(R.string.vpn_off),
+                intent =
+                    Intent(context, ShortcutsActivity::class.java).apply {
+                        putExtra("className", "WireGuardTunnelService")
+                        action = ShortcutsActivity.Action.STOP.name
+                    },
+                shortcutIcon = R.drawable.vpn_off,
+            ),
+            buildShortcut(
+                context.getString(R.string.vpn_on),
+                context.getString(R.string.vpn_on),
+                context.getString(R.string.vpn_on),
+                intent =
+                    Intent(context, ShortcutsActivity::class.java).apply {
+                        putExtra("className", "WireGuardTunnelService")
+                        action = ShortcutsActivity.Action.START.name
+                    },
+                shortcutIcon = R.drawable.vpn_on,
+            ),
+            buildShortcut(
+                context.getString(R.string.start_auto),
+                context.getString(R.string.start_auto),
+                context.getString(R.string.start_auto),
+                intent =
+                    Intent(context, ShortcutsActivity::class.java).apply {
+                        putExtra("className", "WireGuardConnectivityWatcherService")
+                        action = ShortcutsActivity.Action.START.name
+                    },
+                shortcutIcon = R.drawable.auto_play,
+            ),
+            buildShortcut(
+                context.getString(R.string.stop_auto),
+                context.getString(R.string.stop_auto),
+                context.getString(R.string.stop_auto),
+                intent =
+                    Intent(context, ShortcutsActivity::class.java).apply {
+                        putExtra("className", "WireGuardConnectivityWatcherService")
+                        action = ShortcutsActivity.Action.STOP.name
+                    },
+                shortcutIcon = R.drawable.auto_pause,
+            ),
+        )
+    }
 
-	private fun buildShortcut(id: String, shortLabel: String, longLabel: String, intent: Intent, shortcutIcon: Int): ShortcutInfoCompat {
-		return ShortcutInfoCompat.Builder(context, id)
-			.setShortLabel(shortLabel)
-			.setLongLabel(longLabel)
-			.setIntent(intent)
-			.setIcon(IconCompat.createWithResource(context, shortcutIcon))
-			.build()
-	}
+    private fun buildShortcut(
+        id: String,
+        shortLabel: String,
+        longLabel: String,
+        intent: Intent,
+        shortcutIcon: Int,
+    ): ShortcutInfoCompat {
+        return ShortcutInfoCompat.Builder(context, id)
+            .setShortLabel(shortLabel)
+            .setLongLabel(longLabel)
+            .setIntent(intent)
+            .setIcon(IconCompat.createWithResource(context, shortcutIcon))
+            .build()
+    }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/shortcut/ShortcutManager.kt

@@ -1,6 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.core.shortcut
 
 interface ShortcutManager {
-	suspend fun addShortcuts()
-	suspend fun removeShortcuts()
+    suspend fun addShortcuts()
+
+    suspend fun removeShortcuts()
 }

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

@@ -2,72 +2,75 @@ package com.zaneschepke.wireguardautotunnel.core.shortcut
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelService
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class ShortcutsActivity : ComponentActivity() {
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
+    @Inject lateinit var appDataRepository: AppDataRepository
 
-	@Inject
-	lateinit var serviceManager: ServiceManager
+    @Inject lateinit var serviceManager: ServiceManager
 
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
+    @Inject lateinit var tunnelManager: TunnelManager
 
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		applicationScope.launch {
-			val settings = appDataRepository.settings.get()
-			if (settings.isShortcutsEnabled) {
-				when (intent.getStringExtra(CLASS_NAME_EXTRA_KEY)) {
-					LEGACY_TUNNEL_SERVICE_NAME, TunnelProvider::class.java.simpleName -> {
-						val tunnelName = intent.getStringExtra(TUNNEL_NAME_EXTRA_KEY)
-						Timber.d("Tunnel name extra: $tunnelName")
-						val tunnelConfig = tunnelName?.let {
-							appDataRepository.tunnels.getAll()
-								.firstOrNull { it.tunName == tunnelName }
-						} ?: appDataRepository.getStartTunnelConfig()
-						Timber.d("Shortcut action on name: ${tunnelConfig?.tunName}")
-// 						tunnelConfig?.let {
-// 							when (intent.action) {
-// 								Action.START.name -> tunnelService.get().startTunnel(it)
-// 								Action.STOP.name -> tunnelService.get().stopTunnel()
-// 								else -> Unit
-// 							}
-// 						}
-					}
-					AutoTunnelService::class.java.simpleName, LEGACY_AUTO_TUNNEL_SERVICE_NAME -> {
-						when (intent.action) {
-							Action.START.name -> serviceManager.startAutoTunnel(true)
-							Action.STOP.name -> serviceManager.stopAutoTunnel()
-						}
-					}
-				}
-			}
-		}
-		finish()
-	}
+    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
 
-	enum class Action {
-		START,
-		STOP,
-	}
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        applicationScope.launch {
+            val settings = appDataRepository.settings.get()
+            if (settings.isShortcutsEnabled) {
+                when (intent.getStringExtra(CLASS_NAME_EXTRA_KEY)) {
+                    LEGACY_TUNNEL_SERVICE_NAME,
+                    TunnelProvider::class.java.simpleName -> {
+                        val tunnelName = intent.getStringExtra(TUNNEL_NAME_EXTRA_KEY)
+                        Timber.d("Tunnel name extra: $tunnelName")
+                        val tunnelConfig =
+                            tunnelName?.let {
+                                appDataRepository.tunnels.getAll().firstOrNull {
+                                    it.tunName == tunnelName
+                                }
+                            } ?: appDataRepository.getStartTunnelConfig()
+                        Timber.d("Shortcut action on name: ${tunnelConfig?.tunName}")
+                        tunnelConfig?.let {
+                            when (intent.action) {
+                                Action.START.name -> tunnelManager.startTunnel(it)
+                                Action.STOP.name -> tunnelManager.stopTunnel()
+                                else -> Unit
+                            }
+                        }
+                    }
+                    AutoTunnelService::class.java.simpleName,
+                    LEGACY_AUTO_TUNNEL_SERVICE_NAME -> {
+                        when (intent.action) {
+                            Action.START.name -> serviceManager.startAutoTunnel()
+                            Action.STOP.name -> serviceManager.stopAutoTunnel()
+                        }
+                    }
+                }
+            }
+        }
+        finish()
+    }
 
-	companion object {
-		const val LEGACY_TUNNEL_SERVICE_NAME = "WireGuardTunnelService"
-		const val LEGACY_AUTO_TUNNEL_SERVICE_NAME = "WireGuardConnectivityWatcherService"
-		const val TUNNEL_NAME_EXTRA_KEY = "tunnelName"
-		const val CLASS_NAME_EXTRA_KEY = "className"
-	}
+    enum class Action {
+        START,
+        STOP,
+    }
+
+    companion object {
+        const val LEGACY_TUNNEL_SERVICE_NAME = "WireGuardTunnelService"
+        const val LEGACY_AUTO_TUNNEL_SERVICE_NAME = "WireGuardConnectivityWatcherService"
+        const val TUNNEL_NAME_EXTRA_KEY = "tunnelName"
+        const val CLASS_NAME_EXTRA_KEY = "className"
+    }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/BaseTunnel.kt

@@ -1,256 +1,238 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
+import com.wireguard.android.backend.BackendException
 import com.wireguard.android.backend.Tunnel
-import com.zaneschepke.networkmonitor.NetworkMonitor
-import com.zaneschepke.networkmonitor.NetworkStatus
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
-import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider.Companion.CHECK_INTERVAL
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendError
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
-import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.StringValue
 import com.zaneschepke.wireguardautotunnel.util.extensions.asTunnelState
-import com.zaneschepke.wireguardautotunnel.util.extensions.cancelWithMessage
-import kotlinx.coroutines.CoroutineDispatcher
+import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
+import java.util.concurrent.ConcurrentHashMap
+import kotlin.concurrent.thread
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import timber.log.Timber
-import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.atomic.AtomicBoolean
 
-open class BaseTunnel(
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-	@ApplicationScope private val applicationScope: CoroutineScope,
-	private val networkMonitor: NetworkMonitor,
-	private val appDataRepository: AppDataRepository,
-	private val serviceManager: ServiceManager,
-	private val notificationManager: NotificationManager,
+abstract class BaseTunnel(
+    @ApplicationScope private val applicationScope: CoroutineScope,
+    private val appDataRepository: AppDataRepository,
+    private val serviceManager: ServiceManager,
 ) : TunnelProvider {
 
-	internal val tunnels = MutableStateFlow<List<TunnelConf>>(emptyList())
+    private val activeTuns = MutableStateFlow<Map<TunnelConf, TunnelState>>(emptyMap())
+    private val tunThreads = ConcurrentHashMap<Int, Thread>()
+    override val activeTunnels = activeTuns.asStateFlow()
 
-	private val _tunnelStates = MutableStateFlow<Map<Int, TunnelState>>(emptyMap())
+    private val tunMutex = Mutex()
+    private val tunStatusMutex = Mutex()
+    private val bounceTunnelMutex = Mutex()
 
-	private val tunnelJobs = ConcurrentHashMap<Int, Job>()
+    override val bouncingTunnelIds = ConcurrentHashMap<Int, TunnelStatus.StopReason>()
 
-	private val isNetworkAvailable = AtomicBoolean(false)
+    abstract suspend fun startBackend(tunnel: TunnelConf)
 
-	init {
-		applicationScope.launch(ioDispatcher) {
-			launch { startNetworkJob() }
-			launch { monitorTunnelConfigChanges() }
-			tunnels.collect { tuns ->
-				val previousTunIds = tunnelJobs.keys.toSet()
-				val currentTunIds = tuns.map { it.id }.toSet()
-				val newTuns = tuns.filter { it.id !in previousTunIds }
-				val removedTunIds = previousTunIds - currentTunIds
+    abstract fun stopBackend(tunnel: TunnelConf)
 
-				newTuns.forEach { tun ->
-					Timber.d("Starting tunnel jobs for tun ${tun.name} (ID: ${tun.id})")
-					tunnelJobs[tun.id] = startTunnelJobs(tun)
-				}
+    override suspend fun clearError(tunnelConf: TunnelConf) =
+        updateTunnelStatus(tunnelConf, TunnelStatus.Down)
 
-				removedTunIds.forEach { tunId ->
-					tunnelJobs[tunId]?.cancelWithMessage("Canceling tunnel jobs for tunnel ID: $tunId")
-					tunnelJobs.remove(tunId)
-					_tunnelStates.update { it - tunId }
-					serviceManager.updateTunnelTile()
-				}
-			}
-		}
-	}
+    override fun hasVpnPermission(): Boolean {
+        return serviceManager.hasVpnPermission()
+    }
 
-	private fun startTunnelJobs(tunnel: TunnelConf) = applicationScope.launch(ioDispatcher) {
-		launch { startTunnelStatisticsJob(tunnel) }
-		if (tunnel.isPingEnabled) launch { startPingJob(tunnel) }
-	}
+    protected suspend fun updateTunnelStatus(
+        tunnelConf: TunnelConf,
+        state: TunnelStatus? = null,
+        stats: TunnelStatistics? = null,
+    ) {
+        tunStatusMutex.withLock {
+            activeTuns.update { current ->
+                val originalConf = current.getKeyById(tunnelConf.id) ?: tunnelConf
+                val existingState = current.getValueById(tunnelConf.id) ?: TunnelState()
+                val newState = state ?: existingState.status
+                if (newState == TunnelStatus.Down) {
+                    Timber.d("Removing tunnel ${tunnelConf.id} from activeTunnels as state is DOWN")
+                    cleanUpTunThread(tunnelConf)
+                    current - originalConf
+                } else if (existingState.status == newState && stats == null) {
+                    Timber.d("Skipping redundant state update for ${tunnelConf.id}: $newState")
+                    current
+                } else {
+                    val updated =
+                        existingState.copy(
+                            status = newState,
+                            statistics = stats ?: existingState.statistics,
+                        )
+                    current + (originalConf to updated)
+                }
+            }
+        }
+    }
 
-	private fun updateTunnelState(tunnelId: Int, newState: TunnelStatus) {
-		Timber.d("Updating tunnel state for ID $tunnelId to $newState")
-		_tunnelStates.update { current ->
-			val currentState = current[tunnelId]
-			val updatedState = currentState?.copy(state = newState) ?: TunnelState(state = newState)
-			val newMap = current + (tunnelId to updatedState)
-			Timber.d("New tunnel states: $newMap")
-			newMap
-		}
-	}
+    private suspend fun stopActiveTunnels() {
+        activeTunnels.value.forEach { (config, state) ->
+            if (state.status.isUpOrStarting()) {
+                stopTunnel(config)
+            }
+        }
+    }
 
-	internal fun beforeStartTunnel(tunnelConf: TunnelConf) {
-		tunnelConf.setStateChangeCallback { state ->
-			Timber.d("New tunnel state $state")
-			when (state) {
-				is Tunnel.State -> updateTunnelState(tunnelConf.id, state.asTunnelState())
-				is org.amnezia.awg.backend.Tunnel.State -> updateTunnelState(tunnelConf.id, state.asTunnelState())
-			}
-			applicationScope.launch(ioDispatcher) {
-				serviceManager.updateTunnelTile()
-			}
-		}
-	}
+    private fun configureTunnelCallbacks(tunnelConf: TunnelConf) {
+        Timber.d("Configuring TunnelConf instance: ${tunnelConf.hashCode()}")
+        tunnelConf.setStateChangeCallback { state ->
+            applicationScope.launch {
+                Timber.d(
+                    "State change callback triggered for tunnel ${tunnelConf.id}: ${tunnelConf.tunName} with state $state at ${System.currentTimeMillis()}"
+                )
+                when (state) {
+                    is Tunnel.State -> updateTunnelStatus(tunnelConf, state.asTunnelState())
+                    is org.amnezia.awg.backend.Tunnel.State ->
+                        updateTunnelStatus(tunnelConf, state.asTunnelState())
+                }
+                handleServiceStateOnChange()
+            }
+            serviceManager.updateTunnelTile()
+        }
+    }
 
-	override fun startTunnel(tunnelConf: TunnelConf) {
-		applicationScope.launch(ioDispatcher) {
-			serviceManager.startBackgroundService(tunnelConf)
-			appDataRepository.tunnels.save(tunnelConf.copy(isActive = true))
-			addToActiveTunnels(tunnelConf)
-		}
-	}
+    override suspend fun updateTunnelStatistics(tunnel: TunnelConf) {
+        val stats = getStatistics(tunnel)
+        updateTunnelStatus(tunnel, null, stats)
+    }
 
-	override fun stopTunnel(tunnelConf: TunnelConf?) {
-		// Default empty implementation; subclasses override
-	}
+    override suspend fun startTunnel(tunnelConf: TunnelConf) {
+        if (activeTuns.exists(tunnelConf.id) || tunThreads.containsKey(tunnelConf.id)) return
+        if (this@BaseTunnel is UserspaceTunnel) stopActiveTunnels()
+        tunMutex.withLock {
+            tunThreads[tunnelConf.id] = thread {
+                runCatching {
+                        runBlocking {
+                            try {
+                                Timber.d("Starting tunnel ${tunnelConf.id}...")
+                                startTunnelInner(tunnelConf)
+                                Timber.d("Started complete for tunnel ${tunnelConf.name}...")
+                            } catch (e: BackendError) {
+                                Timber.e(e, "Failed to start tunnel ${tunnelConf.name} userspace")
+                                updateTunnelStatus(tunnelConf, TunnelStatus.Error(e))
+                            } catch (e: InterruptedException) {
+                                Timber.w(
+                                    "Tunnel start has been interrupted as ${tunnelConf.name} failed to start"
+                                )
+                            }
+                        }
+                    }
+                    .onFailure { Timber.w("Tunnel start has been interrupted") }
+            }
+        }
+    }
 
-	override suspend fun bounceTunnel(tunnelConf: TunnelConf) {
-		stopTunnel(tunnelConf)
-		delay(1000)
-		startTunnel(tunnelConf)
-	}
+    private suspend fun startTunnelInner(tunnelConf: TunnelConf) {
+        configureTunnelCallbacks(tunnelConf)
+        Timber.d("Starting  backend for tunnel ${tunnelConf.id}...")
+        try {
+            startBackend(tunnelConf)
+            updateTunnelStatus(tunnelConf, TunnelStatus.Up)
+            Timber.d("Started for tun ${tunnelConf.id}...")
+            saveTunnelActiveState(tunnelConf, true)
+            serviceManager.startTunnelForegroundService()
+        } catch (e: BackendException) {
+            Timber.e(e, "Failed to start backend for ${tunnelConf.name}")
+            val backendError = e.toBackendError()
+            updateTunnelStatus(tunnelConf, TunnelStatus.Error(backendError))
+            throw backendError
+        }
+    }
 
-	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
-		// Default empty implementation
-	}
+    private suspend fun saveTunnelActiveState(tunnelConf: TunnelConf, active: Boolean) {
+        val tunnelCopy = tunnelConf.copyWithCallback(isActive = active)
+        appDataRepository.tunnels.save(tunnelCopy)
+    }
 
-	override suspend fun runningTunnelNames(): Set<String> {
-		return emptySet()
-	}
+    override suspend fun stopTunnel(tunnelConf: TunnelConf?, reason: TunnelStatus.StopReason) {
+        if (tunnelConf == null) return stopActiveTunnels()
+        tunMutex.withLock {
+            try {
+                if (activeTuns.isStarting(tunnelConf.id))
+                    return handleStuckStartingTunnelShutdown(tunnelConf)
+                updateTunnelStatus(tunnelConf, TunnelStatus.Stopping(reason))
+                stopTunnelInner(tunnelConf)
+            } catch (e: BackendError) {
+                Timber.e(e, "Failed to stop tunnel ${tunnelConf.id}")
+                updateTunnelStatus(tunnelConf, TunnelStatus.Error(e))
+            }
+        }
+    }
 
-	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
-		throw NotImplementedError("Get statistics not implemented in base class")
-	}
+    private suspend fun stopTunnelInner(tunnelConf: TunnelConf) {
+        val tunnel = activeTuns.findTunnel(tunnelConf.id) ?: return
+        stopBackend(tunnel)
+        saveTunnelActiveState(tunnelConf, false)
+        removeActiveTunnel(tunnel)
+    }
 
-	override val activeTunnels: StateFlow<Map<Int, TunnelState>>
-		get() = _tunnelStates.asStateFlow()
+    private suspend fun handleServiceStateOnChange() {
+        if (activeTuns.value.isEmpty() && bouncingTunnelIds.isEmpty())
+            serviceManager.stopTunnelForegroundService()
+    }
 
-	internal suspend fun onTunnelStop(tunnelConf: TunnelConf) {
-		appDataRepository.tunnels.save(tunnelConf.copy(isActive = false))
-		removeFromActiveTunnels(tunnelConf)
-		if (tunnels.value.isEmpty()) serviceManager.stopBackgroundService()
-	}
+    private suspend fun handleStuckStartingTunnelShutdown(tunnel: TunnelConf) {
+        Timber.d("Stuck in starting state so shutting down tunnel thread for tunnel ${tunnel.name}")
+        try {
+            tunThreads[tunnel.id]?.let {
+                if (it.state != Thread.State.TERMINATED) {
+                    it.interrupt()
+                    updateTunnelStatus(tunnel, TunnelStatus.Down)
+                } else {
+                    Timber.d("Thread already terminated")
+                }
+            }
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to stop tunnel thread for ${tunnel.name}")
+        }
+        cleanUpTunThread(tunnel)
+    }
 
-	internal fun stopAllTunnels() {
-		tunnels.value.forEach {
-			stopTunnel(it)
-		}
-	}
+    private fun cleanUpTunThread(tunnel: TunnelConf) {
+        Timber.d("Removing thread for ${tunnel.name}")
+        tunThreads -= tunnel.id
+    }
 
-	private fun addToActiveTunnels(conf: TunnelConf) {
-		tunnels.update {
-			it.toMutableList().apply {
-				add(conf)
-			}
-		}
-	}
+    private fun removeActiveTunnel(tunnelConf: TunnelConf) {
+        activeTuns.update { current -> current.toMutableMap().apply { remove(tunnelConf) } }
+    }
 
-	private fun removeFromActiveTunnels(conf: TunnelConf) {
-		tunnels.update {
-			it.toMutableList().apply {
-				remove(conf)
-			}
-		}
-	}
+    override suspend fun bounceTunnel(tunnelConf: TunnelConf, reason: TunnelStatus.StopReason) {
+        bounceTunnelMutex.withLock {
+            Timber.i(
+                "Bounce tunnel ${tunnelConf.name} for reason: $reason, current bouncing: ${bouncingTunnelIds.size}"
+            )
+            bouncingTunnelIds[tunnelConf.id] = reason
+            try {
+                stopTunnel(tunnelConf, reason)
+                delay(300L)
+                startTunnel(tunnelConf)
+            } finally {
+                bouncingTunnelIds.remove(tunnelConf.id)
+                handleServiceStateOnChange()
+                Timber.d(
+                    "Cleared bounce state for ${tunnelConf.name}, remaining: ${bouncingTunnelIds.size}"
+                )
+            }
+        }
+    }
 
-	private suspend fun startNetworkJob() = coroutineScope {
-		networkMonitor.getNetworkStatusFlow(includeWifiSsid = false, useRootShell = false)
-			.flowOn(ioDispatcher).collect {
-				isNetworkAvailable.set(it !is NetworkStatus.Disconnected)
-			}
-	}
-
-	private suspend fun startPingJob(tunnel: TunnelConf) = coroutineScope {
-		while (isActive) {
-			runCatching {
-				if (isNetworkAvailable.get() && tunnel.isActive) {
-					val pingSuccess = tunnel.isTunnelPingable(ioDispatcher)
-					handlePingResult(tunnel, pingSuccess)
-				}
-				delay(tunnel.pingInterval ?: Constants.PING_INTERVAL)
-			}
-		}
-	}
-
-	private suspend fun handlePingResult(tunnel: TunnelConf, pingSuccess: Boolean) {
-		if (!pingSuccess) {
-			if (isNetworkAvailable.get()) {
-				Timber.i("Ping result: target was not reachable, bouncing the tunnel")
-				bounceTunnel(tunnel)
-				delay(tunnel.pingCooldown ?: Constants.PING_COOLDOWN)
-			} else {
-				Timber.i("Ping result: target was not reachable, but no network available")
-			}
-		} else {
-			Timber.i("Ping result: all ping targets were reached successfully")
-		}
-	}
-
-	internal fun handleBackendThrowable(backendError: BackendError) {
-		val message = when (backendError) {
-			BackendError.Config -> StringValue.StringResource(R.string.start_failed_config)
-			BackendError.DNS -> StringValue.StringResource(R.string.dns_error)
-			BackendError.Unauthorized -> StringValue.StringResource(R.string.unauthorized)
-		}
-		if (WireGuardAutoTunnel.isForeground()) {
-			SnackbarController.showMessage(message)
-		} else {
-			notificationManager.show(
-				NotificationManager.VPN_NOTIFICATION_ID,
-				notificationManager.createNotification(
-					WireGuardNotification.NotificationChannels.VPN,
-					title = StringValue.StringResource(R.string.tunne_start_failed_title),
-					description = message,
-				),
-			)
-		}
-	}
-
-	private suspend fun monitorTunnelConfigChanges() = coroutineScope {
-		appDataRepository.tunnels.flow.collect { storageTuns ->
-			storageTuns.forEach { storageTun ->
-				val currentTun = tunnels.value.firstOrNull { it.id == storageTun.id }
-				if (currentTun != null) {
-					if (!currentTun.isQuickConfigMatching(storageTun)) {
-						Timber.d("Tunnel config changed for ID $storageTun, bouncing tunnel")
-						bounceTunnel(storageTun)
-					}
-				}
-			}
-		}
-	}
-
-	private suspend fun startTunnelStatisticsJob(tunnel: TunnelConf) = coroutineScope {
-		while (this.isActive) {
-			runCatching {
-				val stats = getStatistics(tunnel)
-				_tunnelStates.update { currentStates ->
-					val updatedState = currentStates[tunnel.id]?.copy(statistics = stats)
-						?: TunnelState(statistics = stats)
-					currentStates + (tunnel.id to updatedState)
-				}
-				delay(CHECK_INTERVAL)
-			}.onFailure { exception ->
-				Timber.e(exception, "Failed to update tunnel statistics for ${tunnel.tunName}")
-			}
-		}
-	}
+    override suspend fun runningTunnelNames(): Set<String> =
+        activeTuns.value.keys.map { it.tunName }.toSet()
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/Extensions.kt

@@ -0,0 +1,50 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel
+
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
+import kotlinx.coroutines.flow.MutableStateFlow
+
+fun Map<TunnelConf, TunnelState>.allDown(): Boolean {
+    return this.all { it.value.status.isDown() }
+}
+
+fun Map<TunnelConf, TunnelState>.hasActive(): Boolean {
+    return this.any { it.value.status.isUp() }
+}
+
+fun Map<TunnelConf, TunnelState>.getValueById(id: Int): TunnelState? {
+    val key = this.keys.find { it.id == id }
+    return key?.let { this@getValueById[it] }
+}
+
+fun Map<TunnelConf, TunnelState>.getKeyById(id: Int): TunnelConf? {
+    return this.keys.find { it.id == id }
+}
+
+fun Map<TunnelConf, TunnelState>.isUp(tunnelConf: TunnelConf): Boolean {
+    return this.getValueById(tunnelConf.id)?.status?.isUp() ?: false
+}
+
+fun MutableStateFlow<Map<TunnelConf, TunnelState>>.exists(id: Int): Boolean {
+    return this.value.any { it.key.id == id }
+}
+
+fun MutableStateFlow<Map<TunnelConf, TunnelState>>.isUp(id: Int): Boolean {
+    return this.value.any { it.key.id == id && it.value.status == TunnelStatus.Up }
+}
+
+fun MutableStateFlow<Map<TunnelConf, TunnelState>>.isStarting(id: Int): Boolean {
+    return this.value.any { it.key.id == id && it.value.status == TunnelStatus.Starting }
+}
+
+fun MutableStateFlow<Map<TunnelConf, TunnelState>>.findTunnel(id: Int): TunnelConf? {
+    return this.value.keys.find { it.id == id }
+}
+
+private val URL_PATTERN =
+    Regex("""^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}:[0-9]{1,5}$""")
+
+fun String.isUrl(): Boolean {
+    return URL_PATTERN.matches(this)
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/KernelTunnel.kt

@@ -3,77 +3,64 @@ package com.zaneschepke.wireguardautotunnel.core.tunnel
 import com.wireguard.android.backend.Backend
 import com.wireguard.android.backend.BackendException
 import com.wireguard.android.backend.Tunnel
-import com.zaneschepke.networkmonitor.NetworkMonitor
-import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import com.zaneschepke.wireguardautotunnel.domain.state.WireGuardStatistics
 import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import timber.log.Timber
 import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import timber.log.Timber
 
-class KernelTunnel @Inject constructor(
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-	@ApplicationScope private val applicationScope: CoroutineScope,
-	serviceManager: ServiceManager,
-	appDataRepository: AppDataRepository,
-	notificationManager: NotificationManager,
-	private val backend: Backend,
-	networkMonitor: NetworkMonitor,
-) : BaseTunnel(ioDispatcher, applicationScope, networkMonitor, appDataRepository, serviceManager, notificationManager) {
+class KernelTunnel
+@Inject
+constructor(
+    @ApplicationScope private val applicationScope: CoroutineScope,
+    serviceManager: ServiceManager,
+    appDataRepository: AppDataRepository,
+    private val backend: Backend,
+) : BaseTunnel(applicationScope, appDataRepository, serviceManager) {
 
-	override fun startTunnel(tunnelConf: TunnelConf) {
-		Timber.d("Starting tunnel ${tunnelConf.id} kernel")
-		applicationScope.launch(ioDispatcher) {
-			if (tunnels.value.any { it.id == tunnelConf.id }) return@launch Timber.w("Tunnel already running")
-			runCatching {
-				Timber.d("Setting backend state UP")
-				super.beforeStartTunnel(tunnelConf)
-				backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toWgConfig())
-				Timber.d("Calling super.startTunnel")
-				super.startTunnel(tunnelConf)
-			}.onFailure {
-				Timber.e(it, "Failed to start tunnel ${tunnelConf.id} kernel")
-				onTunnelStop(tunnelConf)
-				if (it is BackendException) {
-					handleBackendThrowable(it.toBackendError())
-				} else {
-					Timber.e(it)
-				}
-			}
-		}
-	}
+    override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
+        return try {
+            WireGuardStatistics(backend.getStatistics(tunnelConf))
+        } catch (e: Exception) {
+            Timber.e(e)
+            null
+        }
+    }
 
-	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
-		return WireGuardStatistics(backend.getStatistics(tunnelConf))
-	}
+    override suspend fun startBackend(tunnel: TunnelConf) {
+        try {
+            updateTunnelStatus(tunnel, TunnelStatus.Starting)
+            backend.setState(tunnel, Tunnel.State.UP, tunnel.toWgConfig())
+        } catch (e: BackendException) {
+            throw e.toBackendError()
+        }
+    }
 
-	override fun stopTunnel(tunnelConf: TunnelConf?) {
-		applicationScope.launch(ioDispatcher) {
-			runCatching {
-				tunnels.value.firstOrNull { it.id == tunnelConf?.id }?.let {
-					backend.setState(it, Tunnel.State.DOWN, it.toWgConfig())
-					onTunnelStop(it)
-				} ?: stopAllTunnels()
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
-	}
+    override fun stopBackend(tunnel: TunnelConf) {
+        Timber.i("Stopping tunnel ${tunnel.id} kernel")
+        try {
+            backend.setState(tunnel, Tunnel.State.DOWN, tunnel.toWgConfig())
+        } catch (e: BackendException) {
+            throw e.toBackendError()
+        }
+    }
 
-	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
-		Timber.w("Not yet implemented for kernel")
-	}
+    override fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
+        Timber.w("Not yet implemented for kernel")
+    }
 
-	override suspend fun runningTunnelNames(): Set<String> {
-		return backend.runningTunnelNames
-	}
+    override fun getBackendState(): BackendState {
+        return BackendState.INACTIVE
+    }
+
+    override suspend fun runningTunnelNames(): Set<String> {
+        return backend.runningTunnelNames
+    }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/TunnelManager.kt

@@ -6,8 +6,11 @@ import com.zaneschepke.wireguardautotunnel.di.Kernel
 import com.zaneschepke.wireguardautotunnel.di.Userspace
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
+import java.util.concurrent.ConcurrentHashMap
+import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -18,80 +21,104 @@ import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.plus
-import javax.inject.Inject
 
-class TunnelManager @Inject constructor(
-	@Kernel private val kernelTunnel: TunnelProvider,
-	@Userspace private val userspaceTunnel: TunnelProvider,
-	private val appDataRepository: AppDataRepository,
-	@ApplicationScope private val applicationScope: CoroutineScope,
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+class TunnelManager
+@Inject
+constructor(
+    @Kernel private val kernelTunnel: TunnelProvider,
+    @Userspace private val userspaceTunnel: TunnelProvider,
+    private val appDataRepository: AppDataRepository,
+    @ApplicationScope private val applicationScope: CoroutineScope,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : TunnelProvider {
 
-	@OptIn(ExperimentalCoroutinesApi::class)
-	private val tunnelProviderFlow = appDataRepository.settings.flow
-		.filterNotNull()
-		.flatMapLatest { settings ->
-			MutableStateFlow(if (settings.isKernelEnabled) kernelTunnel else userspaceTunnel)
-		}
-		.stateIn(
-			scope = applicationScope.plus(ioDispatcher),
-			started = SharingStarted.Eagerly,
-			initialValue = userspaceTunnel,
-		)
+    @OptIn(ExperimentalCoroutinesApi::class)
+    private val tunnelProviderFlow =
+        appDataRepository.settings.flow
+            .filterNotNull()
+            .flatMapLatest { settings ->
+                MutableStateFlow(if (settings.isKernelEnabled) kernelTunnel else userspaceTunnel)
+            }
+            .stateIn(
+                scope = applicationScope.plus(ioDispatcher),
+                started = SharingStarted.Eagerly,
+                initialValue = userspaceTunnel,
+            )
 
-	@OptIn(ExperimentalCoroutinesApi::class)
-	override val activeTunnels = appDataRepository.settings.flow
-		.filterNotNull()
-		.flatMapLatest { settings ->
-			if (settings.isKernelEnabled) {
-				kernelTunnel.activeTunnels
-			} else {
-				userspaceTunnel.activeTunnels
-			}
-		}
-		.stateIn(
-			scope = applicationScope.plus(ioDispatcher),
-			started = SharingStarted.Eagerly,
-			initialValue = emptyMap(),
-		)
+    @OptIn(ExperimentalCoroutinesApi::class)
+    override val activeTunnels =
+        appDataRepository.settings.flow
+            .filterNotNull()
+            .flatMapLatest { settings ->
+                if (settings.isKernelEnabled) {
+                    kernelTunnel.activeTunnels
+                } else {
+                    userspaceTunnel.activeTunnels
+                }
+            }
+            .stateIn(
+                scope = applicationScope.plus(ioDispatcher),
+                started = SharingStarted.Eagerly,
+                initialValue = emptyMap(),
+            )
 
-	override fun startTunnel(tunnelConf: TunnelConf) {
-		tunnelProviderFlow.value.startTunnel(tunnelConf)
-	}
+    override val bouncingTunnelIds: ConcurrentHashMap<Int, TunnelStatus.StopReason> =
+        tunnelProviderFlow.value.bouncingTunnelIds
 
-	override fun stopTunnel(tunnelConf: TunnelConf?) {
-		tunnelProviderFlow.value.stopTunnel(tunnelConf)
-	}
+    override fun hasVpnPermission(): Boolean {
+        return userspaceTunnel.hasVpnPermission()
+    }
 
-	override suspend fun bounceTunnel(tunnelConf: TunnelConf) {
-		tunnelProviderFlow.value.bounceTunnel(tunnelConf)
-	}
+    override suspend fun clearError(tunnelConf: TunnelConf) {
+        tunnelProviderFlow.value.clearError(tunnelConf)
+    }
 
-	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
-		tunnelProviderFlow.value.setBackendState(backendState, allowedIps)
-	}
+    override suspend fun updateTunnelStatistics(tunnel: TunnelConf) {
+        tunnelProviderFlow.value.updateTunnelStatistics(tunnel)
+    }
 
-	override suspend fun runningTunnelNames(): Set<String> {
-		return tunnelProviderFlow.value.runningTunnelNames()
-	}
+    override suspend fun startTunnel(tunnelConf: TunnelConf) {
+        tunnelProviderFlow.value.startTunnel(tunnelConf)
+    }
 
-	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
-		return tunnelProviderFlow.value.getStatistics(tunnelConf)
-	}
+    override suspend fun stopTunnel(tunnelConf: TunnelConf?, reason: TunnelStatus.StopReason) {
+        tunnelProviderFlow.value.stopTunnel(tunnelConf, reason)
+    }
 
-	fun restorePreviousState() = applicationScope.launch(ioDispatcher) {
-		val settings = appDataRepository.settings.get()
-		if (settings.isRestoreOnBootEnabled) {
-			val previouslyActiveTuns = appDataRepository.tunnels.getActive()
-			val tunsToStart = previouslyActiveTuns.filterNot { tun -> activeTunnels.value.any { tun.id == it.key } }
-			if (settings.isKernelEnabled) {
-				return@launch tunsToStart.forEach {
-					startTunnel(it)
-				}
-			} else {
-				tunsToStart.firstOrNull()?.let { startTunnel(it) }
-			}
-		}
-	}
+    override suspend fun bounceTunnel(tunnelConf: TunnelConf, reason: TunnelStatus.StopReason) {
+        tunnelProviderFlow.value.bounceTunnel(tunnelConf, reason)
+    }
+
+    override fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
+        tunnelProviderFlow.value.setBackendState(backendState, allowedIps)
+    }
+
+    override fun getBackendState(): BackendState {
+        return tunnelProviderFlow.value.getBackendState()
+    }
+
+    override suspend fun runningTunnelNames(): Set<String> {
+        return tunnelProviderFlow.value.runningTunnelNames()
+    }
+
+    override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
+        return tunnelProviderFlow.value.getStatistics(tunnelConf)
+    }
+
+    fun restorePreviousState() =
+        applicationScope.launch(ioDispatcher) {
+            val settings = appDataRepository.settings.get()
+            if (settings.isRestoreOnBootEnabled) {
+                val previouslyActiveTuns = appDataRepository.tunnels.getActive()
+                val tunsToStart =
+                    previouslyActiveTuns.filterNot { tun ->
+                        activeTunnels.value.any { tun.id == it.key.id }
+                    }
+                if (settings.isKernelEnabled) {
+                    return@launch tunsToStart.forEach { startTunnel(it) }
+                } else {
+                    tunsToStart.firstOrNull()?.let { startTunnel(it) }
+                }
+            }
+        }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/TunnelProvider.kt

@@ -2,20 +2,55 @@ package com.zaneschepke.wireguardautotunnel.core.tunnel
 
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
+import java.util.concurrent.ConcurrentHashMap
 import kotlinx.coroutines.flow.StateFlow
 
 interface TunnelProvider {
-	companion object {
-		const val CHECK_INTERVAL = 1000L
-	}
+    /** Starts the specified tunnel configuration. */
+    suspend fun startTunnel(tunnelConf: TunnelConf)
 
-	fun startTunnel(tunnelConf: TunnelConf)
-	fun stopTunnel(tunnelConf: TunnelConf? = null)
-	suspend fun bounceTunnel(tunnelConf: TunnelConf)
-	suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>)
-	suspend fun runningTunnelNames(): Set<String>
-	fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics
-	val activeTunnels: StateFlow<Map<Int, TunnelState>>
+    /**
+     * Stops the specified tunnel, or all tunnels if none is provided.
+     *
+     * @param tunnelConf The tunnel to stop, or null to stop all active tunnels.
+     * @param reason The reason for stopping, defaults to USER for manual stops. Callers should
+     *   override with specific reasons (e.g., PING, CONFIG_CHANGED) when applicable.
+     */
+    suspend fun stopTunnel(
+        tunnelConf: TunnelConf? = null,
+        reason: TunnelStatus.StopReason = TunnelStatus.StopReason.USER,
+    )
+
+    /**
+     * Bounces (stops and restarts) the specified tunnel.
+     *
+     * @param tunnelConf The tunnel to bounce.
+     * @param reason The reason for bouncing, defaults to USER for manual actions. Callers should
+     *   override with specific reasons (e.g., PING, CONFIG_CHANGED) when applicable.
+     */
+    suspend fun bounceTunnel(
+        tunnelConf: TunnelConf,
+        reason: TunnelStatus.StopReason = TunnelStatus.StopReason.USER,
+    )
+
+    fun setBackendState(backendState: BackendState, allowedIps: Collection<String>)
+
+    fun getBackendState(): BackendState
+
+    suspend fun runningTunnelNames(): Set<String>
+
+    fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics?
+
+    val activeTunnels: StateFlow<Map<TunnelConf, TunnelState>>
+
+    val bouncingTunnelIds: ConcurrentHashMap<Int, TunnelStatus.StopReason>
+
+    fun hasVpnPermission(): Boolean
+
+    suspend fun clearError(tunnelConf: TunnelConf)
+
+    suspend fun updateTunnelStatistics(tunnel: TunnelConf)
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/UserspaceTunnel.kt

@@ -1,84 +1,107 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
-import com.wireguard.android.backend.BackendException
-import com.zaneschepke.networkmonitor.NetworkMonitor
-import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.AmneziaStatistics
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import com.zaneschepke.wireguardautotunnel.util.extensions.asAmBackendState
+import com.zaneschepke.wireguardautotunnel.util.extensions.asBackendState
 import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import org.amnezia.awg.backend.Backend
-import org.amnezia.awg.backend.Tunnel
-import timber.log.Timber
 import javax.inject.Inject
+import kotlin.jvm.optionals.getOrNull
+import kotlinx.coroutines.CoroutineScope
+import org.amnezia.awg.backend.Backend
+import org.amnezia.awg.backend.BackendException
+import org.amnezia.awg.backend.Tunnel
+import org.amnezia.awg.config.Config
+import timber.log.Timber
 
-class UserspaceTunnel @Inject constructor(
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-	@ApplicationScope private val applicationScope: CoroutineScope,
-	serviceManager: ServiceManager,
-	appDataRepository: AppDataRepository,
-	notificationManager: NotificationManager,
-	private val backend: Backend,
-	networkMonitor: NetworkMonitor,
-) : BaseTunnel(ioDispatcher, applicationScope, networkMonitor, appDataRepository, serviceManager, notificationManager) {
+class UserspaceTunnel
+@Inject
+constructor(
+    @ApplicationScope private val applicationScope: CoroutineScope,
+    val serviceManager: ServiceManager,
+    val appDataRepository: AppDataRepository,
+    private val backend: Backend,
+) : BaseTunnel(applicationScope, appDataRepository, serviceManager) {
 
-	override fun startTunnel(tunnelConf: TunnelConf) {
-		applicationScope.launch(ioDispatcher) {
-			Timber.d("Starting tunnel ${tunnelConf.id} userspace")
-			if (tunnels.value.any { it.id == tunnelConf.id }) return@launch Timber.w("Tunnel already running")
-			if (tunnels.value.isNotEmpty()) {
-				Timber.d("Stopping all tunnels")
-				stopAllTunnels()
-			}
-			runCatching {
-				Timber.d("Setting backend state UP")
-				super.beforeStartTunnel(tunnelConf)
-				backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toAmConfig())
-				Timber.d("Calling super.startTunnel")
-				super.startTunnel(tunnelConf)
-			}.onFailure {
-				Timber.e(it, "Failed to start tunnel ${tunnelConf.id} userspace")
-				onTunnelStop(tunnelConf)
-				if (it is BackendException) {
-					handleBackendThrowable(it.toBackendError())
-				} else {
-					Timber.e(it)
-				}
-			}
-		}
-	}
+    private var previousBackendState: Pair<BackendState, Boolean>? = null
 
-	override fun stopTunnel(tunnelConf: TunnelConf?) {
-		applicationScope.launch(ioDispatcher) {
-			runCatching {
-				tunnels.value.firstOrNull { it.id == tunnelConf?.id }?.let {
-					backend.setState(it, Tunnel.State.DOWN, it.toAmConfig())
-					onTunnelStop(it)
-				} ?: stopAllTunnels()
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
-	}
+    override suspend fun startBackend(tunnel: TunnelConf) {
+        try {
+            updateTunnelStatus(tunnel, TunnelStatus.Starting)
+            val amConfig = tunnel.toAmConfig()
+            handleVpnKillSwitchWithDomainEndpoints(amConfig)
+            backend.setState(tunnel, Tunnel.State.UP, amConfig)
+        } catch (e: BackendException) {
+            Timber.e(e, "Failed to start up backend for tunnel ${tunnel.name}")
+            throw e.toBackendError()
+        }
+    }
 
-	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
-		backend.setBackendState(backendState.asAmBackendState(), allowedIps)
-	}
+    override fun stopBackend(tunnel: TunnelConf) {
+        Timber.i("Stopping tunnel ${tunnel.name} userspace")
+        try {
+            backend.setState(tunnel, Tunnel.State.DOWN, tunnel.toAmConfig())
+        } catch (e: BackendException) {
+            Timber.e(e, "Failed to stop tunnel ${tunnel.id}")
+            throw e.toBackendError()
+        }
+        handlePreviouslyEnabledVpnKillSwitch()
+    }
 
-	override suspend fun runningTunnelNames(): Set<String> {
-		return backend.runningTunnelNames
-	}
+    // stop vpn kill switch if we need to resolve DNS for peer endpoints
+    private suspend fun handleVpnKillSwitchWithDomainEndpoints(config: Config) {
+        if (
+            config.peers.any { it.endpoint.getOrNull()?.toString()?.isUrl() == true } &&
+                backend.backendState.asBackendState() == BackendState.KILL_SWITCH_ACTIVE
+        ) {
+            val bypassLan = appDataRepository.settings.get().isLanOnKillSwitchEnabled
+            previousBackendState = Pair(BackendState.KILL_SWITCH_ACTIVE, bypassLan)
+            setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
+        }
+    }
 
-	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
-		return AmneziaStatistics(backend.getStatistics(tunnelConf))
-	}
+    // restore vpn kill switch if needed
+    private fun handlePreviouslyEnabledVpnKillSwitch() {
+        // let auto tunnel handle this if it is active
+        if (!serviceManager.autoTunnelActive.value) {
+            previousBackendState?.let { (state, lanEnabled) ->
+                Timber.d("Restoring kill switch configuration")
+                val lan = if (lanEnabled) TunnelConf.LAN_BYPASS_ALLOWED_IPS else emptyList()
+                backend.setBackendState(state.asAmBackendState(), lan)
+            }
+        }
+        previousBackendState = null
+    }
+
+    override fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
+        Timber.d("Setting backend state: $backendState with allowedIps: $allowedIps")
+        try {
+            backend.setBackendState(backendState.asAmBackendState(), allowedIps)
+        } catch (e: BackendException) {
+            throw e.toBackendError()
+        }
+    }
+
+    override fun getBackendState(): BackendState {
+        return backend.backendState.asBackendState()
+    }
+
+    override suspend fun runningTunnelNames(): Set<String> {
+        return backend.runningTunnelNames
+    }
+
+    override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
+        return try {
+            AmneziaStatistics(backend.getStatistics(tunnelConf))
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to get stats for ${tunnelConf.tunName}")
+            null
+        }
+    }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/worker/ServiceWorker.kt

@@ -13,48 +13,55 @@ import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
+import java.util.concurrent.TimeUnit
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import timber.log.Timber
-import java.util.concurrent.TimeUnit
 
 @HiltWorker
-class ServiceWorker @AssistedInject constructor(
-	@Assisted private val context: Context,
-	@Assisted private val params: WorkerParameters,
-	private val serviceManager: ServiceManager,
-	private val appDataRepository: AppDataRepository,
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-	private val tunnelManager: TunnelManager,
+class ServiceWorker
+@AssistedInject
+constructor(
+    @Assisted private val context: Context,
+    @Assisted private val params: WorkerParameters,
+    private val serviceManager: ServiceManager,
+    private val appDataRepository: AppDataRepository,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+    private val tunnelManager: TunnelManager,
 ) : CoroutineWorker(context, params) {
 
-	companion object {
-		private const val TAG = "service_worker"
+    companion object {
+        private const val TAG = "service_worker"
 
-		fun stop(context: Context) {
-			WorkManager.getInstance(context).cancelAllWorkByTag(TAG)
-		}
+        fun stop(context: Context) {
+            WorkManager.getInstance(context).cancelAllWorkByTag(TAG)
+        }
 
-		fun start(context: Context) {
-			val periodicWorkRequest = PeriodicWorkRequestBuilder<ServiceWorker>(
-				repeatInterval = 15,
-				repeatIntervalTimeUnit = TimeUnit.MINUTES,
-			).build()
-			WorkManager.getInstance(context)
-				.enqueueUniquePeriodicWork(
-					TAG,
-					ExistingPeriodicWorkPolicy.KEEP,
-					periodicWorkRequest,
-				)
-		}
-	}
+        fun start(context: Context) {
+            val periodicWorkRequest =
+                PeriodicWorkRequestBuilder<ServiceWorker>(
+                        repeatInterval = 15,
+                        repeatIntervalTimeUnit = TimeUnit.MINUTES,
+                    )
+                    .build()
+            WorkManager.getInstance(context)
+                .enqueueUniquePeriodicWork(
+                    TAG,
+                    ExistingPeriodicWorkPolicy.KEEP,
+                    periodicWorkRequest,
+                )
+        }
+    }
 
-	override suspend fun doWork(): Result = withContext(ioDispatcher) {
-		Timber.i("Service worker started")
-		with(appDataRepository.settings.get()) {
-			if (isAutoTunnelEnabled && !serviceManager.autoTunnelActive.value) return@with serviceManager.startAutoTunnel(true)
-			if (tunnelManager.activeTunnels.value.isEmpty()) tunnelManager.restorePreviousState()
-		}
-		Result.success()
-	}
+    override suspend fun doWork(): Result =
+        withContext(ioDispatcher) {
+            Timber.i("Service worker started")
+            with(appDataRepository.settings.get()) {
+                if (isAutoTunnelEnabled && !serviceManager.autoTunnelActive.value)
+                    return@with serviceManager.startAutoTunnel()
+                if (tunnelManager.activeTunnels.value.isEmpty())
+                    tunnelManager.restorePreviousState()
+            }
+            Result.success()
+        }
 }

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

@@ -12,79 +12,38 @@ import com.zaneschepke.wireguardautotunnel.data.model.Settings
 import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 
 @Database(
-	entities = [Settings::class, TunnelConfig::class],
-	version = 16,
-	autoMigrations =
-	[
-		AutoMigration(from = 1, to = 2),
-		AutoMigration(from = 2, to = 3),
-		AutoMigration(
-			from = 3,
-			to = 4,
-		),
-		AutoMigration(
-			from = 4,
-			to = 5,
-		),
-		AutoMigration(
-			from = 5,
-			to = 6,
-		),
-		AutoMigration(
-			from = 6,
-			to = 7,
-			spec = RemoveLegacySettingColumnsMigration::class,
-		),
-		AutoMigration(7, 8),
-		AutoMigration(8, 9),
-		AutoMigration(9, 10),
-		AutoMigration(
-			from = 10,
-			to = 11,
-			spec = RemoveTunnelPauseMigration::class,
-		),
-		AutoMigration(
-			from = 11,
-			to = 12,
-		),
-		AutoMigration(
-			from = 12,
-			to = 13,
-		),
-		AutoMigration(
-			from = 13,
-			to = 14,
-		),
-		AutoMigration(
-			from = 14,
-			to = 15,
-		),
-		AutoMigration(
-			from = 15,
-			to = 16,
-		),
-	],
-	exportSchema = true,
+    entities = [Settings::class, TunnelConfig::class],
+    version = 16,
+    autoMigrations =
+        [
+            AutoMigration(from = 1, to = 2),
+            AutoMigration(from = 2, to = 3),
+            AutoMigration(from = 3, to = 4),
+            AutoMigration(from = 4, to = 5),
+            AutoMigration(from = 5, to = 6),
+            AutoMigration(from = 6, to = 7, spec = RemoveLegacySettingColumnsMigration::class),
+            AutoMigration(7, 8),
+            AutoMigration(8, 9),
+            AutoMigration(9, 10),
+            AutoMigration(from = 10, to = 11, spec = RemoveTunnelPauseMigration::class),
+            AutoMigration(from = 11, to = 12),
+            AutoMigration(from = 12, to = 13),
+            AutoMigration(from = 13, to = 14),
+            AutoMigration(from = 14, to = 15),
+            AutoMigration(from = 15, to = 16),
+        ],
+    exportSchema = true,
 )
 @TypeConverters(DatabaseListConverters::class)
 abstract class AppDatabase : RoomDatabase() {
-	abstract fun settingDao(): SettingsDao
+    abstract fun settingDao(): SettingsDao
 
-	abstract fun tunnelConfigDoa(): TunnelConfigDao
+    abstract fun tunnelConfigDoa(): TunnelConfigDao
 }
 
-@DeleteColumn(
-	tableName = "Settings",
-	columnName = "default_tunnel",
-)
-@DeleteColumn(
-	tableName = "Settings",
-	columnName = "is_battery_saver_enabled",
-)
+@DeleteColumn(tableName = "Settings", columnName = "default_tunnel")
+@DeleteColumn(tableName = "Settings", columnName = "is_battery_saver_enabled")
 class RemoveLegacySettingColumnsMigration : AutoMigrationSpec
 
-@DeleteColumn(
-	tableName = "Settings",
-	columnName = "is_auto_tunnel_paused",
-)
+@DeleteColumn(tableName = "Settings", columnName = "is_auto_tunnel_paused")
 class RemoveTunnelPauseMigration : AutoMigrationSpec

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

@@ -7,6 +7,7 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import java.io.IOException
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
@@ -15,80 +16,77 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import timber.log.Timber
-import java.io.IOException
 
 class DataStoreManager(
-	private val context: Context,
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+    private val context: Context,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) {
-	companion object {
-		val locationDisclosureShown = booleanPreferencesKey("LOCATION_DISCLOSURE_SHOWN")
-		val batteryDisableShown = booleanPreferencesKey("BATTERY_OPTIMIZE_DISABLE_SHOWN")
-		val currentSSID = stringPreferencesKey("CURRENT_SSID")
-		val pinLockEnabled = booleanPreferencesKey("PIN_LOCK_ENABLED")
-		val tunnelStatsExpanded = booleanPreferencesKey("TUNNEL_STATS_EXPANDED")
-		val isLocalLogsEnabled = booleanPreferencesKey("LOCAL_LOGS_ENABLED")
-		val locale = stringPreferencesKey("LOCALE")
-		val theme = stringPreferencesKey("THEME")
-	}
+    companion object {
+        val locationDisclosureShown = booleanPreferencesKey("LOCATION_DISCLOSURE_SHOWN")
+        val batteryDisableShown = booleanPreferencesKey("BATTERY_OPTIMIZE_DISABLE_SHOWN")
+        val pinLockEnabled = booleanPreferencesKey("PIN_LOCK_ENABLED")
+        val tunnelStatsExpanded = booleanPreferencesKey("TUNNEL_STATS_EXPANDED")
+        val isLocalLogsEnabled = booleanPreferencesKey("LOCAL_LOGS_ENABLED")
+        val locale = stringPreferencesKey("LOCALE")
+        val theme = stringPreferencesKey("THEME")
+        val isRemoteControlEnabled = booleanPreferencesKey("IS_REMOTE_CONTROL_ENABLED")
+        val remoteKey = stringPreferencesKey("REMOTE_KEY")
+    }
 
-	// preferences
-	private val preferencesKey = "preferences"
-	private val Context.dataStore by
-		preferencesDataStore(
-			name = preferencesKey,
-		)
+    // preferences
+    private val preferencesKey = "preferences"
+    private val Context.dataStore by preferencesDataStore(name = preferencesKey)
 
-	suspend fun init() {
-		withContext(ioDispatcher) {
-			try {
-				context.dataStore.data.first()
-			} catch (e: IOException) {
-				Timber.Forest.e(e)
-			}
-		}
-	}
+    suspend fun init() {
+        withContext(ioDispatcher) {
+            try {
+                context.dataStore.data.first()
+            } catch (e: IOException) {
+                Timber.Forest.e(e)
+            }
+        }
+    }
 
-	suspend fun <T> saveToDataStore(key: Preferences.Key<T>, value: T) {
-		withContext(ioDispatcher) {
-			try {
-				context.dataStore.edit { it[key] = value }
-			} catch (e: IOException) {
-				Timber.Forest.e(e)
-			} catch (e: Exception) {
-				Timber.Forest.e(e)
-			}
-		}
-	}
+    suspend fun <T> saveToDataStore(key: Preferences.Key<T>, value: T) {
+        withContext(ioDispatcher) {
+            try {
+                context.dataStore.edit { it[key] = value }
+            } catch (e: IOException) {
+                Timber.Forest.e(e)
+            } catch (e: Exception) {
+                Timber.Forest.e(e)
+            }
+        }
+    }
 
-	suspend fun <T> removeFromDataStore(key: Preferences.Key<T>) {
-		withContext(ioDispatcher) {
-			try {
-				context.dataStore.edit { it.remove(key) }
-			} catch (e: IOException) {
-				Timber.Forest.e(e)
-			} catch (e: Exception) {
-				Timber.Forest.e(e)
-			}
-		}
-	}
+    suspend fun <T> removeFromDataStore(key: Preferences.Key<T>) {
+        withContext(ioDispatcher) {
+            try {
+                context.dataStore.edit { it.remove(key) }
+            } catch (e: IOException) {
+                Timber.Forest.e(e)
+            } catch (e: Exception) {
+                Timber.Forest.e(e)
+            }
+        }
+    }
 
-	fun <T> getFromStoreFlow(key: Preferences.Key<T>) = context.dataStore.data.map { it[key] }
+    fun <T> getFromStoreFlow(key: Preferences.Key<T>) = context.dataStore.data.map { it[key] }
 
-	suspend fun <T> getFromStore(key: Preferences.Key<T>): T? {
-		return withContext(ioDispatcher) {
-			try {
-				context.dataStore.data.map { it[key] }.first()
-			} catch (e: IOException) {
-				Timber.Forest.e(e)
-				null
-			}
-		}
-	}
+    suspend fun <T> getFromStore(key: Preferences.Key<T>): T? {
+        return withContext(ioDispatcher) {
+            try {
+                context.dataStore.data.map { it[key] }.first()
+            } catch (e: IOException) {
+                Timber.Forest.e(e)
+                null
+            }
+        }
+    }
 
-	fun <T> getFromStoreBlocking(key: Preferences.Key<T>) = runBlocking {
-		context.dataStore.data.map { it[key] }.first()
-	}
+    fun <T> getFromStoreBlocking(key: Preferences.Key<T>) = runBlocking {
+        context.dataStore.data.map { it[key] }.first()
+    }
 
-	val preferencesFlow: Flow<Preferences?> = context.dataStore.data.flowOn(ioDispatcher)
+    val preferencesFlow: Flow<Preferences?> = context.dataStore.data.flowOn(ioDispatcher)
 }

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

@@ -5,17 +5,18 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 import timber.log.Timber
 
 class DatabaseCallback : RoomDatabase.Callback() {
-	override fun onCreate(db: SupportSQLiteDatabase) = db.run {
-		// Notice non-ui thread is here
-		beginTransaction()
-		try {
-			execSQL(Queries.createDefaultSettings())
-			Timber.i("Bootstrapping settings data")
-			setTransactionSuccessful()
-		} catch (e: Exception) {
-			Timber.e(e)
-		} finally {
-			endTransaction()
-		}
-	}
+    override fun onCreate(db: SupportSQLiteDatabase) =
+        db.run {
+            // Notice non-ui thread is here
+            beginTransaction()
+            try {
+                execSQL(Queries.createDefaultSettings())
+                Timber.i("Bootstrapping settings data")
+                setTransactionSuccessful()
+            } catch (e: Exception) {
+                Timber.e(e)
+            } finally {
+                endTransaction()
+            }
+        }
 }

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

@@ -1,24 +1,23 @@
 package com.zaneschepke.wireguardautotunnel.data
 
 import androidx.room.TypeConverter
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 
 class DatabaseListConverters {
-	@TypeConverter
-	fun listToString(value: MutableList<String>): String {
-		return Json.encodeToString(value)
-	}
+    @TypeConverter
+    fun listToString(value: MutableList<String>): String {
+        return Json.encodeToString(value)
+    }
 
-	@TypeConverter
-	fun stringToList(value: String): MutableList<String> {
-		if (value.isBlank() || value.isEmpty()) return mutableListOf()
-		return try {
-			Json.decodeFromString<MutableList<String>>(value)
-		} catch (e: Exception) {
-			val list = value.split(",").toMutableList()
-			val json = listToString(list)
-			Json.decodeFromString<MutableList<String>>(json)
-		}
-	}
+    @TypeConverter
+    fun stringToList(value: String): MutableList<String> {
+        if (value.isBlank() || value.isEmpty()) return mutableListOf()
+        return try {
+            Json.decodeFromString<MutableList<String>>(value)
+        } catch (e: Exception) {
+            val list = value.split(",").toMutableList()
+            val json = listToString(list)
+            Json.decodeFromString<MutableList<String>>(json)
+        }
+    }
 }

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

@@ -1,8 +1,8 @@
 package com.zaneschepke.wireguardautotunnel.data
 
 object Queries {
-	fun createDefaultSettings(): String {
-		return """
+    fun createDefaultSettings(): String {
+        return """
 		INSERT INTO Settings (is_tunnel_enabled,
 		        is_tunnel_on_mobile_data_enabled,
 		        trusted_network_ssids,
@@ -24,12 +24,14 @@ object Queries {
 		        'false',
 		        'false',
 		        'false')
-		""".trimIndent()
-	}
+		"""
+            .trimIndent()
+    }
 
-	fun createTunnelConfig(): String {
-		return """
+    fun createTunnelConfig(): String {
+        return """
 		INSERT INTO TunnelConfig (name, wg_quick) VALUES ('test', 'test')
-		""".trimIndent()
-	}
+		"""
+            .trimIndent()
+    }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/dao/SettingsDao.kt

@@ -10,27 +10,19 @@ import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface SettingsDao {
-	@Insert(onConflict = OnConflictStrategy.REPLACE)
-	suspend fun save(t: Settings)
+    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun save(t: Settings)
 
-	@Insert(onConflict = OnConflictStrategy.REPLACE)
-	suspend fun saveAll(t: List<Settings>)
+    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun saveAll(t: List<Settings>)
 
-	@Query("SELECT * FROM settings WHERE id=:id")
-	suspend fun getById(id: Long): Settings?
+    @Query("SELECT * FROM settings WHERE id=:id") suspend fun getById(id: Long): Settings?
 
-	@Query("SELECT * FROM settings")
-	suspend fun getAll(): List<Settings>
+    @Query("SELECT * FROM settings") suspend fun getAll(): List<Settings>
 
-	@Query("SELECT * FROM settings LIMIT 1")
-	fun getSettingsFlow(): Flow<Settings>
+    @Query("SELECT * FROM settings LIMIT 1") fun getSettingsFlow(): Flow<Settings>
 
-	@Query("SELECT * FROM settings")
-	fun getAllFlow(): Flow<MutableList<Settings>>
+    @Query("SELECT * FROM settings") fun getAllFlow(): Flow<MutableList<Settings>>
 
-	@Delete
-	suspend fun delete(t: Settings)
+    @Delete suspend fun delete(t: Settings)
 
-	@Query("SELECT COUNT('id') FROM settings")
-	suspend fun count(): Long
+    @Query("SELECT COUNT('id') FROM settings") suspend fun count(): Long
 }

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

@@ -11,48 +11,40 @@ import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface TunnelConfigDao {
-	@Insert(onConflict = OnConflictStrategy.REPLACE)
-	suspend fun save(t: TunnelConfig)
+    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun save(t: TunnelConfig)
 
-	@Insert(onConflict = OnConflictStrategy.REPLACE)
-	suspend fun saveAll(t: TunnelConfigs)
+    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun saveAll(t: TunnelConfigs)
 
-	@Query("SELECT * FROM TunnelConfig WHERE id=:id")
-	suspend fun getById(id: Long): TunnelConfig?
+    @Query("SELECT * FROM TunnelConfig WHERE id=:id") suspend fun getById(id: Long): TunnelConfig?
 
-	@Query("SELECT * FROM TunnelConfig WHERE name=:name")
-	suspend fun getByName(name: String): TunnelConfig?
+    @Query("SELECT * FROM TunnelConfig WHERE name=:name")
+    suspend fun getByName(name: String): TunnelConfig?
 
-	@Query("SELECT * FROM TunnelConfig WHERE is_Active=1")
-	suspend fun getActive(): TunnelConfigs
+    @Query("SELECT * FROM TunnelConfig WHERE is_Active=1") suspend fun getActive(): TunnelConfigs
 
-	@Query("SELECT * FROM TunnelConfig")
-	suspend fun getAll(): TunnelConfigs
+    @Query("SELECT * FROM TunnelConfig") suspend fun getAll(): TunnelConfigs
 
-	@Delete
-	suspend fun delete(t: TunnelConfig)
+    @Delete suspend fun delete(t: TunnelConfig)
 
-	@Query("SELECT COUNT('id') FROM TunnelConfig")
-	suspend fun count(): Long
+    @Query("SELECT COUNT('id') FROM TunnelConfig") suspend fun count(): Long
 
-	@Query("SELECT * FROM TunnelConfig WHERE tunnel_networks LIKE '%' || :name || '%'")
-	suspend fun findByTunnelNetworkName(name: String): TunnelConfigs
+    @Query("SELECT * FROM TunnelConfig WHERE tunnel_networks LIKE '%' || :name || '%'")
+    suspend fun findByTunnelNetworkName(name: String): TunnelConfigs
 
-	@Query("UPDATE TunnelConfig SET is_primary_tunnel = 0 WHERE is_primary_tunnel =1")
-	suspend fun resetPrimaryTunnel()
+    @Query("UPDATE TunnelConfig SET is_primary_tunnel = 0 WHERE is_primary_tunnel =1")
+    suspend fun resetPrimaryTunnel()
 
-	@Query("UPDATE TunnelConfig SET is_mobile_data_tunnel = 0 WHERE is_mobile_data_tunnel =1")
-	suspend fun resetMobileDataTunnel()
+    @Query("UPDATE TunnelConfig SET is_mobile_data_tunnel = 0 WHERE is_mobile_data_tunnel =1")
+    suspend fun resetMobileDataTunnel()
 
-	@Query("UPDATE TunnelConfig SET is_ethernet_tunnel = 0 WHERE is_ethernet_tunnel =1")
-	suspend fun resetEthernetTunnel()
+    @Query("UPDATE TunnelConfig SET is_ethernet_tunnel = 0 WHERE is_ethernet_tunnel =1")
+    suspend fun resetEthernetTunnel()
 
-	@Query("SELECT * FROM TUNNELCONFIG WHERE is_primary_tunnel=1")
-	suspend fun findByPrimary(): TunnelConfigs
+    @Query("SELECT * FROM TUNNELCONFIG WHERE is_primary_tunnel=1")
+    suspend fun findByPrimary(): TunnelConfigs
 
-	@Query("SELECT * FROM TUNNELCONFIG WHERE is_mobile_data_tunnel=1")
-	suspend fun findByMobileDataTunnel(): TunnelConfigs
+    @Query("SELECT * FROM TUNNELCONFIG WHERE is_mobile_data_tunnel=1")
+    suspend fun findByMobileDataTunnel(): TunnelConfigs
 
-	@Query("SELECT * FROM tunnelconfig")
-	fun getAllFlow(): Flow<MutableList<TunnelConfig>>
+    @Query("SELECT * FROM tunnelconfig") fun getAllFlow(): Flow<MutableList<TunnelConfig>>
 }

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

@@ -4,43 +4,52 @@ import com.zaneschepke.wireguardautotunnel.domain.entity.AppState
 import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 
 data class GeneralState(
-	val isLocationDisclosureShown: Boolean = LOCATION_DISCLOSURE_SHOWN_DEFAULT,
-	val isBatteryOptimizationDisableShown: Boolean = BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
-	val isPinLockEnabled: Boolean = PIN_LOCK_ENABLED_DEFAULT,
-	val isTunnelStatsExpanded: Boolean = IS_TUNNEL_STATS_EXPANDED,
-	val isLocalLogsEnabled: Boolean = IS_LOGS_ENABLED_DEFAULT,
-	val locale: String? = null,
-	val theme: Theme = Theme.AUTOMATIC,
+    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 isLocalLogsEnabled: Boolean = IS_LOGS_ENABLED_DEFAULT,
+    val isRemoteControlEnabled: Boolean = IS_REMOTE_CONTROL_ENABLED,
+    val remoteKey: String? = null,
+    val locale: String? = null,
+    val theme: Theme = Theme.AUTOMATIC,
 ) {
 
-	fun toAppState(): AppState = AppState(
-		isLocationDisclosureShown,
-		isBatteryOptimizationDisableShown,
-		isPinLockEnabled,
-		isTunnelStatsExpanded,
-		isLocationDisclosureShown,
-		locale,
-		theme,
-	)
+    fun toAppState(): AppState =
+        AppState(
+            isLocationDisclosureShown,
+            isBatteryOptimizationDisableShown,
+            isPinLockEnabled,
+            isTunnelStatsExpanded,
+            isLocalLogsEnabled,
+            isRemoteControlEnabled,
+            remoteKey,
+            locale,
+            theme,
+        )
 
-	companion object {
-		fun from(appState: AppState): GeneralState {
-			return with(appState) {
-				GeneralState(
-					isLocationDisclosureShown,
-					isBatteryOptimizationDisableShown,
-					isPinLockEnabled,
-					isTunnelStatsExpanded,
-					isLocationDisclosureShown,
-					locale,
-					theme,
-				)
-			}
-		}
-		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
-		const val IS_LOGS_ENABLED_DEFAULT = false
-	}
+    companion object {
+        fun from(appState: AppState): GeneralState {
+            return with(appState) {
+                GeneralState(
+                    isLocationDisclosureShown,
+                    isBatteryOptimizationDisableShown,
+                    isPinLockEnabled,
+                    isTunnelStatsExpanded,
+                    isLocalLogsEnabled,
+                    isRemoteControlEnabled,
+                    remoteKey,
+                    locale,
+                    theme,
+                )
+            }
+        }
+
+        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
+        const val IS_LOGS_ENABLED_DEFAULT = false
+        const val IS_REMOTE_CONTROL_ENABLED = false
+    }
 }

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

@@ -7,112 +7,100 @@ import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
 
 @Entity
 data class Settings(
-	@PrimaryKey(autoGenerate = true) val id: Int = 0,
-	@ColumnInfo(name = "is_tunnel_enabled") val isAutoTunnelEnabled: Boolean = false,
-	@ColumnInfo(name = "is_tunnel_on_mobile_data_enabled")
-	val isTunnelOnMobileDataEnabled: Boolean = false,
-	@ColumnInfo(name = "trusted_network_ssids")
-	val trustedNetworkSSIDs: MutableList<String> = mutableListOf(),
-	@ColumnInfo(name = "is_always_on_vpn_enabled") val isAlwaysOnVpnEnabled: Boolean = false,
-	@ColumnInfo(name = "is_tunnel_on_ethernet_enabled")
-	val isTunnelOnEthernetEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_shortcuts_enabled",
-		defaultValue = "false",
-	)
-	val isShortcutsEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_tunnel_on_wifi_enabled",
-		defaultValue = "false",
-	)
-	val isTunnelOnWifiEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_kernel_enabled",
-		defaultValue = "false",
-	)
-	val isKernelEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_restore_on_boot_enabled",
-		defaultValue = "false",
-	)
-	val isRestoreOnBootEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_multi_tunnel_enabled",
-		defaultValue = "false",
-	)
-	val isMultiTunnelEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_ping_enabled",
-		defaultValue = "false",
-	)
-	val isPingEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_amnezia_enabled",
-		defaultValue = "false",
-	)
-	val isAmneziaEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_wildcards_enabled",
-		defaultValue = "false",
-	)
-	val isWildcardsEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_wifi_by_shell_enabled",
-		defaultValue = "false",
-	)
-	val isWifiNameByShellEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_stop_on_no_internet_enabled",
-		defaultValue = "false",
-	)
-	val isStopOnNoInternetEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_vpn_kill_switch_enabled",
-		defaultValue = "false",
-	)
-	val isVpnKillSwitchEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_kernel_kill_switch_enabled",
-		defaultValue = "false",
-	)
-	val isKernelKillSwitchEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_lan_on_kill_switch_enabled",
-		defaultValue = "false",
-	)
-	val isLanOnKillSwitchEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "debounce_delay_seconds",
-		defaultValue = "3",
-	)
-	val debounceDelaySeconds: Int = 3,
-	@ColumnInfo(
-		name = "is_disable_kill_switch_on_trusted_enabled",
-		defaultValue = "false",
-	)
-	val isDisableKillSwitchOnTrustedEnabled: Boolean = false,
+    @PrimaryKey(autoGenerate = true) val id: Int = 0,
+    @ColumnInfo(name = "is_tunnel_enabled") val isAutoTunnelEnabled: Boolean = false,
+    @ColumnInfo(name = "is_tunnel_on_mobile_data_enabled")
+    val isTunnelOnMobileDataEnabled: Boolean = false,
+    @ColumnInfo(name = "trusted_network_ssids")
+    val trustedNetworkSSIDs: MutableList<String> = mutableListOf(),
+    @ColumnInfo(name = "is_always_on_vpn_enabled") val isAlwaysOnVpnEnabled: Boolean = false,
+    @ColumnInfo(name = "is_tunnel_on_ethernet_enabled")
+    val isTunnelOnEthernetEnabled: Boolean = false,
+    @ColumnInfo(name = "is_shortcuts_enabled", defaultValue = "false")
+    val isShortcutsEnabled: Boolean = false,
+    @ColumnInfo(name = "is_tunnel_on_wifi_enabled", defaultValue = "false")
+    val isTunnelOnWifiEnabled: Boolean = false,
+    @ColumnInfo(name = "is_kernel_enabled", defaultValue = "false")
+    val isKernelEnabled: Boolean = false,
+    @ColumnInfo(name = "is_restore_on_boot_enabled", defaultValue = "false")
+    val isRestoreOnBootEnabled: Boolean = false,
+    @ColumnInfo(name = "is_multi_tunnel_enabled", defaultValue = "false")
+    val isMultiTunnelEnabled: Boolean = false,
+    @ColumnInfo(name = "is_ping_enabled", defaultValue = "false")
+    val isPingEnabled: Boolean = false,
+    @ColumnInfo(name = "is_amnezia_enabled", defaultValue = "false")
+    val isAmneziaEnabled: Boolean = false,
+    @ColumnInfo(name = "is_wildcards_enabled", defaultValue = "false")
+    val isWildcardsEnabled: Boolean = false,
+    @ColumnInfo(name = "is_wifi_by_shell_enabled", defaultValue = "false")
+    val isWifiNameByShellEnabled: Boolean = false,
+    @ColumnInfo(name = "is_stop_on_no_internet_enabled", defaultValue = "false")
+    val isStopOnNoInternetEnabled: Boolean = false,
+    @ColumnInfo(name = "is_vpn_kill_switch_enabled", defaultValue = "false")
+    val isVpnKillSwitchEnabled: Boolean = false,
+    @ColumnInfo(name = "is_kernel_kill_switch_enabled", defaultValue = "false")
+    val isKernelKillSwitchEnabled: Boolean = false,
+    @ColumnInfo(name = "is_lan_on_kill_switch_enabled", defaultValue = "false")
+    val isLanOnKillSwitchEnabled: Boolean = false,
+    @ColumnInfo(name = "debounce_delay_seconds", defaultValue = "3")
+    val debounceDelaySeconds: Int = 3,
+    @ColumnInfo(name = "is_disable_kill_switch_on_trusted_enabled", defaultValue = "false")
+    val isDisableKillSwitchOnTrustedEnabled: Boolean = false,
 ) {
 
-	fun toAppSettings(): AppSettings {
-		return AppSettings(
-			id, isAutoTunnelEnabled, isTunnelOnMobileDataEnabled, trustedNetworkSSIDs, isAlwaysOnVpnEnabled, isTunnelOnEthernetEnabled,
-			isShortcutsEnabled, isTunnelOnWifiEnabled, isKernelEnabled, isRestoreOnBootEnabled, isMultiTunnelEnabled, isPingEnabled,
-			isAmneziaEnabled, isWildcardsEnabled, isWifiNameByShellEnabled, isStopOnNoInternetEnabled, isVpnKillSwitchEnabled,
-			isKernelKillSwitchEnabled, isLanOnKillSwitchEnabled, debounceDelaySeconds, isDisableKillSwitchOnTrustedEnabled,
-		)
-	}
+    fun toAppSettings(): AppSettings {
+        return AppSettings(
+            id,
+            isAutoTunnelEnabled,
+            isTunnelOnMobileDataEnabled,
+            trustedNetworkSSIDs,
+            isAlwaysOnVpnEnabled,
+            isTunnelOnEthernetEnabled,
+            isShortcutsEnabled,
+            isTunnelOnWifiEnabled,
+            isKernelEnabled,
+            isRestoreOnBootEnabled,
+            isMultiTunnelEnabled,
+            isPingEnabled,
+            isAmneziaEnabled,
+            isWildcardsEnabled,
+            isWifiNameByShellEnabled,
+            isStopOnNoInternetEnabled,
+            isVpnKillSwitchEnabled,
+            isKernelKillSwitchEnabled,
+            isLanOnKillSwitchEnabled,
+            debounceDelaySeconds,
+            isDisableKillSwitchOnTrustedEnabled,
+        )
+    }
 
-	companion object {
-		fun from(appSettings: AppSettings): Settings {
-			return with(appSettings) {
-				Settings(
-					id, isAutoTunnelEnabled, isTunnelOnMobileDataEnabled, trustedNetworkSSIDs.toMutableList(), isAlwaysOnVpnEnabled,
-					isTunnelOnEthernetEnabled, isShortcutsEnabled, isTunnelOnWifiEnabled, isKernelEnabled, isRestoreOnBootEnabled,
-					isMultiTunnelEnabled, isPingEnabled, isAmneziaEnabled, isWildcardsEnabled, isWifiNameByShellEnabled,
-					isStopOnNoInternetEnabled, isVpnKillSwitchEnabled, isKernelKillSwitchEnabled, isLanOnKillSwitchEnabled,
-					debounceDelaySeconds, isDisableKillSwitchOnTrustedEnabled,
-				)
-			}
-		}
-	}
+    companion object {
+        fun from(appSettings: AppSettings): Settings {
+            return with(appSettings) {
+                Settings(
+                    id,
+                    isAutoTunnelEnabled,
+                    isTunnelOnMobileDataEnabled,
+                    trustedNetworkSSIDs.toMutableList(),
+                    isAlwaysOnVpnEnabled,
+                    isTunnelOnEthernetEnabled,
+                    isShortcutsEnabled,
+                    isTunnelOnWifiEnabled,
+                    isKernelEnabled,
+                    isRestoreOnBootEnabled,
+                    isMultiTunnelEnabled,
+                    isPingEnabled,
+                    isAmneziaEnabled,
+                    isWildcardsEnabled,
+                    isWifiNameByShellEnabled,
+                    isStopOnNoInternetEnabled,
+                    isVpnKillSwitchEnabled,
+                    isKernelKillSwitchEnabled,
+                    isLanOnKillSwitchEnabled,
+                    debounceDelaySeconds,
+                    isDisableKillSwitchOnTrustedEnabled,
+                )
+            }
+        }
+    }
 }

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

@@ -8,86 +8,70 @@ import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 
 @Entity(indices = [Index(value = ["name"], unique = true)])
 data class TunnelConfig(
-	@PrimaryKey(autoGenerate = true) val id: Int = 0,
-	@ColumnInfo(name = "name") val name: String,
-	@ColumnInfo(name = "wg_quick") val wgQuick: String,
-	@ColumnInfo(
-		name = "tunnel_networks",
-		defaultValue = "",
-	)
-	val tunnelNetworks: MutableList<String> = mutableListOf(),
-	@ColumnInfo(
-		name = "is_mobile_data_tunnel",
-		defaultValue = "false",
-	)
-	val isMobileDataTunnel: Boolean = false,
-	@ColumnInfo(
-		name = "is_primary_tunnel",
-		defaultValue = "false",
-	)
-	val isPrimaryTunnel: Boolean = false,
-	@ColumnInfo(
-		name = "am_quick",
-		defaultValue = "",
-	)
-	val amQuick: String = AM_QUICK_DEFAULT,
-	@ColumnInfo(
-		name = "is_Active",
-		defaultValue = "false",
-	)
-	val isActive: Boolean = false,
-	@ColumnInfo(
-		name = "is_ping_enabled",
-		defaultValue = "false",
-	)
-	val isPingEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "ping_interval",
-		defaultValue = "null",
-	)
-	val pingInterval: Long? = null,
-	@ColumnInfo(
-		name = "ping_cooldown",
-		defaultValue = "null",
-	)
-	val pingCooldown: Long? = null,
-	@ColumnInfo(
-		name = "ping_ip",
-		defaultValue = "null",
-	)
-	var pingIp: String? = null,
-	@ColumnInfo(
-		name = "is_ethernet_tunnel",
-		defaultValue = "false",
-	)
-	var isEthernetTunnel: Boolean = false,
-	@ColumnInfo(
-		name = "is_ipv4_preferred",
-		defaultValue = "true",
-	)
-	var isIpv4Preferred: Boolean = true,
+    @PrimaryKey(autoGenerate = true) val id: Int = 0,
+    @ColumnInfo(name = "name") val name: String,
+    @ColumnInfo(name = "wg_quick") val wgQuick: String,
+    @ColumnInfo(name = "tunnel_networks", defaultValue = "")
+    val tunnelNetworks: MutableList<String> = mutableListOf(),
+    @ColumnInfo(name = "is_mobile_data_tunnel", defaultValue = "false")
+    val isMobileDataTunnel: Boolean = false,
+    @ColumnInfo(name = "is_primary_tunnel", defaultValue = "false")
+    val isPrimaryTunnel: Boolean = false,
+    @ColumnInfo(name = "am_quick", defaultValue = "") val amQuick: String = AM_QUICK_DEFAULT,
+    @ColumnInfo(name = "is_Active", defaultValue = "false") val isActive: Boolean = false,
+    @ColumnInfo(name = "is_ping_enabled", defaultValue = "false")
+    val isPingEnabled: Boolean = false,
+    @ColumnInfo(name = "ping_interval", defaultValue = "null") val pingInterval: Long? = null,
+    @ColumnInfo(name = "ping_cooldown", defaultValue = "null") val pingCooldown: Long? = null,
+    @ColumnInfo(name = "ping_ip", defaultValue = "null") var pingIp: String? = null,
+    @ColumnInfo(name = "is_ethernet_tunnel", defaultValue = "false")
+    var isEthernetTunnel: Boolean = false,
+    @ColumnInfo(name = "is_ipv4_preferred", defaultValue = "true")
+    var isIpv4Preferred: Boolean = true,
 ) {
 
-	fun toTunnel(): TunnelConf {
-		return TunnelConf(
-			id, name, wgQuick, tunnelNetworks, isMobileDataTunnel,
-			isPrimaryTunnel, amQuick, isActive, isPingEnabled, pingInterval,
-			pingCooldown, pingIp, isEthernetTunnel, isIpv4Preferred,
-		)
-	}
+    fun toTunnel(): TunnelConf {
+        return TunnelConf(
+            id,
+            name,
+            wgQuick,
+            tunnelNetworks,
+            isMobileDataTunnel,
+            isPrimaryTunnel,
+            amQuick,
+            isActive,
+            isPingEnabled,
+            pingInterval,
+            pingCooldown,
+            pingIp,
+            isEthernetTunnel,
+            isIpv4Preferred,
+        )
+    }
 
-	companion object {
+    companion object {
 
-		const val AM_QUICK_DEFAULT = ""
+        const val AM_QUICK_DEFAULT = ""
 
-		fun from(tunnelConf: TunnelConf): TunnelConfig {
-			return with(tunnelConf) {
-				return TunnelConfig(
-					id, tunName, wgQuick, tunnelNetworks.toMutableList(), isMobileDataTunnel,
-					isPrimaryTunnel, amQuick, isActive, isPingEnabled, pingInterval,
-					pingCooldown, pingIp, isEthernetTunnel, isIpv4Preferred,
-				)
-			}
-		}
-	}
+        fun from(tunnelConf: TunnelConf): TunnelConfig {
+            return with(tunnelConf) {
+                return TunnelConfig(
+                    id,
+                    tunName,
+                    wgQuick,
+                    tunnelNetworks.toMutableList(),
+                    isMobileDataTunnel,
+                    isPrimaryTunnel,
+                    amQuick,
+                    isActive,
+                    isPingEnabled,
+                    pingInterval,
+                    pingCooldown,
+                    pingIp,
+                    isEthernetTunnel,
+                    isIpv4Preferred,
+                )
+            }
+        }
+    }
 }

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

@@ -1,28 +1,28 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import javax.inject.Inject
 
 class AppDataRoomRepository
 @Inject
 constructor(
-	override val settings: AppSettingRepository,
-	override val tunnels: TunnelRepository,
-	override val appState: AppStateRepository,
+    override val settings: AppSettingRepository,
+    override val tunnels: TunnelRepository,
+    override val appState: AppStateRepository,
 ) : AppDataRepository {
 
-	override suspend fun getPrimaryOrFirstTunnel(): TunnelConf? {
-		return tunnels.findPrimary().firstOrNull() ?: tunnels.getAll().firstOrNull()
-	}
+    override suspend fun getPrimaryOrFirstTunnel(): TunnelConf? {
+        return tunnels.findPrimary().firstOrNull() ?: tunnels.getAll().firstOrNull()
+    }
 
-	override suspend fun getStartTunnelConfig(): TunnelConf? {
-		tunnels.getActive().let {
-			if (it.isNotEmpty()) return it.first()
-			return getPrimaryOrFirstTunnel()
-		}
-	}
+    override suspend fun getStartTunnelConfig(): TunnelConf? {
+        tunnels.getActive().let {
+            if (it.isNotEmpty()) return it.first()
+            return getPrimaryOrFirstTunnel()
+        }
+    }
 }

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

@@ -1,106 +1,133 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.DataStoreManager
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.data.model.GeneralState
+import com.zaneschepke.wireguardautotunnel.domain.entity.AppState
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import timber.log.Timber
 
-class DataStoreAppStateRepository(
-	private val dataStoreManager: DataStoreManager,
-) :
-	AppStateRepository {
-	override suspend fun isLocationDisclosureShown(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.locationDisclosureShown)
-			?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT
-	}
+class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager) :
+    AppStateRepository {
+    override suspend fun isLocationDisclosureShown(): Boolean {
+        return dataStoreManager.getFromStore(DataStoreManager.locationDisclosureShown)
+            ?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT
+    }
 
-	override suspend fun setLocationDisclosureShown(shown: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.locationDisclosureShown, shown)
-	}
+    override suspend fun setLocationDisclosureShown(shown: Boolean) {
+        dataStoreManager.saveToDataStore(DataStoreManager.locationDisclosureShown, shown)
+    }
 
-	override suspend fun isPinLockEnabled(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.pinLockEnabled)
-			?: GeneralState.PIN_LOCK_ENABLED_DEFAULT
-	}
+    override suspend fun isPinLockEnabled(): Boolean {
+        return dataStoreManager.getFromStore(DataStoreManager.pinLockEnabled)
+            ?: GeneralState.PIN_LOCK_ENABLED_DEFAULT
+    }
 
-	override suspend fun setPinLockEnabled(enabled: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.pinLockEnabled, enabled)
-	}
+    override suspend fun setPinLockEnabled(enabled: Boolean) {
+        dataStoreManager.saveToDataStore(DataStoreManager.pinLockEnabled, enabled)
+    }
 
-	override suspend fun isBatteryOptimizationDisableShown(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.batteryDisableShown)
-			?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT
-	}
+    override suspend fun isBatteryOptimizationDisableShown(): Boolean {
+        return dataStoreManager.getFromStore(DataStoreManager.batteryDisableShown)
+            ?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT
+    }
 
-	override suspend fun setBatteryOptimizationDisableShown(shown: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.batteryDisableShown, shown)
-	}
+    override suspend fun setBatteryOptimizationDisableShown(shown: Boolean) {
+        dataStoreManager.saveToDataStore(DataStoreManager.batteryDisableShown, shown)
+    }
 
-	override suspend fun isTunnelStatsExpanded(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.tunnelStatsExpanded)
-			?: GeneralState.IS_TUNNEL_STATS_EXPANDED
-	}
+    override suspend fun isTunnelStatsExpanded(): Boolean {
+        return dataStoreManager.getFromStore(DataStoreManager.tunnelStatsExpanded)
+            ?: GeneralState.IS_TUNNEL_STATS_EXPANDED
+    }
 
-	override suspend fun setTunnelStatsExpanded(expanded: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.tunnelStatsExpanded, expanded)
-	}
+    override suspend fun setTunnelStatsExpanded(expanded: Boolean) {
+        dataStoreManager.saveToDataStore(DataStoreManager.tunnelStatsExpanded, expanded)
+    }
 
-	override suspend fun setTheme(theme: Theme) {
-		dataStoreManager.saveToDataStore(DataStoreManager.theme, theme.name)
-	}
+    override suspend fun setTheme(theme: Theme) {
+        dataStoreManager.saveToDataStore(DataStoreManager.theme, theme.name)
+    }
 
-	override suspend fun getTheme(): Theme {
-		return dataStoreManager.getFromStore(DataStoreManager.theme)?.let {
-			try {
-				Theme.valueOf(it)
-			} catch (_: IllegalArgumentException) {
-				Theme.AUTOMATIC
-			}
-		} ?: Theme.AUTOMATIC
-	}
+    override suspend fun getTheme(): Theme {
+        return dataStoreManager.getFromStore(DataStoreManager.theme)?.let {
+            try {
+                Theme.valueOf(it)
+            } catch (_: IllegalArgumentException) {
+                Theme.AUTOMATIC
+            }
+        } ?: Theme.AUTOMATIC
+    }
 
-	override suspend fun isLocalLogsEnabled(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.isLocalLogsEnabled) ?: GeneralState.IS_LOGS_ENABLED_DEFAULT
-	}
+    override suspend fun isLocalLogsEnabled(): Boolean {
+        return dataStoreManager.getFromStore(DataStoreManager.isLocalLogsEnabled)
+            ?: GeneralState.IS_LOGS_ENABLED_DEFAULT
+    }
 
-	override suspend fun setLocalLogsEnabled(enabled: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.isLocalLogsEnabled, enabled)
-	}
+    override suspend fun setLocalLogsEnabled(enabled: Boolean) {
+        dataStoreManager.saveToDataStore(DataStoreManager.isLocalLogsEnabled, enabled)
+    }
 
-	override suspend fun setLocale(localeTag: String) {
-		dataStoreManager.saveToDataStore(DataStoreManager.locale, localeTag)
-	}
+    override suspend fun setLocale(localeTag: String) {
+        dataStoreManager.saveToDataStore(DataStoreManager.locale, localeTag)
+    }
 
-	override suspend fun getLocale(): String? {
-		return dataStoreManager.getFromStore(DataStoreManager.locale)
-	}
+    override suspend fun getLocale(): String? {
+        return dataStoreManager.getFromStore(DataStoreManager.locale)
+    }
 
-	override val flow: Flow<GeneralState> =
-		dataStoreManager.preferencesFlow.map { prefs ->
-			prefs?.let { pref ->
-				try {
-					GeneralState(
-						isLocationDisclosureShown =
-						pref[DataStoreManager.locationDisclosureShown]
-							?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT,
-						isBatteryOptimizationDisableShown =
-						pref[DataStoreManager.batteryDisableShown]
-							?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
-						isPinLockEnabled =
-						pref[DataStoreManager.pinLockEnabled]
-							?: GeneralState.PIN_LOCK_ENABLED_DEFAULT,
-						isTunnelStatsExpanded = pref[DataStoreManager.tunnelStatsExpanded] ?: GeneralState.IS_TUNNEL_STATS_EXPANDED,
-						isLocalLogsEnabled = pref[DataStoreManager.isLocalLogsEnabled] ?: GeneralState.IS_LOGS_ENABLED_DEFAULT,
-						locale = pref[DataStoreManager.locale],
-						theme = getTheme(),
-					)
-				} catch (e: IllegalArgumentException) {
-					Timber.e(e)
-					GeneralState()
-				}
-			} ?: GeneralState()
-		}
+    override suspend fun setIsRemoteControlEnabled(enabled: Boolean) {
+        dataStoreManager.saveToDataStore(DataStoreManager.isRemoteControlEnabled, enabled)
+    }
+
+    override suspend fun isRemoteControlEnabled(): Boolean {
+        return dataStoreManager.getFromStore(DataStoreManager.isRemoteControlEnabled)
+            ?: GeneralState.IS_REMOTE_CONTROL_ENABLED
+    }
+
+    override suspend fun setRemoteKey(key: String) {
+        dataStoreManager.saveToDataStore(DataStoreManager.remoteKey, key)
+    }
+
+    override suspend fun getRemoteKey(): String? {
+        return dataStoreManager.getFromStore(DataStoreManager.remoteKey)
+    }
+
+    override val flow: Flow<AppState> =
+        dataStoreManager.preferencesFlow
+            .map { prefs ->
+                prefs?.let { pref ->
+                    try {
+                        GeneralState(
+                            isLocationDisclosureShown =
+                                pref[DataStoreManager.locationDisclosureShown]
+                                    ?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT,
+                            isBatteryOptimizationDisableShown =
+                                pref[DataStoreManager.batteryDisableShown]
+                                    ?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
+                            isPinLockEnabled =
+                                pref[DataStoreManager.pinLockEnabled]
+                                    ?: GeneralState.PIN_LOCK_ENABLED_DEFAULT,
+                            isTunnelStatsExpanded =
+                                pref[DataStoreManager.tunnelStatsExpanded]
+                                    ?: GeneralState.IS_TUNNEL_STATS_EXPANDED,
+                            isLocalLogsEnabled =
+                                pref[DataStoreManager.isLocalLogsEnabled]
+                                    ?: GeneralState.IS_LOGS_ENABLED_DEFAULT,
+                            isRemoteControlEnabled =
+                                pref[DataStoreManager.isRemoteControlEnabled]
+                                    ?: GeneralState.IS_REMOTE_CONTROL_ENABLED,
+                            remoteKey = pref[DataStoreManager.remoteKey],
+                            locale = pref[DataStoreManager.locale],
+                            theme = getTheme(),
+                        )
+                    } catch (e: IllegalArgumentException) {
+                        Timber.e(e)
+                        GeneralState()
+                    }
+                } ?: GeneralState()
+            }
+            .map { it.toAppState() }
 }

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

@@ -1,31 +1,30 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.dao.SettingsDao
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
 import com.zaneschepke.wireguardautotunnel.data.model.Settings
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
 
 class RoomSettingsRepository(
-	private val settingsDoa: SettingsDao,
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+    private val settingsDoa: SettingsDao,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : AppSettingRepository {
 
-	override suspend fun save(appSettings: AppSettings) {
-		withContext(ioDispatcher) {
-			settingsDoa.save(Settings.from(appSettings))
-		}
-	}
+    override suspend fun save(appSettings: AppSettings) {
+        withContext(ioDispatcher) { settingsDoa.save(Settings.from(appSettings)) }
+    }
 
-	override val flow = settingsDoa.getSettingsFlow().flowOn(ioDispatcher).map { it.toAppSettings() }
+    override val flow =
+        settingsDoa.getSettingsFlow().flowOn(ioDispatcher).map { it.toAppSettings() }
 
-	override suspend fun get(): AppSettings {
-		return withContext(ioDispatcher) {
-			(settingsDoa.getAll().firstOrNull() ?: Settings()).toAppSettings()
-		}
-	}
+    override suspend fun get(): AppSettings {
+        return withContext(ioDispatcher) {
+            (settingsDoa.getAll().firstOrNull() ?: Settings()).toAppSettings()
+        }
+    }
 }

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

@@ -1,10 +1,10 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.dao.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.util.extensions.Tunnels
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.flowOn
@@ -12,96 +12,81 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
 
 class RoomTunnelRepository(
-	private val tunnelConfigDao: TunnelConfigDao,
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+    private val tunnelConfigDao: TunnelConfigDao,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : TunnelRepository {
 
-	override val flow = tunnelConfigDao.getAllFlow().flowOn(ioDispatcher).map { it.map { it.toTunnel() } }
+    override val flow =
+        tunnelConfigDao.getAllFlow().flowOn(ioDispatcher).map { it.map { it.toTunnel() } }
 
-	override suspend fun getAll(): Tunnels {
-		return withContext(ioDispatcher) {
-			tunnelConfigDao.getAll().map { it.toTunnel() }
-		}
-	}
+    override suspend fun getAll(): Tunnels {
+        return withContext(ioDispatcher) { tunnelConfigDao.getAll().map { it.toTunnel() } }
+    }
 
-	override suspend fun save(tunnelConf: TunnelConf) {
-		withContext(ioDispatcher) {
-			tunnelConfigDao.save(TunnelConfig.from(tunnelConf))
-		}
-	}
+    override suspend fun save(tunnelConf: TunnelConf) {
+        withContext(ioDispatcher) { tunnelConfigDao.save(TunnelConfig.from(tunnelConf)) }
+    }
 
-	override suspend fun updatePrimaryTunnel(tunnelConf: TunnelConf?) {
-		withContext(ioDispatcher) {
-			tunnelConfigDao.resetPrimaryTunnel()
-			tunnelConf?.let {
-				save(
-					it.copy(
-						isPrimaryTunnel = true,
-					),
-				)
-			}
-		}
-	}
+    override suspend fun saveAll(tunnelConfList: List<TunnelConf>) {
+        withContext(ioDispatcher) {
+            tunnelConfigDao.saveAll(tunnelConfList.map(TunnelConfig::from))
+        }
+    }
 
-	override suspend fun updateMobileDataTunnel(tunnelConf: TunnelConf?) {
-		withContext(ioDispatcher) {
-			tunnelConfigDao.resetMobileDataTunnel()
-			tunnelConf?.let {
-				save(
-					it.copy(
-						isMobileDataTunnel = true,
-					),
-				)
-			}
-		}
-	}
+    override suspend fun updatePrimaryTunnel(tunnelConf: TunnelConf?) {
+        withContext(ioDispatcher) {
+            tunnelConfigDao.resetPrimaryTunnel()
+            tunnelConf?.let { save(it.copy(isPrimaryTunnel = true)) }
+        }
+    }
 
-	override suspend fun updateEthernetTunnel(tunnelConf: TunnelConf?) {
-		withContext(ioDispatcher) {
-			tunnelConfigDao.resetEthernetTunnel()
-			tunnelConf?.let {
-				save(
-					it.copy(
-						isEthernetTunnel = true,
-					),
-				)
-			}
-		}
-	}
+    override suspend fun updateMobileDataTunnel(tunnelConf: TunnelConf?) {
+        withContext(ioDispatcher) {
+            tunnelConfigDao.resetMobileDataTunnel()
+            tunnelConf?.let { save(it.copy(isMobileDataTunnel = true)) }
+        }
+    }
 
-	override suspend fun delete(tunnelConf: TunnelConf) {
-		withContext(ioDispatcher) {
-			tunnelConfigDao.delete(TunnelConfig.from(tunnelConf))
-		}
-	}
+    override suspend fun updateEthernetTunnel(tunnelConf: TunnelConf?) {
+        withContext(ioDispatcher) {
+            tunnelConfigDao.resetEthernetTunnel()
+            tunnelConf?.let { save(it.copy(isEthernetTunnel = true)) }
+        }
+    }
 
-	override suspend fun getById(id: Int): TunnelConf? {
-		return withContext(ioDispatcher) { tunnelConfigDao.getById(id.toLong())?.toTunnel() }
-	}
+    override suspend fun delete(tunnelConf: TunnelConf) {
+        withContext(ioDispatcher) { tunnelConfigDao.delete(TunnelConfig.from(tunnelConf)) }
+    }
 
-	override suspend fun getActive(): Tunnels {
-		return withContext(ioDispatcher) {
-			tunnelConfigDao.getActive().map { it.toTunnel() }
-		}
-	}
+    override suspend fun getById(id: Int): TunnelConf? {
+        return withContext(ioDispatcher) { tunnelConfigDao.getById(id.toLong())?.toTunnel() }
+    }
 
-	override suspend fun count(): Int {
-		return withContext(ioDispatcher) { tunnelConfigDao.count().toInt() }
-	}
+    override suspend fun getActive(): Tunnels {
+        return withContext(ioDispatcher) { tunnelConfigDao.getActive().map { it.toTunnel() } }
+    }
 
-	override suspend fun findByTunnelName(name: String): TunnelConf? {
-		return withContext(ioDispatcher) { tunnelConfigDao.getByName(name)?.toTunnel() }
-	}
+    override suspend fun count(): Int {
+        return withContext(ioDispatcher) { tunnelConfigDao.count().toInt() }
+    }
 
-	override suspend fun findByTunnelNetworksName(name: String): Tunnels {
-		return withContext(ioDispatcher) { tunnelConfigDao.findByTunnelNetworkName(name).map { it.toTunnel() } }
-	}
+    override suspend fun findByTunnelName(name: String): TunnelConf? {
+        return withContext(ioDispatcher) { tunnelConfigDao.getByName(name)?.toTunnel() }
+    }
 
-	override suspend fun findByMobileDataTunnel(): Tunnels {
-		return withContext(ioDispatcher) { tunnelConfigDao.findByMobileDataTunnel().map { it.toTunnel() } }
-	}
+    override suspend fun findByTunnelNetworksName(name: String): Tunnels {
+        return withContext(ioDispatcher) {
+            tunnelConfigDao.findByTunnelNetworkName(name).map { it.toTunnel() }
+        }
+    }
 
-	override suspend fun findPrimary(): Tunnels {
-		return withContext(ioDispatcher) { tunnelConfigDao.findByPrimary().map { it.toTunnel() } }
-	}
+    override suspend fun findByMobileDataTunnel(): Tunnels {
+        return withContext(ioDispatcher) {
+            tunnelConfigDao.findByMobileDataTunnel().map { it.toTunnel() }
+        }
+    }
+
+    override suspend fun findPrimary(): Tunnels {
+        return withContext(ioDispatcher) { tunnelConfigDao.findByPrimary().map { it.toTunnel() } }
+    }
 }

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

@@ -12,35 +12,39 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
-import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 class AppModule {
-	@Singleton
-	@ApplicationScope
-	@Provides
-	fun providesApplicationScope(@DefaultDispatcher defaultDispatcher: CoroutineDispatcher): CoroutineScope =
-		CoroutineScope(SupervisorJob() + defaultDispatcher)
+    @Singleton
+    @ApplicationScope
+    @Provides
+    fun providesApplicationScope(
+        @DefaultDispatcher defaultDispatcher: CoroutineDispatcher
+    ): CoroutineScope = CoroutineScope(SupervisorJob() + defaultDispatcher)
 
-	@Singleton
-	@Provides
-	fun provideLogCollect(@ApplicationContext context: Context): LogReader {
-		return LogcatReader.init(storageDir = context.filesDir.absolutePath)
-	}
+    @Singleton
+    @Provides
+    fun provideLogCollect(@ApplicationContext context: Context): LogReader {
+        return LogcatReader.init(storageDir = context.filesDir.absolutePath)
+    }
 
-	@Singleton
-	@Provides
-	fun provideNotificationService(@ApplicationContext context: Context): NotificationManager {
-		return WireGuardNotification(context)
-	}
+    @Singleton
+    @Provides
+    fun provideNotificationService(@ApplicationContext context: Context): NotificationManager {
+        return WireGuardNotification(context)
+    }
 
-	@Singleton
-	@Provides
-	fun provideShortcutManager(@ApplicationContext context: Context, @IoDispatcher ioDispatcher: CoroutineDispatcher): ShortcutManager {
-		return DynamicShortcutManager(context, ioDispatcher)
-	}
+    @Singleton
+    @Provides
+    fun provideShortcutManager(
+        @ApplicationContext context: Context,
+        @IoDispatcher ioDispatcher: CoroutineDispatcher,
+    ): ShortcutManager {
+        return DynamicShortcutManager(context, ioDispatcher)
+    }
 }

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

@@ -2,18 +2,10 @@ package com.zaneschepke.wireguardautotunnel.di
 
 import javax.inject.Qualifier
 
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class TunnelShell
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class TunnelShell
 
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class AppShell
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class AppShell
 
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class Kernel
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class Kernel
 
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class Userspace
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class Userspace

app/src/main/java/com/zaneschepke/wireguardautotunnel/di/CoroutineQualifiers.kt

@@ -2,26 +2,14 @@ package com.zaneschepke.wireguardautotunnel.di
 
 import javax.inject.Qualifier
 
-@Retention(AnnotationRetention.RUNTIME)
-@Qualifier
-annotation class DefaultDispatcher
+@Retention(AnnotationRetention.RUNTIME) @Qualifier annotation class DefaultDispatcher
 
-@Retention(AnnotationRetention.RUNTIME)
-@Qualifier
-annotation class IoDispatcher
+@Retention(AnnotationRetention.RUNTIME) @Qualifier annotation class IoDispatcher
 
-@Retention(AnnotationRetention.RUNTIME)
-@Qualifier
-annotation class MainDispatcher
+@Retention(AnnotationRetention.RUNTIME) @Qualifier annotation class MainDispatcher
 
-@Retention(AnnotationRetention.BINARY)
-@Qualifier
-annotation class MainImmediateDispatcher
+@Retention(AnnotationRetention.BINARY) @Qualifier annotation class MainImmediateDispatcher
 
-@Retention(AnnotationRetention.RUNTIME)
-@Qualifier
-annotation class ApplicationScope
+@Retention(AnnotationRetention.RUNTIME) @Qualifier annotation class ApplicationScope
 
-@Retention(AnnotationRetention.RUNTIME)
-@Qualifier
-annotation class ServiceScope
+@Retention(AnnotationRetention.RUNTIME) @Qualifier annotation class ServiceScope

app/src/main/java/com/zaneschepke/wireguardautotunnel/di/CoroutinesDispatchersModule.kt

@@ -10,19 +10,15 @@ import kotlinx.coroutines.Dispatchers
 @Module
 @InstallIn(SingletonComponent::class)
 object CoroutinesDispatchersModule {
-	@DefaultDispatcher
-	@Provides
-	fun providesDefaultDispatcher(): CoroutineDispatcher = Dispatchers.Default
+    @DefaultDispatcher
+    @Provides
+    fun providesDefaultDispatcher(): CoroutineDispatcher = Dispatchers.Default
 
-	@IoDispatcher
-	@Provides
-	fun providesIoDispatcher(): CoroutineDispatcher = Dispatchers.IO
+    @IoDispatcher @Provides fun providesIoDispatcher(): CoroutineDispatcher = Dispatchers.IO
 
-	@MainDispatcher
-	@Provides
-	fun providesMainDispatcher(): CoroutineDispatcher = Dispatchers.Main
+    @MainDispatcher @Provides fun providesMainDispatcher(): CoroutineDispatcher = Dispatchers.Main
 
-	@MainImmediateDispatcher
-	@Provides
-	fun providesMainImmediateDispatcher(): CoroutineDispatcher = Dispatchers.Main.immediate
+    @MainImmediateDispatcher
+    @Provides
+    fun providesMainImmediateDispatcher(): CoroutineDispatcher = Dispatchers.Main.immediate
 }

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

@@ -4,85 +4,94 @@ import android.content.Context
 import androidx.room.Room
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
+import com.zaneschepke.wireguardautotunnel.data.DataStoreManager
 import com.zaneschepke.wireguardautotunnel.data.DatabaseCallback
 import com.zaneschepke.wireguardautotunnel.data.dao.SettingsDao
 import com.zaneschepke.wireguardautotunnel.data.dao.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.data.DataStoreManager
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRoomRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.DataStoreAppStateRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.RoomSettingsRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.RoomTunnelRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import kotlinx.coroutines.CoroutineDispatcher
 import javax.inject.Singleton
+import kotlinx.coroutines.CoroutineDispatcher
 
 @Module
 @InstallIn(SingletonComponent::class)
 class RepositoryModule {
-	@Provides
-	@Singleton
-	fun provideDatabase(@ApplicationContext context: Context): AppDatabase {
-		return Room.databaseBuilder(
-			context,
-			AppDatabase::class.java,
-			context.getString(R.string.db_name),
-		)
-			.fallbackToDestructiveMigration()
-			.addCallback(DatabaseCallback())
-			.build()
-	}
+    @Provides
+    @Singleton
+    fun provideDatabase(@ApplicationContext context: Context): AppDatabase {
+        return Room.databaseBuilder(
+                context,
+                AppDatabase::class.java,
+                context.getString(R.string.db_name),
+            )
+            .fallbackToDestructiveMigration()
+            .addCallback(DatabaseCallback())
+            .build()
+    }
 
-	@Singleton
-	@Provides
-	fun provideSettingsDoa(appDatabase: AppDatabase): SettingsDao {
-		return appDatabase.settingDao()
-	}
+    @Singleton
+    @Provides
+    fun provideSettingsDoa(appDatabase: AppDatabase): SettingsDao {
+        return appDatabase.settingDao()
+    }
 
-	@Singleton
-	@Provides
-	fun provideTunnelConfigDoa(appDatabase: AppDatabase): TunnelConfigDao {
-		return appDatabase.tunnelConfigDoa()
-	}
+    @Singleton
+    @Provides
+    fun provideTunnelConfigDoa(appDatabase: AppDatabase): TunnelConfigDao {
+        return appDatabase.tunnelConfigDoa()
+    }
 
-	@Singleton
-	@Provides
-	fun provideTunnelConfigRepository(tunnelConfigDao: TunnelConfigDao, @IoDispatcher ioDispatcher: CoroutineDispatcher): TunnelRepository {
-		return RoomTunnelRepository(tunnelConfigDao, ioDispatcher)
-	}
+    @Singleton
+    @Provides
+    fun provideTunnelConfigRepository(
+        tunnelConfigDao: TunnelConfigDao,
+        @IoDispatcher ioDispatcher: CoroutineDispatcher,
+    ): TunnelRepository {
+        return RoomTunnelRepository(tunnelConfigDao, ioDispatcher)
+    }
 
-	@Singleton
-	@Provides
-	fun provideSettingsRepository(settingsDao: SettingsDao, @IoDispatcher ioDispatcher: CoroutineDispatcher): AppSettingRepository {
-		return RoomSettingsRepository(settingsDao, ioDispatcher)
-	}
+    @Singleton
+    @Provides
+    fun provideSettingsRepository(
+        settingsDao: SettingsDao,
+        @IoDispatcher ioDispatcher: CoroutineDispatcher,
+    ): AppSettingRepository {
+        return RoomSettingsRepository(settingsDao, ioDispatcher)
+    }
 
-	@Singleton
-	@Provides
-	fun providePreferencesDataStore(@ApplicationContext context: Context, @IoDispatcher ioDispatcher: CoroutineDispatcher): DataStoreManager {
-		return DataStoreManager(context, ioDispatcher)
-	}
+    @Singleton
+    @Provides
+    fun providePreferencesDataStore(
+        @ApplicationContext context: Context,
+        @IoDispatcher ioDispatcher: CoroutineDispatcher,
+    ): DataStoreManager {
+        return DataStoreManager(context, ioDispatcher)
+    }
 
-	@Provides
-	@Singleton
-	fun provideGeneralStateRepository(dataStoreManager: DataStoreManager): AppStateRepository {
-		return DataStoreAppStateRepository(dataStoreManager)
-	}
+    @Provides
+    @Singleton
+    fun provideGeneralStateRepository(dataStoreManager: DataStoreManager): AppStateRepository {
+        return DataStoreAppStateRepository(dataStoreManager)
+    }
 
-	@Provides
-	@Singleton
-	fun provideAppDataRepository(
-		settingsRepository: AppSettingRepository,
-		tunnelRepository: TunnelRepository,
-		appStateRepository: AppStateRepository,
-	): AppDataRepository {
-		return AppDataRoomRepository(settingsRepository, tunnelRepository, appStateRepository)
-	}
+    @Provides
+    @Singleton
+    fun provideAppDataRepository(
+        settingsRepository: AppSettingRepository,
+        tunnelRepository: TunnelRepository,
+        appStateRepository: AppStateRepository,
+    ): AppDataRepository {
+        return AppDataRoomRepository(settingsRepository, tunnelRepository, appStateRepository)
+    }
 }

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

@@ -6,113 +6,133 @@ import com.wireguard.android.util.RootShell
 import com.wireguard.android.util.ToolsInstaller
 import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
 import com.zaneschepke.networkmonitor.NetworkMonitor
-import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.KernelTunnel
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider
 import com.zaneschepke.wireguardautotunnel.core.tunnel.UserspaceTunnel
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.runBlocking
 import org.amnezia.awg.backend.Backend
 import org.amnezia.awg.backend.GoBackend
 import org.amnezia.awg.backend.RootTunnelActionHandler
-import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 class TunnelModule {
 
-	@Provides
-	@Singleton
-	@TunnelShell
-	fun provideTunnelRootShell(@ApplicationContext context: Context): RootShell {
-		return RootShell(context)
-	}
+    @Provides
+    @Singleton
+    @TunnelShell
+    fun provideTunnelRootShell(@ApplicationContext context: Context): RootShell {
+        return RootShell(context)
+    }
 
-	@Provides
-	@Singleton
-	@AppShell
-	fun provideAppRootShell(@ApplicationContext context: Context): RootShell {
-		return RootShell(context)
-	}
+    @Provides
+    @Singleton
+    @AppShell
+    fun provideAppRootShell(@ApplicationContext context: Context): RootShell {
+        return RootShell(context)
+    }
 
-	@Provides
-	@Singleton
-	fun provideAmneziaBackend(@ApplicationContext context: Context): Backend {
-		return GoBackend(context, RootTunnelActionHandler(org.amnezia.awg.util.RootShell(context)))
-	}
+    @Provides
+    @Singleton
+    fun provideAmneziaBackend(@ApplicationContext context: Context): Backend {
+        return GoBackend(context, RootTunnelActionHandler(org.amnezia.awg.util.RootShell(context)))
+    }
 
-	@Provides
-	@Singleton
-	fun provideKernelBackend(@ApplicationContext context: Context, @TunnelShell shell: RootShell): com.wireguard.android.backend.Backend {
-		return WgQuickBackend(context, shell, ToolsInstaller(context, shell), com.wireguard.android.backend.RootTunnelActionHandler(shell)).also {
-			it.setMultipleTunnels(true)
-		}
-	}
+    @Provides
+    @Singleton
+    fun provideKernelBackend(
+        @ApplicationContext context: Context,
+        @TunnelShell shell: RootShell,
+    ): com.wireguard.android.backend.Backend {
+        return WgQuickBackend(
+                context,
+                shell,
+                ToolsInstaller(context, shell),
+                com.wireguard.android.backend.RootTunnelActionHandler(shell),
+            )
+            .also { it.setMultipleTunnels(true) }
+    }
 
-	@Provides
-	@Singleton
-	@Kernel
-	fun provideKernelProvider(
-		@IoDispatcher ioDispatcher: CoroutineDispatcher,
-		@ApplicationScope applicationScope: CoroutineScope,
-		serviceManager: ServiceManager,
-		appDataRepository: AppDataRepository,
-		networkMonitor: NetworkMonitor,
-		notificationManager: NotificationManager,
-		backend: com.wireguard.android.backend.Backend,
-	): TunnelProvider {
-		return KernelTunnel(ioDispatcher, applicationScope, serviceManager, appDataRepository, notificationManager, backend, networkMonitor)
-	}
+    @Provides
+    @Singleton
+    @Kernel
+    fun provideKernelProvider(
+        @ApplicationScope applicationScope: CoroutineScope,
+        serviceManager: ServiceManager,
+        appDataRepository: AppDataRepository,
+        backend: com.wireguard.android.backend.Backend,
+    ): TunnelProvider {
+        return KernelTunnel(applicationScope, serviceManager, appDataRepository, backend)
+    }
 
-	@Provides
-	@Singleton
-	@Userspace
-	fun provideUserspaceProvider(
-		@IoDispatcher ioDispatcher: CoroutineDispatcher,
-		@ApplicationScope applicationScope: CoroutineScope,
-		serviceManager: ServiceManager,
-		appDataRepository: AppDataRepository,
-		notificationManager: NotificationManager,
-		networkMonitor: NetworkMonitor,
-		backend: Backend,
-	): TunnelProvider {
-		return UserspaceTunnel(ioDispatcher, applicationScope, serviceManager, appDataRepository, notificationManager, backend, networkMonitor)
-	}
+    @Provides
+    @Singleton
+    @Userspace
+    fun provideUserspaceProvider(
+        @ApplicationScope applicationScope: CoroutineScope,
+        serviceManager: ServiceManager,
+        appDataRepository: AppDataRepository,
+        backend: Backend,
+    ): TunnelProvider {
+        return UserspaceTunnel(applicationScope, serviceManager, appDataRepository, backend)
+    }
 
-	@Provides
-	@Singleton
-	fun provideTunnelManager(
-		@Kernel kernelTunnel: TunnelProvider,
-		@Userspace userspaceTunnel: TunnelProvider,
-		appDataRepository: AppDataRepository,
-		@IoDispatcher ioDispatcher: CoroutineDispatcher,
-		@ApplicationScope applicationScope: CoroutineScope,
-	): TunnelManager {
-		return TunnelManager(kernelTunnel, userspaceTunnel, appDataRepository, applicationScope, ioDispatcher)
-	}
+    @Provides
+    @Singleton
+    fun provideTunnelManager(
+        @Kernel kernelTunnel: TunnelProvider,
+        @Userspace userspaceTunnel: TunnelProvider,
+        appDataRepository: AppDataRepository,
+        @IoDispatcher ioDispatcher: CoroutineDispatcher,
+        @ApplicationScope applicationScope: CoroutineScope,
+    ): TunnelManager {
+        return TunnelManager(
+            kernelTunnel,
+            userspaceTunnel,
+            appDataRepository,
+            applicationScope,
+            ioDispatcher,
+        )
+    }
 
-	@Provides
-	@Singleton
-	fun provideNetworkMonitor(@ApplicationContext context: Context): NetworkMonitor {
-		return AndroidNetworkMonitor(context)
-	}
+    @Provides
+    @Singleton
+    fun provideNetworkMonitor(
+        @ApplicationContext context: Context,
+        settingsRepository: AppSettingRepository,
+    ): NetworkMonitor {
+        return AndroidNetworkMonitor(context) {
+            runBlocking { settingsRepository.get().isWifiNameByShellEnabled }
+        }
+    }
 
-	@Singleton
-	@Provides
-	fun provideServiceManager(
-		@ApplicationContext context: Context,
-		@IoDispatcher ioDispatcher: CoroutineDispatcher,
-		@ApplicationScope applicationScope: CoroutineScope,
-		appDataRepository: AppDataRepository,
-	): ServiceManager {
-		return ServiceManager(context, ioDispatcher, applicationScope, appDataRepository)
-	}
+    @Singleton
+    @Provides
+    fun provideServiceManager(
+        @ApplicationContext context: Context,
+        @IoDispatcher ioDispatcher: CoroutineDispatcher,
+        @MainDispatcher mainCoroutineDispatcher: CoroutineDispatcher,
+        @ApplicationScope applicationScope: CoroutineScope,
+        appDataRepository: AppDataRepository,
+    ): ServiceManager {
+        return ServiceManager(
+            context,
+            ioDispatcher,
+            applicationScope,
+            mainCoroutineDispatcher,
+            appDataRepository,
+        )
+    }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/di/ViewModelModule.kt

@@ -13,9 +13,12 @@ import kotlinx.coroutines.CoroutineDispatcher
 @Module
 @InstallIn(ViewModelComponent::class)
 class ViewModelModule {
-	@ViewModelScoped
-	@Provides
-	fun provideFileUtils(@ApplicationContext context: Context, @IoDispatcher ioDispatcher: CoroutineDispatcher): FileUtils {
-		return FileUtils(context, ioDispatcher)
-	}
+    @ViewModelScoped
+    @Provides
+    fun provideFileUtils(
+        @ApplicationContext context: Context,
+        @IoDispatcher ioDispatcher: CoroutineDispatcher,
+    ): FileUtils {
+        return FileUtils(context, ioDispatcher)
+    }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/entity/AppSettings.kt

@@ -1,29 +1,29 @@
 package com.zaneschepke.wireguardautotunnel.domain.entity
 
 data class AppSettings(
-	val id: Int = 0,
-	val isAutoTunnelEnabled: Boolean = false,
-	val isTunnelOnMobileDataEnabled: Boolean = false,
-	val trustedNetworkSSIDs: List<String> = emptyList(),
-	val isAlwaysOnVpnEnabled: Boolean = false,
-	val isTunnelOnEthernetEnabled: Boolean = false,
-	val isShortcutsEnabled: Boolean = false,
-	val isTunnelOnWifiEnabled: Boolean = false,
-	val isKernelEnabled: Boolean = false,
-	val isRestoreOnBootEnabled: Boolean = false,
-	val isMultiTunnelEnabled: Boolean = false,
-	val isPingEnabled: Boolean = false,
-	val isAmneziaEnabled: Boolean = false,
-	val isWildcardsEnabled: Boolean = false,
-	val isWifiNameByShellEnabled: Boolean = false,
-	val isStopOnNoInternetEnabled: Boolean = false,
-	val isVpnKillSwitchEnabled: Boolean = false,
-	val isKernelKillSwitchEnabled: Boolean = false,
-	val isLanOnKillSwitchEnabled: Boolean = false,
-	val debounceDelaySeconds: Int = 3,
-	val isDisableKillSwitchOnTrustedEnabled: Boolean = false,
+    val id: Int = 0,
+    val isAutoTunnelEnabled: Boolean = false,
+    val isTunnelOnMobileDataEnabled: Boolean = false,
+    val trustedNetworkSSIDs: List<String> = emptyList(),
+    val isAlwaysOnVpnEnabled: Boolean = false,
+    val isTunnelOnEthernetEnabled: Boolean = false,
+    val isShortcutsEnabled: Boolean = false,
+    val isTunnelOnWifiEnabled: Boolean = false,
+    val isKernelEnabled: Boolean = false,
+    val isRestoreOnBootEnabled: Boolean = false,
+    val isMultiTunnelEnabled: Boolean = false,
+    val isPingEnabled: Boolean = false,
+    val isAmneziaEnabled: Boolean = false,
+    val isWildcardsEnabled: Boolean = false,
+    val isWifiNameByShellEnabled: Boolean = false,
+    val isStopOnNoInternetEnabled: Boolean = false,
+    val isVpnKillSwitchEnabled: Boolean = false,
+    val isKernelKillSwitchEnabled: Boolean = false,
+    val isLanOnKillSwitchEnabled: Boolean = false,
+    val debounceDelaySeconds: Int = 3,
+    val isDisableKillSwitchOnTrustedEnabled: Boolean = false,
 ) {
-	fun debounceDelayMillis(): Long {
-		return debounceDelaySeconds * 1000L
-	}
+    fun debounceDelayMillis(): Long {
+        return debounceDelaySeconds * 1000L
+    }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/entity/AppState.kt

@@ -3,11 +3,13 @@ package com.zaneschepke.wireguardautotunnel.domain.entity
 import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 
 data class AppState(
-	val isLocationDisclosureShown: Boolean,
-	val isBatteryOptimizationDisableShown: Boolean,
-	val isPinLockEnabled: Boolean,
-	val isTunnelStatsExpanded: Boolean,
-	val isLocalLogsEnabled: Boolean,
-	val locale: String?,
-	val theme: Theme,
+    val isLocationDisclosureShown: Boolean,
+    val isBatteryOptimizationDisableShown: Boolean,
+    val isPinLockEnabled: Boolean,
+    val isTunnelStatsExpanded: Boolean,
+    val isLocalLogsEnabled: Boolean,
+    val isRemoteControlEnabled: Boolean,
+    val remoteKey: String?,
+    val locale: String?,
+    val theme: Theme,
 )

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/entity/TunnelConf.kt

@@ -1,122 +1,215 @@
 package com.zaneschepke.wireguardautotunnel.domain.entity
 
+import com.wireguard.android.backend.Tunnel
 import com.wireguard.config.Config
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.isReachable
-import com.zaneschepke.wireguardautotunnel.util.extensions.toWgQuickString
-import kotlinx.coroutines.withContext
-import kotlinx.serialization.Transient
-import org.amnezia.awg.backend.Tunnel
-import timber.log.Timber
+import com.zaneschepke.wireguardautotunnel.util.extensions.*
 import java.io.InputStream
 import java.net.InetAddress
+import java.nio.charset.StandardCharsets
 import kotlin.coroutines.CoroutineContext
+import kotlinx.coroutines.withContext
+import timber.log.Timber
 
 data class TunnelConf(
-	val id: Int = 0,
-	val tunName: String,
-	val wgQuick: String,
-	val tunnelNetworks: List<String> = emptyList(),
-	val isMobileDataTunnel: Boolean = false,
-	val isPrimaryTunnel: Boolean = false,
-	val amQuick: String,
-	val isActive: Boolean = false,
-	val isPingEnabled: Boolean = false,
-	val pingInterval: Long? = null,
-	val pingCooldown: Long? = null,
-	val pingIp: String? = null,
-	val isEthernetTunnel: Boolean = false,
-	val isIpv4Preferred: Boolean = false,
-	@Transient
-	private var stateChangeCallback: ((Any) -> Unit)? = null,
-) : Tunnel, com.wireguard.android.backend.Tunnel {
+    val id: Int = 0,
+    val tunName: String,
+    val wgQuick: String,
+    val tunnelNetworks: List<String> = emptyList(),
+    val isMobileDataTunnel: Boolean = false,
+    val isPrimaryTunnel: Boolean = false,
+    val amQuick: String,
+    val isActive: Boolean = false,
+    val isPingEnabled: Boolean = false,
+    val pingInterval: Long? = null,
+    val pingCooldown: Long? = null,
+    val pingIp: String? = null,
+    val isEthernetTunnel: Boolean = false,
+    val isIpv4Preferred: Boolean = true,
+    val useCache: Boolean = false,
+    @Transient private var stateChangeCallback: ((Any) -> Unit)? = null,
+) : Tunnel, org.amnezia.awg.backend.Tunnel {
 
-	fun setStateChangeCallback(callback: (Any) -> Unit) {
-		stateChangeCallback = callback
-	}
+    fun setStateChangeCallback(callback: (Any) -> Unit) {
+        stateChangeCallback = callback
+    }
 
-	fun toAmConfig(): org.amnezia.awg.config.Config {
-		return configFromAmQuick(amQuick.ifBlank { wgQuick })
-	}
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is TunnelConf) return false
+        return id == other.id &&
+            tunName == other.tunName &&
+            wgQuick == other.wgQuick &&
+            amQuick == other.amQuick &&
+            isPrimaryTunnel == other.isPrimaryTunnel &&
+            isMobileDataTunnel == other.isMobileDataTunnel &&
+            isEthernetTunnel == other.isEthernetTunnel &&
+            isPingEnabled == other.isPingEnabled &&
+            pingIp == other.pingIp &&
+            pingCooldown == other.pingCooldown &&
+            pingInterval == other.pingInterval &&
+            tunnelNetworks == other.tunnelNetworks &&
+            isIpv4Preferred == other.isIpv4Preferred
+    }
 
-	fun toWgConfig(): Config {
-		return configFromWgQuick(wgQuick)
-	}
+    override fun hashCode(): Int {
+        var result = id
+        result = 31 * result + tunName.hashCode()
+        result = 31 * result + wgQuick.hashCode()
+        result = 31 * result + amQuick.hashCode()
+        return result
+    }
 
-	override fun getName(): String {
-		return tunName
-	}
+    fun copyWithCallback(
+        id: Int = this.id,
+        tunName: String = this.tunName,
+        wgQuick: String = this.wgQuick,
+        tunnelNetworks: List<String> = this.tunnelNetworks,
+        isMobileDataTunnel: Boolean = this.isMobileDataTunnel,
+        isPrimaryTunnel: Boolean = this.isPrimaryTunnel,
+        amQuick: String = this.amQuick,
+        isActive: Boolean = this.isActive,
+        isPingEnabled: Boolean = this.isPingEnabled,
+        pingInterval: Long? = this.pingInterval,
+        pingCooldown: Long? = this.pingCooldown,
+        pingIp: String? = this.pingIp,
+        isEthernetTunnel: Boolean = this.isEthernetTunnel,
+        isIpv4Preferred: Boolean = this.isIpv4Preferred,
+    ): TunnelConf {
+        return TunnelConf(
+                id,
+                tunName,
+                wgQuick,
+                tunnelNetworks,
+                isMobileDataTunnel,
+                isPrimaryTunnel,
+                amQuick,
+                isActive,
+                isPingEnabled,
+                pingInterval,
+                pingCooldown,
+                pingIp,
+                isEthernetTunnel,
+                isIpv4Preferred,
+            )
+            .apply { stateChangeCallback = this@TunnelConf.stateChangeCallback }
+    }
 
-	override fun isIpv4ResolutionPreferred(): Boolean {
-		return isIpv4Preferred
-	}
+    fun toAmConfig(): org.amnezia.awg.config.Config {
+        return configFromAmQuick(amQuick.ifBlank { wgQuick })
+    }
 
-	override fun onStateChange(newState: com.wireguard.android.backend.Tunnel.State) {
-		stateChangeCallback?.invoke(newState)
-	}
+    fun toWgConfig(): Config {
+        return configFromWgQuick(wgQuick)
+    }
 
-	override fun onStateChange(newState: Tunnel.State) {
-		stateChangeCallback?.invoke(newState)
-	}
+    override fun getName(): String = tunName
 
-	fun isQuickConfigMatching(updatedConf: TunnelConf): Boolean {
-		return updatedConf.wgQuick == wgQuick ||
-			updatedConf.amQuick == amQuick
-	}
+    override fun isIpv4ResolutionPreferred(): Boolean = isIpv4Preferred
 
-	fun isPingConfigMatching(updatedConf: TunnelConf): Boolean {
-		return updatedConf.isPingEnabled == isPingEnabled &&
-			pingIp == updatedConf.pingIp &&
-			updatedConf.pingCooldown == pingCooldown &&
-			updatedConf.pingInterval == pingInterval
-	}
+    override fun useCache(): Boolean = useCache
 
-	suspend fun isTunnelPingable(context: CoroutineContext): Boolean {
-		return withContext(context) {
-			val config = toWgConfig()
-			if (pingIp != null) {
-				return@withContext InetAddress.getByName(pingIp)
-					.isReachable(Constants.PING_TIMEOUT.toInt())
-			}
-			Timber.i("Pinging all peers")
-			config.peers.map { peer ->
-				peer.isReachable(isIpv4Preferred)
-			}.all { true }
-		}
-	}
+    override fun onStateChange(newState: org.amnezia.awg.backend.Tunnel.State) {
+        stateChangeCallback?.invoke(newState)
+    }
 
-	companion object {
-		fun configFromWgQuick(wgQuick: String): Config {
-			val inputStream: InputStream = wgQuick.byteInputStream()
-			return inputStream.bufferedReader(Charsets.UTF_8).use {
-				Config.parse(it)
-			}
-		}
+    override fun onStateChange(newState: Tunnel.State) {
+        stateChangeCallback?.invoke(newState)
+    }
 
-		fun configFromAmQuick(amQuick: String): org.amnezia.awg.config.Config {
-			val inputStream: InputStream = amQuick.byteInputStream()
-			return inputStream.bufferedReader(Charsets.UTF_8).use {
-				org.amnezia.awg.config.Config.parse(it)
-			}
-		}
+    fun generateUniqueName(tunnelNames: List<String>): String {
+        var tunnelName = this.tunName
+        var num = 1
+        while (tunnelNames.any { it == tunnelName }) {
+            tunnelName =
+                if (!tunnelName.hasNumberInParentheses()) {
+                    "$name($num)"
+                } else {
+                    val pair = tunnelName.extractNameAndNumber()
+                    "${pair?.first}($num)"
+                }
+            num++
+        }
+        return tunnelName
+    }
 
-		fun tunnelConfigFromAmConfig(config: org.amnezia.awg.config.Config, name: String): TunnelConf {
-			val amQuick = config.toAwgQuickString(true)
-			val wgQuick = config.toWgQuickString()
-			return TunnelConf(tunName = name, wgQuick = wgQuick, amQuick = amQuick)
-		}
+    suspend fun isTunnelPingable(context: CoroutineContext): Boolean {
+        return withContext(context) {
+            val config = toWgConfig()
+            if (pingIp != null) {
+                return@withContext InetAddress.getByName(pingIp)
+                    .isReachable(Constants.PING_TIMEOUT.toInt())
+                    .also { Timber.i("Ping reachable $pingIp: $it") }
+            }
+            config.peers
+                .map { peer -> peer.isReachable() }
+                .all { true }
+                .also { Timber.i("Ping of all peers reachable: $it") }
+        }
+    }
 
-		private const val IPV6_ALL_NETWORKS = "::/0"
-		private const val IPV4_ALL_NETWORKS = "0.0.0.0/0"
-		val ALL_IPS = listOf(IPV4_ALL_NETWORKS, IPV6_ALL_NETWORKS)
-		private val IPV4_PUBLIC_NETWORKS = listOf(
-			"0.0.0.0/5", "8.0.0.0/7", "11.0.0.0/8", "12.0.0.0/6", "16.0.0.0/4", "32.0.0.0/3",
-			"64.0.0.0/2", "128.0.0.0/3", "160.0.0.0/5", "168.0.0.0/6", "172.0.0.0/12",
-			"172.32.0.0/11", "172.64.0.0/10", "172.128.0.0/9", "173.0.0.0/8", "174.0.0.0/7",
-			"176.0.0.0/4", "192.0.0.0/9", "192.128.0.0/11", "192.160.0.0/13", "192.169.0.0/16",
-			"192.170.0.0/15", "192.172.0.0/14", "192.176.0.0/12", "192.192.0.0/10",
-			"193.0.0.0/8", "194.0.0.0/7", "196.0.0.0/6", "200.0.0.0/5", "208.0.0.0/4",
-		)
-		val LAN_BYPASS_ALLOWED_IPS = listOf(IPV6_ALL_NETWORKS) + IPV4_PUBLIC_NETWORKS
-	}
+    companion object {
+        fun configFromWgQuick(wgQuick: String): Config {
+            val inputStream: InputStream = wgQuick.byteInputStream()
+            return inputStream.bufferedReader(StandardCharsets.UTF_8).use { Config.parse(it) }
+        }
+
+        fun configFromAmQuick(amQuick: String): org.amnezia.awg.config.Config {
+            val inputStream: InputStream = amQuick.byteInputStream()
+            return inputStream.bufferedReader(StandardCharsets.UTF_8).use {
+                org.amnezia.awg.config.Config.parse(it)
+            }
+        }
+
+        fun tunnelConfigFromAmConfig(
+            config: org.amnezia.awg.config.Config,
+            name: String? = null,
+        ): TunnelConf {
+            val amQuick = config.toAwgQuickString(true)
+            val wgQuick = config.toWgQuickString()
+            return TunnelConf(
+                tunName = name ?: config.defaultName(),
+                wgQuick = wgQuick,
+                amQuick = amQuick,
+            )
+        }
+
+        private const val IPV6_ALL_NETWORKS = "::/0"
+        private const val IPV4_ALL_NETWORKS = "0.0.0.0/0"
+        val ALL_IPS = listOf(IPV4_ALL_NETWORKS, IPV6_ALL_NETWORKS)
+        private val IPV4_PUBLIC_NETWORKS =
+            listOf(
+                "0.0.0.0/5",
+                "8.0.0.0/7",
+                "11.0.0.0/8",
+                "12.0.0.0/6",
+                "16.0.0.0/4",
+                "32.0.0.0/3",
+                "64.0.0.0/2",
+                "128.0.0.0/3",
+                "160.0.0.0/5",
+                "168.0.0.0/6",
+                "172.0.0.0/12",
+                "172.32.0.0/11",
+                "172.64.0.0/10",
+                "172.128.0.0/9",
+                "173.0.0.0/8",
+                "174.0.0.0/7",
+                "176.0.0.0/4",
+                "192.0.0.0/9",
+                "192.128.0.0/11",
+                "192.160.0.0/13",
+                "192.169.0.0/16",
+                "192.170.0.0/15",
+                "192.172.0.0/14",
+                "192.176.0.0/12",
+                "192.192.0.0/10",
+                "193.0.0.0/8",
+                "194.0.0.0/7",
+                "196.0.0.0/6",
+                "200.0.0.0/5",
+                "208.0.0.0/4",
+            )
+        val LAN_BYPASS_ALLOWED_IPS = listOf(IPV6_ALL_NETWORKS) + IPV4_PUBLIC_NETWORKS
+    }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/enums/BackendError.kt

@@ -1,7 +1,33 @@
 package com.zaneschepke.wireguardautotunnel.domain.enums
 
-sealed class BackendError() {
-	data object DNS : BackendError()
-	data object Unauthorized : BackendError()
-	data object Config : BackendError()
+import com.zaneschepke.wireguardautotunnel.R
+
+sealed class BackendError : Exception() {
+    data object DNS : BackendError()
+
+    data object Unauthorized : BackendError()
+
+    data object Config : BackendError()
+
+    data object KernelModuleName : BackendError()
+
+    data object InvalidConfig : BackendError()
+
+    data object NotAuthorized : BackendError()
+
+    data object ServiceNotRunning : BackendError()
+
+    data object Unknown : BackendError()
+
+    fun toStringRes() =
+        when (this) {
+            Config -> R.string.config_error
+            DNS -> R.string.dns_resolve_error
+            InvalidConfig -> R.string.invalid_config_error
+            KernelModuleName -> R.string.kernel_name_error
+            NotAuthorized,
+            Unauthorized -> R.string.auth_error
+            ServiceNotRunning -> R.string.service_running_error
+            Unknown -> R.string.unknown_error
+        }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/enums/BackendState.kt

@@ -1,7 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.domain.enums
 
 enum class BackendState {
-	KILL_SWITCH_ACTIVE,
-	SERVICE_ACTIVE,
-	INACTIVE,
+    KILL_SWITCH_ACTIVE,
+    SERVICE_ACTIVE,
+    INACTIVE,
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/enums/ConfigType.kt

@@ -1,6 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.domain.enums
 
 enum class ConfigType {
-	AMNEZIA,
-	WG,
+    AMNEZIA,
+    WG,
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/enums/HandshakeStatus.kt

@@ -1,17 +1,16 @@
 package com.zaneschepke.wireguardautotunnel.domain.enums
 
 enum class HandshakeStatus {
-	HEALTHY,
-	STALE,
-	UNKNOWN,
-	NOT_STARTED,
-	;
+    HEALTHY,
+    STALE,
+    UNKNOWN,
+    NOT_STARTED;
 
-	companion object {
-		private const val WG_TYPICAL_HANDSHAKE_INTERVAL_WHEN_HEALTHY_SEC = 180
-		const val STATUS_CHANGE_TIME_BUFFER = 30
-		const val STALE_TIME_LIMIT_SEC =
-			WG_TYPICAL_HANDSHAKE_INTERVAL_WHEN_HEALTHY_SEC + STATUS_CHANGE_TIME_BUFFER
-		const val NEVER_CONNECTED_TO_UNHEALTHY_TIME_LIMIT_SEC = 30
-	}
+    companion object {
+        private const val WG_TYPICAL_HANDSHAKE_INTERVAL_WHEN_HEALTHY_SEC = 180
+        const val STATUS_CHANGE_TIME_BUFFER = 30
+        const val STALE_TIME_LIMIT_SEC =
+            WG_TYPICAL_HANDSHAKE_INTERVAL_WHEN_HEALTHY_SEC + STATUS_CHANGE_TIME_BUFFER
+        const val NEVER_CONNECTED_TO_UNHEALTHY_TIME_LIMIT_SEC = 30
+    }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/enums/NotificationAction.kt

@@ -4,14 +4,13 @@ import android.content.Context
 import com.zaneschepke.wireguardautotunnel.R
 
 enum class NotificationAction {
-	TUNNEL_OFF,
-	AUTO_TUNNEL_OFF,
-	;
+    TUNNEL_OFF,
+    AUTO_TUNNEL_OFF;
 
-	fun title(context: Context): String {
-		return when (this) {
-			TUNNEL_OFF -> context.getString(R.string.stop)
-			AUTO_TUNNEL_OFF -> context.getString(R.string.stop)
-		}
-	}
+    fun title(context: Context): String {
+        return when (this) {
+            TUNNEL_OFF -> context.getString(R.string.stop)
+            AUTO_TUNNEL_OFF -> context.getString(R.string.stop)
+        }
+    }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/enums/TunnelStatus.kt

@@ -1,15 +1,35 @@
 package com.zaneschepke.wireguardautotunnel.domain.enums
 
-enum class TunnelStatus {
-	UP,
-	DOWN,
-	;
+sealed class TunnelStatus {
+    data class Error(val error: BackendError) : TunnelStatus()
 
-	fun isDown(): Boolean {
-		return this == DOWN
-	}
+    data object Up : TunnelStatus()
 
-	fun isUp(): Boolean {
-		return this == UP
-	}
+    data object Down : TunnelStatus()
+
+    data class Stopping(val reason: StopReason) : TunnelStatus()
+
+    data object Starting : TunnelStatus()
+
+    enum class StopReason {
+        USER,
+        PING,
+        CONFIG_CHANGED,
+    }
+
+    fun isDown(): Boolean {
+        return this == Down
+    }
+
+    fun isUp(): Boolean {
+        return this == Up
+    }
+
+    fun isUpOrStarting(): Boolean {
+        return this == Up || this == Starting
+    }
+
+    fun isDownOrStopping(): Boolean {
+        return this == Down || this is Stopping
+    }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/events/AutoTunnelEvent.kt

@@ -3,7 +3,9 @@ package com.zaneschepke.wireguardautotunnel.domain.events
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 
 sealed class AutoTunnelEvent {
-	data class Start(val tunnelConf: TunnelConf? = null) : AutoTunnelEvent()
-	data object Stop : AutoTunnelEvent()
-	data object DoNothing : AutoTunnelEvent()
+    data class Start(val tunnelConf: TunnelConf? = null) : AutoTunnelEvent()
+
+    data object Stop : AutoTunnelEvent()
+
+    data object DoNothing : AutoTunnelEvent()
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/events/KillSwitchEvent.kt

@@ -1,7 +1,9 @@
 package com.zaneschepke.wireguardautotunnel.domain.events
 
 sealed class KillSwitchEvent {
-	data class Start(val allowedIps: List<String>) : KillSwitchEvent()
-	data object Stop : KillSwitchEvent()
-	data object DoNothing : KillSwitchEvent()
+    data class Start(val allowedIps: List<String>) : KillSwitchEvent()
+
+    data object Stop : KillSwitchEvent()
+
+    data object DoNothing : KillSwitchEvent()
 }

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

@@ -3,11 +3,11 @@ package com.zaneschepke.wireguardautotunnel.domain.repository
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 
 interface AppDataRepository {
-	suspend fun getPrimaryOrFirstTunnel(): TunnelConf?
+    suspend fun getPrimaryOrFirstTunnel(): TunnelConf?
 
-	suspend fun getStartTunnelConfig(): TunnelConf?
+    suspend fun getStartTunnelConfig(): TunnelConf?
 
-	val settings: AppSettingRepository
-	val tunnels: TunnelRepository
-	val appState: AppStateRepository
+    val settings: AppSettingRepository
+    val tunnels: TunnelRepository
+    val appState: AppStateRepository
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/repository/AppSettingRepository.kt

@@ -4,7 +4,9 @@ import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
 import kotlinx.coroutines.flow.Flow
 
 interface AppSettingRepository {
-	suspend fun save(appSettings: AppSettings)
-	val flow: Flow<AppSettings>
-	suspend fun get(): AppSettings
+    suspend fun save(appSettings: AppSettings)
+
+    val flow: Flow<AppSettings>
+
+    suspend fun get(): AppSettings
 }

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

@@ -1,37 +1,45 @@
 package com.zaneschepke.wireguardautotunnel.domain.repository
 
-import com.zaneschepke.wireguardautotunnel.data.model.GeneralState
+import com.zaneschepke.wireguardautotunnel.domain.entity.AppState
 import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 import kotlinx.coroutines.flow.Flow
 
 interface AppStateRepository {
-	suspend fun isLocationDisclosureShown(): Boolean
+    suspend fun isLocationDisclosureShown(): Boolean
 
-	suspend fun setLocationDisclosureShown(shown: Boolean)
+    suspend fun setLocationDisclosureShown(shown: Boolean)
 
-	suspend fun isPinLockEnabled(): Boolean
+    suspend fun isPinLockEnabled(): Boolean
 
-	suspend fun setPinLockEnabled(enabled: Boolean)
+    suspend fun setPinLockEnabled(enabled: Boolean)
 
-	suspend fun isBatteryOptimizationDisableShown(): Boolean
+    suspend fun isBatteryOptimizationDisableShown(): Boolean
 
-	suspend fun setBatteryOptimizationDisableShown(shown: Boolean)
+    suspend fun setBatteryOptimizationDisableShown(shown: Boolean)
 
-	suspend fun isTunnelStatsExpanded(): Boolean
+    suspend fun isTunnelStatsExpanded(): Boolean
 
-	suspend fun setTunnelStatsExpanded(expanded: Boolean)
+    suspend fun setTunnelStatsExpanded(expanded: Boolean)
 
-	suspend fun setTheme(theme: Theme)
+    suspend fun setTheme(theme: Theme)
 
-	suspend fun getTheme(): Theme
+    suspend fun getTheme(): Theme
 
-	suspend fun isLocalLogsEnabled(): Boolean
+    suspend fun isLocalLogsEnabled(): Boolean
 
-	suspend fun setLocalLogsEnabled(enabled: Boolean)
+    suspend fun setLocalLogsEnabled(enabled: Boolean)
 
-	suspend fun setLocale(localeTag: String)
+    suspend fun setLocale(localeTag: String)
 
-	suspend fun getLocale(): String?
+    suspend fun getLocale(): String?
 
-	val flow: Flow<GeneralState>
+    suspend fun setIsRemoteControlEnabled(enabled: Boolean)
+
+    suspend fun isRemoteControlEnabled(): Boolean
+
+    suspend fun setRemoteKey(key: String)
+
+    suspend fun getRemoteKey(): String?
+
+    val flow: Flow<AppState>
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/repository/TunnelRepository.kt

@@ -5,31 +5,33 @@ import com.zaneschepke.wireguardautotunnel.util.extensions.Tunnels
 import kotlinx.coroutines.flow.Flow
 
 interface TunnelRepository {
-	val flow: Flow<List<TunnelConf>>
+    val flow: Flow<List<TunnelConf>>
 
-	suspend fun getAll(): Tunnels
+    suspend fun getAll(): Tunnels
 
-	suspend fun save(tunnelConf: TunnelConf)
+    suspend fun save(tunnelConf: TunnelConf)
 
-	suspend fun updatePrimaryTunnel(tunnelConf: TunnelConf?)
+    suspend fun saveAll(tunnelConfList: List<TunnelConf>)
 
-	suspend fun updateMobileDataTunnel(tunnelConf: TunnelConf?)
+    suspend fun updatePrimaryTunnel(tunnelConf: TunnelConf?)
 
-	suspend fun updateEthernetTunnel(tunnelConf: TunnelConf?)
+    suspend fun updateMobileDataTunnel(tunnelConf: TunnelConf?)
 
-	suspend fun delete(tunnelConf: TunnelConf)
+    suspend fun updateEthernetTunnel(tunnelConf: TunnelConf?)
 
-	suspend fun getById(id: Int): TunnelConf?
+    suspend fun delete(tunnelConf: TunnelConf)
 
-	suspend fun getActive(): Tunnels
+    suspend fun getById(id: Int): TunnelConf?
 
-	suspend fun count(): Int
+    suspend fun getActive(): Tunnels
 
-	suspend fun findByTunnelName(name: String): TunnelConf?
+    suspend fun count(): Int
 
-	suspend fun findByTunnelNetworksName(name: String): Tunnels
+    suspend fun findByTunnelName(name: String): TunnelConf?
 
-	suspend fun findByMobileDataTunnel(): Tunnels
+    suspend fun findByTunnelNetworksName(name: String): Tunnels
 
-	suspend fun findPrimary(): Tunnels
+    suspend fun findByMobileDataTunnel(): Tunnels
+
+    suspend fun findPrimary(): Tunnels
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/state/AmneziaStatistics.kt

@@ -4,31 +4,31 @@ import org.amnezia.awg.backend.Statistics
 import org.amnezia.awg.crypto.Key
 
 class AmneziaStatistics(private val statistics: Statistics) : TunnelStatistics() {
-	override fun peerStats(peer: Key): PeerStats? {
-		val key = Key.fromBase64(peer.toBase64())
-		val stats = statistics.peer(key)
-		return stats?.let {
-			PeerStats(
-				rxBytes = stats.rxBytes,
-				txBytes = stats.txBytes,
-				latestHandshakeEpochMillis = stats.latestHandshakeEpochMillis,
-			)
-		}
-	}
+    override fun peerStats(peer: Key): PeerStats? {
+        val key = Key.fromBase64(peer.toBase64())
+        val stats = statistics.peer(key)
+        return stats?.let {
+            PeerStats(
+                rxBytes = stats.rxBytes,
+                txBytes = stats.txBytes,
+                latestHandshakeEpochMillis = stats.latestHandshakeEpochMillis,
+            )
+        }
+    }
 
-	override fun isTunnelStale(): Boolean {
-		return statistics.isStale
-	}
+    override fun isTunnelStale(): Boolean {
+        return statistics.isStale
+    }
 
-	override fun getPeers(): Array<Key> {
-		return statistics.peers()
-	}
+    override fun getPeers(): Array<Key> {
+        return statistics.peers()
+    }
 
-	override fun rx(): Long {
-		return statistics.totalRx()
-	}
+    override fun rx(): Long {
+        return statistics.totalRx()
+    }
 
-	override fun tx(): Long {
-		return statistics.totalTx()
-	}
+    override fun tx(): Long {
+        return statistics.totalTx()
+    }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/state/AutoTunnelState.kt

@@ -1,156 +1,198 @@
 package com.zaneschepke.wireguardautotunnel.domain.state
 
-import com.zaneschepke.wireguardautotunnel.domain.events.KillSwitchEvent
+import com.zaneschepke.wireguardautotunnel.core.tunnel.allDown
+import com.zaneschepke.wireguardautotunnel.core.tunnel.hasActive
+import com.zaneschepke.wireguardautotunnel.core.tunnel.isUp
 import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
 import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
+import com.zaneschepke.wireguardautotunnel.domain.events.KillSwitchEvent
 import com.zaneschepke.wireguardautotunnel.util.extensions.isMatchingToWildcardList
 
 data class AutoTunnelState(
-	val activeTunnels: Map<Int, TunnelState> = emptyMap(),
-	val networkState: NetworkState = NetworkState(),
-	val settings: AppSettings = AppSettings(),
-	val tunnels: List<TunnelConf> = emptyList(),
+    val activeTunnels: Map<TunnelConf, TunnelState> = emptyMap(),
+    val networkState: NetworkState = NetworkState(),
+    val settings: AppSettings = AppSettings(),
+    val tunnels: List<TunnelConf> = emptyList(),
 ) {
 
-	private fun isMobileDataActive(): Boolean {
-		return !networkState.isEthernetConnected && !networkState.isWifiConnected && networkState.isMobileDataConnected
-	}
+    private fun isMobileDataActive(): Boolean {
+        return !networkState.isEthernetConnected &&
+            !networkState.isWifiConnected &&
+            networkState.isMobileDataConnected
+    }
 
-	private fun isMobileTunnelDataChangeNeeded(): Boolean {
-		val preferredTunnel = preferredMobileDataTunnel()
-		return preferredTunnel != null &&
-			activeTunnels.isNotEmpty() && !activeTunnels.any { it.key == preferredTunnel.id }
-	}
+    private fun isMobileTunnelDataChangeNeeded(): Boolean {
+        val preferredTunnel = preferredMobileDataTunnel()
+        return preferredTunnel != null &&
+            activeTunnels.isNotEmpty() &&
+            !activeTunnels.isUp(preferredTunnel)
+    }
 
-	private fun isEthernetTunnelChangeNeeded(): Boolean {
-		val preferredTunnel = preferredEthernetTunnel()
-		return preferredTunnel != null && activeTunnels.isNotEmpty() && !activeTunnels.any { it.key == preferredTunnel.id }
-	}
+    private fun isEthernetTunnelChangeNeeded(): Boolean {
+        val preferredTunnel = preferredEthernetTunnel()
+        return preferredTunnel != null &&
+            activeTunnels.isNotEmpty() &&
+            !activeTunnels.isUp(preferredTunnel)
+    }
 
-	private fun preferredMobileDataTunnel(): TunnelConf? {
-		return tunnels.firstOrNull { it.isMobileDataTunnel } ?: tunnels.firstOrNull { it.isPrimaryTunnel }
-	}
+    private fun preferredMobileDataTunnel(): TunnelConf? {
+        return tunnels.firstOrNull { it.isMobileDataTunnel }
+            ?: tunnels.firstOrNull { it.isPrimaryTunnel }
+    }
 
-	private fun preferredEthernetTunnel(): TunnelConf? {
-		return tunnels.firstOrNull { it.isEthernetTunnel } ?: tunnels.firstOrNull { it.isPrimaryTunnel }
-	}
+    private fun preferredEthernetTunnel(): TunnelConf? {
+        return tunnels.firstOrNull { it.isEthernetTunnel }
+            ?: tunnels.firstOrNull { it.isPrimaryTunnel }
+    }
 
-	private fun preferredWifiTunnel(): TunnelConf? {
-		return getTunnelWithMatchingTunnelNetwork() ?: tunnels.firstOrNull { it.isPrimaryTunnel }
-	}
+    private fun preferredWifiTunnel(): TunnelConf? {
+        return getTunnelWithMatchingTunnelNetwork() ?: tunnels.firstOrNull { it.isPrimaryTunnel }
+    }
 
-	private fun isWifiActive(): Boolean {
-		return !networkState.isEthernetConnected && networkState.isWifiConnected
-	}
+    private fun isWifiActive(): Boolean {
+        return !networkState.isEthernetConnected && networkState.isWifiConnected
+    }
 
-	private fun startOnEthernet(): Boolean {
-		return networkState.isEthernetConnected && settings.isTunnelOnEthernetEnabled && activeTunnels.isEmpty()
-	}
+    private fun startOnEthernet(): Boolean {
+        return networkState.isEthernetConnected &&
+            settings.isTunnelOnEthernetEnabled &&
+            activeTunnels.allDown()
+    }
 
-	private fun stopOnEthernet(): Boolean {
-		return networkState.isEthernetConnected && !settings.isTunnelOnEthernetEnabled && activeTunnels.isNotEmpty()
-	}
+    private fun stopOnEthernet(): Boolean {
+        return networkState.isEthernetConnected &&
+            !settings.isTunnelOnEthernetEnabled &&
+            activeTunnels.hasActive()
+    }
 
-	// TODO test removed kill switch state check
-	private fun stopKillSwitchOnTrusted(): Boolean {
-		return networkState.isWifiConnected && settings.isVpnKillSwitchEnabled && settings.isDisableKillSwitchOnTrustedEnabled && isCurrentSSIDTrusted()
-	}
+    // TODO test removed kill switch state check
+    private fun stopKillSwitchOnTrusted(): Boolean {
+        return networkState.isWifiConnected &&
+            settings.isVpnKillSwitchEnabled &&
+            settings.isDisableKillSwitchOnTrustedEnabled &&
+            isCurrentSSIDTrusted()
+    }
 
-	// TODO test, removed kill switch state check
-	private fun startKillSwitch(): Boolean {
-		return settings.isVpnKillSwitchEnabled && (!settings.isDisableKillSwitchOnTrustedEnabled || !isCurrentSSIDTrusted())
-	}
+    // TODO test, removed kill switch state check
+    private fun startKillSwitch(): Boolean {
+        return settings.isVpnKillSwitchEnabled &&
+            (!settings.isDisableKillSwitchOnTrustedEnabled || !isCurrentSSIDTrusted())
+    }
 
-	private fun isNoConnectivity(): Boolean {
-		return !networkState.isEthernetConnected && !networkState.isWifiConnected && !networkState.isMobileDataConnected
-	}
+    private fun isNoConnectivity(): Boolean {
+        return !networkState.isEthernetConnected &&
+            !networkState.isWifiConnected &&
+            !networkState.isMobileDataConnected
+    }
 
-	private fun stopOnMobileData(): Boolean {
-		return isMobileDataActive() && !settings.isTunnelOnMobileDataEnabled && activeTunnels.isNotEmpty()
-	}
+    private fun stopOnMobileData(): Boolean {
+        return isMobileDataActive() &&
+            !settings.isTunnelOnMobileDataEnabled &&
+            activeTunnels.hasActive()
+    }
 
-	private fun startOnMobileData(): Boolean {
-		return isMobileDataActive() && settings.isTunnelOnMobileDataEnabled && activeTunnels.isEmpty()
-	}
+    private fun startOnMobileData(): Boolean {
+        return isMobileDataActive() &&
+            settings.isTunnelOnMobileDataEnabled &&
+            activeTunnels.allDown()
+    }
 
-	private fun changeOnMobileData(): Boolean {
-		return isMobileDataActive() && settings.isTunnelOnMobileDataEnabled && isMobileTunnelDataChangeNeeded()
-	}
+    private fun changeOnMobileData(): Boolean {
+        return isMobileDataActive() &&
+            settings.isTunnelOnMobileDataEnabled &&
+            isMobileTunnelDataChangeNeeded()
+    }
 
-	private fun changeOnEthernet(): Boolean {
-		return networkState.isEthernetConnected && settings.isTunnelOnEthernetEnabled && isEthernetTunnelChangeNeeded()
-	}
+    private fun changeOnEthernet(): Boolean {
+        return networkState.isEthernetConnected &&
+            settings.isTunnelOnEthernetEnabled &&
+            isEthernetTunnelChangeNeeded()
+    }
 
-	private fun stopOnWifi(): Boolean {
-		return isWifiActive() && !settings.isTunnelOnWifiEnabled && activeTunnels.isNotEmpty()
-	}
+    private fun stopOnWifi(): Boolean {
+        return isWifiActive() && !settings.isTunnelOnWifiEnabled && activeTunnels.hasActive()
+    }
 
-	private fun stopOnTrustedWifi(): Boolean {
-		return isWifiActive() && settings.isTunnelOnWifiEnabled && activeTunnels.isNotEmpty() && isCurrentSSIDTrusted()
-	}
+    private fun stopOnTrustedWifi(): Boolean {
+        return isWifiActive() &&
+            settings.isTunnelOnWifiEnabled &&
+            activeTunnels.hasActive() &&
+            isCurrentSSIDTrusted()
+    }
 
-	private fun startOnUntrustedWifi(): Boolean {
-		return isWifiActive() && settings.isTunnelOnWifiEnabled && activeTunnels.isEmpty() && !isCurrentSSIDTrusted()
-	}
+    private fun startOnUntrustedWifi(): Boolean {
+        return isWifiActive() &&
+            settings.isTunnelOnWifiEnabled &&
+            activeTunnels.allDown() &&
+            !isCurrentSSIDTrusted()
+    }
 
-	private fun changeOnUntrustedWifi(): Boolean {
-		return isWifiActive() && settings.isTunnelOnWifiEnabled && activeTunnels.isNotEmpty() && !isCurrentSSIDTrusted() && !isWifiTunnelPreferred()
-	}
+    private fun changeOnUntrustedWifi(): Boolean {
+        return isWifiActive() &&
+            settings.isTunnelOnWifiEnabled &&
+            activeTunnels.hasActive() &&
+            !isCurrentSSIDTrusted() &&
+            !isWifiTunnelPreferred()
+    }
 
-	private fun isWifiTunnelPreferred(): Boolean {
-		val preferred = preferredWifiTunnel()
-		return activeTunnels.any { it.key == preferred?.id }
-	}
+    private fun isWifiTunnelPreferred(): Boolean {
+        val preferred = preferredWifiTunnel()
+        return preferred?.let { activeTunnels.isUp(it) } ?: true
+    }
 
-	fun asAutoTunnelEvent(): AutoTunnelEvent {
-		return when {
-			// ethernet scenarios
-			stopOnEthernet() -> AutoTunnelEvent.Stop
-			startOnEthernet() || changeOnEthernet() -> AutoTunnelEvent.Start(preferredEthernetTunnel())
-			// mobile data scenarios
-			stopOnMobileData() -> AutoTunnelEvent.Stop
-			startOnMobileData() || changeOnMobileData() -> AutoTunnelEvent.Start(preferredMobileDataTunnel())
-			// wifi scenarios
-			stopOnWifi() -> AutoTunnelEvent.Stop
-			stopOnTrustedWifi() -> AutoTunnelEvent.Stop
-			startOnUntrustedWifi() || changeOnUntrustedWifi() -> AutoTunnelEvent.Start(preferredWifiTunnel())
-			// no connectivity
-			isNoConnectivity() && settings.isStopOnNoInternetEnabled -> AutoTunnelEvent.Stop
-			else -> AutoTunnelEvent.DoNothing
-		}
-	}
+    fun asAutoTunnelEvent(): AutoTunnelEvent {
+        return when {
+            // ethernet scenarios
+            stopOnEthernet() -> AutoTunnelEvent.Stop
+            startOnEthernet() || changeOnEthernet() ->
+                AutoTunnelEvent.Start(preferredEthernetTunnel())
+            // mobile data scenarios
+            stopOnMobileData() -> AutoTunnelEvent.Stop
+            startOnMobileData() || changeOnMobileData() ->
+                AutoTunnelEvent.Start(preferredMobileDataTunnel())
+            // wifi scenarios
+            stopOnWifi() -> AutoTunnelEvent.Stop
+            stopOnTrustedWifi() -> AutoTunnelEvent.Stop
+            startOnUntrustedWifi() || changeOnUntrustedWifi() ->
+                AutoTunnelEvent.Start(preferredWifiTunnel())
+            // no connectivity
+            isNoConnectivity() && settings.isStopOnNoInternetEnabled -> AutoTunnelEvent.Stop
+            else -> AutoTunnelEvent.DoNothing
+        }
+    }
 
-	fun asKillSwitchEvent(): KillSwitchEvent {
-		return when {
-			stopKillSwitchOnTrusted() -> KillSwitchEvent.Stop
-			startKillSwitch() -> {
-				val allowedIps = if (settings.isLanOnKillSwitchEnabled) TunnelConf.LAN_BYPASS_ALLOWED_IPS else emptyList()
-				KillSwitchEvent.Start(allowedIps)
-			}
-			else -> KillSwitchEvent.DoNothing
-		}
-	}
+    fun asKillSwitchEvent(): KillSwitchEvent {
+        return when {
+            stopKillSwitchOnTrusted() -> KillSwitchEvent.Stop
+            startKillSwitch() -> {
+                val allowedIps =
+                    if (settings.isLanOnKillSwitchEnabled) TunnelConf.LAN_BYPASS_ALLOWED_IPS
+                    else emptyList()
+                KillSwitchEvent.Start(allowedIps)
+            }
+            else -> KillSwitchEvent.DoNothing
+        }
+    }
 
-	private fun isCurrentSSIDTrusted(): Boolean {
-		return networkState.wifiName?.let {
-			hasTrustedWifiName(it)
-		} == true
-	}
+    private fun isCurrentSSIDTrusted(): Boolean {
+        return networkState.wifiName?.let { hasTrustedWifiName(it) } == true
+    }
 
-	private fun hasTrustedWifiName(wifiName: String, wifiNames: List<String> = settings.trustedNetworkSSIDs): Boolean {
-		return if (settings.isWildcardsEnabled) {
-			wifiNames.isMatchingToWildcardList(wifiName)
-		} else {
-			wifiNames.contains(wifiName)
-		}
-	}
+    private fun hasTrustedWifiName(
+        wifiName: String,
+        wifiNames: List<String> = settings.trustedNetworkSSIDs,
+    ): Boolean {
+        return if (settings.isWildcardsEnabled) {
+            wifiNames.isMatchingToWildcardList(wifiName)
+        } else {
+            wifiNames.contains(wifiName)
+        }
+    }
 
-	private fun getTunnelWithMatchingTunnelNetwork(): TunnelConf? {
-		return networkState.wifiName?.let { wifiName ->
-			tunnels.firstOrNull {
-				hasTrustedWifiName(wifiName, it.tunnelNetworks)
-			}
-		}
-	}
+    private fun getTunnelWithMatchingTunnelNetwork(): TunnelConf? {
+        return networkState.wifiName?.let { wifiName ->
+            tunnels.firstOrNull { hasTrustedWifiName(wifiName, it.tunnelNetworks) }
+        }
+    }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/state/ConnectivityState.kt

@@ -1,9 +1,9 @@
 package com.zaneschepke.wireguardautotunnel.domain.state
 
 data class ConnectivityState(
-	val wifiAvailable: Boolean,
-	val ethernetAvailable: Boolean,
-	val cellularAvailable: Boolean,
+    val wifiAvailable: Boolean,
+    val ethernetAvailable: Boolean,
+    val cellularAvailable: Boolean,
 ) {
-	val allOffline = !wifiAvailable && !ethernetAvailable && !cellularAvailable
+    val allOffline = !wifiAvailable && !ethernetAvailable && !cellularAvailable
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/state/NetworkState.kt

@@ -1,12 +1,12 @@
 package com.zaneschepke.wireguardautotunnel.domain.state
 
 data class NetworkState(
-	val isWifiConnected: Boolean = false,
-	val isMobileDataConnected: Boolean = false,
-	val isEthernetConnected: Boolean = false,
-	val wifiName: String? = null,
+    val isWifiConnected: Boolean = false,
+    val isMobileDataConnected: Boolean = false,
+    val isEthernetConnected: Boolean = false,
+    val wifiName: String? = null,
 ) {
-	fun hasNoCapabilities(): Boolean {
-		return !isWifiConnected && !isMobileDataConnected && !isEthernetConnected
-	}
+    fun hasNoCapabilities(): Boolean {
+        return !isWifiConnected && !isMobileDataConnected && !isEthernetConnected
+    }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/state/TunnelState.kt

@@ -4,7 +4,7 @@ import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 
 data class TunnelState(
-	val state: TunnelStatus = TunnelStatus.DOWN,
-	val backendState: BackendState = BackendState.INACTIVE,
-	val statistics: TunnelStatistics? = null,
+    val status: TunnelStatus = TunnelStatus.Down,
+    val backendState: BackendState = BackendState.INACTIVE,
+    val statistics: TunnelStatistics? = null,
 )

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/state/TunnelStatistics.kt

@@ -3,16 +3,20 @@ package com.zaneschepke.wireguardautotunnel.domain.state
 import org.amnezia.awg.crypto.Key
 
 abstract class TunnelStatistics {
-	@JvmRecord
-	data class PeerStats(val rxBytes: Long, val txBytes: Long, val latestHandshakeEpochMillis: Long)
+    @JvmRecord
+    data class PeerStats(
+        val rxBytes: Long,
+        val txBytes: Long,
+        val latestHandshakeEpochMillis: Long,
+    )
 
-	abstract fun peerStats(peer: Key): PeerStats?
+    abstract fun peerStats(peer: Key): PeerStats?
 
-	abstract fun isTunnelStale(): Boolean
+    abstract fun isTunnelStale(): Boolean
 
-	abstract fun getPeers(): Array<Key>
+    abstract fun getPeers(): Array<Key>
 
-	abstract fun rx(): Long
+    abstract fun rx(): Long
 
-	abstract fun tx(): Long
+    abstract fun tx(): Long
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/state/WireGuardStatistics.kt

@@ -4,33 +4,31 @@ import com.wireguard.android.backend.Statistics
 import org.amnezia.awg.crypto.Key
 
 class WireGuardStatistics(private val statistics: Statistics) : TunnelStatistics() {
-	override fun peerStats(peer: Key): PeerStats? {
-		val key = com.wireguard.crypto.Key.fromBase64(peer.toBase64())
-		val peerStats = statistics.peer(key)
-		return peerStats?.let {
-			PeerStats(
-				txBytes = peerStats.txBytes,
-				rxBytes = peerStats.rxBytes,
-				latestHandshakeEpochMillis = peerStats.latestHandshakeEpochMillis,
-			)
-		}
-	}
+    override fun peerStats(peer: Key): PeerStats? {
+        val key = com.wireguard.crypto.Key.fromBase64(peer.toBase64())
+        val peerStats = statistics.peer(key)
+        return peerStats?.let {
+            PeerStats(
+                txBytes = peerStats.txBytes,
+                rxBytes = peerStats.rxBytes,
+                latestHandshakeEpochMillis = peerStats.latestHandshakeEpochMillis,
+            )
+        }
+    }
 
-	override fun isTunnelStale(): Boolean {
-		return statistics.isStale
-	}
+    override fun isTunnelStale(): Boolean {
+        return statistics.isStale
+    }
 
-	override fun getPeers(): Array<Key> {
-		return statistics.peers().map {
-			Key.fromBase64(it.toBase64())
-		}.toTypedArray()
-	}
+    override fun getPeers(): Array<Key> {
+        return statistics.peers().map { Key.fromBase64(it.toBase64()) }.toTypedArray()
+    }
 
-	override fun rx(): Long {
-		return statistics.totalRx()
-	}
+    override fun rx(): Long {
+        return statistics.totalRx()
+    }
 
-	override fun tx(): Long {
-		return statistics.totalTx()
-	}
+    override fun tx(): Long {
+        return statistics.totalTx()
+    }
 }

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

@@ -3,62 +3,44 @@ package com.zaneschepke.wireguardautotunnel.ui
 import kotlinx.serialization.Serializable
 
 sealed class Route {
-	@Serializable
-	data object Support : Route()
+    @Serializable data object Support : Route()
 
-	@Serializable
-	data object Settings : Route()
+    @Serializable data object Settings : Route()
 
-	@Serializable
-	data object AutoTunnel : Route()
+    @Serializable data object SettingsAdvanced : Route()
 
-	@Serializable
-	data object AutoTunnelAdvanced : Route()
+    @Serializable data object AutoTunnel : Route()
 
-	@Serializable
-	data object LocationDisclosure : Route()
+    @Serializable data object AutoTunnelAdvanced : Route()
 
-	@Serializable
-	data object Appearance : Route()
+    @Serializable data object LocationDisclosure : Route()
 
-	@Serializable
-	data object Display : Route()
+    @Serializable data object Appearance : Route()
 
-	@Serializable
-	data object KillSwitch : Route()
+    @Serializable data object Display : Route()
 
-	@Serializable
-	data object Language : Route()
+    @Serializable data object KillSwitch : Route()
 
-	@Serializable
-	data object Main : Route()
+    @Serializable data object Language : Route()
 
-	@Serializable
-	data class TunnelOptions(
-		val id: Int,
-	) : Route()
+    @Serializable data object Main : Route()
 
-	@Serializable
-	data object Lock : Route()
+    @Serializable data class TunnelOptions(val id: Int) : Route()
 
-	@Serializable
-	data object Scanner : Route()
+    @Serializable data object Lock : Route()
 
-	@Serializable
-	data class Config(
-		val id: Int,
-	) : Route()
+    @Serializable data object Scanner : Route()
 
-	@Serializable
-	data class SplitTunnel(
-		val id: Int,
-	) : Route()
+    @Serializable data class Config(val id: Int) : Route()
 
-	@Serializable
-	data class TunnelAutoTunnel(
-		val id: Int,
-	) : Route()
+    @Serializable
+    data class SplitTunnel(val id: Int) : Route() {
+        companion object {
+            const val KEY_ID = "id"
+        }
+    }
 
-	@Serializable
-	data object Logs : Route()
+    @Serializable data class TunnelAutoTunnel(val id: Int) : Route()
+
+    @Serializable data object Logs : Route()
 }

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

@@ -1,37 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common
-
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.size
-import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-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) {
-	TextButton(
-		onClick = onClick,
-		enabled = enabled,
-	) {
-		Text(text, Modifier.weight(1f, false), style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.primary)
-		Spacer(modifier = Modifier.size(ButtonDefaults.IconSpacing))
-		Icon(
-			imageVector = icon,
-			contentDescription = icon.name,
-			modifier =
-			Modifier
-				.size(ButtonDefaults.IconSize)
-				.weight(1f, false)
-				.clickable {
-					if (enabled) {
-						onIconClick()
-					}
-				},
-		)
-	}
-}

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

@@ -0,0 +1,56 @@
+package com.zaneschepke.wireguardautotunnel.ui.common
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowDropDown
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.Icon
+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
+
+@Composable
+fun <T> DropdownSelector(
+    currentValue: T,
+    options: List<T>,
+    onValueSelected: (T) -> Unit,
+    modifier: Modifier = Modifier,
+    label: @Composable (() -> Unit)? = null,
+    isExpanded: Boolean = false,
+    onDismiss: () -> Unit = {},
+) {
+    Row(
+        horizontalArrangement = Arrangement.spacedBy(5.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        if (label != null) label()
+        Text(text = currentValue.toString(), style = MaterialTheme.typography.bodyMedium)
+        Icon(Icons.Default.ArrowDropDown, contentDescription = stringResource(R.string.dropdown))
+    }
+    DropdownMenu(
+        modifier = modifier.height(250.dp),
+        scrollState = rememberScrollState(),
+        containerColor = MaterialTheme.colorScheme.surface,
+        expanded = isExpanded,
+        onDismissRequest = onDismiss,
+    ) {
+        options.forEach { option ->
+            DropdownMenuItem(
+                text = { Text(text = option.toString()) },
+                onClick = {
+                    onValueSelected(option)
+                    onDismiss() // Close dropdown after selection
+                },
+            )
+        }
+    }
+}

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

@@ -22,50 +22,43 @@ 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 = {},
+    leading: @Composable () -> Unit,
+    text: String,
+    onHold: () -> Unit = {},
+    onClick: () -> Unit,
+    trailing: @Composable () -> Unit,
+    isExpanded: Boolean,
+    expanded: @Composable () -> Unit = {},
 ) {
-	Box(
-		modifier =
-		Modifier
-			.animateContentSize()
-			.clip(RoundedCornerShape(30.dp))
-			.combinedClickable(
-				onClick = { onClick() },
-				onLongClick = { onHold() },
-			),
-	) {
-		Column {
-			Row(
-				modifier =
-				Modifier
-					.fillMaxWidth()
-					.padding(horizontal = 15.dp),
-				verticalAlignment = Alignment.CenterVertically,
-				horizontalArrangement = Arrangement.SpaceBetween,
-			) {
-				Row(
-					verticalAlignment = Alignment.CenterVertically,
-					horizontalArrangement = Arrangement.spacedBy(15.dp),
-					modifier = Modifier.fillMaxWidth(13 / 20f),
-				) {
-					leading()
-					Text(
-						text,
-						maxLines = 1,
-						overflow = TextOverflow.Ellipsis,
-						style = MaterialTheme.typography.labelLarge,
-						color = MaterialTheme.colorScheme.onBackground,
-					)
-				}
-				trailing()
-			}
-			if (isExpanded) expanded()
-		}
-	}
+    Box(
+        modifier =
+            Modifier.animateContentSize()
+                .clip(RoundedCornerShape(8.dp))
+                .combinedClickable(onClick = { onClick() }, onLongClick = { onHold() })
+    ) {
+        Column {
+            Row(
+                modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.SpaceBetween,
+            ) {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.spacedBy(16.dp),
+                    modifier = Modifier.fillMaxWidth(13 / 20f),
+                ) {
+                    leading()
+                    Text(
+                        text,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                        style = MaterialTheme.typography.labelLarge,
+                        color = MaterialTheme.colorScheme.onBackground,
+                    )
+                }
+                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/SearchBar.kt

@@ -1,82 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.Clear
-import androidx.compose.material.icons.rounded.Search
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextField
-import androidx.compose.material3.TextFieldDefaults
-import androidx.compose.runtime.Composable
-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.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.RectangleShape
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.input.KeyboardType
-import com.zaneschepke.wireguardautotunnel.R
-
-@Composable
-fun SearchBar(onQuery: (queryString: String) -> Unit) {
-	// Immediately update and keep track of query from text field changes.
-	var query: String by rememberSaveable { mutableStateOf("") }
-	var showClearIcon by rememberSaveable { mutableStateOf(false) }
-
-	if (query.isEmpty()) {
-		showClearIcon = false
-	} else if (query.isNotEmpty()) {
-		showClearIcon = true
-	}
-
-	TextField(
-		value = query,
-		onValueChange = { onQueryChanged ->
-			// If user makes changes to text, immediately updated it.
-			query = onQueryChanged
-			onQuery(onQueryChanged)
-		},
-		leadingIcon = {
-			val icon = Icons.Rounded.Search
-			Icon(
-				imageVector = icon,
-				tint = MaterialTheme.colorScheme.onBackground,
-				contentDescription = icon.name,
-			)
-		},
-		trailingIcon = {
-			if (showClearIcon) {
-				IconButton(onClick = { query = "" }) {
-					val icon = Icons.Rounded.Clear
-					Icon(
-						imageVector = icon,
-						tint = MaterialTheme.colorScheme.onBackground,
-						contentDescription = icon.name,
-					)
-				}
-			}
-		},
-		maxLines = 1,
-		colors =
-		TextFieldDefaults.colors(
-			focusedContainerColor = Color.Transparent,
-			unfocusedContainerColor = Color.Transparent,
-			disabledContainerColor = Color.Transparent,
-		),
-		placeholder = { Text(text = stringResource(R.string.hint_search_packages)) },
-		textStyle = MaterialTheme.typography.bodySmall,
-		singleLine = true,
-		keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Text),
-		modifier =
-		Modifier
-			.fillMaxWidth()
-			.background(color = MaterialTheme.colorScheme.background, shape = RectangleShape),
-	)
-}

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

@@ -0,0 +1,38 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.animation
+
+import androidx.compose.animation.core.LinearEasing
+import androidx.compose.animation.core.animateFloat
+import androidx.compose.animation.core.infiniteRepeatable
+import androidx.compose.animation.core.rememberInfiniteTransition
+import androidx.compose.animation.core.tween
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+
+@Composable
+fun ShimmerEffect(modifier: Modifier = Modifier): Brush {
+    val shimmerColors =
+        listOf(
+            Color.LightGray.copy(alpha = 0.9f),
+            Color.LightGray.copy(alpha = 0.3f),
+            Color.LightGray.copy(alpha = 0.9f),
+        )
+
+    val transition = rememberInfiniteTransition()
+    val translateAnim by
+        transition.animateFloat(
+            initialValue = 0f,
+            targetValue = 1000f,
+            animationSpec =
+                infiniteRepeatable(animation = tween(durationMillis = 1200, easing = LinearEasing)),
+        )
+
+    return Brush.linearGradient(
+        colors = shimmerColors,
+        start = Offset(0f, 0f),
+        end = Offset(translateAnim, translateAnim),
+    )
+}

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

@@ -0,0 +1,42 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.button
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+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,
+) {
+    TextButton(onClick = onClick, enabled = enabled) {
+        Text(
+            text,
+            Modifier.weight(1f, false),
+            style = MaterialTheme.typography.bodySmall,
+            color = MaterialTheme.colorScheme.primary,
+        )
+        Spacer(modifier = Modifier.size(ButtonDefaults.IconSpacing))
+        Icon(
+            imageVector = icon,
+            contentDescription = icon.name,
+            modifier =
+                Modifier.size(ButtonDefaults.IconSize).weight(1f, false).clickable {
+                    if (enabled) {
+                        onIconClick()
+                    }
+                },
+        )
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.settings.components
+package com.zaneschepke.wireguardautotunnel.ui.common.button
 
 import androidx.compose.foundation.focusable
 import androidx.compose.foundation.layout.size
@@ -12,11 +12,8 @@ import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
 
 @Composable
 fun ForwardButton(modifier: Modifier = Modifier.focusable(), onClick: () -> Unit) {
-	IconButton(
-		modifier = modifier,
-		onClick = onClick,
-	) {
-		val icon = Icons.AutoMirrored.Outlined.ArrowForward
-		Icon(icon, icon.name, Modifier.size(iconSize))
-	}
+    IconButton(modifier = modifier, onClick = onClick) {
+        val icon = Icons.AutoMirrored.Outlined.ArrowForward
+        Icon(icon, icon.name, Modifier.size(iconSize))
+    }
 }

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

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

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

@@ -7,22 +7,28 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.scale
 import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
 
 @Composable
-fun ScaledSwitch(checked: Boolean, onClick: (checked: Boolean) -> Unit, enabled: Boolean = true, modifier: Modifier = Modifier) {
-	Switch(
-		checked,
-		{ onClick(it) },
-		modifier.scale((52.dp.scaledHeight() / 52.dp)),
-		enabled = enabled,
-		colors = SwitchDefaults.colors().copy(
-			checkedThumbColor = MaterialTheme.colorScheme.background,
-			checkedIconColor = MaterialTheme.colorScheme.background,
-			uncheckedTrackColor = MaterialTheme.colorScheme.surface,
-			uncheckedBorderColor = MaterialTheme.colorScheme.outline,
-			uncheckedThumbColor = MaterialTheme.colorScheme.outline,
-			uncheckedIconColor = MaterialTheme.colorScheme.outline,
-		),
-	)
+fun ScaledSwitch(
+    checked: Boolean,
+    onClick: (checked: Boolean) -> Unit,
+    enabled: Boolean = true,
+    modifier: Modifier = Modifier,
+) {
+    Switch(
+        checked,
+        { onClick(it) },
+        modifier.scale((52.dp / 52.dp)),
+        enabled = enabled,
+        colors =
+            SwitchDefaults.colors()
+                .copy(
+                    checkedThumbColor = MaterialTheme.colorScheme.background,
+                    checkedIconColor = MaterialTheme.colorScheme.background,
+                    uncheckedTrackColor = MaterialTheme.colorScheme.surface,
+                    uncheckedBorderColor = MaterialTheme.colorScheme.outline,
+                    uncheckedThumbColor = MaterialTheme.colorScheme.outline,
+                    uncheckedIconColor = MaterialTheme.colorScheme.outline,
+                ),
+    )
 }

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

@@ -19,55 +19,46 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledHeight
-import com.zaneschepke.wireguardautotunnel.util.extensions.scaledWidth
 
 @Composable
 fun SelectionItemButton(
-	leading: (@Composable () -> Unit)? = null,
-	buttonText: String,
-	trailing: (@Composable () -> Unit)? = null,
-	onClick: () -> Unit,
-	ripple: Boolean = true,
+    leading: (@Composable () -> Unit)? = null,
+    buttonText: String,
+    trailing: (@Composable () -> Unit)? = null,
+    onClick: () -> Unit,
+    ripple: Boolean = true,
+    modifier: Modifier = Modifier,
 ) {
-	Card(
-		modifier =
-		Modifier
-			.clip(RoundedCornerShape(8.dp))
-			.clickable(
-				indication = if (ripple) ripple() else null,
-				interactionSource = remember { MutableInteractionSource() },
-				onClick = { onClick() },
-			)
-			.height(56.dp.scaledHeight()),
-		colors =
-		CardDefaults.cardColors(
-			containerColor = MaterialTheme.colorScheme.background,
-		),
-	) {
-		Row(
-			verticalAlignment = Alignment.CenterVertically,
-			horizontalArrangement = Arrangement.Start,
-			modifier = Modifier
-				.fillMaxSize()
-				.padding(end = 10.dp.scaledWidth()),
-		) {
-			leading?.let {
-				it()
-			}
-			Text(
-				buttonText,
-				style = MaterialTheme.typography.labelMedium,
-				color = MaterialTheme.colorScheme.onSurface,
-				modifier = Modifier.fillMaxWidth(3 / 4f),
-				maxLines = 2,
-				overflow = TextOverflow.Ellipsis,
-			)
-			trailing?.let {
-				it()
-			}
-		}
-	}
+    Card(
+        modifier =
+            modifier
+                .clip(RoundedCornerShape(8.dp))
+                .clickable(
+                    indication = if (ripple) ripple() else null,
+                    interactionSource = remember { MutableInteractionSource() },
+                    onClick = { onClick() },
+                )
+                .height(56.dp),
+        colors = CardDefaults.cardColors(containerColor = Color.Transparent),
+    ) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.Start,
+            modifier = Modifier.fillMaxSize().padding(horizontal = 12.dp),
+        ) {
+            leading?.let { it() }
+            Text(
+                buttonText,
+                style = MaterialTheme.typography.labelMedium,
+                color = MaterialTheme.colorScheme.onSurface,
+                modifier = Modifier.fillMaxWidth(3 / 4f),
+                maxLines = 2,
+                overflow = TextOverflow.Ellipsis,
+            )
+            trailing?.let { it() }
+        }
+    }
 }

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

@@ -4,10 +4,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.vector.ImageVector
 
 data class SelectionItem(
-	val leadingIcon: ImageVector? = null,
-	val trailing: (@Composable () -> Unit)? = null,
-	val title: (@Composable () -> Unit),
-	val description: (@Composable () -> Unit)? = null,
-	val onClick: (() -> Unit)? = null,
-	val height: Int = 64,
+    val leadingIcon: ImageVector? = null,
+    val trailing: (@Composable () -> Unit)? = null,
+    val title: (@Composable () -> Unit),
+    val description: (@Composable () -> Unit)? = null,
+    val onClick: (() -> Unit)? = null,
+    val height: Int = 64,
 )

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

@@ -0,0 +1,23 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.button.surface
+
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+
+@Composable
+fun SelectionItemLabel(
+    textResId: Int,
+    style: androidx.compose.ui.text.TextStyle = MaterialTheme.typography.bodyMedium,
+    isDescription: Boolean = false,
+) {
+    Text(
+        text = stringResource(textResId),
+        style =
+            style.copy(
+                color =
+                    if (isDescription) MaterialTheme.colorScheme.outline
+                    else MaterialTheme.colorScheme.onSurface
+            ),
+    )
+}

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

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

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

@@ -13,33 +13,43 @@ import androidx.compose.ui.text.input.KeyboardCapitalization
 
 @Composable
 fun ConfigurationTextBox(
-	value: String,
-	hint: String,
-	onValueChange: (String) -> Unit,
-	keyboardActions: KeyboardActions = KeyboardActions(),
-	label: String,
-	modifier: Modifier,
-	isError: Boolean = false,
-	keyboardOptions: KeyboardOptions = KeyboardOptions(
-		capitalization = KeyboardCapitalization.None,
-		imeAction = ImeAction.Done,
-	),
-	trailing: (@Composable () -> Unit)? = null,
-	interactionSource: MutableInteractionSource? = null,
+    value: String,
+    hint: String,
+    onValueChange: (String) -> Unit,
+    keyboardActions: KeyboardActions = KeyboardActions(),
+    label: String,
+    modifier: Modifier,
+    isError: Boolean = false,
+    keyboardOptions: KeyboardOptions =
+        KeyboardOptions(capitalization = KeyboardCapitalization.None, imeAction = ImeAction.Done),
+    trailing: (@Composable () -> Unit)? = null,
+    interactionSource: MutableInteractionSource? = null,
 ) {
-	OutlinedTextField(
-		isError = isError,
-		textStyle = MaterialTheme.typography.labelLarge,
-		modifier = modifier,
-		value = value,
-		singleLine = true,
-		interactionSource = interactionSource,
-		onValueChange = { onValueChange(it) },
-		label = { Text(label, color = MaterialTheme.colorScheme.onSurface, style = MaterialTheme.typography.labelMedium) },
-		maxLines = 1,
-		placeholder = { Text(hint, color = MaterialTheme.colorScheme.outline, style = MaterialTheme.typography.labelLarge) },
-		keyboardOptions = keyboardOptions,
-		keyboardActions = keyboardActions,
-		trailingIcon = trailing,
-	)
+    OutlinedTextField(
+        isError = isError,
+        textStyle = MaterialTheme.typography.labelLarge,
+        modifier = modifier,
+        value = value,
+        singleLine = true,
+        interactionSource = interactionSource,
+        onValueChange = { onValueChange(it) },
+        label = {
+            Text(
+                label,
+                color = MaterialTheme.colorScheme.onSurface,
+                style = MaterialTheme.typography.bodyMedium,
+            )
+        },
+        maxLines = 1,
+        placeholder = {
+            Text(
+                hint,
+                color = MaterialTheme.colorScheme.outline,
+                style = MaterialTheme.typography.bodyMedium,
+            )
+        },
+        keyboardOptions = keyboardOptions,
+        keyboardActions = keyboardActions,
+        trailingIcon = trailing,
+    )
 }

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

@@ -13,36 +13,29 @@ import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
 
 @Composable
 fun ConfigurationToggle(
-	label: String,
-	enabled: Boolean = true,
-	checked: Boolean,
-	onCheckChanged: (checked: Boolean) -> Unit,
-	modifier: Modifier = Modifier,
+    label: String,
+    enabled: Boolean = true,
+    checked: Boolean,
+    onCheckChanged: (checked: Boolean) -> Unit,
+    modifier: Modifier = Modifier,
 ) {
-	Row(
-		modifier =
-		Modifier
-			.fillMaxWidth(),
-		verticalAlignment = Alignment.CenterVertically,
-		horizontalArrangement = Arrangement.SpaceBetween,
-	) {
-		Text(
-			label,
-			textAlign = TextAlign.Start,
-			style = MaterialTheme.typography.labelLarge,
-			modifier =
-			Modifier
-				.weight(
-					weight = 1.0f,
-					fill = false,
-				),
-			softWrap = true,
-		)
-		ScaledSwitch(
-			modifier = modifier,
-			enabled = enabled,
-			checked = checked,
-			onClick = { onCheckChanged(it) },
-		)
-	}
+    Row(
+        modifier = Modifier.fillMaxWidth(),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.SpaceBetween,
+    ) {
+        Text(
+            label,
+            textAlign = TextAlign.Start,
+            style = MaterialTheme.typography.labelLarge,
+            modifier = Modifier.weight(weight = 1.0f, fill = false),
+            softWrap = true,
+        )
+        ScaledSwitch(
+            modifier = modifier,
+            enabled = enabled,
+            checked = checked,
+            onClick = { onCheckChanged(it) },
+        )
+    }
 }

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

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

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

@@ -1,37 +1,39 @@
 package com.zaneschepke.wireguardautotunnel.ui.common.dialog
 
 import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.window.DialogProperties
 import com.zaneschepke.wireguardautotunnel.R
 
 @Composable
 fun InfoDialog(
-	onAttest: () -> Unit,
-	onDismiss: () -> Unit,
-	title: @Composable () -> Unit,
-	body: @Composable () -> Unit,
-	confirmText: @Composable () -> Unit,
+    onAttest: () -> Unit,
+    onDismiss: () -> Unit,
+    title: @Composable () -> Unit,
+    body: @Composable () -> Unit,
+    confirmText: @Composable () -> Unit,
 ) {
-	AlertDialog(
-		onDismissRequest = { onDismiss() },
-		confirmButton = {
-			TextButton(
-				onClick = {
-					onAttest()
-				},
-			) {
-				confirmText()
-			}
-		},
-		dismissButton = {
-			TextButton(onClick = { onDismiss() }) {
-				Text(text = stringResource(R.string.cancel))
-			}
-		},
-		title = { title() },
-		text = { body() },
-	)
+    MaterialTheme(colorScheme = MaterialTheme.colorScheme.copy()) {
+        Surface(color = MaterialTheme.colorScheme.surface, tonalElevation = 0.dp) {
+            AlertDialog(
+                onDismissRequest = { onDismiss() },
+                confirmButton = { TextButton(onClick = { onAttest() }) { confirmText() } },
+                dismissButton = {
+                    TextButton(onClick = { onDismiss() }) {
+                        Text(text = stringResource(R.string.cancel))
+                    }
+                },
+                containerColor = MaterialTheme.colorScheme.surface,
+                title = { title() },
+                text = { body() },
+                properties = DialogProperties(usePlatformDefaultWidth = true),
+            )
+        }
+    }
 }