start sticky

.editorconfig

@@ -0,0 +1,97 @@
+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/on-issue.yml

@@ -17,20 +17,4 @@ jobs:
             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=${{ vars.TELEGRAM_ACTIVITY_TOPIC }}"
+          -d "chat_id=${{ secrets.TELEGRAM_TO }}&text=${msg_text}&message_thread_id=${{ secrets.TELEGRAM_TOPIC }}"
-
-      - name: Send Matrix 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 }}'
-          # Escape newlines and quotes for JSON
-          formatted_msg=$(echo -n "$msg_text" | sed ':a;N;$ba;s/\n/\\n/g' | sed 's/"/\\"/g')
-          curl -s -X POST \
-            -H "Authorization: Bearer ${{ secrets.MATRIX_TOKEN }}" \
-            -H "Content-Type: application/json" \
-            -d '{
-            "msgtype": "m.text",
-            "body": "'"$formatted_msg"'"
-            }' \
-            "https://matrix.org/_matrix/client/v3/rooms/${{ vars.MATRIX_ACTIVITY_TOPIC }}/send/m.room.message/$(date +%s)"

.github/workflows/on-pr.yml

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

.github/workflows/on-publish.yml

@@ -6,6 +6,7 @@ on:
 
 
 jobs:
+
   on-publish:
     name: On publish
     runs-on: ubuntu-latest
@@ -17,21 +18,4 @@ jobs:
             ${{ 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=${{ vars.TELEGRAM_RELEASE_TOPIC }}"
+          -d "chat_id=${{ secrets.TELEGRAM_TO }}&text=${msg_text}&message_thread_id=${{ secrets.TELEGRAM_TOPIC }}"
-
-      - name: Send Matrix 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 }}'
-            # Escape newlines and quotes for JSON
-            formatted_msg=$(echo -n "$msg_text" | sed ':a;N;$ba;s/\n/\\n/g' | sed 's/"/\\"/g')
-            curl -s -X POST \
-              -H "Authorization: Bearer ${{ secrets.MATRIX_TOKEN }}" \
-              -H "Content-Type: application/json" \
-              -d '{
-                "msgtype": "m.text",
-                "body": "'"$formatted_msg"'"
-              }' \
-              "https://matrix.org/_matrix/client/v3/rooms/${{ vars.MATRIX_RELEASE_TOPIC }}/send/m.room.message/$(date +%s)"

.github/workflows/publish.yml

@@ -43,7 +43,7 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0  # This fetches all history so we can check commits
 
@@ -168,7 +168,7 @@ jobs:
         id: create_release
         uses: softprops/action-gh-release@v2
         env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           body: |
             ${{ env.RELEASE_NOTES }}
@@ -193,14 +193,6 @@ jobs:
           files: |
             ${{ github.workspace }}/temp/*
 
-      # notify socials
-      - name: Trigger on-publish workflow
-        if: ${{ inputs.release_type == 'release' }}
-        uses: peter-evans/repository-dispatch@v3
-        with:
-          token: ${{ secrets.PAT }}
-          event-type: publish-release
-
   publish-fdroid:
     runs-on: ubuntu-latest
     needs:

LICENSE

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

app/fdroid-rules.pro

@@ -2,41 +2,4 @@
 
 -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

@@ -21,41 +21,4 @@
 #-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
+	@Test
-    fun useAppContext() {
+	fun useAppContext() {
-        // Context of the app under test.
+		// Context of the app under test.
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+		val appContext = InstrumentationRegistry.getInstrumentation().targetContext
-        assertEquals("com.zaneschepke.wireguardautotunnel", appContext.packageName)
+		assertEquals("com.zaneschepke.wireguardautotunnel", appContext.packageName)
-    }
+	}
 }

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

@@ -5,35 +5,40 @@ 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
+	@get:Rule
-    val helper: MigrationTestHelper =
+	val helper: MigrationTestHelper =
-        MigrationTestHelper(InstrumentationRegistry.getInstrumentation(), AppDatabase::class.java)
+		MigrationTestHelper(
+			InstrumentationRegistry.getInstrumentation(),
+			AppDatabase::class.java,
+		)
 
-    @Test
+	@Test
-    @Throws(IOException::class)
+	@Throws(IOException::class)
-    fun migrate6To7() {
+	fun migrate6To7() {
-        helper.createDatabase(dbName, 6).apply {
+		helper.createDatabase(dbName, 6).apply {
-            // Database has schema version 1. Insert some data using SQL queries.
+			// Database has schema version 1. Insert some data using SQL queries.
-            // You can't use DAO classes because they expect the latest schema.
+			// You can't use DAO classes because they expect the latest schema.
-            execSQL(Queries.createDefaultSettings())
+			execSQL(Queries.createDefaultSettings())
-            execSQL(Queries.createTunnelConfig())
+			execSQL(
-            // Prepare for the next version.
+				Queries.createTunnelConfig(),
-            close()
+			)
-        }
+			// Prepare for the next version.
+			close()
+		}
 
-        // Re-open the database with version 2 and provide
+		// Re-open the database with version 2 and provide
-        // MIGRATION_1_2 as the migration process.
+		// MIGRATION_1_2 as the migration process.
-        helper.runMigrationsAndValidate(dbName, 7, true)
+		helper.runMigrationsAndValidate(dbName, 7, true)
-        // MigrationTestHelper automatically verifies the schema changes,
+		// MigrationTestHelper automatically verifies the schema changes,
-        // but you need to validate that the data was migrated properly.
+		// but you need to validate that the data was migrated properly.
-    }
+	}
 }

app/src/main/AndroidManifest.xml

@@ -3,8 +3,13 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <!--foreground service exempt android 14-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"
@@ -20,8 +25,6 @@
 
 	<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" />
 
@@ -47,13 +50,12 @@
     <queries>
         <intent>
             <action android:name="android.intent.action.MAIN" />
-			<category android:name="android.intent.category.LAUNCHER" />
         </intent>
     </queries>
     <application
         android:name=".WireGuardAutoTunnel"
         android:allowBackup="false"
-        android:banner="@mipmap/ic_banner"
+        android:banner="@drawable/ic_banner"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:enableOnBackInvokedCallback="true"
         android:fullBackupContent="@xml/backup_rules"
@@ -66,7 +68,7 @@
         <activity
             android:name=".MainActivity"
             android:exported="true"
-			android:windowSoftInputMode="adjustNothing"
+			android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.WireguardAutoTunnel"
 			android:configChanges="orientation|screenSize|keyboardHidden"
 			>
@@ -87,7 +89,7 @@
         <activity
             android:name=".core.shortcut.ShortcutsActivity"
             android:enabled="true"
-            android:exported="false"
+            android:exported="true"
 			android:noHistory="true"
 			android:excludeFromRecents="true"
 			android:finishOnTaskLaunch="true"
@@ -114,7 +116,7 @@
         <service
             android:name=".core.service.tile.TunnelControlTile"
             android:exported="true"
-            android:icon="@drawable/ic_notification"
+            android:icon="@drawable/ic_launcher"
             android:label="@string/tunnel_control"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <meta-data
@@ -131,7 +133,7 @@
         <service
             android:name=".core.service.tile.AutoTunnelControlTile"
             android:exported="true"
-            android:icon="@drawable/ic_notification"
+            android:icon="@drawable/ic_launcher"
             android:label="@string/auto_tunnel"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <meta-data
@@ -164,20 +166,27 @@
 				<action android:name="android.net.VpnService" />
 			</intent-filter>
 		</service>
+
         <receiver
-            android:name=".core.broadcast.RestartReceiver"
+            android:name=".core.broadcast.BootReceiver"
             android:enabled="true"
-            android:exported="false"
+            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.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>
+		<receiver
+			android:name=".core.broadcast.AppUpdateReceiver"
+			android:exported="false">
+			<intent-filter>
+				<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+			</intent-filter>
+		</receiver>
 		<receiver
 			android:name=".core.broadcast.KernelReceiver"
 			android:exported="false"
@@ -186,20 +195,6 @@
 				<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,34 +1,23 @@
 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.rememberLauncherForActivityResult
+import androidx.activity.compose.BackHandler
 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.AnimatedVisibility
+import androidx.compose.animation.core.tween
-import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.fadeIn
-import androidx.compose.animation.slideOutVertically
+import androidx.compose.animation.fadeOut
-import androidx.compose.foundation.background
-import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.consumeWindowInsets
+import androidx.compose.foundation.layout.WindowInsets
 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
@@ -36,359 +25,243 @@ 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.networkmonitor.NetworkMonitor
+import com.zaneschepke.wireguardautotunnel.core.shortcut.ShortcutManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
+import com.zaneschepke.wireguardautotunnel.core.worker.ServiceWorker
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.common.dialog.VpnDeniedDialog
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavBar
 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.screens.autotunnel.AutoTunnelScreen
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarControllerProvider
-import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.advanced.AutoTunnelAdvancedScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.ConfigScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.MainScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.autotunnel.TunnelAutoTunnelScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.OptionsScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.ConfigScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.PinLockScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.scanner.ScannerScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.ScannerScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.SplitTunnelScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.SplitTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.tunneloptions.TunnelOptionsScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.TunnelAutoTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.pin.PinLockScreen
+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.settings.SettingsScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.advanced.SettingsAdvancedScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.AutoTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.AppearanceScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.support.LogsScreen
-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.extensions.goFromRoot
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
 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 networkMonitor: NetworkMonitor
+	@Inject
+	lateinit var shortcutManager: ShortcutManager
 
-    private var lastLocationPermissionState: Boolean? = null
+	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)
 
-    @SuppressLint("BatteryLife")
+		val viewModel by viewModels<AppViewModel>()
-    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)
 
-        val viewModel by viewModels<AppViewModel>()
+		installSplashScreen().apply {
+			setKeepOnScreenCondition {
+				!viewModel.isAppReady.value
+			}
+		}
 
-        installSplashScreen().apply {
+		setContent {
-            setKeepOnScreenCondition { !viewModel.appViewState.value.isAppReady }
+			val appUiState by viewModel.uiState.collectAsStateWithLifecycle()
-        }
+			val configurationChange by viewModel.configurationChange.collectAsStateWithLifecycle()
+			val navController = rememberNavController()
 
-        setContent {
+			LaunchedEffect(configurationChange) {
-            val appUiState by viewModel.uiState.collectAsStateWithLifecycle()
+				if (configurationChange) {
-            val appViewState by viewModel.appViewState.collectAsStateWithLifecycle()
+					Intent(this@MainActivity, MainActivity::class.java).also {
+						startActivity(it)
+						exitProcess(0)
+					}
+				}
+			}
 
-            val navController = rememberNavController()
+			LaunchedEffect(Unit) {
-            val backStackEntry by navController.currentBackStackEntryAsState()
+				viewModel.getEmitSplitTunnelApps(this@MainActivity)
-            val navBarState by
+			}
-                currentNavBackStackEntryAsNavBarState(
-                    navController,
-                    backStackEntry,
-                    viewModel,
-                    appUiState,
-                )
-            val snackbar = remember { SnackbarHostState() }
-            var showVpnPermissionDialog by remember { mutableStateOf(false) }
-            var vpnPermissionDenied by remember { mutableStateOf(false) }
 
-            val vpnActivity =
+			LaunchedEffect(appUiState.autoTunnelActive) {
-                rememberLauncherForActivityResult(
+				requestAutoTunnelTileServiceUpdate()
-                    ActivityResultContracts.StartActivityForResult(),
+			}
-                    onResult = {
-                        if (it.resultCode != RESULT_OK) {
-                            showVpnPermissionDialog = true
-                            vpnPermissionDenied = true
-                        } else {
-                            vpnPermissionDenied = false
-                        }
-                    },
-                )
 
-            LaunchedEffect(appUiState.tunnels) {
+			with(appUiState.appSettings) {
-                if (!appViewState.isAppReady) {
+				LaunchedEffect(isAutoTunnelEnabled) {
-                    viewModel.handleEvent(AppEvent.AppReadyCheck(appUiState.tunnels))
+					this@MainActivity.requestAutoTunnelTileServiceUpdate()
-                }
+				}
-            }
+				LaunchedEffect(isShortcutsEnabled) {
+					if (!isShortcutsEnabled) return@LaunchedEffect shortcutManager.removeShortcuts()
+					shortcutManager.addShortcuts()
+				}
+			}
 
-            val batteryActivity =
+			ServiceWorker.start(this)
-                rememberLauncherForActivityResult(
-                    ActivityResultContracts.StartActivityForResult()
-                ) { _: ActivityResult ->
-                    viewModel.handleEvent(AppEvent.SetBatteryOptimizeDisableShown)
-                }
 
-            with(appViewState) {
+			CompositionLocalProvider(LocalNavController provides navController) {
-                LaunchedEffect(isConfigChanged) {
+				SnackbarControllerProvider { host ->
-                    if (isConfigChanged) {
+					WireguardAutoTunnelTheme(theme = appUiState.generalState.theme) {
-                        Intent(this@MainActivity, MainActivity::class.java).also {
+						Scaffold(
-                            startActivity(it)
+							contentWindowInsets = WindowInsets(0),
-                            exitProcess(0)
+							snackbarHost = {
-                        }
+								SnackbarHost(host) { snackbarData: SnackbarData ->
-                    }
+									CustomSnackBar(
-                }
+										snackbarData.visuals.message,
-                LaunchedEffect(errorMessage) {
+										isRtl = false,
-                    errorMessage?.let {
+										containerColor =
-                        snackbar.showSnackbar(it.asString(this@MainActivity))
+										MaterialTheme.colorScheme.surfaceColorAtElevation(
-                        viewModel.handleEvent(AppEvent.MessageShown)
+											2.dp,
-                    }
+										),
-                }
+									)
-                LaunchedEffect(appUiState.activeTunnels) {
+								}
-                    appUiState.activeTunnels.mapNotNull { (tunnelConf, tunnelState) ->
+							},
-                        (tunnelState.status as? TunnelStatus.Error)?.let { error ->
+							bottomBar = {
-                            val message = error.error.toStringRes()
+								BottomNavBar(
-                            val context = this@MainActivity
+									navController,
-                            snackbar.showSnackbar(
+									listOf(
-                                context.getString(
+										BottomNavItem(
-                                    R.string.tunnel_error_template,
+											name = stringResource(R.string.tunnels),
-                                    context.getString(message),
+											route = Route.Main,
-                                )
+											icon = Icons.Rounded.Home,
-                            )
+										),
-                            viewModel.handleEvent(AppEvent.ClearTunnelError(tunnelConf))
+										BottomNavItem(
-                        }
+											name = stringResource(R.string.settings),
-                    }
+											route = Route.Settings,
-                }
+											icon = Icons.Rounded.Settings,
-                LaunchedEffect(popBackStack) {
+										),
-                    if (popBackStack) {
+										BottomNavItem(
-                        navController.popBackStack()
+											name = stringResource(R.string.support),
-                        viewModel.handleEvent(AppEvent.PopBackStack(false))
+											route = Route.Support,
-                    }
+											icon = Icons.Rounded.QuestionMark,
-                }
+										),
-                LaunchedEffect(requestVpnPermission) {
+									),
-                    if (requestVpnPermission) {
+								)
-                        if (!vpnPermissionDenied) {
+							},
-                            vpnActivity.launch(VpnService.prepare(this@MainActivity))
+						) { padding ->
-                        } else {
+							Box(modifier = Modifier.Companion.fillMaxSize().padding(padding)) {
-                            showVpnPermissionDialog = true
+								NavHost(
-                        }
+									navController,
-                        viewModel.handleEvent(AppEvent.VpnPermissionRequested)
+									enterTransition = { fadeIn(tween(Constants.TRANSITION_ANIMATION_TIME)) },
-                    }
+									exitTransition = { fadeOut(tween(Constants.TRANSITION_ANIMATION_TIME)) },
-                }
+									startDestination = (if (appUiState.generalState.isPinLockEnabled) Route.Lock else Route.Main),
-                LaunchedEffect(requestBatteryPermission) {
+								) {
-                    if (requestBatteryPermission) {
+									composable<Route.Main> {
-                        batteryActivity.launch(
+										MainScreen(
-                            Intent().apply {
+											uiState = appUiState,
-                                action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
+										)
-                                data = Uri.parse("package:${this@MainActivity.packageName}")
+									}
-                            }
+									composable<Route.Settings> {
-                        )
+										SettingsScreen(
-                    }
+											appViewModel = viewModel,
-                }
+											uiState = appUiState,
-            }
+										)
-
+									}
-            CompositionLocalProvider(LocalNavController provides navController) {
+									composable<Route.LocationDisclosure> {
-                WireguardAutoTunnelTheme(theme = appUiState.appState.theme) {
+										LocationDisclosureScreen(viewModel, appUiState)
-                    VpnDeniedDialog(
+									}
-                        showVpnPermissionDialog,
+									composable<Route.AutoTunnel> {
-                        onDismiss = { showVpnPermissionDialog = false },
+										AutoTunnelScreen(
-                    )
+											appUiState.appSettings,
-
+										)
-                    Scaffold(
+									}
-                        modifier =
+									composable<Route.Appearance> {
-                            Modifier.pointerInput(Unit) {
+										AppearanceScreen()
-                                detectTapGestures {
+									}
-                                    viewModel.handleEvent(AppEvent.SetSelectedTunnel(null))
+									composable<Route.Language> {
-                                }
+										LanguageScreen(appUiState, viewModel)
-                            },
+									}
-                        snackbarHost = {
+									composable<Route.Display> {
-                            SnackbarHost(snackbar) { snackbarData: SnackbarData ->
+										DisplayScreen(appUiState)
-                                CustomSnackBar(
+									}
-                                    snackbarData.visuals.message,
+									composable<Route.Support> {
-                                    isRtl = false,
+										SupportScreen(appUiState, viewModel)
-                                    containerColor =
+									}
-                                        MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp),
+									composable<Route.AutoTunnelAdvanced> {
-                                )
+										AdvancedScreen(appUiState.appSettings, viewModel)
-                            }
+									}
-                        },
+									composable<Route.Logs> {
-                        topBar = { DynamicTopAppBar(navBarState) },
+										LogsScreen()
-                        bottomBar = {
+									}
-                            AnimatedVisibility(
+									composable<Route.Config> {
-                                visible = navBarState.showBottom,
+										val args = it.toRoute<Route.Config>()
-                                enter = slideInVertically(initialOffsetY = { it }),
+										val config =
-                                exit = slideOutVertically(targetOffsetY = { it }),
+											appUiState.tunnels.firstOrNull { it.id == args.id }
-                            ) {
+										ConfigScreen(config, viewModel)
-                                CustomBottomNavbar(
+									}
-                                    listOf(
+									composable<Route.TunnelOptions> {
-                                        BottomNavItem(
+										val args = it.toRoute<Route.TunnelOptions>()
-                                            name = stringResource(R.string.tunnels),
+										val config = appUiState.tunnels.first { it.id == args.id }
-                                            route = Route.Main,
+										OptionsScreen(config)
-                                            icon = Icons.Rounded.Home,
+									}
-                                            onClick = { navController.goFromRoot(Route.Main) },
+									composable<Route.Lock> {
-                                        ),
+										PinLockScreen(viewModel)
-                                        BottomNavItem(
+									}
-                                            name = stringResource(R.string.auto_tunnel),
+									composable<Route.Scanner> {
-                                            route = Route.AutoTunnel,
+										ScannerScreen()
-                                            icon = Icons.Rounded.Bolt,
+									}
-                                            onClick = {
+									composable<Route.KillSwitch> {
-                                                val route =
+										KillSwitchScreen(appUiState, viewModel)
-                                                    if (
+									}
-                                                        appUiState.appState
+									composable<Route.SplitTunnel> {
-                                                            .isLocationDisclosureShown
+										val args = it.toRoute<Route.SplitTunnel>()
-                                                    )
+										val config = appUiState.tunnels.first { it.id == args.id }
-                                                        Route.AutoTunnel
+										SplitTunnelScreen(config, viewModel)
-                                                    else Route.LocationDisclosure
+									}
-                                                navController.goFromRoot(route)
+									composable<Route.TunnelAutoTunnel> {
-                                            },
+										val args = it.toRoute<Route.TunnelOptions>()
-                                            active = appUiState.isAutoTunnelActive,
+										val config = appUiState.tunnels.first { it.id == args.id }
-                                        ),
+										TunnelAutoTunnelScreen(config, appUiState.appSettings)
-                                        BottomNavItem(
+									}
-                                            name = stringResource(R.string.settings),
+								}
-                                            route = Route.Settings,
+								BackHandler {
-                                            icon = Icons.Rounded.Settings,
+									if (navController.previousBackStackEntry == null || !navController.popBackStack()) {
-                                            onClick = { navController.goFromRoot(Route.Settings) },
+										this@MainActivity.finish()
-                                        ),
+									}
-                                        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

@@ -11,7 +11,6 @@ import androidx.work.Configuration
 import com.wireguard.android.backend.GoBackend
 import com.zaneschepke.logcatter.LogReader
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.core.worker.ServiceWorker
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.di.MainDispatcher
@@ -19,116 +18,121 @@ 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
+	override val workManagerConfiguration: Configuration
-        get() = Configuration.Builder().setWorkerFactory(workerFactory).build()
+		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() {
+	override fun onCreate() {
-        super.onCreate()
+		super.onCreate()
-        instance = this
+		instance = this
-        ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifecycleObserver())
+		ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifecycleObserver())
-        if (BuildConfig.DEBUG) {
+		if (BuildConfig.DEBUG) {
-            Timber.plant(Timber.DebugTree())
+			Timber.plant(Timber.DebugTree())
-            StrictMode.setThreadPolicy(
+			StrictMode.setThreadPolicy(
-                ThreadPolicy.Builder()
+				ThreadPolicy.Builder()
-                    .detectDiskReads()
+					.detectDiskReads()
-                    .detectDiskWrites()
+					.detectDiskWrites()
-                    .detectNetwork()
+					.detectNetwork()
-                    .penaltyLog()
+					.penaltyLog()
-                    .build()
+					.build(),
-            )
+			)
-        } else {
+		} else {
-            Timber.plant(ReleaseTree())
+			Timber.plant(ReleaseTree())
-        }
+		}
 
-        GoBackend.setAlwaysOnCallback {
+		GoBackend.setAlwaysOnCallback {
-            applicationScope.launch {
+			applicationScope.launch {
-                val settings = appDataRepository.settings.get()
+				val settings = appDataRepository.settings.get()
-                if (settings.isAlwaysOnVpnEnabled) {
+				if (settings.isAlwaysOnVpnEnabled) {
-                    val tunnel = appDataRepository.getPrimaryOrFirstTunnel()
+					val tunnel = appDataRepository.getPrimaryOrFirstTunnel()
-                    tunnel?.let { tunnelManager.startTunnel(it) }
+					tunnel?.let {
-                } else {
+						tunnelManager.startTunnel(it)
-                    Timber.w("Always-on VPN is not enabled in app settings")
+					}
-                }
+				} else {
-            }
+					Timber.Forest.w("Always-on VPN is not enabled in app settings")
-        }
+				}
+			}
+		}
 
-        ServiceWorker.start(this)
+		applicationScope.launch {
+			withContext(mainDispatcher) {
+				if (appDataRepository.appState.isLocalLogsEnabled() && !isRunningOnTv()) logReader.initialize()
+			}
+			if (!appDataRepository.settings.get().isKernelEnabled) {
+				tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
+			}
+			appDataRepository.appState.getLocale()?.let {
+				withContext(mainDispatcher) {
+					LocaleUtil.changeLocale(it)
+				}
+			}
+		}
+	}
 
-        applicationScope.launch {
+	override fun onTerminate() {
-            appDataRepository.appState.getLocale()?.let {
+		applicationScope.launch {
-                withContext(mainDispatcher) { LocaleUtil.changeLocale(it) }
+			tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
-            }
+		}
-            appDataRepository.appState.isLocalLogsEnabled().let { enabled ->
+		super.onTerminate()
-                if (enabled) logReader.start()
+	}
-            }
-        }
-    }
 
-    override fun onTerminate() {
+	class AppLifecycleObserver : DefaultLifecycleObserver {
-        applicationScope.launch {
-            tunnelManager.setBackendState(BackendState.INACTIVE, emptyList())
-        }
-        super.onTerminate()
-    }
 
-    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) {
+	companion object {
-            Timber.d("Application entered foreground")
+		private var foreground = false
-            foreground = true
-        }
 
-        override fun onPause(owner: LifecycleOwner) {
+		fun isForeground(): Boolean {
-            Timber.d("Application entered background")
+			return foreground
-            foreground = false
+		}
-        }
-    }
 
-    companion object {
+		lateinit var instance: WireGuardAutoTunnel
-        private var foreground = false
+			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/AppUpdateReceiver.kt

@@ -0,0 +1,45 @@
+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 dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class AppUpdateReceiver : BroadcastReceiver() {
+
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
+
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
+
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
+	@Inject
+	lateinit var tunnelManager: TunnelManager
+
+	override fun onReceive(context: Context, intent: Intent) {
+		if (intent.action != Intent.ACTION_MY_PACKAGE_REPLACED) return
+		serviceManager.updateTunnelTile()
+		serviceManager.updateAutoTunnelTile()
+		applicationScope.launch {
+			with(appDataRepository.settings.get()) {
+				if (isRestoreOnBootEnabled) {
+					// If auto tunnel is enabled, just start it and let auto tunnel start appropriate tun
+					if (isAutoTunnelEnabled && !serviceManager.autoTunnelActive.value) return@launch serviceManager.startAutoTunnel(true)
+					tunnelManager.restorePreviousState()
+				}
+			}
+		}
+	}
+}

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

@@ -0,0 +1,44 @@
+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 dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class BootReceiver : BroadcastReceiver() {
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
+
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
+
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
+	@Inject
+	lateinit var tunnelManager: TunnelManager
+
+	override fun onReceive(context: Context, intent: Intent) {
+		if (Intent.ACTION_BOOT_COMPLETED != intent.action) return
+		serviceManager.updateTunnelTile()
+		serviceManager.updateAutoTunnelTile()
+		applicationScope.launch {
+			with(appDataRepository.settings.get()) {
+				if (isRestoreOnBootEnabled) {
+					// If auto tunnel is enabled, just start it and let auto tunnel start appropriate tun
+					if (isAutoTunnelEnabled && !serviceManager.autoTunnelActive.value) return@launch serviceManager.startAutoTunnel(true)
+					tunnelManager.restorePreviousState()
+				}
+			}
+		}
+	}
+}

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

@@ -3,40 +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.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) {
+	override fun onReceive(context: Context, intent: Intent) {
-        val action = intent.action ?: return
+		val action = intent.action ?: return
-        applicationScope.launch {
+		applicationScope.launch {
-            if (action == REFRESH_TUNNELS_ACTION) {
+			if (action == REFRESH_TUNNELS_ACTION) {
-                tunnelManager.runningTunnelNames().forEach { name ->
+				tunnelManager.runningTunnelNames().forEach {
-                    val tunnel = tunnelRepository.findByTunnelName(name)
+					val tunnel = tunnelRepository.findByTunnelName(it)
-                    tunnel?.let { tunnelRepository.save(it.copy(isActive = true)) }
+					tunnel?.let {
-                }
+						tunnelRepository.save(it.copy(isActive = true))
-                serviceManager.updateTunnelTile()
+					}
-            }
+				}
-        }
+				serviceManager.updateTunnelTile()
-    }
+			}
+		}
+	}
 
-    companion object {
+	companion object {
-        const val REFRESH_TUNNELS_ACTION = "com.wireguard.android.action.REFRESH_TUNNEL_STATES"
+		const val REFRESH_TUNNELS_ACTION = "com.wireguard.android.action.REFRESH_TUNNEL_STATES"
-    }
+	}
 }

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

@@ -4,42 +4,43 @@ 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) {
+	override fun onReceive(context: Context, intent: Intent) {
-        applicationScope.launch {
+		applicationScope.launch {
-            when (intent.action) {
+			when (intent.action) {
-                NotificationAction.AUTO_TUNNEL_OFF.name -> serviceManager.stopAutoTunnel()
+				NotificationAction.AUTO_TUNNEL_OFF.name -> serviceManager.stopAutoTunnel()
-                NotificationAction.TUNNEL_OFF.name -> {
+				NotificationAction.TUNNEL_OFF.name -> {
-                    val tunnelId = intent.getIntExtra(NotificationManager.EXTRA_ID, 0)
+					val tunnelId = intent.getIntExtra(NotificationManager.EXTRA_ID, 0)
-                    if (tunnelId == STOP_ALL_TUNNELS_ID) return@launch tunnelManager.stopTunnel()
+					if (tunnelId == 0) return@launch tunnelManager.stopTunnel()
-                    val tunnel = tunnelRepository.getById(tunnelId)
+					val tunnel = tunnelRepository.getById(tunnelId)
-                    tunnelManager.stopTunnel(tunnel)
+					tunnelManager.stopTunnel(tunnel)
-                }
+				}
-            }
+			}
-        }
+		}
-    }
+	}
-
-    companion object {
-        const val STOP_ALL_TUNNELS_ID = 0
-    }
 }

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

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

@@ -1,49 +0,0 @@
-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.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
-
-@AndroidEntryPoint
-class RestartReceiver : BroadcastReceiver() {
-    @Inject lateinit var appDataRepository: AppDataRepository
-
-    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
-
-    @Inject lateinit var serviceManager: ServiceManager
-
-    @Inject lateinit var tunnelManager: TunnelManager
-
-    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
-
-    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/network/InternetConnectivityMonitor.kt

@@ -0,0 +1,161 @@
+package com.zaneschepke.wireguardautotunnel.core.network
+
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import android.net.NetworkRequest
+import android.net.wifi.SupplicantState
+import android.net.wifi.WifiManager
+import android.os.Build
+import com.zaneschepke.wireguardautotunnel.domain.state.ConnectivityState
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.flowOn
+import javax.inject.Inject
+
+class InternetConnectivityMonitor
+@Inject
+constructor(
+	@ApplicationContext private val context: Context,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) : NetworkMonitor {
+
+	private val connectivityManager =
+		context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+
+	@get:Synchronized @set:Synchronized
+	private var wifiCapabilities: NetworkCapabilities? = null
+
+	@get:Synchronized @set:Synchronized
+	private var wifiNetworkChanged: Boolean = false
+
+	override val didWifiChangeSinceLastCapabilitiesQuery: Boolean
+		get() = wifiNetworkChanged
+
+	override val status = callbackFlow {
+
+		var wifiState: Boolean = false
+		var ethernetState: Boolean = false
+		var cellularState: Boolean = false
+
+		fun emitState() {
+			trySend(ConnectivityState(wifiState, ethernetState, cellularState))
+		}
+
+		val currentNetwork = connectivityManager.activeNetwork
+		if (currentNetwork == null) {
+			emitState()
+		}
+
+		fun updateCapabilityState(up: Boolean, network: Network) {
+			with(connectivityManager.getNetworkCapabilities(network)) {
+				when {
+					this == null -> return
+					hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> wifiState = up
+					hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) ->
+						cellularState = up
+
+					hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) ->
+						ethernetState = up
+				}
+			}
+		}
+
+		fun onWifiChange(network: Network, callback: () -> Unit) {
+			if (connectivityManager.getNetworkCapabilities(network)?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) == true) {
+				callback()
+			}
+		}
+
+		fun onAvailable(network: Network) {
+			onWifiChange(network) {
+				wifiNetworkChanged = true
+			}
+		}
+
+		fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
+			onWifiChange(network) {
+				wifiCapabilities = networkCapabilities
+			}
+			updateCapabilityState(true, network)
+			emitState()
+		}
+
+		val networkStatusCallback =
+			when (Build.VERSION.SDK_INT) {
+				in Build.VERSION_CODES.S..Int.MAX_VALUE -> {
+					object :
+						ConnectivityManager.NetworkCallback(
+							FLAG_INCLUDE_LOCATION_INFO,
+						) {
+						override fun onAvailable(network: Network) {
+							onAvailable(network)
+						}
+
+						override fun onLost(network: Network) {
+							updateCapabilityState(false, network)
+							emitState()
+						}
+
+						override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
+							onCapabilitiesChanged(network, networkCapabilities)
+						}
+					}
+				}
+
+				else -> {
+					object : ConnectivityManager.NetworkCallback() {
+						override fun onAvailable(network: Network) {
+							onAvailable(network)
+						}
+
+						override fun onLost(network: Network) {
+							updateCapabilityState(false, network)
+							emitState()
+						}
+
+						override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
+							onCapabilitiesChanged(network, networkCapabilities)
+						}
+					}
+				}
+			}
+		val request =
+			NetworkRequest.Builder()
+				.addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
+				.addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET)
+				.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
+				.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+				.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
+				.build()
+		connectivityManager.registerNetworkCallback(request, networkStatusCallback)
+
+		awaitClose { connectivityManager.unregisterNetworkCallback(networkStatusCallback) }
+	}.flowOn(ioDispatcher)
+
+	override fun getWifiCapabilities(): NetworkCapabilities? {
+		wifiNetworkChanged = false
+		return wifiCapabilities
+	}
+
+	companion object {
+		fun getNetworkName(networkCapabilities: NetworkCapabilities, context: Context): String? {
+			var ssid = networkCapabilities.getWifiName()
+			if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S) {
+				val wifiManager =
+					context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
+
+				@Suppress("DEPRECATION")
+				val info = wifiManager.connectionInfo
+				if (info.supplicantState === SupplicantState.COMPLETED) {
+					ssid = info.ssid
+				}
+			}
+			return ssid?.trim('"')
+		}
+	}
+}

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

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

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/network/NetworkMonitor.kt

@@ -0,0 +1,13 @@
+package com.zaneschepke.wireguardautotunnel.core.network
+
+import android.net.NetworkCapabilities
+import com.zaneschepke.wireguardautotunnel.domain.state.ConnectivityState
+import kotlinx.coroutines.flow.Flow
+
+interface NetworkMonitor {
+	val status: Flow<ConnectivityState>
+
+	// util to help limit location queries
+	val didWifiChangeSinceLastCapabilitiesQuery: Boolean
+	fun getWifiCapabilities(): NetworkCapabilities?
+}

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

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

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

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

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

@@ -3,132 +3,117 @@ 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.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.di.MainDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+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.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
 import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
 import jakarta.inject.Inject
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 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 timber.log.Timber
 
+@OptIn(ExperimentalCoroutinesApi::class)
 class ServiceManager
-@Inject
+@Inject constructor(private val context: Context, private val ioDispatcher: CoroutineDispatcher, private val appDataRepository: AppDataRepository) {
-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 autoTunnelMutex = Mutex()
+	private val _autoTunnelActive = MutableStateFlow(false)
 
-    private val _autoTunnelActive = MutableStateFlow(false)
+	val autoTunnelActive = _autoTunnelActive.asStateFlow()
-    val autoTunnelActive = _autoTunnelActive.asStateFlow()
 
-    var autoTunnelService = CompletableDeferred<AutoTunnelService>()
+	var autoTunnelService = CompletableDeferred<AutoTunnelService>()
-    var backgroundService = CompletableDeferred<TunnelForegroundService>()
+	var backgroundService = CompletableDeferred<TunnelForegroundService>()
+	var autoTunnelTile = CompletableDeferred<AutoTunnelControlTile>()
+	var tunnelControlTile = CompletableDeferred<TunnelControlTile>()
 
-    private fun <T : Service> startService(cls: Class<T>, background: Boolean) {
+	private fun <T : Service> startService(cls: Class<T>, background: Boolean) {
-        runCatching {
+		runCatching {
-                val intent = Intent(context, cls)
+			val intent = Intent(context, cls)
-                if (background) {
+			if (background) {
-                    context.startForegroundService(intent)
+				context.startForegroundService(intent)
-                } else {
+			} else {
-                    context.startService(intent)
+				context.startService(intent)
-                }
+			}
-            }
+		}.onFailure { Timber.e(it) }
-            .onFailure { Timber.e(it) }
+	}
-    }
 
-    fun hasVpnPermission(): Boolean {
+	suspend fun startAutoTunnel(background: Boolean) {
-        return VpnService.prepare(context) == null
+		val settings = appDataRepository.settings.get()
-    }
+		appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = true))
+		if (autoTunnelService.isCompleted) return _autoTunnelActive.update { true }
+		runCatching {
+			startService(AutoTunnelService::class.java, background)
+			autoTunnelService.await()
+			autoTunnelService.getCompleted().start()
+			_autoTunnelActive.update { true }
+			updateAutoTunnelTile()
+		}.onFailure {
+			Timber.e(it)
+		}
+	}
 
-    suspend fun startAutoTunnel() {
+	suspend fun startBackgroundService(tunnelConf: TunnelConf) {
-        autoTunnelMutex.withLock {
+		if (backgroundService.isCompleted) return
-            val settings = appDataRepository.settings.get()
+		runCatching {
-            appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = true))
+			startService(TunnelForegroundService::class.java, true)
-            if (autoTunnelService.isCompleted) {
+			backgroundService.await()
-                _autoTunnelActive.update { true }
+			backgroundService.getCompleted().start(tunnelConf)
-                return
+		}.onFailure {
-            }
+			Timber.e(it)
-            runCatching {
+		}
-                    autoTunnelService = CompletableDeferred()
+	}
-                    startService(AutoTunnelService::class.java, !WireGuardAutoTunnel.isForeground())
-                    _autoTunnelActive.update { true }
-                }
-                .onFailure {
-                    Timber.e(it)
-                    _autoTunnelActive.update { false }
-                }
-            withContext(mainDispatcher) { updateAutoTunnelTile() }
-        }
-    }
 
-    suspend fun stopAutoTunnel() {
+	fun stopBackgroundService() {
-        autoTunnelMutex.withLock {
+		if (!backgroundService.isCompleted) return
-            val settings = appDataRepository.settings.get()
+		runCatching {
-            appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = false))
+			backgroundService.getCompleted().stop()
-            if (!autoTunnelService.isCompleted) return
+		}.onFailure {
-            runCatching {
+			Timber.e(it)
-                    val service = autoTunnelService.await()
+		}
-                    service.stop()
+	}
-                    _autoTunnelActive.update { false }
-                    autoTunnelService = CompletableDeferred()
-                }
-                .onFailure { Timber.e(it) }
-            withContext(mainDispatcher) { updateAutoTunnelTile() }
-        }
-    }
 
-    fun startTunnelForegroundService() {
+	suspend fun toggleAutoTunnel(background: Boolean) {
-        if (backgroundService.isCompleted) return
+		withContext(ioDispatcher) {
-        runCatching {
+			if (_autoTunnelActive.value) return@withContext stopAutoTunnel()
-                backgroundService = CompletableDeferred()
+			startAutoTunnel(background)
-                startService(
+		}
-                    TunnelForegroundService::class.java,
+	}
-                    !WireGuardAutoTunnel.isForeground(),
-                )
-            }
-            .onFailure { Timber.e(it) }
-    }
 
-    suspend fun stopTunnelForegroundService() {
+	fun updateAutoTunnelTile() {
-        if (!backgroundService.isCompleted) return
+		if (autoTunnelTile.isCompleted) {
-        runCatching {
+			autoTunnelTile.getCompleted().updateTileState()
-                val service = backgroundService.await()
+		} else {
-                service.stop()
+			context.requestAutoTunnelTileServiceUpdate()
-                backgroundService = CompletableDeferred()
+		}
-            }
+	}
-            .onFailure { Timber.e(it) }
-    }
 
-    fun toggleAutoTunnel() {
+	fun updateTunnelTile() {
-        applicationScope.launch(ioDispatcher) {
+		if (tunnelControlTile.isCompleted) {
-            if (_autoTunnelActive.value) stopAutoTunnel() else startAutoTunnel()
+			tunnelControlTile.getCompleted().updateTileState()
-        }
+		} else {
-    }
+			context.requestTunnelTileServiceStateUpdate()
+		}
+	}
 
-    fun updateAutoTunnelTile() {
+	suspend fun stopAutoTunnel() {
-        context.requestAutoTunnelTileServiceUpdate()
+		withContext(ioDispatcher) {
-    }
+			val settings = appDataRepository.settings.get()
-
+			appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = false))
-    fun updateTunnelTile() {
+			if (!autoTunnelService.isCompleted) return@withContext
-        context.requestTunnelTileServiceStateUpdate()
+			runCatching {
-    }
+				autoTunnelService.getCompleted().stop()
+				_autoTunnelActive.update { false }
+				updateAutoTunnelTile()
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
+	}
 }

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

@@ -5,318 +5,67 @@ 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 java.util.concurrent.ConcurrentHashMap
-import javax.inject.Inject
 import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineDispatcher
+import javax.inject.Inject
-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
 
-    @Inject lateinit var networkMonitor: NetworkMonitor
+	override fun onCreate() {
+		super.onCreate()
+		serviceManager.backgroundService.complete(this)
+	}
 
-    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
+	override fun onBind(intent: Intent): IBinder? {
+		super.onBind(intent)
+		return null
+	}
 
-    @Inject lateinit var tunnelRepo: TunnelRepository
+	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+		super.onStartCommand(intent, flags, startId)
+		serviceManager.backgroundService.complete(this)
+		return START_NOT_STICKY
+	}
 
-    @Inject lateinit var tunnelManager: TunnelManager
+	fun start(tunnelConf: TunnelConf) {
+		ServiceCompat.startForeground(
+			this@TunnelForegroundService,
+			NotificationManager.KERNEL_SERVICE_NOTIFICATION_ID,
+			createNotification(tunnelConf),
+			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+		)
+	}
 
-    private val isNetworkConnected = MutableStateFlow(true)
+	fun stop() {
+		stopForeground(STOP_FOREGROUND_REMOVE)
+		stopSelf()
+	}
 
-    private val tunnelJobs = ConcurrentHashMap<TunnelConf, Job>()
+	override fun onDestroy() {
-    private val pingJobs = ConcurrentHashMap<TunnelConf, Job>()
+		serviceManager.backgroundService = CompletableDeferred()
+		super.onDestroy()
+	}
 
-    private val jobsMutex = Mutex()
+	private fun createNotification(tunnelConf: TunnelConf): Notification {
-
+		return notificationManager.createNotification(
-    override fun onCreate() {
+			WireGuardNotification.NotificationChannels.VPN,
-        super.onCreate()
+			title = "${getString(R.string.tunnel_running)} - ${tunnelConf.tunName}",
-        serviceManager.backgroundService.complete(this)
+			actions = listOf(
-        ServiceCompat.startForeground(
+				notificationManager.createNotificationAction(NotificationAction.TUNNEL_OFF, tunnelConf.id),
-            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

@@ -1,276 +1,255 @@
 package com.zaneschepke.wireguardautotunnel.core.service.autotunnel
 
 import android.content.Intent
+import android.net.NetworkCapabilities
 import android.os.IBinder
 import android.os.PowerManager
 import androidx.core.app.ServiceCompat
 import androidx.lifecycle.LifecycleService
 import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.networkmonitor.NetworkMonitor
+import com.wireguard.android.util.RootShell
-import com.zaneschepke.networkmonitor.NetworkStatus
 import com.zaneschepke.wireguardautotunnel.R
-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.TunnelManager
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-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
-import com.zaneschepke.wireguardautotunnel.domain.events.KillSwitchEvent
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.di.AppShell
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.di.MainImmediateDispatcher
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.domain.state.AutoTunnelState
 import com.zaneschepke.wireguardautotunnel.domain.state.NetworkState
+import com.zaneschepke.wireguardautotunnel.core.network.InternetConnectivityMonitor
+import com.zaneschepke.wireguardautotunnel.core.network.NetworkMonitor
+import com.zaneschepke.wireguardautotunnel.domain.state.ConnectivityState
+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.domain.entity.AppSettings
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
+import com.zaneschepke.wireguardautotunnel.domain.events.KillSwitchEvent
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.extensions.Tunnels
+import com.zaneschepke.wireguardautotunnel.util.extensions.getCurrentWifiName
 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
 import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.flowOn
 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
+	@AppShell
+	lateinit var rootShell: Provider<RootShell>
 
-    @Inject lateinit var appDataRepository: Provider<AppDataRepository>
+	@Inject
+	lateinit var networkMonitor: NetworkMonitor
 
-    @Inject lateinit var notificationManager: NotificationManager
+	@Inject
+	lateinit var appDataRepository: Provider<AppDataRepository>
 
-    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
+	@Inject
+	lateinit var notificationManager: NotificationManager
 
-    @Inject lateinit var serviceManager: ServiceManager
+	@Inject
+	@IoDispatcher
+	lateinit var ioDispatcher: CoroutineDispatcher
 
-    @Inject lateinit var tunnelManager: TunnelManager
+	@Inject
+	lateinit var serviceManager: ServiceManager
 
-    private val defaultState = AutoTunnelState()
+	@Inject
+	@MainImmediateDispatcher
+	lateinit var mainImmediateDispatcher: CoroutineDispatcher
 
-    private val autoTunnelStateFlow = MutableStateFlow(defaultState)
+	@Inject
+	lateinit var tunnelManager: TunnelManager
 
-    private var wakeLock: PowerManager.WakeLock? = null
+	private val defaultState = AutoTunnelState()
 
-    private var killSwitchJob: Job? = null
+	private val autoTunnelStateFlow = MutableStateFlow(defaultState)
 
-    override fun onCreate() {
+	private var wakeLock: PowerManager.WakeLock? = null
-        super.onCreate()
-        serviceManager.autoTunnelService.complete(this)
-        launchWatcherNotification()
-    }
 
-    override fun onBind(intent: Intent): IBinder? {
+	override fun onCreate() {
-        super.onBind(intent)
+		super.onCreate()
-        return null
+		serviceManager.autoTunnelService.complete(this)
-    }
+		lifecycleScope.launch(mainImmediateDispatcher) {
+			runCatching {
+				launchWatcherNotification()
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
+	}
 
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+	override fun onBind(intent: Intent): IBinder? {
-        super.onStartCommand(intent, flags, startId)
+		super.onBind(intent)
-        Timber.d("onStartCommand executed with startId: $startId")
+		return null
-        serviceManager.autoTunnelService.complete(this)
+	}
-        start()
-        return START_STICKY
-    }
 
-    fun start() {
+	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        kotlin
+		super.onStartCommand(intent, flags, startId)
-            .runCatching {
+		Timber.d("onStartCommand executed with startId: $startId")
-                launchWatcherNotification()
+		serviceManager.autoTunnelService.complete(this)
-                initWakeLock()
+		return START_NOT_STICKY
-                startAutoTunnelJob()
+	}
-                startAutoTunnelStateJob()
-                killSwitchJob = startKillSwitchJob()
-            }
-            .onFailure { Timber.e(it) }
-    }
 
-    fun stop() {
+	fun start() {
-        wakeLock?.let { if (it.isHeld) it.release() }
+		kotlin.runCatching {
-        stopSelf()
+			lifecycleScope.launch(mainImmediateDispatcher) {
-    }
+				launchWatcherNotification()
+				initWakeLock()
+			}
+			startAutoTunnelJob()
+			startAutoTunnelStateJob()
+			startKillSwitchJob()
+		}.onFailure {
+			Timber.e(it)
+		}
+	}
 
-    override fun onDestroy() {
+	fun stop() {
-        serviceManager.autoTunnelService = CompletableDeferred()
+		wakeLock?.let { if (it.isHeld) it.release() }
-        restoreVpnKillSwitch()
+		stopSelf()
-        super.onDestroy()
+	}
-    }
 
-    private fun restoreVpnKillSwitch() {
+	override fun onDestroy() {
-        with(autoTunnelStateFlow.value) {
+		serviceManager.autoTunnelService = CompletableDeferred()
-            if (
+		super.onDestroy()
-                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 launchWatcherNotification(
+	private fun launchWatcherNotification(description: String = getString(R.string.monitoring_state_changes)) {
-        description: String = getString(R.string.monitoring_state_changes)
+		val notification =
-    ) {
+			notificationManager.createNotification(
-        val notification =
+				WireGuardNotification.NotificationChannels.AUTO_TUNNEL,
-            notificationManager.createNotification(
+				title = getString(R.string.auto_tunnel_title),
-                WireGuardNotification.NotificationChannels.AUTO_TUNNEL,
+				description = description,
-                title = getString(R.string.auto_tunnel_title),
+				actions = listOf(
-                description = description,
+					notificationManager.createNotificationAction(NotificationAction.AUTO_TUNNEL_OFF),
-                actions =
+				),
-                    listOf(
+			)
-                        notificationManager.createNotificationAction(
+		ServiceCompat.startForeground(
-                            NotificationAction.AUTO_TUNNEL_OFF
+			this,
-                        )
+			NotificationManager.AUTO_TUNNEL_NOTIFICATION_ID,
-                    ),
+			notification,
-            )
+			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
-        ServiceCompat.startForeground(
+		)
-            this,
+	}
-            NotificationManager.AUTO_TUNNEL_NOTIFICATION_ID,
-            notification,
-            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
-        )
-    }
 
-    private fun initWakeLock() {
+	private fun initWakeLock() {
-        wakeLock =
+		wakeLock = (getSystemService(POWER_SERVICE) as PowerManager).run {
-            (getSystemService(POWER_SERVICE) as PowerManager).run {
+			val tag = this.javaClass.name
-                val tag = this.javaClass.name
+			newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "$tag::lock").apply {
-                newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "$tag::lock").apply {
+				try {
-                    try {
+					Timber.i("Initiating wakelock with 10 min timeout")
-                        Timber.i("Initiating wakelock with 10 min timeout")
+					acquire(Constants.BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT)
-                        acquire(Constants.BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT)
+				} finally {
-                    } finally {
+					release()
-                        release()
+				}
-                    }
+			}
-                }
+		}
-            }
+	}
-    }
 
-    private fun buildNetworkState(networkStatus: NetworkStatus): NetworkState {
+	private suspend fun buildNetworkState(connectivityState: ConnectivityState): NetworkState {
-        return with(autoTunnelStateFlow.value.networkState) {
+		return with(autoTunnelStateFlow.value.networkState) {
-            val wifiName =
+			val wifiName = when {
-                when (networkStatus) {
+				connectivityState.wifiAvailable &&
-                    is NetworkStatus.Connected -> {
+					(wifiName == null || wifiName == Constants.UNREADABLE_SSID || networkMonitor.didWifiChangeSinceLastCapabilitiesQuery) -> {
-                        networkStatus.wifiSsid
+					networkMonitor.getWifiCapabilities()?.let { getWifiName(it) } ?: wifiName
-                    }
+				}
-                    else -> null
+				!connectivityState.wifiAvailable -> null
-                }
+				else -> wifiName
-            copy(
+			}
-                isWifiConnected = networkStatus.wifiConnected,
+			copy(
-                isMobileDataConnected = networkStatus.cellularConnected,
+				isWifiConnected = connectivityState.wifiAvailable,
-                isEthernetConnected = networkStatus.ethernetConnected,
+				isMobileDataConnected = connectivityState.cellularAvailable,
-                wifiName = wifiName,
+				isEthernetConnected = isEthernetConnected,
-            )
+				wifiName = wifiName,
-        }
+			)
-    }
+		}
+	}
 
-    @OptIn(ExperimentalCoroutinesApi::class)
+	private fun startAutoTunnelStateJob() = lifecycleScope.launch(ioDispatcher) {
-    private fun startAutoTunnelStateJob() =
+		combine(
-        lifecycleScope.launch(ioDispatcher) {
+			combineSettings(),
-            combine(
+			networkMonitor.status.map {
-                    combineSettings(),
+				buildNetworkState(it)
-                    appDataRepository
+			}.distinctUntilChanged(),
-                        .get()
+		) { double, networkState ->
-                        .settings
+			AutoTunnelState(tunnelManager.activeTunnels().value, networkState, double.first, double.second)
-                        .flow
+		}.collect { state ->
-                        .distinctUntilChanged { old, new ->
+			autoTunnelStateFlow.update {
-                            old.isKernelEnabled == new.isKernelEnabled
+				it.copy(activeTunnels = state.activeTunnels, networkState = state.networkState, settings = state.settings, tunnels = state.tunnels)
-                        } // 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 combineSettings(): Flow<Pair<AppSettings, Tunnels>> {
+	private suspend fun getWifiName(wifiCapabilities: NetworkCapabilities): String? {
-        return combine(
+		val setting = appDataRepository.get().settings.get()
-                appDataRepository.get().settings.flow,
+		return if (setting.isWifiNameByShellEnabled) {
-                appDataRepository.get().tunnels.flow.map { tunnels ->
+			rootShell.get().getCurrentWifiName()
-                    // isActive is ignored for equality checks so user can manually toggle off
+		} else {
-                    // tunnel with auto-tunnel
+			InternetConnectivityMonitor.getNetworkName(wifiCapabilities, this@AutoTunnelService)
-                    tunnels.map { it.copy(isActive = false) }
+		}
-                },
+	}
-            ) { settings, tunnels ->
-                Pair(settings, tunnels)
-            }
-            .distinctUntilChanged()
-    }
 
-    private fun startKillSwitchJob() =
+	private fun combineSettings(): Flow<Pair<AppSettings, Tunnels>> {
-        lifecycleScope.launch(ioDispatcher) {
+		return combine(
-            autoTunnelStateFlow.collect {
+			appDataRepository.get().settings.flow,
-                if (it == defaultState) return@collect
+			appDataRepository.get().tunnels.flow.map { tunnels ->
-                when (val event = it.asKillSwitchEvent()) {
+				// isActive is ignored for equality checks so user can manually toggle off tunnel with auto-tunnel
-                    KillSwitchEvent.DoNothing -> Unit
+				tunnels.map { it.copy(isActive = false) }
-                    is KillSwitchEvent.Start -> {
+			},
-                        Timber.d("Starting kill switch")
+		) { settings, tunnels ->
-                        tunnelManager.setBackendState(
+			Pair(settings, tunnels)
-                            BackendState.KILL_SWITCH_ACTIVE,
+		}.distinctUntilChanged()
-                            event.allowedIps,
+	}
-                        )
-                    }
-                    KillSwitchEvent.Stop -> {
-                        Timber.d("Stopping kill switch")
-                        tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, emptySet())
-                    }
-                }
-            }
-        }
 
-    @OptIn(FlowPreview::class)
+	private fun startKillSwitchJob() = lifecycleScope.launch(ioDispatcher) {
-    private fun startAutoTunnelJob() =
+		autoTunnelStateFlow.collect {
-        lifecycleScope.launch(ioDispatcher) {
+			if (it == defaultState) return@collect
-            Timber.i("Starting auto-tunnel network event watcher")
+			when (val event = it.asKillSwitchEvent()) {
-            val settings = appDataRepository.get().settings.get()
+				KillSwitchEvent.DoNothing -> Unit
-            Timber.d("Starting with debounce delay of: ${settings.debounceDelaySeconds} seconds")
+				is KillSwitchEvent.Start -> {
-            autoTunnelStateFlow.debounce(settings.debounceDelayMillis()).collect { watcherState ->
+					Timber.d("Starting kill switch")
-                if (watcherState == defaultState) return@collect
+					tunnelManager.setBackendState(BackendState.KILL_SWITCH_ACTIVE, event.allowedIps)
-                Timber.d("New auto tunnel state emitted ${watcherState.networkState}")
+				}
-                when (val event = watcherState.asAutoTunnelEvent()) {
+				KillSwitchEvent.Stop -> {
-                    is AutoTunnelEvent.Start ->
+					Timber.d("Stopping kill switch")
-                        (event.tunnelConf ?: appDataRepository.get().getPrimaryOrFirstTunnel())
+					tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, emptySet())
-                            ?.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")
+	}
-                }
+
-            }
+	@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")
+			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,101 +4,97 @@ import android.content.Intent
 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.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
+import javax.inject.Inject
 
 @AndroidEntryPoint
-class AutoTunnelControlTile : TileService(), LifecycleOwner {
+class AutoTunnelControlTile : TileService() {
-    @Inject lateinit var appDataRepository: AppDataRepository
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
 
-    @Inject lateinit var serviceManager: ServiceManager
+	@Inject
+	lateinit var serviceManager: ServiceManager
 
-    private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
 
-    override fun onCreate() {
+	override fun onCreate() {
-        super.onCreate()
+		super.onCreate()
-        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+		serviceManager.autoTunnelTile.complete(this)
-    }
+	}
 
-    override fun onDestroy() {
+	override fun onDestroy() {
-        super.onDestroy()
+		super.onDestroy()
-        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+		serviceManager.autoTunnelTile = CompletableDeferred()
-    }
+	}
 
-    override fun onStartListening() {
+	override fun onStartListening() {
-        super.onStartListening()
+		super.onStartListening()
-        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
+		serviceManager.autoTunnelTile.complete(this)
-        Timber.d("Start listening called for auto tunnel tile")
+		applicationScope.launch {
-        lifecycleScope.launch {
+			if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
-            serviceManager.autoTunnelActive.collect {
+			updateTileState()
-                if (it) return@collect setActive()
+		}
-                setInactive()
+	}
-            }
-        }
-        lifecycleScope.launch {
-            appDataRepository.tunnels.flow.collect {
-                if (it.isEmpty()) {
-                    setUnavailable()
-                }
-            }
-        }
-    }
 
-    override fun onClick() {
+	fun updateTileState() {
-        super.onClick()
+		serviceManager.autoTunnelActive.value.let {
-        unlockAndRun {
+			if (it) setActive() else setInactive()
-            lifecycleScope.launch {
+		}
-                if (serviceManager.autoTunnelActive.value) {
+	}
-                    serviceManager.stopAutoTunnel()
-                    setInactive()
-                } else {
-                    serviceManager.startAutoTunnel()
-                    setActive()
-                }
-            }
-        }
-    }
 
-    private fun setActive() {
+	override fun onClick() {
-        runCatching {
+		super.onClick()
-            qsTile.state = Tile.STATE_ACTIVE
+		unlockAndRun {
-            qsTile.updateTile()
+			applicationScope.launch {
-        }
+				if (serviceManager.autoTunnelActive.value) {
-    }
+					serviceManager.stopAutoTunnel()
+					setInactive()
+				} else {
+					serviceManager.startAutoTunnel(true)
+					setActive()
+				}
+			}
+		}
+	}
 
-    private fun setInactive() {
+	private fun setActive() {
-        runCatching {
+		runCatching {
-            qsTile.state = Tile.STATE_INACTIVE
+			qsTile.state = Tile.STATE_ACTIVE
-            qsTile.updateTile()
+			qsTile.updateTile()
-        }
+		}
-    }
+	}
 
-    /* This works around an annoying unsolved frameworks bug some people are hitting. */
+	private fun setInactive() {
-    override fun onBind(intent: Intent): IBinder? {
+		runCatching {
-        var ret: IBinder? = null
+			qsTile.state = Tile.STATE_INACTIVE
-        try {
+			qsTile.updateTile()
-            ret = super.onBind(intent)
+		}
-        } catch (_: Throwable) {
+	}
-            Timber.e("Failed to bind to TunnelControlTile")
-        }
-        return ret
-    }
 
-    private fun setUnavailable() {
+	/* This works around an annoying unsolved frameworks bug some people are hitting. */
-        runCatching {
+	override fun onBind(intent: Intent): IBinder? {
-            qsTile.state = Tile.STATE_UNAVAILABLE
+		var ret: IBinder? = null
-            qsTile.updateTile()
+		try {
-        }
+			ret = super.onBind(intent)
-    }
+		} catch (_: Throwable) {
+			Timber.e("Failed to bind to TunnelControlTile")
+		}
+		return ret
+	}
 
-    override val lifecycle: Lifecycle
+	private fun setUnavailable() {
-        get() = lifecycleRegistry
+		runCatching {
+			qsTile.state = Tile.STATE_UNAVAILABLE
+			qsTile.updateTile()
+		}
+	}
 }

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

@@ -5,179 +5,126 @@ 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.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
+import javax.inject.Inject
 
 @AndroidEntryPoint
-class TunnelControlTile : TileService(), LifecycleOwner {
+class TunnelControlTile : TileService() {
-    @Inject lateinit var appDataRepository: AppDataRepository
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
 
-    @Inject lateinit var serviceManager: ServiceManager
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
 
-    @Inject lateinit var tunnelManager: TunnelManager
+	@Inject
+	lateinit var serviceManager: ServiceManager
 
-    private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
+	@Inject
+	lateinit var tunnelManager: TunnelManager
 
-    private var isCollecting = false
+	override fun onCreate() {
+		super.onCreate()
+		serviceManager.tunnelControlTile.complete(this)
+	}
 
-    override fun onCreate() {
+	override fun onDestroy() {
-        super.onCreate()
+		super.onDestroy()
-        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
+		serviceManager.tunnelControlTile = CompletableDeferred()
-    }
+	}
 
-    override fun onDestroy() {
+	override fun onStartListening() {
-        super.onDestroy()
+		super.onStartListening()
-        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+		Timber.d("Start listening called")
-    }
+		serviceManager.tunnelControlTile.complete(this)
+		applicationScope.launch {
+			updateTileState()
+		}
+	}
 
-    override fun onStartListening() {
+	fun updateTileState() = applicationScope.launch {
-        super.onStartListening()
+		if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
-        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
+		with(tunnelManager.activeTunnels().value) {
-        Timber.d("Start listening called for tunnel tile")
+			if (isNotEmpty()) return@launch updateTile(if (size == 1) first().tunName else getString(R.string.multiple), true)
-        if (isCollecting) return
+		}
-        isCollecting = true
+		appDataRepository.getStartTunnelConfig()?.let {
-        lifecycleScope.launch { tunnelManager.activeTunnels.collect { updateTileState() } }
+			updateTile(it.tunName, false)
-    }
+		}
+	}
 
-    private suspend fun updateTileState() {
+	override fun onClick() {
-        try {
+		super.onClick()
-            val tunnels = appDataRepository.tunnels.getAll()
+		unlockAndRun {
-            if (tunnels.isEmpty()) {
+			applicationScope.launch {
-                setUnavailable()
+				if (tunnelManager.activeTunnels().value.isNotEmpty()) return@launch tunnelManager.stopTunnel()
-                return
+				appDataRepository.getStartTunnelConfig()?.let {
-            }
+					tunnelManager.startTunnel(it)
+				}
+			}
+		}
+	}
 
-            val activeTunnels =
+	private fun setActive() {
-                tunnelManager.activeTunnels.value.filter { it.value.status.isUpOrStarting() }
+		runCatching {
+			qsTile.state = Tile.STATE_ACTIVE
+			qsTile.updateTile()
+		}
+	}
 
-            when {
+	private fun setInactive() {
-                activeTunnels.isNotEmpty() -> {
+		runCatching {
-                    val activeIds = activeTunnels.map { it.key.id }
+			qsTile.state = Tile.STATE_INACTIVE
-                    // TODO improvements would be needed to make this work well with toggling
+			qsTile.updateTile()
-                    // multiple tunnels
+		}
-                    // this would be better managed elsewhere
+	}
-                    WireGuardAutoTunnel.setLastActiveTunnels(activeIds)
-                    updateTileForActiveTunnels(activeTunnels)
-                }
-                else -> updateTileForLastActiveTunnels()
-            }
-        } catch (e: Exception) {
-            setUnavailable()
-        }
-    }
 
-    private fun updateTileForActiveTunnels(activeTunnels: Map<TunnelConf, TunnelState>) {
+	private fun setUnavailable() {
-        val tileName =
+		runCatching {
-            when (activeTunnels.size) {
+			qsTile.state = Tile.STATE_UNAVAILABLE
-                1 -> activeTunnels.keys.first().tunName
+			setTileDescription("")
-                else -> getString(R.string.multiple)
+			qsTile.updateTile()
-            }
+		}
-        updateTile(tileName, true)
+	}
-    }
 
-    private suspend fun updateTileForLastActiveTunnels() {
+	private fun setTileDescription(description: String) {
-        val lastActiveIds = WireGuardAutoTunnel.getLastActiveTunnels()
+		runCatching {
-        when {
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            lastActiveIds.isEmpty() -> {
+				qsTile.subtitle = description
-                appDataRepository.getStartTunnelConfig()?.let { config ->
+			}
-                    updateTile(config.tunName, false)
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                } ?: setUnavailable()
+				qsTile.stateDescription = description
-            }
+			}
-            lastActiveIds.size > 1 -> updateTile(getString(R.string.multiple), false)
+			qsTile.updateTile()
-            else -> {
+		}
-                val tunnelId = lastActiveIds.first()
+	}
-                appDataRepository.tunnels.getById(tunnelId)?.let { tunnel ->
-                    updateTile(tunnel.tunName, false)
-                } ?: setUnavailable()
-            }
-        }
-    }
 
-    override fun onClick() {
+	/* This works around an annoying unsolved frameworks bug some people are hitting. */
-        super.onClick()
+	override fun onBind(intent: Intent): IBinder? {
-        unlockAndRun {
+		var ret: IBinder? = null
-            lifecycleScope.launch {
+		try {
-                if (tunnelManager.activeTunnels.value.isNotEmpty())
+			ret = super.onBind(intent)
-                    return@launch tunnelManager.stopTunnel()
+		} catch (_: Throwable) {
-                val lastActive = WireGuardAutoTunnel.getLastActiveTunnels()
+			Timber.e("Failed to bind to TunnelControlTile")
-                if (lastActive.isEmpty()) {
+		}
-                    appDataRepository.getStartTunnelConfig()?.let { tunnelManager.startTunnel(it) }
+		return ret
-                } else {
+	}
-                    lastActive.forEach { id ->
-                        appDataRepository.tunnels.getById(id)?.let { tunnelManager.startTunnel(it) }
-                    }
-                }
-            }
-        }
-    }
 
-    private fun setActive() {
+	private fun updateTile(name: String, active: Boolean) {
-        runCatching {
+		runCatching {
-            qsTile.state = Tile.STATE_ACTIVE
+			setTileDescription(name)
-            qsTile.updateTile()
+			if (active) return setActive()
-        }
+			setInactive()
-    }
+		}.onFailure {
-
+			Timber.e(it)
-    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 (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()
-        }
-    }
-
-    /* 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,83 +10,70 @@ import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 
-class DynamicShortcutManager(
+class DynamicShortcutManager(private val context: Context, @IoDispatcher private val ioDispatcher: CoroutineDispatcher) : ShortcutManager {
-    private val context: Context,
+	override suspend fun addShortcuts() {
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+		withContext(ioDispatcher) {
-) : ShortcutManager {
+			ShortcutManagerCompat.setDynamicShortcuts(context, createShortcuts())
-    override suspend fun addShortcuts() {
+		}
-        withContext(ioDispatcher) {
+	}
-            ShortcutManagerCompat.setDynamicShortcuts(context, createShortcuts())
-        }
-    }
 
-    override suspend fun removeShortcuts() {
+	override suspend fun removeShortcuts() {
-        withContext(ioDispatcher) {
+		withContext(ioDispatcher) {
-            ShortcutManagerCompat.removeDynamicShortcuts(context, createShortcuts().map { it.id })
+			ShortcutManagerCompat.removeDynamicShortcuts(context, createShortcuts().map { it.id })
-        }
+		}
-    }
+	}
 
-    private fun createShortcuts(): List<ShortcutInfoCompat> {
+	private fun createShortcuts(): List<ShortcutInfoCompat> {
-        return listOf(
+		return listOf(
-            buildShortcut(
+			buildShortcut(
-                context.getString(R.string.vpn_off),
+				context.getString(R.string.vpn_off),
-                context.getString(R.string.vpn_off),
+				context.getString(R.string.vpn_off),
-                context.getString(R.string.vpn_off),
+				context.getString(R.string.vpn_off),
-                intent =
+				intent = Intent(context, ShortcutsActivity::class.java).apply {
-                    Intent(context, ShortcutsActivity::class.java).apply {
+					putExtra("className", "WireGuardTunnelService")
-                        putExtra("className", "WireGuardTunnelService")
+					action = ShortcutsActivity.Action.STOP.name
-                        action = ShortcutsActivity.Action.STOP.name
+				},
-                    },
+				shortcutIcon = R.drawable.vpn_off,
-                shortcutIcon = R.drawable.vpn_off,
+			),
-            ),
+			buildShortcut(
-            buildShortcut(
+				context.getString(R.string.vpn_on),
-                context.getString(R.string.vpn_on),
+				context.getString(R.string.vpn_on),
-                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 {
-                intent =
+					putExtra("className", "WireGuardTunnelService")
-                    Intent(context, ShortcutsActivity::class.java).apply {
+					action = ShortcutsActivity.Action.START.name
-                        putExtra("className", "WireGuardTunnelService")
+				},
-                        action = ShortcutsActivity.Action.START.name
+				shortcutIcon = R.drawable.vpn_on,
-                    },
+			),
-                shortcutIcon = R.drawable.vpn_on,
+			buildShortcut(
-            ),
+				context.getString(R.string.start_auto),
-            buildShortcut(
+				context.getString(R.string.start_auto),
-                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 {
-                context.getString(R.string.start_auto),
+					putExtra("className", "WireGuardConnectivityWatcherService")
-                intent =
+					action = ShortcutsActivity.Action.START.name
-                    Intent(context, ShortcutsActivity::class.java).apply {
+				},
-                        putExtra("className", "WireGuardConnectivityWatcherService")
+				shortcutIcon = R.drawable.auto_play,
-                        action = ShortcutsActivity.Action.START.name
+			),
-                    },
+			buildShortcut(
-                shortcutIcon = R.drawable.auto_play,
+				context.getString(R.string.stop_auto),
-            ),
+				context.getString(R.string.stop_auto),
-            buildShortcut(
+				context.getString(R.string.stop_auto),
-                context.getString(R.string.stop_auto),
+				intent = Intent(context, ShortcutsActivity::class.java).apply {
-                context.getString(R.string.stop_auto),
+					putExtra("className", "WireGuardConnectivityWatcherService")
-                context.getString(R.string.stop_auto),
+					action = ShortcutsActivity.Action.STOP.name
-                intent =
+				},
-                    Intent(context, ShortcutsActivity::class.java).apply {
+				shortcutIcon = R.drawable.auto_pause,
-                        putExtra("className", "WireGuardConnectivityWatcherService")
+			),
-                        action = ShortcutsActivity.Action.STOP.name
+		)
-                    },
+	}
-                shortcutIcon = R.drawable.auto_pause,
-            ),
-        )
-    }
 
-    private fun buildShortcut(
+	private fun buildShortcut(id: String, shortLabel: String, longLabel: String, intent: Intent, shortcutIcon: Int): ShortcutInfoCompat {
-        id: String,
+		return ShortcutInfoCompat.Builder(context, id)
-        shortLabel: String,
+			.setShortLabel(shortLabel)
-        longLabel: String,
+			.setLongLabel(longLabel)
-        intent: Intent,
+			.setIntent(intent)
-        shortcutIcon: Int,
+			.setIcon(IconCompat.createWithResource(context, shortcutIcon))
-    ): ShortcutInfoCompat {
+			.build()
-        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,7 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.core.shortcut
 
 interface ShortcutManager {
-    suspend fun addShortcuts()
+	suspend fun addShortcuts()
-
+	suspend fun removeShortcuts()
-    suspend fun removeShortcuts()
 }

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

@@ -2,75 +2,72 @@ 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 lateinit var tunnelManager: TunnelManager
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
 
-    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
+	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()
+	}
 
-    override fun onCreate(savedInstanceState: Bundle?) {
+	enum class Action {
-        super.onCreate(savedInstanceState)
+		START,
-        applicationScope.launch {
+		STOP,
-            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()
-    }
 
-    enum class Action {
+	companion object {
-        START,
+		const val LEGACY_TUNNEL_SERVICE_NAME = "WireGuardTunnelService"
-        STOP,
+		const val LEGACY_AUTO_TUNNEL_SERVICE_NAME = "WireGuardConnectivityWatcherService"
-    }
+		const val TUNNEL_NAME_EXTRA_KEY = "tunnelName"
-
+		const val CLASS_NAME_EXTRA_KEY = "className"
-    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,238 +1,219 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
-import com.wireguard.android.backend.BackendException
+import com.zaneschepke.wireguardautotunnel.R
-import com.wireguard.android.backend.Tunnel
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.core.network.NetworkMonitor
+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.util.extensions.asTunnelState
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
-import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
+import com.zaneschepke.wireguardautotunnel.util.Constants
-import java.util.concurrent.ConcurrentHashMap
+import com.zaneschepke.wireguardautotunnel.util.StringValue
-import kotlin.concurrent.thread
+import com.zaneschepke.wireguardautotunnel.util.extensions.cancelWithMessage
+import kotlinx.coroutines.CoroutineDispatcher
 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.distinctUntilChanged
 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.atomic.AtomicBoolean
 
-abstract class BaseTunnel(
+open class BaseTunnel(
-    @ApplicationScope private val applicationScope: CoroutineScope,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-    private val appDataRepository: AppDataRepository,
+	@ApplicationScope private val applicationScope: CoroutineScope,
-    private val serviceManager: ServiceManager,
+	private val networkMonitor: NetworkMonitor,
+	private val appDataRepository: AppDataRepository,
+	private val serviceManager: ServiceManager,
+	private val notificationManager: NotificationManager,
 ) : TunnelProvider {
 
-    private val activeTuns = MutableStateFlow<Map<TunnelConf, TunnelState>>(emptyMap())
+	internal val tunnels = MutableStateFlow<List<TunnelConf>>(emptyList())
-    private val tunThreads = ConcurrentHashMap<Int, Thread>()
-    override val activeTunnels = activeTuns.asStateFlow()
 
-    private val tunMutex = Mutex()
+	private val tunnelJobs = mutableMapOf<TunnelConf, Job>()
-    private val tunStatusMutex = Mutex()
-    private val bounceTunnelMutex = Mutex()
 
-    override val bouncingTunnelIds = ConcurrentHashMap<Int, TunnelStatus.StopReason>()
+	private val isNetworkAvailable = AtomicBoolean(false)
 
-    abstract suspend fun startBackend(tunnel: TunnelConf)
+	init {
+		applicationScope.launch(ioDispatcher) {
+			launch {
+				startNetworkJob()
+			}
+			tunnels.collect { tuns ->
+				val previousTuns = tunnelJobs.keys.toSet()
+				val newTuns = tuns - previousTuns
+				val removedItems = previousTuns - tuns.toSet()
 
-    abstract fun stopBackend(tunnel: TunnelConf)
+				newTuns.forEach { tun ->
+					Timber.d("Starting tunnel jobs for tun ${tun.name}")
+					tunnelJobs[tun] = startTunnelJobs(tun)
+				}
 
-    override suspend fun clearError(tunnelConf: TunnelConf) =
+				removedItems.forEach { tun ->
-        updateTunnelStatus(tunnelConf, TunnelStatus.Down)
+					tunnelJobs[tun]?.cancelWithMessage("Canceling tunnel jobs for tunnel: ${tun.name}")
+					tunnelJobs.remove(tun)
+				}
+				serviceManager.updateTunnelTile()
+			}
+		}
+	}
 
-    override fun hasVpnPermission(): Boolean {
+	private fun startTunnelJobs(tunnel: TunnelConf) = applicationScope.launch(ioDispatcher) {
-        return serviceManager.hasVpnPermission()
+		launch {
-    }
+			startTunnelStatisticsJob(tunnel)
+		}
+		launch {
+			startPingJob(tunnel)
+		}
+		launch {
+			startTunnelConfigChangeJob(tunnel)
+		}
+	}
 
-    protected suspend fun updateTunnelStatus(
+	override suspend fun bounceTunnel(tunnelConf: TunnelConf) {
-        tunnelConf: TunnelConf,
+		if (tunnels.value.any { it.id == tunnelConf.id }) {
-        state: TunnelStatus? = null,
+			toggleTunnel(tunnelConf, TunnelStatus.DOWN)
-        stats: TunnelStatistics? = null,
+			toggleTunnel(tunnelConf, TunnelStatus.UP)
-    ) {
+		}
-        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 suspend fun stopActiveTunnels() {
+	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
-        activeTunnels.value.forEach { (config, state) ->
+	}
-            if (state.status.isUpOrStarting()) {
-                stopTunnel(config)
-            }
-        }
-    }
 
-    private fun configureTunnelCallbacks(tunnelConf: TunnelConf) {
+	override suspend fun runningTunnelNames(): Set<String> {
-        Timber.d("Configuring TunnelConf instance: ${tunnelConf.hashCode()}")
+		return emptySet()
-        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 suspend fun updateTunnelStatistics(tunnel: TunnelConf) {
+	override suspend fun activeTunnels(): StateFlow<List<TunnelConf>> {
-        val stats = getStatistics(tunnel)
+		return tunnels.asStateFlow()
-        updateTunnelStatus(tunnel, null, stats)
+	}
-    }
 
-    override suspend fun startTunnel(tunnelConf: TunnelConf) {
+	override suspend fun startTunnel(tunnelConf: TunnelConf) {
-        if (activeTuns.exists(tunnelConf.id) || tunThreads.containsKey(tunnelConf.id)) return
+		if (tunnels.value.any { it.id == tunnelConf.id }) return Timber.w("Tunnel already running")
-        if (this@BaseTunnel is UserspaceTunnel) stopActiveTunnels()
+		serviceManager.startBackgroundService(tunnelConf)
-        tunMutex.withLock {
+		appDataRepository.tunnels.save(tunnelConf.copy(isActive = true))
-            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") }
-            }
-        }
-    }
 
-    private suspend fun startTunnelInner(tunnelConf: TunnelConf) {
+	override suspend fun stopTunnel(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
-        }
-    }
 
-    private suspend fun saveTunnelActiveState(tunnelConf: TunnelConf, active: Boolean) {
+	open suspend fun toggleTunnel(tunnelConf: TunnelConf, state: TunnelStatus) {
-        val tunnelCopy = tunnelConf.copyWithCallback(isActive = active)
+	}
-        appDataRepository.tunnels.save(tunnelCopy)
-    }
 
-    override suspend fun stopTunnel(tunnelConf: TunnelConf?, reason: TunnelStatus.StopReason) {
+	open suspend fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
-        if (tunnelConf == null) return stopActiveTunnels()
+		throw NotImplementedError("Get statistics not implemented in base class")
-        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))
-            }
-        }
-    }
 
-    private suspend fun stopTunnelInner(tunnelConf: TunnelConf) {
+	internal suspend fun onTunnelStop(tunnelConf: TunnelConf) {
-        val tunnel = activeTuns.findTunnel(tunnelConf.id) ?: return
+		appDataRepository.tunnels.save(tunnelConf.copy(isActive = false))
-        stopBackend(tunnel)
+		removeFromActiveTunnels(tunnelConf)
-        saveTunnelActiveState(tunnelConf, false)
+		if (tunnels.value.isEmpty()) serviceManager.stopBackgroundService()
-        removeActiveTunnel(tunnel)
+	}
-    }
 
-    private suspend fun handleServiceStateOnChange() {
+	internal suspend fun stopAllTunnels() {
-        if (activeTuns.value.isEmpty() && bouncingTunnelIds.isEmpty())
+		tunnels.value.forEach {
-            serviceManager.stopTunnelForegroundService()
+			stopTunnel(it)
-    }
+		}
+	}
 
-    private suspend fun handleStuckStartingTunnelShutdown(tunnel: TunnelConf) {
+	internal fun addToActiveTunnels(conf: TunnelConf) {
-        Timber.d("Stuck in starting state so shutting down tunnel thread for tunnel ${tunnel.name}")
+		tunnels.update {
-        try {
+			it.toMutableList().apply {
-            tunThreads[tunnel.id]?.let {
+				add(conf)
-                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)
-    }
 
-    private fun cleanUpTunThread(tunnel: TunnelConf) {
+	private fun removeFromActiveTunnels(conf: TunnelConf) {
-        Timber.d("Removing thread for ${tunnel.name}")
+		tunnels.update {
-        tunThreads -= tunnel.id
+			it.toMutableList().apply {
-    }
+				remove(conf)
+			}
+		}
+	}
 
-    private fun removeActiveTunnel(tunnelConf: TunnelConf) {
+	private suspend fun startNetworkJob() = coroutineScope {
-        activeTuns.update { current -> current.toMutableMap().apply { remove(tunnelConf) } }
+		networkMonitor.status.distinctUntilChanged().collect {
-    }
+			isNetworkAvailable.set(!it.allOffline)
+		}
+	}
 
-    override suspend fun bounceTunnel(tunnelConf: TunnelConf, reason: TunnelStatus.StopReason) {
+	private suspend fun startPingJob(tunnel: TunnelConf) = coroutineScope {
-        bounceTunnelMutex.withLock {
+		while (isActive) {
-            Timber.i(
+			if (isNetworkAvailable.get() && tunnel.isActive) {
-                "Bounce tunnel ${tunnelConf.name} for reason: $reason, current bouncing: ${bouncingTunnelIds.size}"
+				val pingResult = tunnel.pingTunnel(ioDispatcher)
-            )
+				handlePingResult(tunnel, pingResult)
-            bouncingTunnelIds[tunnelConf.id] = reason
+			}
-            try {
+			delay(CHECK_INTERVAL)
-                stopTunnel(tunnelConf, reason)
+		}
-                delay(300L)
+	}
-                startTunnel(tunnelConf)
-            } finally {
-                bouncingTunnelIds.remove(tunnelConf.id)
-                handleServiceStateOnChange()
-                Timber.d(
-                    "Cleared bounce state for ${tunnelConf.name}, remaining: ${bouncingTunnelIds.size}"
-                )
-            }
-        }
-    }
 
-    override suspend fun runningTunnelNames(): Set<String> =
+	private suspend fun handlePingResult(tunnel: TunnelConf, pingResult: List<Boolean>) {
-        activeTuns.value.keys.map { it.tunName }.toSet()
+		if (pingResult.contains(false)) {
+			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 startTunnelConfigChangeJob(tunnel: TunnelConf) = coroutineScope {
+		appDataRepository.tunnels.flow.collect { storageTuns ->
+			storageTuns.firstOrNull { it.id == tunnel.id }?.let { storageTun ->
+				if (tunnel.isQuickConfigChanged(storageTun) || tunnel.isPingConfigMatching(storageTun)) {
+					bounceTunnel(tunnel)
+				}
+			}
+		}
+	}
+
+	private suspend fun startTunnelStatisticsJob(tunnel: TunnelConf) = coroutineScope {
+		while (isActive) {
+			val stats = getStatistics(tunnel)
+			tunnel.state.update {
+				it.copy(statistics = stats)
+			}
+			delay(CHECK_INTERVAL)
+		}
+	}
 }

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

@@ -1,50 +0,0 @@
-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,8 +3,11 @@ 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.wireguardautotunnel.core.network.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
@@ -12,55 +15,69 @@ 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 javax.inject.Inject
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.withContext
 import timber.log.Timber
+import javax.inject.Inject
 
-class KernelTunnel
+class KernelTunnel @Inject constructor(
-@Inject
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-constructor(
+	@ApplicationScope private val applicationScope: CoroutineScope,
-    @ApplicationScope private val applicationScope: CoroutineScope,
+	serviceManager: ServiceManager,
-    serviceManager: ServiceManager,
+	appDataRepository: AppDataRepository,
-    appDataRepository: AppDataRepository,
+	notificationManager: NotificationManager,
-    private val backend: Backend,
+	private val backend: Backend,
-) : BaseTunnel(applicationScope, appDataRepository, serviceManager) {
+	networkMonitor: NetworkMonitor,
+) : BaseTunnel(ioDispatcher, applicationScope, networkMonitor, appDataRepository, serviceManager, notificationManager) {
 
-    override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
+	override suspend fun startTunnel(tunnelConf: TunnelConf) {
-        return try {
+		withContext(ioDispatcher) {
-            WireGuardStatistics(backend.getStatistics(tunnelConf))
+			super.startTunnel(tunnelConf)
-        } catch (e: Exception) {
+			runCatching {
-            Timber.e(e)
+				backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toWgConfig())
-            null
+				addToActiveTunnels(tunnelConf)
-        }
+			}.onFailure {
-    }
+				onTunnelStop(tunnelConf)
+				if (it is BackendException) {
+					handleBackendThrowable(it.toBackendError())
+				} else {
+					Timber.e(it)
+				}
+			}
+		}
+	}
 
-    override suspend fun startBackend(tunnel: TunnelConf) {
+	override suspend fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
-        try {
+		return WireGuardStatistics(backend.getStatistics(tunnelConf))
-            updateTunnelStatus(tunnel, TunnelStatus.Starting)
+	}
-            backend.setState(tunnel, Tunnel.State.UP, tunnel.toWgConfig())
-        } catch (e: BackendException) {
-            throw e.toBackendError()
-        }
-    }
 
-    override fun stopBackend(tunnel: TunnelConf) {
+	override suspend fun stopTunnel(tunnelConf: TunnelConf?) {
-        Timber.i("Stopping tunnel ${tunnel.id} kernel")
+		withContext(ioDispatcher) {
-        try {
+			val tunnel = tunnels.value.firstOrNull { it.id == tunnelConf?.id }
-            backend.setState(tunnel, Tunnel.State.DOWN, tunnel.toWgConfig())
+			runCatching {
-        } catch (e: BackendException) {
+				tunnel?.let {
-            throw e.toBackendError()
+					backend.setState(it, Tunnel.State.DOWN, it.toWgConfig())
-        }
+					onTunnelStop(it)
-    }
+				} ?: stopAllTunnels()
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
+	}
 
-    override fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
+	override suspend fun toggleTunnel(tunnelConf: TunnelConf, status: TunnelStatus) {
-        Timber.w("Not yet implemented for kernel")
+		when (status) {
-    }
+			TunnelStatus.UP -> backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toWgConfig())
+			TunnelStatus.DOWN -> backend.setState(tunnelConf, Tunnel.State.DOWN, tunnelConf.toWgConfig())
+		}
+	}
 
-    override fun getBackendState(): BackendState {
+	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
-        return BackendState.INACTIVE
+		Timber.w("Not yet implemented for kernel")
-    }
+	}
 
-    override suspend fun runningTunnelNames(): Set<String> {
+	override suspend fun runningTunnelNames(): Set<String> {
-        return backend.runningTunnelNames
+		return backend.runningTunnelNames
-    }
+	}
 }

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

@@ -4,121 +4,96 @@ import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.di.Kernel
 import com.zaneschepke.wireguardautotunnel.di.Userspace
+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.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
+import com.zaneschepke.wireguardautotunnel.util.extensions.withData
-import java.util.concurrent.ConcurrentHashMap
-import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.plus
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
 
-class TunnelManager
+class TunnelManager @Inject constructor(
-@Inject
+	@Kernel private val kernelTunnel: TunnelProvider,
-constructor(
+	@Userspace private val userspaceTunnel: TunnelProvider,
-    @Kernel private val kernelTunnel: TunnelProvider,
+	private val appDataRepository: AppDataRepository,
-    @Userspace private val userspaceTunnel: TunnelProvider,
+	@ApplicationScope private val applicationScope: CoroutineScope,
-    private val appDataRepository: AppDataRepository,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-    @ApplicationScope private val applicationScope: CoroutineScope,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : TunnelProvider {
 
-    @OptIn(ExperimentalCoroutinesApi::class)
+	val appSettings: StateFlow<AppSettings?> = appDataRepository.settings.flow.stateIn(
-    private val tunnelProviderFlow =
+		scope = applicationScope.plus(ioDispatcher),
-        appDataRepository.settings.flow
+		started = SharingStarted.Eagerly,
-            .filterNotNull()
+		initialValue = null,
-            .flatMapLatest { settings ->
+	)
-                MutableStateFlow(if (settings.isKernelEnabled) kernelTunnel else userspaceTunnel)
-            }
-            .stateIn(
-                scope = applicationScope.plus(ioDispatcher),
-                started = SharingStarted.Eagerly,
-                initialValue = userspaceTunnel,
-            )
 
-    @OptIn(ExperimentalCoroutinesApi::class)
+	override suspend fun activeTunnels(): StateFlow<List<TunnelConf>> {
-    override val activeTunnels =
+		return withContext(ioDispatcher) {
-        appDataRepository.settings.flow
+			appSettings.filterNotNull().first().let {
-            .filterNotNull()
+				if (it.isKernelEnabled) return@withContext kernelTunnel.activeTunnels()
-            .flatMapLatest { settings ->
+				userspaceTunnel.activeTunnels()
-                if (settings.isKernelEnabled) {
+			}
-                    kernelTunnel.activeTunnels
+		}
-                } else {
+	}
-                    userspaceTunnel.activeTunnels
-                }
-            }
-            .stateIn(
-                scope = applicationScope.plus(ioDispatcher),
-                started = SharingStarted.Eagerly,
-                initialValue = emptyMap(),
-            )
 
-    override val bouncingTunnelIds: ConcurrentHashMap<Int, TunnelStatus.StopReason> =
+	override suspend fun startTunnel(tunnelConf: TunnelConf) {
-        tunnelProviderFlow.value.bouncingTunnelIds
+		appSettings.withData {
+			if (it.isKernelEnabled) return@withData kernelTunnel.startTunnel(tunnelConf)
+			userspaceTunnel.startTunnel(tunnelConf)
+		}
+	}
 
-    override fun hasVpnPermission(): Boolean {
+	override suspend fun stopTunnel(tunnelConf: TunnelConf?) {
-        return userspaceTunnel.hasVpnPermission()
+		appSettings.withData {
-    }
+			if (it.isKernelEnabled) return@withData kernelTunnel.stopTunnel(tunnelConf)
+			userspaceTunnel.stopTunnel(tunnelConf)
+		}
+	}
 
-    override suspend fun clearError(tunnelConf: TunnelConf) {
+	override suspend fun bounceTunnel(tunnelConf: TunnelConf) {
-        tunnelProviderFlow.value.clearError(tunnelConf)
+		appSettings.withData {
-    }
+			if (it.isKernelEnabled) return@withData kernelTunnel.stopTunnel(tunnelConf)
+			userspaceTunnel.stopTunnel(tunnelConf)
+		}
+	}
 
-    override suspend fun updateTunnelStatistics(tunnel: TunnelConf) {
+	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
-        tunnelProviderFlow.value.updateTunnelStatistics(tunnel)
+		appSettings.withData {
-    }
+			if (it.isKernelEnabled) return@withData kernelTunnel.setBackendState(backendState, allowedIps)
+			userspaceTunnel.setBackendState(backendState, allowedIps)
+		}
+	}
 
-    override suspend fun startTunnel(tunnelConf: TunnelConf) {
+	override suspend fun runningTunnelNames(): Set<String> {
-        tunnelProviderFlow.value.startTunnel(tunnelConf)
+		appSettings.filterNotNull().first().let {
-    }
+			if (it.isKernelEnabled) return kernelTunnel.runningTunnelNames()
+			return userspaceTunnel.runningTunnelNames()
+		}
+	}
 
-    override suspend fun stopTunnel(tunnelConf: TunnelConf?, reason: TunnelStatus.StopReason) {
+	suspend fun restorePreviousState() {
-        tunnelProviderFlow.value.stopTunnel(tunnelConf, reason)
+		withContext(ioDispatcher) {
-    }
+			with(appDataRepository.settings.get()) {
-
+				if (isRestoreOnBootEnabled) {
-    override suspend fun bounceTunnel(tunnelConf: TunnelConf, reason: TunnelStatus.StopReason) {
+					val previouslyActiveTuns = appDataRepository.tunnels.getActive()
-        tunnelProviderFlow.value.bounceTunnel(tunnelConf, reason)
+					// handle kernel mode
-    }
+					val tunsToStart = previouslyActiveTuns.filterNot { tun -> activeTunnels().value.any { tun.id == it.id } }
-
+					if (isKernelEnabled) {
-    override fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
+						return@withContext tunsToStart.forEach {
-        tunnelProviderFlow.value.setBackendState(backendState, allowedIps)
+							startTunnel(it)
-    }
+						}
-
+					}
-    override fun getBackendState(): BackendState {
+					// handle userspace
-        return tunnelProviderFlow.value.getBackendState()
+					if (activeTunnels().value.isEmpty()) tunsToStart.firstOrNull()?.let { startTunnel(it) }
-    }
+				}
-
+			}
-    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,55 +2,23 @@ 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 {
-    /** Starts the specified tunnel configuration. */
-    suspend fun startTunnel(tunnelConf: TunnelConf)
 
-    /**
+	suspend fun activeTunnels(): StateFlow<List<TunnelConf>>
-     * 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,
-    )
 
-    /**
+	suspend fun startTunnel(tunnelConf: TunnelConf)
-     * 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>)
+	suspend fun stopTunnel(tunnelConf: TunnelConf? = null)
 
-    fun getBackendState(): BackendState
+	suspend fun bounceTunnel(tunnelConf: TunnelConf)
 
-    suspend fun runningTunnelNames(): Set<String>
+	suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>)
 
-    fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics?
+	suspend fun runningTunnelNames(): Set<String>
 
-    val activeTunnels: StateFlow<Map<TunnelConf, TunnelState>>
+	companion object {
-
+		const val CHECK_INTERVAL = 1_000L
-    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,7 +1,11 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
+import com.wireguard.android.backend.BackendException
+import com.zaneschepke.wireguardautotunnel.core.network.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
@@ -9,99 +13,71 @@ 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 javax.inject.Inject
+import kotlinx.coroutines.CoroutineDispatcher
-import kotlin.jvm.optionals.getOrNull
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.withContext
 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
+import javax.inject.Inject
 
-class UserspaceTunnel
+class UserspaceTunnel @Inject constructor(
-@Inject
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-constructor(
+	@ApplicationScope private val applicationScope: CoroutineScope,
-    @ApplicationScope private val applicationScope: CoroutineScope,
+	serviceManager: ServiceManager,
-    val serviceManager: ServiceManager,
+	appDataRepository: AppDataRepository,
-    val appDataRepository: AppDataRepository,
+	notificationManager: NotificationManager,
-    private val backend: Backend,
+	private val backend: Backend,
-) : BaseTunnel(applicationScope, appDataRepository, serviceManager) {
+	networkMonitor: NetworkMonitor,
+) : TunnelProvider, BaseTunnel(ioDispatcher, applicationScope, networkMonitor, appDataRepository, serviceManager, notificationManager) {
 
-    private var previousBackendState: Pair<BackendState, Boolean>? = null
+	override suspend fun startTunnel(tunnelConf: TunnelConf) {
+		withContext(ioDispatcher) {
+			super.startTunnel(tunnelConf)
+			runCatching {
+				backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toAmConfig())
+				addToActiveTunnels(tunnelConf)
+			}.onFailure {
+				onTunnelStop(tunnelConf)
+				if (it is BackendException) {
+					handleBackendThrowable(it.toBackendError())
+				} else {
+					Timber.e(it)
+				}
+			}
+		}
+	}
 
-    override suspend fun startBackend(tunnel: TunnelConf) {
+	override suspend fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
-        try {
+		return AmneziaStatistics(backend.getStatistics(tunnelConf))
-            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 fun stopBackend(tunnel: TunnelConf) {
+	override suspend fun toggleTunnel(tunnelConf: TunnelConf, status: TunnelStatus) {
-        Timber.i("Stopping tunnel ${tunnel.name} userspace")
+		when (status) {
-        try {
+			TunnelStatus.UP -> backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toAmConfig())
-            backend.setState(tunnel, Tunnel.State.DOWN, tunnel.toAmConfig())
+			TunnelStatus.DOWN -> backend.setState(tunnelConf, Tunnel.State.DOWN, tunnelConf.toAmConfig())
-        } catch (e: BackendException) {
+		}
-            Timber.e(e, "Failed to stop tunnel ${tunnel.id}")
+	}
-            throw e.toBackendError()
-        }
-        handlePreviouslyEnabledVpnKillSwitch()
-    }
 
-    // stop vpn kill switch if we need to resolve DNS for peer endpoints
+	override suspend fun stopTunnel(tunnelConf: TunnelConf?) {
-    private suspend fun handleVpnKillSwitchWithDomainEndpoints(config: Config) {
+		withContext(ioDispatcher) {
-        if (
+			runCatching {
-            config.peers.any { it.endpoint.getOrNull()?.toString()?.isUrl() == true } &&
+				tunnels.value.firstOrNull { it.id == tunnelConf?.id }?.let {
-                backend.backendState.asBackendState() == BackendState.KILL_SWITCH_ACTIVE
+					backend.setState(it, Tunnel.State.DOWN, it.toAmConfig())
-        ) {
+					onTunnelStop(it)
-            val bypassLan = appDataRepository.settings.get().isLanOnKillSwitchEnabled
+				} ?: stopAllTunnels()
-            previousBackendState = Pair(BackendState.KILL_SWITCH_ACTIVE, bypassLan)
+			}.onFailure {
-            setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
+				Timber.e(it)
-        }
+			}
-    }
+		}
+	}
 
-    // restore vpn kill switch if needed
+	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
-    private fun handlePreviouslyEnabledVpnKillSwitch() {
+		backend.setBackendState(backendState.asAmBackendState(), allowedIps)
-        // 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>) {
+	override suspend fun runningTunnelNames(): Set<String> {
-        Timber.d("Setting backend state: $backendState with allowedIps: $allowedIps")
+		return backend.runningTunnelNames
-        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,55 +13,48 @@ 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
+class ServiceWorker @AssistedInject constructor(
-@AssistedInject
+	@Assisted private val context: Context,
-constructor(
+	@Assisted private val params: WorkerParameters,
-    @Assisted private val context: Context,
+	private val serviceManager: ServiceManager,
-    @Assisted private val params: WorkerParameters,
+	private val appDataRepository: AppDataRepository,
-    private val serviceManager: ServiceManager,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-    private val appDataRepository: AppDataRepository,
+	private val tunnelManager: TunnelManager,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-    private val tunnelManager: TunnelManager,
 ) : CoroutineWorker(context, params) {
 
-    companion object {
+	companion object {
-        private const val TAG = "service_worker"
+		private const val TAG = "service_worker"
 
-        fun stop(context: Context) {
+		fun stop(context: Context) {
-            WorkManager.getInstance(context).cancelAllWorkByTag(TAG)
+			WorkManager.getInstance(context).cancelAllWorkByTag(TAG)
-        }
+		}
 
-        fun start(context: Context) {
+		fun start(context: Context) {
-            val periodicWorkRequest =
+			val periodicWorkRequest = PeriodicWorkRequestBuilder<ServiceWorker>(
-                PeriodicWorkRequestBuilder<ServiceWorker>(
+				repeatInterval = 15,
-                        repeatInterval = 15,
+				repeatIntervalTimeUnit = TimeUnit.MINUTES,
-                        repeatIntervalTimeUnit = TimeUnit.MINUTES,
+			).build()
-                    )
+			WorkManager.getInstance(context)
-                    .build()
+				.enqueueUniquePeriodicWork(
-            WorkManager.getInstance(context)
+					TAG,
-                .enqueueUniquePeriodicWork(
+					ExistingPeriodicWorkPolicy.KEEP,
-                    TAG,
+					periodicWorkRequest,
-                    ExistingPeriodicWorkPolicy.KEEP,
+				)
-                    periodicWorkRequest,
+		}
-                )
+	}
-        }
-    }
 
-    override suspend fun doWork(): Result =
+	override suspend fun doWork(): Result = withContext(ioDispatcher) {
-        withContext(ioDispatcher) {
+		Timber.i("Service worker started")
-            Timber.i("Service worker started")
+		with(appDataRepository.settings.get()) {
-            with(appDataRepository.settings.get()) {
+			if (isAutoTunnelEnabled && !serviceManager.autoTunnelActive.value) return@with serviceManager.startAutoTunnel(true)
-                if (isAutoTunnelEnabled && !serviceManager.autoTunnelActive.value)
+			if (tunnelManager.activeTunnels().value.isEmpty()) tunnelManager.restorePreviousState()
-                    return@with serviceManager.startAutoTunnel()
+		}
-                if (tunnelManager.activeTunnels.value.isEmpty())
+		Result.success()
-                    tunnelManager.restorePreviousState()
+	}
-            }
-            Result.success()
-        }
 }

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

@@ -12,38 +12,79 @@ import com.zaneschepke.wireguardautotunnel.data.model.Settings
 import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 
 @Database(
-    entities = [Settings::class, TunnelConfig::class],
+	entities = [Settings::class, TunnelConfig::class],
-    version = 16,
+	version = 16,
-    autoMigrations =
+	autoMigrations =
-        [
+	[
-            AutoMigration(from = 1, to = 2),
+		AutoMigration(from = 1, to = 2),
-            AutoMigration(from = 2, to = 3),
+		AutoMigration(from = 2, to = 3),
-            AutoMigration(from = 3, to = 4),
+		AutoMigration(
-            AutoMigration(from = 4, to = 5),
+			from = 3,
-            AutoMigration(from = 5, to = 6),
+			to = 4,
-            AutoMigration(from = 6, to = 7, spec = RemoveLegacySettingColumnsMigration::class),
+		),
-            AutoMigration(7, 8),
+		AutoMigration(
-            AutoMigration(8, 9),
+			from = 4,
-            AutoMigration(9, 10),
+			to = 5,
-            AutoMigration(from = 10, to = 11, spec = RemoveTunnelPauseMigration::class),
+		),
-            AutoMigration(from = 11, to = 12),
+		AutoMigration(
-            AutoMigration(from = 12, to = 13),
+			from = 5,
-            AutoMigration(from = 13, to = 14),
+			to = 6,
-            AutoMigration(from = 14, to = 15),
+		),
-            AutoMigration(from = 15, to = 16),
+		AutoMigration(
-        ],
+			from = 6,
-    exportSchema = true,
+			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(
-@DeleteColumn(tableName = "Settings", columnName = "is_battery_saver_enabled")
+	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,7 +7,6 @@ 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
@@ -16,77 +15,80 @@ 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,
+	private val context: Context,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) {
-    companion object {
+	companion object {
-        val locationDisclosureShown = booleanPreferencesKey("LOCATION_DISCLOSURE_SHOWN")
+		val locationDisclosureShown = booleanPreferencesKey("LOCATION_DISCLOSURE_SHOWN")
-        val batteryDisableShown = booleanPreferencesKey("BATTERY_OPTIMIZE_DISABLE_SHOWN")
+		val batteryDisableShown = booleanPreferencesKey("BATTERY_OPTIMIZE_DISABLE_SHOWN")
-        val pinLockEnabled = booleanPreferencesKey("PIN_LOCK_ENABLED")
+		val currentSSID = stringPreferencesKey("CURRENT_SSID")
-        val tunnelStatsExpanded = booleanPreferencesKey("TUNNEL_STATS_EXPANDED")
+		val pinLockEnabled = booleanPreferencesKey("PIN_LOCK_ENABLED")
-        val isLocalLogsEnabled = booleanPreferencesKey("LOCAL_LOGS_ENABLED")
+		val tunnelStatsExpanded = booleanPreferencesKey("TUNNEL_STATS_EXPANDED")
-        val locale = stringPreferencesKey("LOCALE")
+		val isLocalLogsEnabled = booleanPreferencesKey("LOCAL_LOGS_ENABLED")
-        val theme = stringPreferencesKey("THEME")
+		val locale = stringPreferencesKey("LOCALE")
-        val isRemoteControlEnabled = booleanPreferencesKey("IS_REMOTE_CONTROL_ENABLED")
+		val theme = stringPreferencesKey("THEME")
-        val remoteKey = stringPreferencesKey("REMOTE_KEY")
+	}
-    }
 
-    // preferences
+	// preferences
-    private val preferencesKey = "preferences"
+	private val preferencesKey = "preferences"
-    private val Context.dataStore by preferencesDataStore(name = preferencesKey)
+	private val Context.dataStore by
+		preferencesDataStore(
+			name = preferencesKey,
+		)
 
-    suspend fun init() {
+	suspend fun init() {
-        withContext(ioDispatcher) {
+		withContext(ioDispatcher) {
-            try {
+			try {
-                context.dataStore.data.first()
+				context.dataStore.data.first()
-            } catch (e: IOException) {
+			} catch (e: IOException) {
-                Timber.Forest.e(e)
+				Timber.Forest.e(e)
-            }
+			}
-        }
+		}
-    }
+	}
 
-    suspend fun <T> saveToDataStore(key: Preferences.Key<T>, value: T) {
+	suspend fun <T> saveToDataStore(key: Preferences.Key<T>, value: T) {
-        withContext(ioDispatcher) {
+		withContext(ioDispatcher) {
-            try {
+			try {
-                context.dataStore.edit { it[key] = value }
+				context.dataStore.edit { it[key] = value }
-            } catch (e: IOException) {
+			} catch (e: IOException) {
-                Timber.Forest.e(e)
+				Timber.Forest.e(e)
-            } catch (e: Exception) {
+			} catch (e: Exception) {
-                Timber.Forest.e(e)
+				Timber.Forest.e(e)
-            }
+			}
-        }
+		}
-    }
+	}
 
-    suspend fun <T> removeFromDataStore(key: Preferences.Key<T>) {
+	suspend fun <T> removeFromDataStore(key: Preferences.Key<T>) {
-        withContext(ioDispatcher) {
+		withContext(ioDispatcher) {
-            try {
+			try {
-                context.dataStore.edit { it.remove(key) }
+				context.dataStore.edit { it.remove(key) }
-            } catch (e: IOException) {
+			} catch (e: IOException) {
-                Timber.Forest.e(e)
+				Timber.Forest.e(e)
-            } catch (e: Exception) {
+			} catch (e: Exception) {
-                Timber.Forest.e(e)
+				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? {
+	suspend fun <T> getFromStore(key: Preferences.Key<T>): T? {
-        return withContext(ioDispatcher) {
+		return withContext(ioDispatcher) {
-            try {
+			try {
-                context.dataStore.data.map { it[key] }.first()
+				context.dataStore.data.map { it[key] }.first()
-            } catch (e: IOException) {
+			} catch (e: IOException) {
-                Timber.Forest.e(e)
+				Timber.Forest.e(e)
-                null
+				null
-            }
+			}
-        }
+		}
-    }
+	}
 
-    fun <T> getFromStoreBlocking(key: Preferences.Key<T>) = runBlocking {
+	fun <T> getFromStoreBlocking(key: Preferences.Key<T>) = runBlocking {
-        context.dataStore.data.map { it[key] }.first()
+		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,18 +5,17 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 import timber.log.Timber
 
 class DatabaseCallback : RoomDatabase.Callback() {
-    override fun onCreate(db: SupportSQLiteDatabase) =
+	override fun onCreate(db: SupportSQLiteDatabase) = db.run {
-        db.run {
+		// Notice non-ui thread is here
-            // Notice non-ui thread is here
+		beginTransaction()
-            beginTransaction()
+		try {
-            try {
+			execSQL(Queries.createDefaultSettings())
-                execSQL(Queries.createDefaultSettings())
+			Timber.i("Bootstrapping settings data")
-                Timber.i("Bootstrapping settings data")
+			setTransactionSuccessful()
-                setTransactionSuccessful()
+		} catch (e: Exception) {
-            } catch (e: Exception) {
+			Timber.e(e)
-                Timber.e(e)
+		} finally {
-            } finally {
+			endTransaction()
-                endTransaction()
+		}
-            }
+	}
-        }
 }

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

@@ -1,23 +1,24 @@
 package com.zaneschepke.wireguardautotunnel.data
 
 import androidx.room.TypeConverter
+import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 
 class DatabaseListConverters {
-    @TypeConverter
+	@TypeConverter
-    fun listToString(value: MutableList<String>): String {
+	fun listToString(value: MutableList<String>): String {
-        return Json.encodeToString(value)
+		return Json.encodeToString(value)
-    }
+	}
 
-    @TypeConverter
+	@TypeConverter
-    fun stringToList(value: String): MutableList<String> {
+	fun stringToList(value: String): MutableList<String> {
-        if (value.isBlank() || value.isEmpty()) return mutableListOf()
+		if (value.isBlank() || value.isEmpty()) return mutableListOf()
-        return try {
+		return try {
-            Json.decodeFromString<MutableList<String>>(value)
+			Json.decodeFromString<MutableList<String>>(value)
-        } catch (e: Exception) {
+		} catch (e: Exception) {
-            val list = value.split(",").toMutableList()
+			val list = value.split(",").toMutableList()
-            val json = listToString(list)
+			val json = listToString(list)
-            Json.decodeFromString<MutableList<String>>(json)
+			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 {
+	fun createDefaultSettings(): String {
-        return """
+		return """
 		INSERT INTO Settings (is_tunnel_enabled,
 		        is_tunnel_on_mobile_data_enabled,
 		        trusted_network_ssids,
@@ -24,14 +24,12 @@ object Queries {
 		        'false',
 		        'false',
 		        'false')
-		"""
+		""".trimIndent()
-            .trimIndent()
+	}
-    }
 
-    fun createTunnelConfig(): String {
+	fun createTunnelConfig(): String {
-        return """
+		return """
 		INSERT INTO TunnelConfig (name, wg_quick) VALUES ('test', 'test')
-		"""
+		""".trimIndent()
-            .trimIndent()
+	}
-    }
 }

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

@@ -10,19 +10,27 @@ 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,40 +11,48 @@ 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")
+	@Query("SELECT * FROM TunnelConfig WHERE name=:name")
-    suspend fun getByName(name: String): TunnelConfig?
+	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 || '%'")
+	@Query("SELECT * FROM TunnelConfig WHERE tunnel_networks LIKE '%' || :name || '%'")
-    suspend fun findByTunnelNetworkName(name: String): TunnelConfigs
+	suspend fun findByTunnelNetworkName(name: String): TunnelConfigs
 
-    @Query("UPDATE TunnelConfig SET is_primary_tunnel = 0 WHERE is_primary_tunnel =1")
+	@Query("UPDATE TunnelConfig SET is_primary_tunnel = 0 WHERE is_primary_tunnel =1")
-    suspend fun resetPrimaryTunnel()
+	suspend fun resetPrimaryTunnel()
 
-    @Query("UPDATE TunnelConfig SET is_mobile_data_tunnel = 0 WHERE is_mobile_data_tunnel =1")
+	@Query("UPDATE TunnelConfig SET is_mobile_data_tunnel = 0 WHERE is_mobile_data_tunnel =1")
-    suspend fun resetMobileDataTunnel()
+	suspend fun resetMobileDataTunnel()
 
-    @Query("UPDATE TunnelConfig SET is_ethernet_tunnel = 0 WHERE is_ethernet_tunnel =1")
+	@Query("UPDATE TunnelConfig SET is_ethernet_tunnel = 0 WHERE is_ethernet_tunnel =1")
-    suspend fun resetEthernetTunnel()
+	suspend fun resetEthernetTunnel()
 
-    @Query("SELECT * FROM TUNNELCONFIG WHERE is_primary_tunnel=1")
+	@Query("SELECT * FROM TUNNELCONFIG WHERE is_primary_tunnel=1")
-    suspend fun findByPrimary(): TunnelConfigs
+	suspend fun findByPrimary(): TunnelConfigs
 
-    @Query("SELECT * FROM TUNNELCONFIG WHERE is_mobile_data_tunnel=1")
+	@Query("SELECT * FROM TUNNELCONFIG WHERE is_mobile_data_tunnel=1")
-    suspend fun findByMobileDataTunnel(): TunnelConfigs
+	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,52 +4,43 @@ 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 isLocationDisclosureShown: Boolean = LOCATION_DISCLOSURE_SHOWN_DEFAULT,
-    val isBatteryOptimizationDisableShown: Boolean = BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
+	val isBatteryOptimizationDisableShown: Boolean = BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
-    val isPinLockEnabled: Boolean = PIN_LOCK_ENABLED_DEFAULT,
+	val isPinLockEnabled: Boolean = PIN_LOCK_ENABLED_DEFAULT,
-    val isTunnelStatsExpanded: Boolean = IS_TUNNEL_STATS_EXPANDED,
+	val isTunnelStatsExpanded: Boolean = IS_TUNNEL_STATS_EXPANDED,
-    val isLocalLogsEnabled: Boolean = IS_LOGS_ENABLED_DEFAULT,
+	val isLocalLogsEnabled: Boolean = IS_LOGS_ENABLED_DEFAULT,
-    val isRemoteControlEnabled: Boolean = IS_REMOTE_CONTROL_ENABLED,
+	val locale: String? = null,
-    val remoteKey: String? = null,
+	val theme: Theme = Theme.AUTOMATIC,
-    val locale: String? = null,
-    val theme: Theme = Theme.AUTOMATIC,
 ) {
 
-    fun toAppState(): AppState =
+	fun toAppState(): AppState = AppState(
-        AppState(
+		isLocationDisclosureShown,
-            isLocationDisclosureShown,
+		isBatteryOptimizationDisableShown,
-            isBatteryOptimizationDisableShown,
+		isPinLockEnabled,
-            isPinLockEnabled,
+		isTunnelStatsExpanded,
-            isTunnelStatsExpanded,
+		isLocationDisclosureShown,
-            isLocalLogsEnabled,
+		locale,
-            isRemoteControlEnabled,
+		theme,
-            remoteKey,
+	)
-            locale,
-            theme,
-        )
 
-    companion object {
+	companion object {
-        fun from(appState: AppState): GeneralState {
+		fun from(appState: AppState): GeneralState {
-            return with(appState) {
+			return with(appState) {
-                GeneralState(
+				GeneralState(
-                    isLocationDisclosureShown,
+					isLocationDisclosureShown,
-                    isBatteryOptimizationDisableShown,
+					isBatteryOptimizationDisableShown,
-                    isPinLockEnabled,
+					isPinLockEnabled,
-                    isTunnelStatsExpanded,
+					isTunnelStatsExpanded,
-                    isLocalLogsEnabled,
+					isLocationDisclosureShown,
-                    isRemoteControlEnabled,
+					locale,
-                    remoteKey,
+					theme,
-                    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 LOCATION_DISCLOSURE_SHOWN_DEFAULT = false
+		const val IS_TUNNEL_STATS_EXPANDED = false
-        const val BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT = false
+		const val IS_LOGS_ENABLED_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,100 +7,112 @@ import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
 
 @Entity
 data class Settings(
-    @PrimaryKey(autoGenerate = true) val id: Int = 0,
+	@PrimaryKey(autoGenerate = true) val id: Int = 0,
-    @ColumnInfo(name = "is_tunnel_enabled") val isAutoTunnelEnabled: Boolean = false,
+	@ColumnInfo(name = "is_tunnel_enabled") val isAutoTunnelEnabled: Boolean = false,
-    @ColumnInfo(name = "is_tunnel_on_mobile_data_enabled")
+	@ColumnInfo(name = "is_tunnel_on_mobile_data_enabled")
-    val isTunnelOnMobileDataEnabled: Boolean = false,
+	val isTunnelOnMobileDataEnabled: Boolean = false,
-    @ColumnInfo(name = "trusted_network_ssids")
+	@ColumnInfo(name = "trusted_network_ssids")
-    val trustedNetworkSSIDs: MutableList<String> = mutableListOf(),
+	val trustedNetworkSSIDs: MutableList<String> = mutableListOf(),
-    @ColumnInfo(name = "is_always_on_vpn_enabled") val isAlwaysOnVpnEnabled: Boolean = false,
+	@ColumnInfo(name = "is_always_on_vpn_enabled") val isAlwaysOnVpnEnabled: Boolean = false,
-    @ColumnInfo(name = "is_tunnel_on_ethernet_enabled")
+	@ColumnInfo(name = "is_tunnel_on_ethernet_enabled")
-    val isTunnelOnEthernetEnabled: Boolean = false,
+	val isTunnelOnEthernetEnabled: Boolean = false,
-    @ColumnInfo(name = "is_shortcuts_enabled", defaultValue = "false")
+	@ColumnInfo(
-    val isShortcutsEnabled: Boolean = false,
+		name = "is_shortcuts_enabled",
-    @ColumnInfo(name = "is_tunnel_on_wifi_enabled", defaultValue = "false")
+		defaultValue = "false",
-    val isTunnelOnWifiEnabled: Boolean = false,
+	)
-    @ColumnInfo(name = "is_kernel_enabled", defaultValue = "false")
+	val isShortcutsEnabled: Boolean = false,
-    val isKernelEnabled: Boolean = false,
+	@ColumnInfo(
-    @ColumnInfo(name = "is_restore_on_boot_enabled", defaultValue = "false")
+		name = "is_tunnel_on_wifi_enabled",
-    val isRestoreOnBootEnabled: Boolean = false,
+		defaultValue = "false",
-    @ColumnInfo(name = "is_multi_tunnel_enabled", defaultValue = "false")
+	)
-    val isMultiTunnelEnabled: Boolean = false,
+	val isTunnelOnWifiEnabled: Boolean = false,
-    @ColumnInfo(name = "is_ping_enabled", defaultValue = "false")
+	@ColumnInfo(
-    val isPingEnabled: Boolean = false,
+		name = "is_kernel_enabled",
-    @ColumnInfo(name = "is_amnezia_enabled", defaultValue = "false")
+		defaultValue = "false",
-    val isAmneziaEnabled: Boolean = false,
+	)
-    @ColumnInfo(name = "is_wildcards_enabled", defaultValue = "false")
+	val isKernelEnabled: Boolean = false,
-    val isWildcardsEnabled: Boolean = false,
+	@ColumnInfo(
-    @ColumnInfo(name = "is_wifi_by_shell_enabled", defaultValue = "false")
+		name = "is_restore_on_boot_enabled",
-    val isWifiNameByShellEnabled: Boolean = false,
+		defaultValue = "false",
-    @ColumnInfo(name = "is_stop_on_no_internet_enabled", defaultValue = "false")
+	)
-    val isStopOnNoInternetEnabled: Boolean = false,
+	val isRestoreOnBootEnabled: Boolean = false,
-    @ColumnInfo(name = "is_vpn_kill_switch_enabled", defaultValue = "false")
+	@ColumnInfo(
-    val isVpnKillSwitchEnabled: Boolean = false,
+		name = "is_multi_tunnel_enabled",
-    @ColumnInfo(name = "is_kernel_kill_switch_enabled", defaultValue = "false")
+		defaultValue = "false",
-    val isKernelKillSwitchEnabled: Boolean = false,
+	)
-    @ColumnInfo(name = "is_lan_on_kill_switch_enabled", defaultValue = "false")
+	val isMultiTunnelEnabled: Boolean = false,
-    val isLanOnKillSwitchEnabled: Boolean = false,
+	@ColumnInfo(
-    @ColumnInfo(name = "debounce_delay_seconds", defaultValue = "3")
+		name = "is_ping_enabled",
-    val debounceDelaySeconds: Int = 3,
+		defaultValue = "false",
-    @ColumnInfo(name = "is_disable_kill_switch_on_trusted_enabled", defaultValue = "false")
+	)
-    val isDisableKillSwitchOnTrustedEnabled: Boolean = 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 {
+	fun toAppSettings(): AppSettings {
-        return AppSettings(
+		return AppSettings(
-            id,
+			id, isAutoTunnelEnabled, isTunnelOnMobileDataEnabled, trustedNetworkSSIDs, isAlwaysOnVpnEnabled, isTunnelOnEthernetEnabled,
-            isAutoTunnelEnabled,
+			isShortcutsEnabled, isTunnelOnWifiEnabled, isKernelEnabled, isRestoreOnBootEnabled, isMultiTunnelEnabled, isPingEnabled,
-            isTunnelOnMobileDataEnabled,
+			isAmneziaEnabled, isWildcardsEnabled, isWifiNameByShellEnabled, isStopOnNoInternetEnabled, isVpnKillSwitchEnabled,
-            trustedNetworkSSIDs,
+			isKernelKillSwitchEnabled, isLanOnKillSwitchEnabled, debounceDelaySeconds, isDisableKillSwitchOnTrustedEnabled,
-            isAlwaysOnVpnEnabled,
+		)
-            isTunnelOnEthernetEnabled,
+	}
-            isShortcutsEnabled,
-            isTunnelOnWifiEnabled,
-            isKernelEnabled,
-            isRestoreOnBootEnabled,
-            isMultiTunnelEnabled,
-            isPingEnabled,
-            isAmneziaEnabled,
-            isWildcardsEnabled,
-            isWifiNameByShellEnabled,
-            isStopOnNoInternetEnabled,
-            isVpnKillSwitchEnabled,
-            isKernelKillSwitchEnabled,
-            isLanOnKillSwitchEnabled,
-            debounceDelaySeconds,
-            isDisableKillSwitchOnTrustedEnabled,
-        )
-    }
 
-    companion object {
+	companion object {
-        fun from(appSettings: AppSettings): Settings {
+		fun from(appSettings: AppSettings): Settings {
-            return with(appSettings) {
+			return with(appSettings) {
-                Settings(
+				Settings(
-                    id,
+					id, isAutoTunnelEnabled, isTunnelOnMobileDataEnabled, trustedNetworkSSIDs.toMutableList(), isAlwaysOnVpnEnabled,
-                    isAutoTunnelEnabled,
+					isTunnelOnEthernetEnabled, isShortcutsEnabled, isTunnelOnWifiEnabled, isKernelEnabled, isRestoreOnBootEnabled,
-                    isTunnelOnMobileDataEnabled,
+					isMultiTunnelEnabled, isPingEnabled, isAmneziaEnabled, isWildcardsEnabled, isWifiNameByShellEnabled,
-                    trustedNetworkSSIDs.toMutableList(),
+					isStopOnNoInternetEnabled, isVpnKillSwitchEnabled, isKernelKillSwitchEnabled, isLanOnKillSwitchEnabled,
-                    isAlwaysOnVpnEnabled,
+					debounceDelaySeconds, isDisableKillSwitchOnTrustedEnabled,
-                    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,70 +8,86 @@ import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 
 @Entity(indices = [Index(value = ["name"], unique = true)])
 data class TunnelConfig(
-    @PrimaryKey(autoGenerate = true) val id: Int = 0,
+	@PrimaryKey(autoGenerate = true) val id: Int = 0,
-    @ColumnInfo(name = "name") val name: String,
+	@ColumnInfo(name = "name") val name: String,
-    @ColumnInfo(name = "wg_quick") val wgQuick: String,
+	@ColumnInfo(name = "wg_quick") val wgQuick: String,
-    @ColumnInfo(name = "tunnel_networks", defaultValue = "")
+	@ColumnInfo(
-    val tunnelNetworks: MutableList<String> = mutableListOf(),
+		name = "tunnel_networks",
-    @ColumnInfo(name = "is_mobile_data_tunnel", defaultValue = "false")
+		defaultValue = "",
-    val isMobileDataTunnel: Boolean = false,
+	)
-    @ColumnInfo(name = "is_primary_tunnel", defaultValue = "false")
+	val tunnelNetworks: MutableList<String> = mutableListOf(),
-    val isPrimaryTunnel: Boolean = false,
+	@ColumnInfo(
-    @ColumnInfo(name = "am_quick", defaultValue = "") val amQuick: String = AM_QUICK_DEFAULT,
+		name = "is_mobile_data_tunnel",
-    @ColumnInfo(name = "is_Active", defaultValue = "false") val isActive: Boolean = false,
+		defaultValue = "false",
-    @ColumnInfo(name = "is_ping_enabled", defaultValue = "false")
+	)
-    val isPingEnabled: Boolean = false,
+	val isMobileDataTunnel: Boolean = false,
-    @ColumnInfo(name = "ping_interval", defaultValue = "null") val pingInterval: Long? = null,
+	@ColumnInfo(
-    @ColumnInfo(name = "ping_cooldown", defaultValue = "null") val pingCooldown: Long? = null,
+		name = "is_primary_tunnel",
-    @ColumnInfo(name = "ping_ip", defaultValue = "null") var pingIp: String? = null,
+		defaultValue = "false",
-    @ColumnInfo(name = "is_ethernet_tunnel", defaultValue = "false")
+	)
-    var isEthernetTunnel: Boolean = false,
+	val isPrimaryTunnel: Boolean = false,
-    @ColumnInfo(name = "is_ipv4_preferred", defaultValue = "true")
+	@ColumnInfo(
-    var isIpv4Preferred: Boolean = true,
+		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 {
+	fun toTunnel(): TunnelConf {
-        return TunnelConf(
+		return TunnelConf(
-            id,
+			id, name, wgQuick, tunnelNetworks, isMobileDataTunnel,
-            name,
+			isPrimaryTunnel, amQuick, isActive, isPingEnabled, pingInterval,
-            wgQuick,
+			pingCooldown, pingIp, isEthernetTunnel, isIpv4Preferred,
-            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 {
+		fun from(tunnelConf: TunnelConf): TunnelConfig {
-            return with(tunnelConf) {
+			return with(tunnelConf) {
-                return TunnelConfig(
+				return TunnelConfig(
-                    id,
+					id, tunName, wgQuick, tunnelNetworks.toMutableList(), isMobileDataTunnel,
-                    tunName,
+					isPrimaryTunnel, amQuick, isActive, isPingEnabled, pingInterval,
-                    wgQuick,
+					pingCooldown, pingIp, isEthernetTunnel, isIpv4Preferred,
-                    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.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.AppSettingRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import javax.inject.Inject
 
 class AppDataRoomRepository
 @Inject
 constructor(
-    override val settings: AppSettingRepository,
+	override val settings: AppSettingRepository,
-    override val tunnels: TunnelRepository,
+	override val tunnels: TunnelRepository,
-    override val appState: AppStateRepository,
+	override val appState: AppStateRepository,
 ) : AppDataRepository {
 
-    override suspend fun getPrimaryOrFirstTunnel(): TunnelConf? {
+	override suspend fun getPrimaryOrFirstTunnel(): TunnelConf? {
-        return tunnels.findPrimary().firstOrNull() ?: tunnels.getAll().firstOrNull()
+		return tunnels.findPrimary().firstOrNull() ?: tunnels.getAll().firstOrNull()
-    }
+	}
 
-    override suspend fun getStartTunnelConfig(): TunnelConf? {
+	override suspend fun getStartTunnelConfig(): TunnelConf? {
-        tunnels.getActive().let {
+		tunnels.getActive().let {
-            if (it.isNotEmpty()) return it.first()
+			if (it.isNotEmpty()) return it.first()
-            return getPrimaryOrFirstTunnel()
+			return getPrimaryOrFirstTunnel()
-        }
+		}
-    }
+	}
 }

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

@@ -1,133 +1,106 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.DataStoreManager
-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.data.model.GeneralState
 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) :
+class DataStoreAppStateRepository(
-    AppStateRepository {
+	private val dataStoreManager: DataStoreManager,
-    override suspend fun isLocationDisclosureShown(): Boolean {
+) :
-        return dataStoreManager.getFromStore(DataStoreManager.locationDisclosureShown)
+	AppStateRepository {
-            ?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT
+	override suspend fun isLocationDisclosureShown(): Boolean {
-    }
+		return dataStoreManager.getFromStore(DataStoreManager.locationDisclosureShown)
+			?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT
+	}
 
-    override suspend fun setLocationDisclosureShown(shown: Boolean) {
+	override suspend fun setLocationDisclosureShown(shown: Boolean) {
-        dataStoreManager.saveToDataStore(DataStoreManager.locationDisclosureShown, shown)
+		dataStoreManager.saveToDataStore(DataStoreManager.locationDisclosureShown, shown)
-    }
+	}
 
-    override suspend fun isPinLockEnabled(): Boolean {
+	override suspend fun isPinLockEnabled(): Boolean {
-        return dataStoreManager.getFromStore(DataStoreManager.pinLockEnabled)
+		return dataStoreManager.getFromStore(DataStoreManager.pinLockEnabled)
-            ?: GeneralState.PIN_LOCK_ENABLED_DEFAULT
+			?: GeneralState.PIN_LOCK_ENABLED_DEFAULT
-    }
+	}
 
-    override suspend fun setPinLockEnabled(enabled: Boolean) {
+	override suspend fun setPinLockEnabled(enabled: Boolean) {
-        dataStoreManager.saveToDataStore(DataStoreManager.pinLockEnabled, enabled)
+		dataStoreManager.saveToDataStore(DataStoreManager.pinLockEnabled, enabled)
-    }
+	}
 
-    override suspend fun isBatteryOptimizationDisableShown(): Boolean {
+	override suspend fun isBatteryOptimizationDisableShown(): Boolean {
-        return dataStoreManager.getFromStore(DataStoreManager.batteryDisableShown)
+		return dataStoreManager.getFromStore(DataStoreManager.batteryDisableShown)
-            ?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT
+			?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT
-    }
+	}
 
-    override suspend fun setBatteryOptimizationDisableShown(shown: Boolean) {
+	override suspend fun setBatteryOptimizationDisableShown(shown: Boolean) {
-        dataStoreManager.saveToDataStore(DataStoreManager.batteryDisableShown, shown)
+		dataStoreManager.saveToDataStore(DataStoreManager.batteryDisableShown, shown)
-    }
+	}
 
-    override suspend fun isTunnelStatsExpanded(): Boolean {
+	override suspend fun isTunnelStatsExpanded(): Boolean {
-        return dataStoreManager.getFromStore(DataStoreManager.tunnelStatsExpanded)
+		return dataStoreManager.getFromStore(DataStoreManager.tunnelStatsExpanded)
-            ?: GeneralState.IS_TUNNEL_STATS_EXPANDED
+			?: GeneralState.IS_TUNNEL_STATS_EXPANDED
-    }
+	}
 
-    override suspend fun setTunnelStatsExpanded(expanded: Boolean) {
+	override suspend fun setTunnelStatsExpanded(expanded: Boolean) {
-        dataStoreManager.saveToDataStore(DataStoreManager.tunnelStatsExpanded, expanded)
+		dataStoreManager.saveToDataStore(DataStoreManager.tunnelStatsExpanded, expanded)
-    }
+	}
 
-    override suspend fun setTheme(theme: Theme) {
+	override suspend fun setTheme(theme: Theme) {
-        dataStoreManager.saveToDataStore(DataStoreManager.theme, theme.name)
+		dataStoreManager.saveToDataStore(DataStoreManager.theme, theme.name)
-    }
+	}
 
-    override suspend fun getTheme(): Theme {
+	override suspend fun getTheme(): Theme {
-        return dataStoreManager.getFromStore(DataStoreManager.theme)?.let {
+		return dataStoreManager.getFromStore(DataStoreManager.theme)?.let {
-            try {
+			try {
-                Theme.valueOf(it)
+				Theme.valueOf(it)
-            } catch (_: IllegalArgumentException) {
+			} catch (_: IllegalArgumentException) {
-                Theme.AUTOMATIC
+				Theme.AUTOMATIC
-            }
+			}
-        } ?: Theme.AUTOMATIC
+		} ?: Theme.AUTOMATIC
-    }
+	}
 
-    override suspend fun isLocalLogsEnabled(): Boolean {
+	override suspend fun isLocalLogsEnabled(): Boolean {
-        return dataStoreManager.getFromStore(DataStoreManager.isLocalLogsEnabled)
+		return dataStoreManager.getFromStore(DataStoreManager.isLocalLogsEnabled) ?: GeneralState.IS_LOGS_ENABLED_DEFAULT
-            ?: GeneralState.IS_LOGS_ENABLED_DEFAULT
+	}
-    }
 
-    override suspend fun setLocalLogsEnabled(enabled: Boolean) {
+	override suspend fun setLocalLogsEnabled(enabled: Boolean) {
-        dataStoreManager.saveToDataStore(DataStoreManager.isLocalLogsEnabled, enabled)
+		dataStoreManager.saveToDataStore(DataStoreManager.isLocalLogsEnabled, enabled)
-    }
+	}
 
-    override suspend fun setLocale(localeTag: String) {
+	override suspend fun setLocale(localeTag: String) {
-        dataStoreManager.saveToDataStore(DataStoreManager.locale, localeTag)
+		dataStoreManager.saveToDataStore(DataStoreManager.locale, localeTag)
-    }
+	}
 
-    override suspend fun getLocale(): String? {
+	override suspend fun getLocale(): String? {
-        return dataStoreManager.getFromStore(DataStoreManager.locale)
+		return dataStoreManager.getFromStore(DataStoreManager.locale)
-    }
+	}
 
-    override suspend fun setIsRemoteControlEnabled(enabled: Boolean) {
+	override val flow: Flow<GeneralState> =
-        dataStoreManager.saveToDataStore(DataStoreManager.isRemoteControlEnabled, enabled)
+		dataStoreManager.preferencesFlow.map { prefs ->
-    }
+			prefs?.let { pref ->
-
+				try {
-    override suspend fun isRemoteControlEnabled(): Boolean {
+					GeneralState(
-        return dataStoreManager.getFromStore(DataStoreManager.isRemoteControlEnabled)
+						isLocationDisclosureShown =
-            ?: GeneralState.IS_REMOTE_CONTROL_ENABLED
+						pref[DataStoreManager.locationDisclosureShown]
-    }
+							?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT,
-
+						isBatteryOptimizationDisableShown =
-    override suspend fun setRemoteKey(key: String) {
+						pref[DataStoreManager.batteryDisableShown]
-        dataStoreManager.saveToDataStore(DataStoreManager.remoteKey, key)
+							?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
-    }
+						isPinLockEnabled =
-
+						pref[DataStoreManager.pinLockEnabled]
-    override suspend fun getRemoteKey(): String? {
+							?: GeneralState.PIN_LOCK_ENABLED_DEFAULT,
-        return dataStoreManager.getFromStore(DataStoreManager.remoteKey)
+						isTunnelStatsExpanded = pref[DataStoreManager.tunnelStatsExpanded] ?: GeneralState.IS_TUNNEL_STATS_EXPANDED,
-    }
+						isLocalLogsEnabled = pref[DataStoreManager.isLocalLogsEnabled] ?: GeneralState.IS_LOGS_ENABLED_DEFAULT,
-
+						locale = pref[DataStoreManager.locale],
-    override val flow: Flow<AppState> =
+						theme = getTheme(),
-        dataStoreManager.preferencesFlow
+					)
-            .map { prefs ->
+				} catch (e: IllegalArgumentException) {
-                prefs?.let { pref ->
+					Timber.e(e)
-                    try {
+					GeneralState()
-                        GeneralState(
+				}
-                            isLocationDisclosureShown =
+			} ?: GeneralState()
-                                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,30 +1,31 @@
 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,
+	private val settingsDoa: SettingsDao,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : AppSettingRepository {
 
-    override suspend fun save(appSettings: AppSettings) {
+	override suspend fun save(appSettings: AppSettings) {
-        withContext(ioDispatcher) { settingsDoa.save(Settings.from(appSettings)) }
+		withContext(ioDispatcher) {
-    }
+			settingsDoa.save(Settings.from(appSettings))
+		}
+	}
 
-    override val flow =
+	override val flow = settingsDoa.getSettingsFlow().flowOn(ioDispatcher).map { it.toAppSettings() }
-        settingsDoa.getSettingsFlow().flowOn(ioDispatcher).map { it.toAppSettings() }
 
-    override suspend fun get(): AppSettings {
+	override suspend fun get(): AppSettings {
-        return withContext(ioDispatcher) {
+		return withContext(ioDispatcher) {
-            (settingsDoa.getAll().firstOrNull() ?: Settings()).toAppSettings()
+			(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,81 +12,96 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
 
 class RoomTunnelRepository(
-    private val tunnelConfigDao: TunnelConfigDao,
+	private val tunnelConfigDao: TunnelConfigDao,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : TunnelRepository {
 
-    override val flow =
+	override val flow = tunnelConfigDao.getAllFlow().flowOn(ioDispatcher).map { it.map { it.toTunnel() } }
-        tunnelConfigDao.getAllFlow().flowOn(ioDispatcher).map { it.map { it.toTunnel() } }
 
-    override suspend fun getAll(): Tunnels {
+	override suspend fun getAll(): Tunnels {
-        return withContext(ioDispatcher) { tunnelConfigDao.getAll().map { it.toTunnel() } }
+		return withContext(ioDispatcher) {
-    }
+			tunnelConfigDao.getAll().map { it.toTunnel() }
+		}
+	}
 
-    override suspend fun save(tunnelConf: TunnelConf) {
+	override suspend fun save(tunnelConf: TunnelConf) {
-        withContext(ioDispatcher) { tunnelConfigDao.save(TunnelConfig.from(tunnelConf)) }
+		withContext(ioDispatcher) {
-    }
+			tunnelConfigDao.save(TunnelConfig.from(tunnelConf))
+		}
+	}
 
-    override suspend fun saveAll(tunnelConfList: List<TunnelConf>) {
+	override suspend fun updatePrimaryTunnel(tunnelConf: TunnelConf?) {
-        withContext(ioDispatcher) {
+		withContext(ioDispatcher) {
-            tunnelConfigDao.saveAll(tunnelConfList.map(TunnelConfig::from))
+			tunnelConfigDao.resetPrimaryTunnel()
-        }
+			tunnelConf?.let {
-    }
+				save(
+					it.copy(
+						isPrimaryTunnel = true,
+					),
+				)
+			}
+		}
+	}
 
-    override suspend fun updatePrimaryTunnel(tunnelConf: TunnelConf?) {
+	override suspend fun updateMobileDataTunnel(tunnelConf: TunnelConf?) {
-        withContext(ioDispatcher) {
+		withContext(ioDispatcher) {
-            tunnelConfigDao.resetPrimaryTunnel()
+			tunnelConfigDao.resetMobileDataTunnel()
-            tunnelConf?.let { save(it.copy(isPrimaryTunnel = true)) }
+			tunnelConf?.let {
-        }
+				save(
-    }
+					it.copy(
+						isMobileDataTunnel = true,
+					),
+				)
+			}
+		}
+	}
 
-    override suspend fun updateMobileDataTunnel(tunnelConf: TunnelConf?) {
+	override suspend fun updateEthernetTunnel(tunnelConf: TunnelConf?) {
-        withContext(ioDispatcher) {
+		withContext(ioDispatcher) {
-            tunnelConfigDao.resetMobileDataTunnel()
+			tunnelConfigDao.resetEthernetTunnel()
-            tunnelConf?.let { save(it.copy(isMobileDataTunnel = true)) }
+			tunnelConf?.let {
-        }
+				save(
-    }
+					it.copy(
+						isEthernetTunnel = true,
+					),
+				)
+			}
+		}
+	}
 
-    override suspend fun updateEthernetTunnel(tunnelConf: TunnelConf?) {
+	override suspend fun delete(tunnelConf: TunnelConf) {
-        withContext(ioDispatcher) {
+		withContext(ioDispatcher) {
-            tunnelConfigDao.resetEthernetTunnel()
+			tunnelConfigDao.delete(TunnelConfig.from(tunnelConf))
-            tunnelConf?.let { save(it.copy(isEthernetTunnel = true)) }
+		}
-        }
+	}
-    }
 
-    override suspend fun delete(tunnelConf: TunnelConf) {
+	override suspend fun getById(id: Int): TunnelConf? {
-        withContext(ioDispatcher) { tunnelConfigDao.delete(TunnelConfig.from(tunnelConf)) }
+		return withContext(ioDispatcher) { tunnelConfigDao.getById(id.toLong())?.toTunnel() }
-    }
+	}
 
-    override suspend fun getById(id: Int): TunnelConf? {
+	override suspend fun getActive(): Tunnels {
-        return withContext(ioDispatcher) { tunnelConfigDao.getById(id.toLong())?.toTunnel() }
+		return withContext(ioDispatcher) {
-    }
+			tunnelConfigDao.getActive().map { it.toTunnel() }
+		}
+	}
 
-    override suspend fun getActive(): Tunnels {
+	override suspend fun count(): Int {
-        return withContext(ioDispatcher) { tunnelConfigDao.getActive().map { it.toTunnel() } }
+		return withContext(ioDispatcher) { tunnelConfigDao.count().toInt() }
-    }
+	}
 
-    override suspend fun count(): Int {
+	override suspend fun findByTunnelName(name: String): TunnelConf? {
-        return withContext(ioDispatcher) { tunnelConfigDao.count().toInt() }
+		return withContext(ioDispatcher) { tunnelConfigDao.getByName(name)?.toTunnel() }
-    }
+	}
 
-    override suspend fun findByTunnelName(name: String): TunnelConf? {
+	override suspend fun findByTunnelNetworksName(name: String): Tunnels {
-        return withContext(ioDispatcher) { tunnelConfigDao.getByName(name)?.toTunnel() }
+		return withContext(ioDispatcher) { tunnelConfigDao.findByTunnelNetworkName(name).map { it.toTunnel() } }
-    }
+	}
 
-    override suspend fun findByTunnelNetworksName(name: String): Tunnels {
+	override suspend fun findByMobileDataTunnel(): Tunnels {
-        return withContext(ioDispatcher) {
+		return withContext(ioDispatcher) { tunnelConfigDao.findByMobileDataTunnel().map { it.toTunnel() } }
-            tunnelConfigDao.findByTunnelNetworkName(name).map { it.toTunnel() }
+	}
-        }
-    }
 
-    override suspend fun findByMobileDataTunnel(): Tunnels {
+	override suspend fun findPrimary(): Tunnels {
-        return withContext(ioDispatcher) {
+		return withContext(ioDispatcher) { tunnelConfigDao.findByPrimary().map { it.toTunnel() } }
-            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,39 +12,35 @@ 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
+	@Singleton
-    @ApplicationScope
+	@ApplicationScope
-    @Provides
+	@Provides
-    fun providesApplicationScope(
+	fun providesApplicationScope(@DefaultDispatcher defaultDispatcher: CoroutineDispatcher): CoroutineScope =
-        @DefaultDispatcher defaultDispatcher: CoroutineDispatcher
+		CoroutineScope(SupervisorJob() + defaultDispatcher)
-    ): CoroutineScope = CoroutineScope(SupervisorJob() + defaultDispatcher)
 
-    @Singleton
+	@Singleton
-    @Provides
+	@Provides
-    fun provideLogCollect(@ApplicationContext context: Context): LogReader {
+	fun provideLogCollect(@ApplicationContext context: Context): LogReader {
-        return LogcatReader.init(storageDir = context.filesDir.absolutePath)
+		return LogcatReader.init(storageDir = context.filesDir.absolutePath)
-    }
+	}
 
-    @Singleton
+	@Singleton
-    @Provides
+	@Provides
-    fun provideNotificationService(@ApplicationContext context: Context): NotificationManager {
+	fun provideNotificationService(@ApplicationContext context: Context): NotificationManager {
-        return WireGuardNotification(context)
+		return WireGuardNotification(context)
-    }
+	}
 
-    @Singleton
+	@Singleton
-    @Provides
+	@Provides
-    fun provideShortcutManager(
+	fun provideShortcutManager(@ApplicationContext context: Context, @IoDispatcher ioDispatcher: CoroutineDispatcher): ShortcutManager {
-        @ApplicationContext context: Context,
+		return DynamicShortcutManager(context, ioDispatcher)
-        @IoDispatcher ioDispatcher: CoroutineDispatcher,
+	}
-    ): ShortcutManager {
-        return DynamicShortcutManager(context, ioDispatcher)
-    }
 }

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

@@ -2,10 +2,18 @@ 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,14 +2,26 @@ 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,15 +10,19 @@ import kotlinx.coroutines.Dispatchers
 @Module
 @InstallIn(SingletonComponent::class)
 object CoroutinesDispatchersModule {
-    @DefaultDispatcher
+	@DefaultDispatcher
-    @Provides
+	@Provides
-    fun providesDefaultDispatcher(): CoroutineDispatcher = Dispatchers.Default
+	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
+	@MainImmediateDispatcher
-    @Provides
+	@Provides
-    fun providesMainImmediateDispatcher(): CoroutineDispatcher = Dispatchers.Main.immediate
+	fun providesMainImmediateDispatcher(): CoroutineDispatcher = Dispatchers.Main.immediate
 }

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

@@ -4,94 +4,85 @@ 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 javax.inject.Singleton
 import kotlinx.coroutines.CoroutineDispatcher
+import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 class RepositoryModule {
-    @Provides
+	@Provides
-    @Singleton
+	@Singleton
-    fun provideDatabase(@ApplicationContext context: Context): AppDatabase {
+	fun provideDatabase(@ApplicationContext context: Context): AppDatabase {
-        return Room.databaseBuilder(
+		return Room.databaseBuilder(
-                context,
+			context,
-                AppDatabase::class.java,
+			AppDatabase::class.java,
-                context.getString(R.string.db_name),
+			context.getString(R.string.db_name),
-            )
+		)
-            .fallbackToDestructiveMigration()
+			.fallbackToDestructiveMigration()
-            .addCallback(DatabaseCallback())
+			.addCallback(DatabaseCallback())
-            .build()
+			.build()
-    }
+	}
 
-    @Singleton
+	@Singleton
-    @Provides
+	@Provides
-    fun provideSettingsDoa(appDatabase: AppDatabase): SettingsDao {
+	fun provideSettingsDoa(appDatabase: AppDatabase): SettingsDao {
-        return appDatabase.settingDao()
+		return appDatabase.settingDao()
-    }
+	}
 
-    @Singleton
+	@Singleton
-    @Provides
+	@Provides
-    fun provideTunnelConfigDoa(appDatabase: AppDatabase): TunnelConfigDao {
+	fun provideTunnelConfigDoa(appDatabase: AppDatabase): TunnelConfigDao {
-        return appDatabase.tunnelConfigDoa()
+		return appDatabase.tunnelConfigDoa()
-    }
+	}
 
-    @Singleton
+	@Singleton
-    @Provides
+	@Provides
-    fun provideTunnelConfigRepository(
+	fun provideTunnelConfigRepository(tunnelConfigDao: TunnelConfigDao, @IoDispatcher ioDispatcher: CoroutineDispatcher): TunnelRepository {
-        tunnelConfigDao: TunnelConfigDao,
+		return RoomTunnelRepository(tunnelConfigDao, ioDispatcher)
-        @IoDispatcher ioDispatcher: CoroutineDispatcher,
+	}
-    ): TunnelRepository {
-        return RoomTunnelRepository(tunnelConfigDao, ioDispatcher)
-    }
 
-    @Singleton
+	@Singleton
-    @Provides
+	@Provides
-    fun provideSettingsRepository(
+	fun provideSettingsRepository(settingsDao: SettingsDao, @IoDispatcher ioDispatcher: CoroutineDispatcher): AppSettingRepository {
-        settingsDao: SettingsDao,
+		return RoomSettingsRepository(settingsDao, ioDispatcher)
-        @IoDispatcher ioDispatcher: CoroutineDispatcher,
+	}
-    ): AppSettingRepository {
-        return RoomSettingsRepository(settingsDao, ioDispatcher)
-    }
 
-    @Singleton
+	@Singleton
-    @Provides
+	@Provides
-    fun providePreferencesDataStore(
+	fun providePreferencesDataStore(@ApplicationContext context: Context, @IoDispatcher ioDispatcher: CoroutineDispatcher): DataStoreManager {
-        @ApplicationContext context: Context,
+		return DataStoreManager(context, ioDispatcher)
-        @IoDispatcher ioDispatcher: CoroutineDispatcher,
+	}
-    ): DataStoreManager {
-        return DataStoreManager(context, ioDispatcher)
-    }
 
-    @Provides
+	@Provides
-    @Singleton
+	@Singleton
-    fun provideGeneralStateRepository(dataStoreManager: DataStoreManager): AppStateRepository {
+	fun provideGeneralStateRepository(dataStoreManager: DataStoreManager): AppStateRepository {
-        return DataStoreAppStateRepository(dataStoreManager)
+		return DataStoreAppStateRepository(dataStoreManager)
-    }
+	}
 
-    @Provides
+	@Provides
-    @Singleton
+	@Singleton
-    fun provideAppDataRepository(
+	fun provideAppDataRepository(
-        settingsRepository: AppSettingRepository,
+		settingsRepository: AppSettingRepository,
-        tunnelRepository: TunnelRepository,
+		tunnelRepository: TunnelRepository,
-        appStateRepository: AppStateRepository,
+		appStateRepository: AppStateRepository,
-    ): AppDataRepository {
+	): AppDataRepository {
-        return AppDataRoomRepository(settingsRepository, tunnelRepository, appStateRepository)
+		return AppDataRoomRepository(settingsRepository, tunnelRepository, appStateRepository)
-    }
+	}
 }

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

@@ -0,0 +1,16 @@
+package com.zaneschepke.wireguardautotunnel.di
+
+import com.zaneschepke.wireguardautotunnel.core.network.InternetConnectivityMonitor
+import com.zaneschepke.wireguardautotunnel.core.network.NetworkMonitor
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class ServiceModule {
+
+	@Binds
+	abstract fun provideInternetConnectivityService(wifiService: InternetConnectivityMonitor): NetworkMonitor
+}

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

@@ -4,135 +4,107 @@ import android.content.Context
 import com.wireguard.android.backend.WgQuickBackend
 import com.wireguard.android.util.RootShell
 import com.wireguard.android.util.ToolsInstaller
-import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
+import com.zaneschepke.wireguardautotunnel.core.network.NetworkMonitor
-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
+	@Provides
-    @Singleton
+	@Singleton
-    @TunnelShell
+	@TunnelShell
-    fun provideTunnelRootShell(@ApplicationContext context: Context): RootShell {
+	fun provideTunnelRootShell(@ApplicationContext context: Context): RootShell {
-        return RootShell(context)
+		return RootShell(context)
-    }
+	}
 
-    @Provides
+	@Provides
-    @Singleton
+	@Singleton
-    @AppShell
+	@AppShell
-    fun provideAppRootShell(@ApplicationContext context: Context): RootShell {
+	fun provideAppRootShell(@ApplicationContext context: Context): RootShell {
-        return RootShell(context)
+		return RootShell(context)
-    }
+	}
 
-    @Provides
+	@Provides
-    @Singleton
+	@Singleton
-    fun provideAmneziaBackend(@ApplicationContext context: Context): Backend {
+	fun provideAmneziaBackend(@ApplicationContext context: Context): Backend {
-        return GoBackend(context, RootTunnelActionHandler(org.amnezia.awg.util.RootShell(context)))
+		return GoBackend(context, RootTunnelActionHandler(org.amnezia.awg.util.RootShell(context)))
-    }
+	}
 
-    @Provides
+	@Provides
-    @Singleton
+	@Singleton
-    fun provideKernelBackend(
+	fun provideKernelBackend(@ApplicationContext context: Context, @TunnelShell shell: RootShell): com.wireguard.android.backend.Backend {
-        @ApplicationContext context: Context,
+		return WgQuickBackend(context, shell, ToolsInstaller(context, shell), com.wireguard.android.backend.RootTunnelActionHandler(shell)).also {
-        @TunnelShell shell: RootShell,
+			it.setMultipleTunnels(true)
-    ): com.wireguard.android.backend.Backend {
+		}
-        return WgQuickBackend(
+	}
-                context,
-                shell,
-                ToolsInstaller(context, shell),
-                com.wireguard.android.backend.RootTunnelActionHandler(shell),
-            )
-            .also { it.setMultipleTunnels(true) }
-    }
 
-    @Provides
+	@Provides
-    @Singleton
+	@Singleton
-    @Kernel
+	@Kernel
-    fun provideKernelProvider(
+	fun provideKernelProvider(
-        @ApplicationScope applicationScope: CoroutineScope,
+		@IoDispatcher ioDispatcher: CoroutineDispatcher,
-        serviceManager: ServiceManager,
+		@ApplicationScope applicationScope: CoroutineScope,
-        appDataRepository: AppDataRepository,
+		serviceManager: ServiceManager,
-        backend: com.wireguard.android.backend.Backend,
+		appDataRepository: AppDataRepository,
-    ): TunnelProvider {
+		networkMonitor: NetworkMonitor,
-        return KernelTunnel(applicationScope, serviceManager, appDataRepository, backend)
+		notificationManager: NotificationManager,
-    }
+		backend: com.wireguard.android.backend.Backend,
+	): TunnelProvider {
+		return KernelTunnel(ioDispatcher, applicationScope, serviceManager, appDataRepository, notificationManager, backend, networkMonitor)
+	}
 
-    @Provides
+	@Provides
-    @Singleton
+	@Singleton
-    @Userspace
+	@Userspace
-    fun provideUserspaceProvider(
+	fun provideUserspaceProvider(
-        @ApplicationScope applicationScope: CoroutineScope,
+		@IoDispatcher ioDispatcher: CoroutineDispatcher,
-        serviceManager: ServiceManager,
+		@ApplicationScope applicationScope: CoroutineScope,
-        appDataRepository: AppDataRepository,
+		serviceManager: ServiceManager,
-        backend: Backend,
+		appDataRepository: AppDataRepository,
-    ): TunnelProvider {
+		notificationManager: NotificationManager,
-        return UserspaceTunnel(applicationScope, serviceManager, appDataRepository, backend)
+		networkMonitor: NetworkMonitor,
-    }
+		backend: Backend,
+	): TunnelProvider {
+		return UserspaceTunnel(ioDispatcher, applicationScope, serviceManager, appDataRepository, notificationManager, backend, networkMonitor)
+	}
 
-    @Provides
+	@Provides
-    @Singleton
+	@Singleton
-    fun provideTunnelManager(
+	fun provideTunnelManager(
-        @Kernel kernelTunnel: TunnelProvider,
+		@Kernel kernelTunnel: TunnelProvider,
-        @Userspace userspaceTunnel: TunnelProvider,
+		@Userspace userspaceTunnel: TunnelProvider,
-        appDataRepository: AppDataRepository,
+		appDataRepository: AppDataRepository,
-        @IoDispatcher ioDispatcher: CoroutineDispatcher,
+		@IoDispatcher ioDispatcher: CoroutineDispatcher,
-        @ApplicationScope applicationScope: CoroutineScope,
+		@ApplicationScope applicationScope: CoroutineScope,
-    ): TunnelManager {
+	): TunnelManager {
-        return TunnelManager(
+		return TunnelManager(kernelTunnel, userspaceTunnel, appDataRepository, applicationScope, ioDispatcher)
-            kernelTunnel,
+	}
-            userspaceTunnel,
-            appDataRepository,
-            applicationScope,
-            ioDispatcher,
-        )
-    }
 
-    @Provides
+	@Singleton
-    @Singleton
+	@Provides
-    fun provideNetworkMonitor(
+	fun provideServiceManager(
-        @ApplicationContext context: Context,
+		@ApplicationContext context: Context,
-        settingsRepository: AppSettingRepository,
+		@IoDispatcher ioDispatcher: CoroutineDispatcher,
-    ): NetworkMonitor {
+		appDataRepository: AppDataRepository,
-        return AndroidNetworkMonitor(context) {
+	): ServiceManager {
-            runBlocking { settingsRepository.get().isWifiNameByShellEnabled }
+		return ServiceManager(context, ioDispatcher, 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,12 +13,9 @@ import kotlinx.coroutines.CoroutineDispatcher
 @Module
 @InstallIn(ViewModelComponent::class)
 class ViewModelModule {
-    @ViewModelScoped
+	@ViewModelScoped
-    @Provides
+	@Provides
-    fun provideFileUtils(
+	fun provideFileUtils(@ApplicationContext context: Context, @IoDispatcher ioDispatcher: CoroutineDispatcher): FileUtils {
-        @ApplicationContext context: Context,
+		return FileUtils(context, ioDispatcher)
-        @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 id: Int = 0,
-    val isAutoTunnelEnabled: Boolean = false,
+	val isAutoTunnelEnabled: Boolean = false,
-    val isTunnelOnMobileDataEnabled: Boolean = false,
+	val isTunnelOnMobileDataEnabled: Boolean = false,
-    val trustedNetworkSSIDs: List<String> = emptyList(),
+	val trustedNetworkSSIDs: List<String> = emptyList(),
-    val isAlwaysOnVpnEnabled: Boolean = false,
+	val isAlwaysOnVpnEnabled: Boolean = false,
-    val isTunnelOnEthernetEnabled: Boolean = false,
+	val isTunnelOnEthernetEnabled: Boolean = false,
-    val isShortcutsEnabled: Boolean = false,
+	val isShortcutsEnabled: Boolean = false,
-    val isTunnelOnWifiEnabled: Boolean = false,
+	val isTunnelOnWifiEnabled: Boolean = false,
-    val isKernelEnabled: Boolean = false,
+	val isKernelEnabled: Boolean = false,
-    val isRestoreOnBootEnabled: Boolean = false,
+	val isRestoreOnBootEnabled: Boolean = false,
-    val isMultiTunnelEnabled: Boolean = false,
+	val isMultiTunnelEnabled: Boolean = false,
-    val isPingEnabled: Boolean = false,
+	val isPingEnabled: Boolean = false,
-    val isAmneziaEnabled: Boolean = false,
+	val isAmneziaEnabled: Boolean = false,
-    val isWildcardsEnabled: Boolean = false,
+	val isWildcardsEnabled: Boolean = false,
-    val isWifiNameByShellEnabled: Boolean = false,
+	val isWifiNameByShellEnabled: Boolean = false,
-    val isStopOnNoInternetEnabled: Boolean = false,
+	val isStopOnNoInternetEnabled: Boolean = false,
-    val isVpnKillSwitchEnabled: Boolean = false,
+	val isVpnKillSwitchEnabled: Boolean = false,
-    val isKernelKillSwitchEnabled: Boolean = false,
+	val isKernelKillSwitchEnabled: Boolean = false,
-    val isLanOnKillSwitchEnabled: Boolean = false,
+	val isLanOnKillSwitchEnabled: Boolean = false,
-    val debounceDelaySeconds: Int = 3,
+	val debounceDelaySeconds: Int = 3,
-    val isDisableKillSwitchOnTrustedEnabled: Boolean = false,
+	val isDisableKillSwitchOnTrustedEnabled: Boolean = false,
 ) {
-    fun debounceDelayMillis(): Long {
+	fun debounceDelayMillis(): Long {
-        return debounceDelaySeconds * 1000L
+		return debounceDelaySeconds * 1000L
-    }
+	}
 }

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

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

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

@@ -1,234 +1,126 @@
 package com.zaneschepke.wireguardautotunnel.domain.entity
 
-import com.wireguard.android.backend.Tunnel
 import com.wireguard.config.Config
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.defaultName
+import com.zaneschepke.wireguardautotunnel.util.extensions.asTunnelState
-import com.zaneschepke.wireguardautotunnel.util.extensions.extractNameAndNumber
-import com.zaneschepke.wireguardautotunnel.util.extensions.hasNumberInParentheses
 import com.zaneschepke.wireguardautotunnel.util.extensions.isReachable
 import com.zaneschepke.wireguardautotunnel.util.extensions.toWgQuickString
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.withContext
+import org.amnezia.awg.backend.Tunnel
+import timber.log.Timber
 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 id: Int = 0,
-    val tunName: String,
+	val tunName: String,
-    val wgQuick: String,
+	val wgQuick: String,
-    val tunnelNetworks: List<String> = emptyList(),
+	val tunnelNetworks: List<String> = emptyList(),
-    val isMobileDataTunnel: Boolean = false,
+	val isMobileDataTunnel: Boolean = false,
-    val isPrimaryTunnel: Boolean = false,
+	val isPrimaryTunnel: Boolean = false,
-    val amQuick: String,
+	val amQuick: String,
-    val isActive: Boolean = false,
+	val isActive: Boolean = false,
-    val isPingEnabled: Boolean = false,
+	val isPingEnabled: Boolean = false,
-    val pingInterval: Long? = null,
+	val pingInterval: Long? = null,
-    val pingCooldown: Long? = null,
+	val pingCooldown: Long? = null,
-    val pingIp: String? = null,
+	val pingIp: String? = null,
-    val isEthernetTunnel: Boolean = false,
+	val isEthernetTunnel: Boolean = false,
-    val isIpv4Preferred: Boolean = true,
+	val isIpv4Preferred: Boolean = false,
-    @Transient private var stateChangeCallback: ((Any) -> Unit)? = null,
+) : Tunnel, com.wireguard.android.backend.Tunnel {
-) : Tunnel, org.amnezia.awg.backend.Tunnel {
 
-    fun setStateChangeCallback(callback: (Any) -> Unit) {
+	val state = MutableStateFlow(TunnelState())
-        stateChangeCallback = callback
-    }
 
-    override fun equals(other: Any?): Boolean {
+	fun toAmConfig(): org.amnezia.awg.config.Config {
-        if (this === other) return true
+		return configFromAmQuick(amQuick.ifBlank { wgQuick })
-        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
-    }
 
-    override fun hashCode(): Int {
+	fun toWgConfig(): Config {
-        var result = id
+		return configFromWgQuick(wgQuick)
-        result = 31 * result + tunName.hashCode()
+	}
-        result = 31 * result + wgQuick.hashCode()
-        result = 31 * result + amQuick.hashCode()
-        return result
-    }
 
-    fun copyWithCallback(
+	override fun getName(): String {
-        id: Int = this.id,
+		return tunName
-        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
-                // 			tunnelStatsCallback = this@TunnelConf.tunnelStatsCallback
-                // 			bounceTunnelCallback = this@TunnelConf.bounceTunnelCallback
-            }
-    }
 
-    // 	fun onUpdateStatistics() {
+	override fun isIpv4ResolutionPreferred(): Boolean {
-    // 		tunnelStatsCallback?.invoke()
+		return isIpv4Preferred
-    // 	}
+	}
-    //
-    // 	fun bounceTunnel(tunnelConf: TunnelConf, reason: TunnelStatus.StopReason) {
-    // 		bounceTunnelCallback?.invoke(tunnelConf, reason)
-    // 	}
 
-    fun toAmConfig(): org.amnezia.awg.config.Config {
+	override fun onStateChange(newState: Tunnel.State) {
-        return configFromAmQuick(amQuick.ifBlank { wgQuick })
+		state.update {
-    }
+			it.copy(state = newState.asTunnelState())
+		}
+	}
 
-    fun toWgConfig(): Config {
+	override fun onStateChange(newState: com.wireguard.android.backend.Tunnel.State) {
-        return configFromWgQuick(wgQuick)
+		state.update {
-    }
+			it.copy(state = newState.asTunnelState())
+		}
+	}
 
-    override fun getName(): String = tunName
+	fun isQuickConfigChanged(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 onStateChange(newState: org.amnezia.awg.backend.Tunnel.State) {
+	suspend fun pingTunnel(context: CoroutineContext): List<Boolean> {
-        stateChangeCallback?.invoke(newState)
+		return withContext(context) {
-    }
+			val config = toWgConfig()
+			if (pingIp != null) {
+				Timber.i("Pinging custom ip")
+				listOf(InetAddress.getByName(pingIp).isReachable(Constants.PING_TIMEOUT.toInt()))
+			} else {
+				Timber.i("Pinging all peers")
+				config.peers.map { peer ->
+					peer.isReachable(isIpv4Preferred)
+				}
+			}
+		}
+	}
 
-    override fun onStateChange(newState: Tunnel.State) {
+	companion object {
-        stateChangeCallback?.invoke(newState)
+		fun configFromWgQuick(wgQuick: String): Config {
-    }
+			val inputStream: InputStream = wgQuick.byteInputStream()
+			return inputStream.bufferedReader(Charsets.UTF_8).use {
+				Config.parse(it)
+			}
+		}
 
-    fun isTunnelConfigChanged(updatedConf: TunnelConf): Boolean {
+		fun configFromAmQuick(amQuick: String): org.amnezia.awg.config.Config {
-        return updatedConf.wgQuick != wgQuick ||
+			val inputStream: InputStream = amQuick.byteInputStream()
-            updatedConf.amQuick != amQuick ||
+			return inputStream.bufferedReader(Charsets.UTF_8).use {
-            updatedConf.name != name
+				org.amnezia.awg.config.Config.parse(it)
-    }
+			}
+		}
 
-    fun generateUniqueName(tunnelNames: List<String>): String {
+		fun tunnelConfigFromAmConfig(config: org.amnezia.awg.config.Config, name: String): TunnelConf {
-        var tunnelName = this.tunName
+			val amQuick = config.toAwgQuickString(true)
-        var num = 1
+			val wgQuick = config.toWgQuickString()
-        while (tunnelNames.any { it == tunnelName }) {
+			return TunnelConf(tunName = name, wgQuick = wgQuick, amQuick = amQuick)
-            tunnelName =
+		}
-                if (!tunnelName.hasNumberInParentheses()) {
-                    "$name($num)"
-                } else {
-                    val pair = tunnelName.extractNameAndNumber()
-                    "${pair?.first}($num)"
-                }
-            num++
-        }
-        return tunnelName
-    }
 
-    suspend fun isTunnelPingable(context: CoroutineContext): Boolean {
+		private const val IPV6_ALL_NETWORKS = "::/0"
-        return withContext(context) {
+		private const val IPV4_ALL_NETWORKS = "0.0.0.0/0"
-            val config = toWgConfig()
+		val ALL_IPS = listOf(IPV4_ALL_NETWORKS, IPV6_ALL_NETWORKS)
-            if (pingIp != null) {
+		private val IPV4_PUBLIC_NETWORKS = listOf(
-                return@withContext InetAddress.getByName(pingIp)
+			"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",
-                    .isReachable(Constants.PING_TIMEOUT.toInt())
+			"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",
-                    .also { Timber.i("Ping reachable $pingIp: $it") }
+			"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",
-            config.peers
+			"192.170.0.0/15", "192.172.0.0/14", "192.176.0.0/12", "192.192.0.0/10",
-                .map { peer -> peer.isReachable() }
+			"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",
-                .all { true }
+		)
-                .also { Timber.i("Ping of all peers reachable: $it") }
+		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,33 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.domain.enums
 
-import com.zaneschepke.wireguardautotunnel.R
+sealed class BackendError() {
-
+	data object DNS : BackendError()
-sealed class BackendError : Exception() {
+	data object Unauthorized : BackendError()
-    data object DNS : BackendError()
+	data object Config : 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,
+	KILL_SWITCH_ACTIVE,
-    SERVICE_ACTIVE,
+	SERVICE_ACTIVE,
-    INACTIVE,
+	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,
+	AMNEZIA,
-    WG,
+	WG,
 }

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

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

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

@@ -4,13 +4,14 @@ import android.content.Context
 import com.zaneschepke.wireguardautotunnel.R
 
 enum class NotificationAction {
-    TUNNEL_OFF,
+	TUNNEL_OFF,
-    AUTO_TUNNEL_OFF;
+	AUTO_TUNNEL_OFF,
+	;
 
-    fun title(context: Context): String {
+	fun title(context: Context): String {
-        return when (this) {
+		return when (this) {
-            TUNNEL_OFF -> context.getString(R.string.stop)
+			TUNNEL_OFF -> context.getString(R.string.stop)
-            AUTO_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,35 +1,15 @@
 package com.zaneschepke.wireguardautotunnel.domain.enums
 
-sealed class TunnelStatus {
+enum class TunnelStatus {
-    data class Error(val error: BackendError) : TunnelStatus()
+	UP,
+	DOWN,
+	;
 
-    data object Up : TunnelStatus()
+	fun isDown(): Boolean {
+		return this == DOWN
+	}
 
-    data object Down : TunnelStatus()
+	fun isUp(): Boolean {
-
+		return this == UP
-    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,9 +3,7 @@ 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 class Start(val tunnelConf: TunnelConf? = null) : AutoTunnelEvent()
-
+	data object Stop : AutoTunnelEvent()
-    data object Stop : AutoTunnelEvent()
+	data object DoNothing : AutoTunnelEvent()
-
-    data object DoNothing : AutoTunnelEvent()
 }

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

@@ -1,9 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.domain.events
 
 sealed class KillSwitchEvent {
-    data class Start(val allowedIps: List<String>) : KillSwitchEvent()
+	data class Start(val allowedIps: List<String>) : KillSwitchEvent()
-
+	data object Stop : KillSwitchEvent()
-    data object Stop : KillSwitchEvent()
+	data object DoNothing : 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 settings: AppSettingRepository
-    val tunnels: TunnelRepository
+	val tunnels: TunnelRepository
-    val appState: AppStateRepository
+	val appState: AppStateRepository
 }

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

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

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

@@ -1,45 +1,37 @@
 package com.zaneschepke.wireguardautotunnel.domain.repository
 
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppState
+import com.zaneschepke.wireguardautotunnel.data.model.GeneralState
 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?
 
-    suspend fun setIsRemoteControlEnabled(enabled: Boolean)
+	val flow: Flow<GeneralState>
-
-    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,33 +5,31 @@ 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 saveAll(tunnelConfList: List<TunnelConf>)
+	suspend fun updatePrimaryTunnel(tunnelConf: TunnelConf?)
 
-    suspend fun updatePrimaryTunnel(tunnelConf: TunnelConf?)
+	suspend fun updateMobileDataTunnel(tunnelConf: TunnelConf?)
 
-    suspend fun updateMobileDataTunnel(tunnelConf: TunnelConf?)
+	suspend fun updateEthernetTunnel(tunnelConf: TunnelConf?)
 
-    suspend fun updateEthernetTunnel(tunnelConf: TunnelConf?)
+	suspend fun delete(tunnelConf: TunnelConf)
 
-    suspend fun delete(tunnelConf: TunnelConf)
+	suspend fun getById(id: Int): TunnelConf?
 
-    suspend fun getById(id: Int): TunnelConf?
+	suspend fun getActive(): Tunnels
 
-    suspend fun getActive(): Tunnels
+	suspend fun count(): Int
 
-    suspend fun count(): Int
+	suspend fun findByTunnelName(name: String): TunnelConf?
 
-    suspend fun findByTunnelName(name: String): TunnelConf?
+	suspend fun findByTunnelNetworksName(name: String): Tunnels
 
-    suspend fun findByTunnelNetworksName(name: String): Tunnels
+	suspend fun findByMobileDataTunnel(): Tunnels
 
-    suspend fun findByMobileDataTunnel(): Tunnels
+	suspend fun findPrimary(): 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? {
+	override fun peerStats(peer: Key): PeerStats? {
-        val key = Key.fromBase64(peer.toBase64())
+		val key = Key.fromBase64(peer.toBase64())
-        val stats = statistics.peer(key)
+		val stats = statistics.peer(key)
-        return stats?.let {
+		return stats?.let {
-            PeerStats(
+			PeerStats(
-                rxBytes = stats.rxBytes,
+				rxBytes = stats.rxBytes,
-                txBytes = stats.txBytes,
+				txBytes = stats.txBytes,
-                latestHandshakeEpochMillis = stats.latestHandshakeEpochMillis,
+				latestHandshakeEpochMillis = stats.latestHandshakeEpochMillis,
-            )
+			)
-        }
+		}
-    }
+	}
 
-    override fun isTunnelStale(): Boolean {
+	override fun isTunnelStale(): Boolean {
-        return statistics.isStale
+		return statistics.isStale
-    }
+	}
 
-    override fun getPeers(): Array<Key> {
+	override fun getPeers(): Array<Key> {
-        return statistics.peers()
+		return statistics.peers()
-    }
+	}
 
-    override fun rx(): Long {
+	override fun rx(): Long {
-        return statistics.totalRx()
+		return statistics.totalRx()
-    }
+	}
 
-    override fun tx(): Long {
+	override fun tx(): Long {
-        return statistics.totalTx()
+		return statistics.totalTx()
-    }
+	}
 }

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

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

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

@@ -3,20 +3,16 @@ package com.zaneschepke.wireguardautotunnel.domain.state
 import org.amnezia.awg.crypto.Key
 
 abstract class TunnelStatistics {
-    @JvmRecord
+	@JvmRecord
-    data class PeerStats(
+	data class PeerStats(val rxBytes: Long, val txBytes: Long, val latestHandshakeEpochMillis: Long)
-        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,31 +4,33 @@ 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? {
+	override fun peerStats(peer: Key): PeerStats? {
-        val key = com.wireguard.crypto.Key.fromBase64(peer.toBase64())
+		val key = com.wireguard.crypto.Key.fromBase64(peer.toBase64())
-        val peerStats = statistics.peer(key)
+		val peerStats = statistics.peer(key)
-        return peerStats?.let {
+		return peerStats?.let {
-            PeerStats(
+			PeerStats(
-                txBytes = peerStats.txBytes,
+				txBytes = peerStats.txBytes,
-                rxBytes = peerStats.rxBytes,
+				rxBytes = peerStats.rxBytes,
-                latestHandshakeEpochMillis = peerStats.latestHandshakeEpochMillis,
+				latestHandshakeEpochMillis = peerStats.latestHandshakeEpochMillis,
-            )
+			)
-        }
+		}
-    }
+	}
 
-    override fun isTunnelStale(): Boolean {
+	override fun isTunnelStale(): Boolean {
-        return statistics.isStale
+		return statistics.isStale
-    }
+	}
 
-    override fun getPeers(): Array<Key> {
+	override fun getPeers(): Array<Key> {
-        return statistics.peers().map { Key.fromBase64(it.toBase64()) }.toTypedArray()
+		return statistics.peers().map {
-    }
+			Key.fromBase64(it.toBase64())
+		}.toTypedArray()
+	}
 
-    override fun rx(): Long {
+	override fun rx(): Long {
-        return statistics.totalRx()
+		return statistics.totalRx()
-    }
+	}
 
-    override fun tx(): Long {
+	override fun tx(): Long {
-        return statistics.totalTx()
+		return statistics.totalTx()
-    }
+	}
 }

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

@@ -3,44 +3,62 @@ 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 SettingsAdvanced : Route()
+	@Serializable
+	data object AutoTunnel : Route()
 
-    @Serializable data object AutoTunnel : Route()
+	@Serializable
+	data object AutoTunnelAdvanced : Route()
 
-    @Serializable data object AutoTunnelAdvanced : Route()
+	@Serializable
+	data object LocationDisclosure : Route()
 
-    @Serializable data object LocationDisclosure : Route()
+	@Serializable
+	data object Appearance : Route()
 
-    @Serializable data object Appearance : Route()
+	@Serializable
+	data object Display : Route()
 
-    @Serializable data object Display : Route()
+	@Serializable
+	data object KillSwitch : Route()
 
-    @Serializable data object KillSwitch : Route()
+	@Serializable
+	data object Language : Route()
 
-    @Serializable data object Language : Route()
+	@Serializable
+	data object Main : Route()
 
-    @Serializable data object Main : Route()
+	@Serializable
+	data class TunnelOptions(
+		val id: Int,
+	) : Route()
 
-    @Serializable data class TunnelOptions(val id: Int) : Route()
+	@Serializable
+	data object Lock : Route()
 
-    @Serializable data object Lock : Route()
+	@Serializable
+	data object Scanner : Route()
 
-    @Serializable data object Scanner : Route()
+	@Serializable
+	data class Config(
+		val id: Int,
+	) : Route()
 
-    @Serializable data class Config(val id: Int) : Route()
+	@Serializable
+	data class SplitTunnel(
+		val id: Int,
+	) : Route()
 
-    @Serializable
+	@Serializable
-    data class SplitTunnel(val id: Int) : Route() {
+	data class TunnelAutoTunnel(
-        companion object {
+		val id: Int,
-            const val KEY_ID = "id"
+	) : Route()
-        }
-    }
 
-    @Serializable data class TunnelAutoTunnel(val id: Int) : Route()
+	@Serializable
-
+	data object Logs : Route()
-    @Serializable data object Logs : Route()
 }

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

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

@@ -1,56 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.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,43 +22,50 @@ import androidx.compose.ui.unit.dp
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun ExpandingRowListItem(
-    leading: @Composable () -> Unit,
+	leading: @Composable () -> Unit,
-    text: String,
+	text: String,
-    onHold: () -> Unit = {},
+	onHold: () -> Unit = {},
-    onClick: () -> Unit,
+	onClick: () -> Unit,
-    trailing: @Composable () -> Unit,
+	trailing: @Composable () -> Unit,
-    isExpanded: Boolean,
+	isExpanded: Boolean,
-    expanded: @Composable () -> Unit = {},
+	expanded: @Composable () -> Unit = {},
 ) {
-    Box(
+	Box(
-        modifier =
+		modifier =
-            Modifier.animateContentSize()
+		Modifier
-                .clip(RoundedCornerShape(8.dp))
+			.animateContentSize()
-                .combinedClickable(onClick = { onClick() }, onLongClick = { onHold() })
+			.clip(RoundedCornerShape(30.dp))
-    ) {
+			.combinedClickable(
-        Column {
+				onClick = { onClick() },
-            Row(
+				onLongClick = { onHold() },
-                modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp),
+			),
-                verticalAlignment = Alignment.CenterVertically,
+	) {
-                horizontalArrangement = Arrangement.SpaceBetween,
+		Column {
-            ) {
+			Row(
-                Row(
+				modifier =
-                    verticalAlignment = Alignment.CenterVertically,
+				Modifier
-                    horizontalArrangement = Arrangement.spacedBy(16.dp),
+					.fillMaxWidth()
-                    modifier = Modifier.fillMaxWidth(13 / 20f),
+					.padding(horizontal = 15.dp),
-                ) {
+				verticalAlignment = Alignment.CenterVertically,
-                    leading()
+				horizontalArrangement = Arrangement.SpaceBetween,
-                    Text(
+			) {
-                        text,
+				Row(
-                        maxLines = 1,
+					verticalAlignment = Alignment.CenterVertically,
-                        overflow = TextOverflow.Ellipsis,
+					horizontalArrangement = Arrangement.spacedBy(15.dp),
-                        style = MaterialTheme.typography.labelLarge,
+					modifier = Modifier.fillMaxWidth(13 / 20f),
-                        color = MaterialTheme.colorScheme.onBackground,
+				) {
-                    )
+					leading()
-                }
+					Text(
-                trailing()
+						text,
-            }
+						maxLines = 1,
-            if (isExpanded) expanded()
+						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

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

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

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.label
+package com.zaneschepke.wireguardautotunnel.ui.common
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
@@ -12,12 +12,12 @@ import androidx.compose.ui.Modifier
 
 @Composable
 fun SelectedLabel() {
-    Row(
+	Row(
-        modifier = Modifier.fillMaxSize(),
+		modifier = Modifier.fillMaxSize(),
-        horizontalArrangement = Arrangement.End,
+		horizontalArrangement = Arrangement.End,
-        verticalAlignment = Alignment.CenterVertically,
+		verticalAlignment = Alignment.CenterVertically,
-    ) {
+	) {
-        val icon = Icons.Outlined.CheckBox
+		val icon = Icons.Outlined.CheckBox
-        Icon(icon, icon.name)
+		Icon(icon, icon.name)
-    }
+	}
 }

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

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

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

@@ -23,69 +23,77 @@ 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(
+fun IconSurfaceButton(title: String, onClick: () -> Unit, selected: Boolean, leadingIcon: ImageVector? = null, description: String? = null) {
-    title: String,
+	val border: BorderStroke? =
-    onClick: () -> Unit,
+		if (selected) {
-    selected: Boolean,
+			BorderStroke(
-    leadingIcon: ImageVector? = null,
+				1.dp,
-    description: String? = null,
+				MaterialTheme.colorScheme.primary,
-) {
+			)
-    val border: BorderStroke? =
+		} else {
-        if (selected) {
+			null
-            BorderStroke(1.dp, MaterialTheme.colorScheme.primary)
+		}
-        } else {
+	Card(
-            null
+		modifier =
-        }
+		Modifier
-    Card(
+			.fillMaxWidth()
-        modifier = Modifier.fillMaxWidth().height(IntrinsicSize.Min),
+			.height(IntrinsicSize.Min),
-        shape = RoundedCornerShape(8.dp),
+		shape = RoundedCornerShape(8.dp),
-        border = border,
+		border = border,
-        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface),
+		colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface),
-    ) {
+	) {
-        Box(modifier = Modifier.clickable { onClick() }.fillMaxWidth()) {
+		Box(
-            Column(
+			modifier = Modifier.clickable { onClick() }
-                modifier =
+				.fillMaxWidth(),
-                    Modifier.padding(horizontal = 8.dp, vertical = 10.dp)
+		) {
-                        .padding(end = 16.dp)
+			Column(
-                        .padding(start = 8.dp)
+				modifier =
-                        .fillMaxSize(),
+				Modifier
-                verticalArrangement = Arrangement.Center,
+					.padding(horizontal = 8.dp.scaledWidth(), vertical = 10.dp.scaledHeight())
-                horizontalAlignment = Alignment.Start,
+					.padding(end = 16.dp.scaledWidth()).padding(start = 8.dp.scaledWidth())
-            ) {
+					.fillMaxSize(),
-                Row(
+				verticalArrangement = Arrangement.Center,
-                    verticalAlignment = Alignment.Companion.CenterVertically,
+				horizontalAlignment = Alignment.Start,
-                    horizontalArrangement = Arrangement.spacedBy(16.dp),
+			) {
-                ) {
+				Row(
-                    Row(
+					verticalAlignment = Alignment.Companion.CenterVertically,
-                        horizontalArrangement = Arrangement.spacedBy(16.dp),
+					horizontalArrangement = Arrangement.spacedBy(16.dp.scaledWidth()),
-                        verticalAlignment = Alignment.Companion.CenterVertically,
+				) {
-                        modifier =
+					Row(
-                            Modifier.padding(vertical = if (description == null) 10.dp else 0.dp),
+						horizontalArrangement = Arrangement.spacedBy(
-                    ) {
+							16.dp.scaledWidth(),
-                        leadingIcon?.let {
+						),
-                            Icon(
+						verticalAlignment = Alignment.Companion.CenterVertically,
-                                leadingIcon,
+						modifier = Modifier.padding(vertical = if (description == null) 10.dp.scaledHeight() else 0.dp),
-                                leadingIcon.name,
+					) {
-                                Modifier.size(iconSize),
+						leadingIcon?.let {
-                                if (selected) MaterialTheme.colorScheme.primary
+							Icon(
-                                else MaterialTheme.colorScheme.onSurface,
+								leadingIcon,
-                            )
+								leadingIcon.name,
-                        }
+								Modifier.size(iconSize),
-                        Column {
+								if (selected) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.onSurface,
-                            Text(title, style = MaterialTheme.typography.titleMedium)
+							)
-                            description?.let {
+						}
-                                Text(
+						Column {
-                                    description,
+							Text(
-                                    color = MaterialTheme.colorScheme.onSurfaceVariant,
+								title,
-                                    style = MaterialTheme.typography.bodyMedium,
+								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,28 +7,22 @@ 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(
+fun ScaledSwitch(checked: Boolean, onClick: (checked: Boolean) -> Unit, enabled: Boolean = true, modifier: Modifier = Modifier) {
-    checked: Boolean,
+	Switch(
-    onClick: (checked: Boolean) -> Unit,
+		checked,
-    enabled: Boolean = true,
+		{ onClick(it) },
-    modifier: Modifier = Modifier,
+		modifier.scale((52.dp.scaledHeight() / 52.dp)),
-) {
+		enabled = enabled,
-    Switch(
+		colors = SwitchDefaults.colors().copy(
-        checked,
+			checkedThumbColor = MaterialTheme.colorScheme.background,
-        { onClick(it) },
+			checkedIconColor = MaterialTheme.colorScheme.background,
-        modifier.scale((52.dp / 52.dp)),
+			uncheckedTrackColor = MaterialTheme.colorScheme.surface,
-        enabled = enabled,
+			uncheckedBorderColor = MaterialTheme.colorScheme.outline,
-        colors =
+			uncheckedThumbColor = MaterialTheme.colorScheme.outline,
-            SwitchDefaults.colors()
+			uncheckedIconColor = MaterialTheme.colorScheme.outline,
-                .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,46 +19,55 @@ 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,
+	leading: (@Composable () -> Unit)? = null,
-    buttonText: String,
+	buttonText: String,
-    trailing: (@Composable () -> Unit)? = null,
+	trailing: (@Composable () -> Unit)? = null,
-    onClick: () -> Unit,
+	onClick: () -> Unit,
-    ripple: Boolean = true,
+	ripple: Boolean = true,
-    modifier: Modifier = Modifier,
 ) {
-    Card(
+	Card(
-        modifier =
+		modifier =
-            modifier
+		Modifier
-                .clip(RoundedCornerShape(8.dp))
+			.clip(RoundedCornerShape(8.dp))
-                .clickable(
+			.clickable(
-                    indication = if (ripple) ripple() else null,
+				indication = if (ripple) ripple() else null,
-                    interactionSource = remember { MutableInteractionSource() },
+				interactionSource = remember { MutableInteractionSource() },
-                    onClick = { onClick() },
+				onClick = { onClick() },
-                )
+			)
-                .height(56.dp),
+			.height(56.dp.scaledHeight()),
-        colors = CardDefaults.cardColors(containerColor = Color.Transparent),
+		colors =
-    ) {
+		CardDefaults.cardColors(
-        Row(
+			containerColor = MaterialTheme.colorScheme.background,
-            verticalAlignment = Alignment.CenterVertically,
+		),
-            horizontalArrangement = Arrangement.Start,
+	) {
-            modifier = Modifier.fillMaxSize().padding(horizontal = 12.dp),
+		Row(
-        ) {
+			verticalAlignment = Alignment.CenterVertically,
-            leading?.let { it() }
+			horizontalArrangement = Arrangement.Start,
-            Text(
+			modifier = Modifier
-                buttonText,
+				.fillMaxSize()
-                style = MaterialTheme.typography.labelMedium,
+				.padding(end = 10.dp.scaledWidth()),
-                color = MaterialTheme.colorScheme.onSurface,
+		) {
-                modifier = Modifier.fillMaxWidth(3 / 4f),
+			leading?.let {
-                maxLines = 2,
+				it()
-                overflow = TextOverflow.Ellipsis,
+			}
-            )
+			Text(
-            trailing?.let { it() }
+				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 leadingIcon: ImageVector? = null,
-    val trailing: (@Composable () -> Unit)? = null,
+	val trailing: (@Composable () -> Unit)? = null,
-    val title: (@Composable () -> Unit),
+	val title: (@Composable () -> Unit),
-    val description: (@Composable () -> Unit)? = null,
+	val description: (@Composable () -> Unit)? = null,
-    val onClick: (() -> Unit)? = null,
+	val onClick: (() -> Unit)? = null,
-    val height: Int = 64,
+	val height: Int = 64,
 )

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

@@ -1,23 +0,0 @@
-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
-            ),
-    )
-}