build(deps): bump actions/upload-artifact from 4.3.4 to 4.3.5 (#302)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.editorconfig

@@ -1,8 +1,14 @@
-[{*.kt,*.kts}]
-indent_style = space
-insert_final_newline = true
-max_line_length = 100
+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
@@ -11,8 +17,6 @@ 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_allow_trailing_comma = true
-ij_kotlin_allow_trailing_comma_on_call_site = true
 ij_kotlin_assignment_wrap = normal
 ij_kotlin_blank_lines_after_class_header = 0
 ij_kotlin_blank_lines_around_block_when_branches = 0
@@ -20,10 +24,7 @@ ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_
 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_call_parameters_wrap = on_every_item
 ij_kotlin_catch_on_new_line = false
-ij_kotlin_class_annotation_wrap = split_into_lines
-ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
 ij_kotlin_continuation_indent_for_chained_calls = true
 ij_kotlin_continuation_indent_for_expression_bodies = true
 ij_kotlin_continuation_indent_in_argument_lists = true
@@ -52,7 +53,6 @@ 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_method_parameters_wrap = on_every_item
 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
@@ -82,4 +82,16 @@ 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
+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/CODE_OF_CONDUCT.md

@@ -4,7 +4,7 @@
 
 We as individuals involved in this project, pledge to participate in this
 community in a respectful, constructive, and civil manner as we work towards a common goal
-of delivering free, open source, and value adding software for all. 
+of delivering free, open source, and value adding software for all.
 
 ## Standard
 

.github/workflows/ci.yml

@@ -0,0 +1,23 @@
+name: ci-android
+
+on:
+    workflow_dispatch:
+    pull_request:
+
+jobs:
+  format:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: gradle
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Run ktlint
+        run: ./gradlew ktlintCheck

.github/workflows/issue-workflow.yml

@@ -2,7 +2,7 @@ name: Issue Updates Workflow
 
 on:
   issues:
-    types: [opened, closed, reopened]
+    types: [ opened, closed, reopened ]
 
 
 jobs:

.github/workflows/pre-release.yml

@@ -1,124 +0,0 @@
-name: Android CI Tag Deployment (Pre-release)
-
-on:
-  workflow_dispatch:
-  push:
-    tags:
-      - '*.*.*-**'
-
-jobs:
-  build:
-    name: Build Signed APK
-
-    runs-on: ubuntu-latest
-
-    env:
-      SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
-      SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
-      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
-      KEY_STORE_FILE: 'android_keystore.jks'
-      KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
-      GH_USER: ${{ secrets.GH_USER }}
-      GH_TOKEN: ${{ secrets.GH_TOKEN }}
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-          cache: gradle
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      # Here we need to decode keystore.jks from base64 string and place it
-      # in the folder specified in the release signing configuration
-      - name: Decode Keystore
-        id: decode_keystore
-        uses: timheuer/base64-to-file@v1.2
-        with:
-          fileName: ${{ env.KEY_STORE_FILE }}
-          fileDir: ${{ env.KEY_STORE_LOCATION }}
-          encodedString: ${{ secrets.KEYSTORE }}
-
-      # create keystore path for gradle to read
-      - name: Create keystore path env var
-        run: |
-          store_path=${{ env.KEY_STORE_LOCATION }}${{ env.KEY_STORE_FILE }}
-          echo "KEY_STORE_PATH=$store_path" >> $GITHUB_ENV
-
-      - name: Create service_account.json
-        id: createServiceAccount
-        run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
-
-      # Build and sign APK ("-x test" argument is used to skip tests)
-      # add fdroid flavor for apk upload
-      - name: Build Fdroid Release APK
-        run: ./gradlew :app:assembleFdroidRelease -x test
-
-      # get fdroid flavor release apk path
-      - name: Get apk path
-        id: apk-path
-        run: echo "path=$(find . -regex '^.*/build/outputs/apk/fdroid/release/.*\.apk$' -type f | head -1)" >> $GITHUB_OUTPUT
-      - name: Get version code
-        run: |
-          version_code=$(grep "VERSION_CODE" buildSrc/src/main/kotlin/Constants.kt | awk '{print $5}' | tr -d '\n')
-          echo "VERSION_CODE=$version_code" >> $GITHUB_ENV
-      # Save the APK after the Build job is complete to publish it as a Github release in the next job
-      - name: Upload APK
-        uses: actions/upload-artifact@v4.3.3
-        with:
-          name: wgtunnel
-          path: ${{ steps.apk-path.outputs.path }}
-      - name: Download APK from build
-        uses: actions/download-artifact@v4
-        with:
-          name: wgtunnel
-      - name: Create Release with Fastlane changelog notes
-        id: create_release
-        uses: softprops/action-gh-release@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          # fix hardcode changelog file name
-          body_path: ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/${{ env.VERSION_CODE }}.txt
-          tag_name: ${{ github.ref_name }}
-          name: ${{ github.ref_name }}
-          draft: false
-          prerelease: true
-          files: ${{ github.workspace }}/${{ steps.apk-path.outputs.path }}
-
-      - name: Install apksigner
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y apksigner
-
-      - name: Get checksum
-        id: checksum
-        run: echo "checksum=$(apksigner verify -print-certs ${{ steps.apk-path.outputs.path }} | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")" >> $GITHUB_OUTPUT
-
-      - name: Append checksum
-        id: append_checksum
-        uses: softprops/action-gh-release@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          body: |
-            
-            SHA256 fingerprint:
-            ```${{ steps.checksum.outputs.checksum }}```
-          tag_name: ${{ github.ref_name }}
-          name: ${{ github.ref_name }}
-          draft: false
-          prerelease: true
-          append_body: true
-
-      - name: Deploy with fastlane
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.2' # Not needed with a .ruby-version file
-          bundler-cache: true
-      - name: Distribute app to Beta track 🚀
-        run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane beta)
-

.github/workflows/publish-workflow.yml

@@ -2,7 +2,7 @@ name: Release Updates Workflow
 
 on:
   release:
-    types: [published]
+    types: [ published ]
 
 
 jobs:

.github/workflows/release.yml

@@ -1,17 +1,40 @@
-# name of the workflow
-name: Android CI Tag Deployment (Release)
+name: release-android
 
 on:
+  schedule:
+    - cron: "4 3 * * *"
   workflow_dispatch:
-  push:
-    tags:
-      - '*.*.*'
-      - '!*.*.*-**'
+    inputs:
+      track:
+        type: choice
+        description: "Google play release track"
+        options:
+          - none
+          - internal
+          - alpha
+          - beta
+          - production
+        default: alpha
+        required: true
+      release_type:
+        type: choice
+        description: "GitHub release type"
+        options:
+          - none
+          - prerelease
+          - nightly
+          - release
+        default: release
+        required: true
+      tag_name:
+        description: "Tag name for release"
+        required: false
+        default: nightly
 
 jobs:
   build:
     name: Build Signed APK
-
+    if: ${{ inputs.release_type != 'none' }}
     runs-on: ubuntu-latest
 
     env:
@@ -21,7 +44,9 @@ jobs:
       KEY_STORE_FILE: 'android_keystore.jks'
       KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
       GH_USER: ${{ secrets.GH_USER }}
+      # GH needed for gh cli
       GH_TOKEN: ${{ secrets.GH_TOKEN }}
+      GH_REPO: ${{ github.repository }}
 
     steps:
       - uses: actions/checkout@v4
@@ -34,6 +59,10 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
+      - name: Install system dependencies
+        run: |
+          sudo apt update && sudo apt install -y gh apksigner
+
       # Here we need to decode keystore.jks from base64 string and place it
       # in the folder specified in the release signing configuration
       - name: Decode Keystore
@@ -57,75 +86,151 @@ jobs:
       # Build and sign APK ("-x test" argument is used to skip tests)
       # add fdroid flavor for apk upload
       - name: Build Fdroid Release APK
+        if: ${{ inputs.release_type != '' && inputs.release_type == 'release' }}
         run: ./gradlew :app:assembleFdroidRelease -x test
 
-      # get fdroid flavor release apk path
-      - name: Get apk path
-        id: apk-path
-        run: echo "path=$(find . -regex '^.*/build/outputs/apk/fdroid/release/.*\.apk$' -type f | head -1)" >> $GITHUB_OUTPUT
+      - name: Build Fdroid Prerelease APK
+        if: ${{ inputs.release_type != '' && inputs.release_type == 'prerelease' }}
+        run: ./gradlew :app:assembleFdroidPrerelease -x test
+
+      - name: Build Fdroid Nightly APK
+        if: ${{ inputs.release_type == '' || inputs.release_type == 'nightly' }}
+        run: ./gradlew :app:assembleFdroidNightly -x test
+
+      - if: ${{ inputs.release_type == '' || inputs.release_type == 'nightly' }}
+        run: echo "APK_PATH=$(find . -regex '^.*/build/outputs/apk/fdroid/nightly/.*\.apk$' -type f | head -1)" >> $GITHUB_ENV
+      - if: ${{ inputs.release_type != '' && inputs.release_type == 'release' }}
+        run: echo "APK_PATH=$(find . -regex '^.*/build/outputs/apk/fdroid/release/.*\.apk$' -type f | head -1)" >> $GITHUB_ENV
+      - if: ${{ inputs.release_type != '' && inputs.release_type == 'prerelease' }}
+        run: echo "APK_PATH=$(find . -regex '^.*/build/outputs/apk/fdroid/prerelease/.*\.apk$' -type f | head -1)" >> $GITHUB_ENV
+
       - name: Get version code
+        if: ${{ inputs.release_type == 'release' }}
         run: |
           version_code=$(grep "VERSION_CODE" buildSrc/src/main/kotlin/Constants.kt | awk '{print $5}' | tr -d '\n')
           echo "VERSION_CODE=$version_code" >> $GITHUB_ENV
+
       # Save the APK after the Build job is complete to publish it as a Github release in the next job
       - name: Upload APK
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v4.3.5
         with:
           name: wgtunnel
-          path: ${{ steps.apk-path.outputs.path }}
+          path: ${{ env.APK_PATH }}
+
       - name: Download APK from build
         uses: actions/download-artifact@v4
         with:
           name: wgtunnel
+
       - name: Repository Dispatch for my F-Droid repo
         uses: peter-evans/repository-dispatch@v3
+        if: ${{ inputs.release_type == 'release' }}
         with:
           token: ${{ secrets.PAT }}
           repository: zaneschepke/fdroid
           event-type: fdroid-update
+
+      # Setup TAG_NAME, which is used as a general "name"
+      - if: github.event_name == 'workflow_dispatch'
+        run: echo "TAG_NAME=${{ github.event.inputs.tag_name }}" >> $GITHUB_ENV
+      - if: github.event_name == 'schedule'
+        run: echo "TAG_NAME=nightly" >> $GITHUB_ENV
+
+      - name: Set version release notes
+        if: ${{ inputs.release_type == 'release' }}
+        run: |
+          RELEASE_NOTES="$(cat ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/${{ env.VERSION_CODE }}.txt)"
+          echo "RELEASE_NOTES<<EOF" >> $GITHUB_ENV
+          echo "$RELEASE_NOTES" >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
+
+      - name: On nightly release notes
+        if: ${{ contains(env.TAG_NAME, 'nightly') }}
+        run: |
+          echo "RELEASE_NOTES=Nightly build for the latest development version of the app." >> $GITHUB_ENV
+          gh release delete nightly --yes || true
+
+      - name: On prerelease release notes
+        if: ${{ inputs.release_type == 'prerelease' }}
+        run: |
+          echo "RELEASE_NOTES=Testing version of app for specific feature." >> $GITHUB_ENV
+          gh release delete ${{ github.event.inputs.tag_name }} --yes || true
+
+      - name: Get checksum
+        id: checksum
+        run: echo "checksum=$(apksigner verify -print-certs ${{ env.APK_PATH }} | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")" >> $GITHUB_OUTPUT
+
+
       - name: Create Release with Fastlane changelog notes
         id: create_release
         uses: softprops/action-gh-release@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          body_path: ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/${{ env.VERSION_CODE }}.txt
-          tag_name: ${{ github.ref_name }}
-          name: ${{ github.ref_name }}
-          draft: false
-          prerelease: false
-          files: ${{ github.workspace }}/${{ steps.apk-path.outputs.path }}
-
-      - name: Install apksigner
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y apksigner
-
-      - name: Get checksum
-        id: checksum
-        run: echo "checksum=$(apksigner verify -print-certs ${{ steps.apk-path.outputs.path }} | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")" >> $GITHUB_OUTPUT
-
-      - name: Append checksum
-        id: append_checksum
-        uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           body: |
-            
+            ${{ env.RELEASE_NOTES }}
+
             SHA256 fingerprint:
             ```${{ steps.checksum.outputs.checksum }}```
-          tag_name: ${{ github.ref_name }}
-          name: ${{ github.ref_name }}
+          tag_name: ${{ env.TAG_NAME }}
+          name: ${{ env.TAG_NAME }}
           draft: false
-          prerelease: false
-          append_body: true
+          prerelease: ${{ inputs.release_type == 'prerelease' || inputs.release_type == '' || inputs.release_type == 'nightly' }}
+          make_latest: ${{ inputs.release_type == 'release' }}
+          files: ${{ github.workspace }}/${{ env.APK_PATH }}
+
+  publish-play:
+    if: ${{ inputs.track != 'none' && inputs.track != '' }}
+    name: Publish to Google Play
+    runs-on: ubuntu-latest
+
+    env:
+      SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
+      SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
+      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
+      KEY_STORE_FILE: 'android_keystore.jks'
+      KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
+      GH_USER: ${{ secrets.GH_USER }}
+      GH_TOKEN: ${{ secrets.GH_TOKEN }}
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: gradle
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      # Here we need to decode keystore.jks from base64 string and place it
+      # in the folder specified in the release signing configuration
+      - name: Decode Keystore
+        id: decode_keystore
+        uses: timheuer/base64-to-file@v1.2
+        with:
+          fileName: ${{ env.KEY_STORE_FILE }}
+          fileDir: ${{ env.KEY_STORE_LOCATION }}
+          encodedString: ${{ secrets.KEYSTORE }}
+
+      # create keystore path for gradle to read
+      - name: Create keystore path env var
+        run: |
+          store_path=${{ env.KEY_STORE_LOCATION }}${{ env.KEY_STORE_FILE }}
+          echo "KEY_STORE_PATH=$store_path" >> $GITHUB_ENV
+
+      - name: Create service_account.json
+        id: createServiceAccount
+        run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
 
       - name: Deploy with fastlane
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.2' # Not needed with a .ruby-version file
           bundler-cache: true
-      - name: Distribute app to Prod track 🚀
-        run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane production)
+
+      - name: Distribute app to Prod track 🚀
+        run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane ${{ inputs.track }})
 

README.md

@@ -22,7 +22,8 @@ WG Tunnel
 
 <div align="left">
 
-This is an alternative Android Application for [WireGuard](https://www.wireguard.com/) and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) with added
+This is an alternative Android Application for [WireGuard](https://www.wireguard.com/)
+and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) with added
 features. Built using the [wireguard-android](https://github.com/WireGuard/wireguard-android)
 library and [Jetpack Compose](https://developer.android.com/jetpack/compose), this application was
 inspired by the official [WireGuard Android](https://github.com/WireGuard/wireguard-android) app.
@@ -64,27 +65,28 @@ and on while on different networks. This app was created to offer a free solutio
 * Battery preservation measures
 * Restart tunnel on ping failure (beta)
 
+## Fdroid
+
+Want updates faster?
+
+Check out my personal [fdroid repository](https://github.com/zaneschepke/fdroid) to get updates the
+moment they are released.
+
 ## Docs
 
-Basic documentation of the feature and behaviors of this app can be
-found [here](https://zaneschepke.com/wgtunnel-docs/overview.html).
+Information about features, behaviors, and answers to common questions can be found in the
+app [documentation](https://zaneschepke.com/wgtunnel-docs/overview.html).
 
 The repository for these docs can be found [here](https://github.com/zaneschepke/wgtunnel-docs).
 
-## Contributing
-
-Any contributions in the form of feedback, issues, code, or translations are welcome and much appreciated!
-
-Please read the [code of conduct](https://github.com/zaneschepke/wgtunnel?tab=coc-ov-file#contributor-code-of-conduct) before contributing.
-
 ## Translation
 
-This app is using [Weblate](https://weblate.org) to assist with translations. 
+This app is using [Weblate](https://weblate.org) to assist with translations.
 
-Help translate WG Tunnel into your language at [Hosted Weblate](https://hosted.weblate.org/engage/wg-tunnel/).\
+Help translate WG Tunnel into your language
+at [Hosted Weblate](https://hosted.weblate.org/engage/wg-tunnel/).\
 [![Translation status](https://hosted.weblate.org/widgets/wg-tunnel/-/multi-auto.svg)](https://hosted.weblate.org/engage/wg-tunnel/)
 
-
 ## Building
 
 ```
@@ -98,4 +100,11 @@ And then build the app:
 $ ./gradlew assembleDebug
 ```
 
-</span>
+## Contributing
+
+Any contributions in the form of feedback, issues, code, or translations are welcome and much
+appreciated!
+
+Please read
+the [code of conduct](https://github.com/zaneschepke/wgtunnel?tab=coc-ov-file#contributor-code-of-conduct)
+before contributing.

app/build.gradle.kts

@@ -1,215 +1,209 @@
-import java.util.Properties
-
 plugins {
-    alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.hilt.android)
-    alias(libs.plugins.kotlinxSerialization)
-    alias(libs.plugins.ksp)
+	alias(libs.plugins.android.application)
+	alias(libs.plugins.kotlin.android)
+	alias(libs.plugins.hilt.android)
+	alias(libs.plugins.kotlinxSerialization)
+	alias(libs.plugins.ksp)
+	alias(libs.plugins.compose.compiler)
+	alias(libs.plugins.grgit)
 }
 
 android {
-    namespace = Constants.APP_ID
-    compileSdk = Constants.TARGET_SDK
+	namespace = Constants.APP_ID
+	compileSdk = Constants.TARGET_SDK
 
-    androidResources {
-        generateLocaleConfig = true
-    }
+	androidResources {
+		generateLocaleConfig = true
+	}
 
-    defaultConfig {
-        applicationId = Constants.APP_ID
-        minSdk = Constants.MIN_SDK
-        targetSdk = Constants.TARGET_SDK
-        versionCode = Constants.VERSION_CODE
-        versionName = Constants.VERSION_NAME
+	defaultConfig {
+		applicationId = Constants.APP_ID
+		minSdk = Constants.MIN_SDK
+		targetSdk = Constants.TARGET_SDK
+		versionCode = determineVersionCode()
+		versionName = determineVersionName()
 
-        ksp { arg("room.schemaLocation", "$projectDir/schemas") }
+		ksp { arg("room.schemaLocation", "$projectDir/schemas") }
 
-        sourceSets {
-            getByName("debug").assets.srcDirs(files("$projectDir/schemas")) // Room
-        }
+		sourceSets {
+			getByName("debug").assets.srcDirs(files("$projectDir/schemas")) // Room
+		}
 
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables { useSupportLibrary = true }
-    }
+		testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+		vectorDrawables { useSupportLibrary = true }
+	}
 
-    signingConfigs {
-        create(Constants.RELEASE) {
-            val properties =
-                Properties().apply {
-                    // created local file for signing details
-                    try {
-                        load(file("signing.properties").reader())
-                    } catch (_: Exception) {
-                        load(file("signing_template.properties").reader())
-                    }
-                }
+	signingConfigs {
+		create(Constants.RELEASE) {
+			storeFile = getStoreFile()
+			storePassword = getSigningProperty(Constants.STORE_PASS_VAR)
+			keyAlias = getSigningProperty(Constants.KEY_ALIAS_VAR)
+			keyPassword = getSigningProperty(Constants.KEY_PASS_VAR)
+		}
+	}
 
-            // try to get secrets from env first for pipeline build, then properties file for local
-            // build
-            storeFile =
-                file(
-                    System.getenv()
-                        .getOrDefault(
-                            Constants.KEY_STORE_PATH_VAR,
-                            properties.getProperty(Constants.KEY_STORE_PATH_VAR),
-                        ),
-                )
-            storePassword =
-                System.getenv()
-                    .getOrDefault(
-                        Constants.STORE_PASS_VAR,
-                        properties.getProperty(Constants.STORE_PASS_VAR),
-                    )
-            keyAlias =
-                System.getenv()
-                    .getOrDefault(
-                        Constants.KEY_ALIAS_VAR,
-                        properties.getProperty(Constants.KEY_ALIAS_VAR),
-                    )
-            keyPassword =
-                System.getenv()
-                    .getOrDefault(
-                        Constants.KEY_PASS_VAR,
-                        properties.getProperty(Constants.KEY_PASS_VAR),
-                    )
-        }
-    }
+	buildTypes {
+		// don't strip
+		packaging.jniLibs.keepDebugSymbols.addAll(
+			listOf("libwg-go.so", "libwg-quick.so", "libwg.so"),
+		)
 
-    buildTypes {
-        // don't strip
-        packaging.jniLibs.keepDebugSymbols.addAll(
-            listOf("libwg-go.so", "libwg-quick.so", "libwg.so"),
-        )
+		release {
+			isDebuggable = false
+			isMinifyEnabled = true
+			isShrinkResources = true
+			proguardFiles(
+				getDefaultProguardFile("proguard-android-optimize.txt"),
+				"proguard-rules.pro",
+			)
+			signingConfig = signingConfigs.getByName(Constants.RELEASE)
+		}
+		debug { isDebuggable = true }
 
-        applicationVariants.all {
-            val variant = this
-            variant.outputs
-                .map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
-                .forEach { output ->
-                    val outputFileName =
-                        "${Constants.APP_NAME}-${variant.flavorName}-${variant.buildType.name}-${variant.versionName}.apk"
-                    output.outputFileName = outputFileName
-                }
-        }
-        release {
-            isDebuggable = false
-            isMinifyEnabled = true
-            isShrinkResources = true
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro",
-            )
-            signingConfig = signingConfigs.getByName(Constants.RELEASE)
-        }
-        debug { isDebuggable = true }
-    }
-    flavorDimensions.add(Constants.TYPE)
-    productFlavors {
-        create("fdroid") {
-            dimension = Constants.TYPE
-            proguardFile("fdroid-rules.pro")
-        }
-        create("general") {
-            dimension = Constants.TYPE
-            if (BuildHelper.isReleaseBuild(gradle) && BuildHelper.isGeneralFlavor(gradle)) {
-                //any plugins general specific
-            }
-        }
-    }
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-        isCoreLibraryDesugaringEnabled = true
-    }
-    kotlinOptions { jvmTarget = Constants.JVM_TARGET }
-    buildFeatures {
-        compose = true
-        buildConfig = true
-    }
-    composeOptions { kotlinCompilerExtensionVersion = Constants.COMPOSE_COMPILER_EXTENSION_VERSION }
-    packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
+		create(Constants.PRERELEASE) {
+			initWith(buildTypes.getByName(Constants.RELEASE))
+		}
+
+		create(Constants.NIGHTLY) {
+			initWith(buildTypes.getByName(Constants.RELEASE))
+		}
+
+		applicationVariants.all {
+			val variant = this
+			variant.outputs
+				.map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
+				.forEach { output ->
+					val outputFileName =
+						"${Constants.APP_NAME}-${variant.flavorName}-" +
+							"${variant.buildType.name}-${variant.versionName}.apk"
+					output.outputFileName = outputFileName
+				}
+		}
+	}
+	flavorDimensions.add(Constants.TYPE)
+	productFlavors {
+		create("fdroid") {
+			dimension = Constants.TYPE
+			proguardFile("fdroid-rules.pro")
+		}
+		create("general") {
+			dimension = Constants.TYPE
+		}
+	}
+	compileOptions {
+		sourceCompatibility = JavaVersion.VERSION_17
+		targetCompatibility = JavaVersion.VERSION_17
+		isCoreLibraryDesugaringEnabled = true
+	}
+	kotlinOptions { jvmTarget = Constants.JVM_TARGET }
+	buildFeatures {
+		compose = true
+		buildConfig = true
+	}
+	packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
 }
 
 val generalImplementation by configurations
 
 dependencies {
 
-    implementation(project(":logcatter"))
+	implementation(project(":logcatter"))
 
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.lifecycle.runtime.ktx)
+	implementation(libs.androidx.core.ktx)
+	implementation(libs.androidx.lifecycle.runtime.ktx)
 
-    // helpers for implementing LifecycleOwner in a Service
-    implementation(libs.androidx.lifecycle.service)
-    implementation(libs.androidx.activity.compose)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.ui)
-    implementation(libs.androidx.compose.ui.graphics)
-    implementation(libs.androidx.compose.ui.tooling.preview)
-    implementation(libs.androidx.material3)
-    implementation(libs.androidx.appcompat)
+	// helpers for implementing LifecycleOwner in a Service
+	implementation(libs.androidx.lifecycle.service)
+	implementation(libs.androidx.activity.compose)
+	implementation(platform(libs.androidx.compose.bom))
+	implementation(libs.androidx.compose.ui)
+	implementation(libs.androidx.compose.ui.graphics)
+	implementation(libs.androidx.compose.ui.tooling.preview)
+	implementation(libs.androidx.material3)
+	implementation(libs.androidx.appcompat)
 
-    // test
-    testImplementation(libs.junit)
-    testImplementation(libs.androidx.junit)
-    androidTestImplementation(libs.androidx.junit)
-    androidTestImplementation(libs.androidx.espresso.core)
-    androidTestImplementation(platform(libs.androidx.compose.bom))
-    androidTestImplementation(libs.androidx.compose.ui.test)
-    androidTestImplementation(libs.androidx.room.testing)
-    debugImplementation(libs.androidx.compose.ui.tooling)
-    debugImplementation(libs.androidx.compose.manifest)
+	// test
+	testImplementation(libs.junit)
+	testImplementation(libs.androidx.junit)
+	androidTestImplementation(libs.androidx.junit)
+	androidTestImplementation(libs.androidx.espresso.core)
+	androidTestImplementation(platform(libs.androidx.compose.bom))
+	androidTestImplementation(libs.androidx.compose.ui.test)
+	androidTestImplementation(libs.androidx.room.testing)
+	debugImplementation(libs.androidx.compose.ui.tooling)
+	debugImplementation(libs.androidx.compose.manifest)
 
-    // get tunnel lib from github packages or mavenLocal
-    implementation(libs.tunnel)
-    implementation(libs.amneziawg.android)
-    coreLibraryDesugaring(libs.desugar.jdk.libs)
+	// get tunnel lib from github packages or mavenLocal
+	implementation(libs.tunnel)
+	implementation(libs.amneziawg.android)
+	coreLibraryDesugaring(libs.desugar.jdk.libs)
 
-    // logging
-    implementation(libs.timber)
+	// logging
+	implementation(libs.timber)
 
+	// compose navigation
+	implementation(libs.androidx.navigation.compose)
+	implementation(libs.androidx.hilt.navigation.compose)
 
-    // compose navigation
-    implementation(libs.androidx.navigation.compose)
-    implementation(libs.androidx.hilt.navigation.compose)
+	implementation(libs.zaneschepke.multifab)
 
-    implementation(libs.zaneschepke.multifab)
+	// hilt
+	implementation(libs.hilt.android)
+	ksp(libs.hilt.android.compiler)
 
-    // hilt
-    implementation(libs.hilt.android)
-    ksp(libs.hilt.android.compiler)
+	// accompanist
+	implementation(libs.accompanist.permissions)
+	implementation(libs.accompanist.flowlayout)
+	implementation(libs.accompanist.drawablepainter)
 
-    // accompanist
-    implementation(libs.accompanist.permissions)
-    implementation(libs.accompanist.flowlayout)
-    implementation(libs.accompanist.drawablepainter)
+	// storage
+	implementation(libs.androidx.room.runtime)
+	ksp(libs.androidx.room.compiler)
+	implementation(libs.androidx.room.ktx)
+	implementation(libs.androidx.datastore.preferences)
 
-    // storage
-    implementation(libs.androidx.room.runtime)
-    ksp(libs.androidx.room.compiler)
-    implementation(libs.androidx.room.ktx)
-    implementation(libs.androidx.datastore.preferences)
+	// lifecycle
+	implementation(libs.lifecycle.runtime.compose)
+	implementation(libs.androidx.lifecycle.runtime.ktx)
+	implementation(libs.androidx.lifecycle.process)
 
-    // lifecycle
-    implementation(libs.lifecycle.runtime.compose)
-    implementation(libs.androidx.lifecycle.runtime.ktx)
-    implementation(libs.androidx.lifecycle.process)
+	// icons
+	implementation(libs.material.icons.extended)
+	// serialization
+	implementation(libs.kotlinx.serialization.json)
 
-    // icons
-    implementation(libs.material.icons.extended)
-    // serialization
-    implementation(libs.kotlinx.serialization.json)
+	// barcode scanning
+	implementation(libs.zxing.android.embedded)
 
-    // barcode scanning
-    implementation(libs.zxing.android.embedded)
-    implementation(libs.zxing.core)
+	// bio
+	implementation(libs.androidx.biometric.ktx)
+	implementation(libs.pin.lock.compose)
 
-    // bio
-    implementation(libs.androidx.biometric.ktx)
-    implementation(libs.pin.lock.compose)
+	// shortcuts
+	implementation(libs.androidx.core)
+	implementation(libs.androidx.core.google.shortcuts)
 
-    // shortcuts
-    implementation(libs.androidx.core)
-    implementation(libs.androidx.core.google.shortcuts)
+	// splash
+	implementation(libs.androidx.core.splashscreen)
+}
+
+fun determineVersionCode(): Int {
+	return with(getBuildTaskName().lowercase()) {
+		when {
+			contains(Constants.NIGHTLY) -> Constants.VERSION_CODE + Constants.NIGHTLY_CODE
+			contains(Constants.PRERELEASE) -> Constants.VERSION_CODE + Constants.PRERELEASE_CODE
+			else -> Constants.VERSION_CODE
+		}
+	}
+}
+
+fun determineVersionName(): String {
+	return with(getBuildTaskName().lowercase()) {
+		when {
+			contains(Constants.NIGHTLY) || contains(Constants.PRERELEASE) ->
+				Constants.VERSION_NAME +
+					"-${grgitService.service.get().grgit.head().abbreviatedId}"
+			else -> Constants.VERSION_NAME
+		}
+	}
 }

app/fdroid-rules.pro

@@ -2,4 +2,4 @@
 
 -keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
     <fields>;
-}
+}

app/proguard-rules.pro

@@ -21,6 +21,4 @@
 #-renamesourcefileattribute SourceFile
 -keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
     <fields>;
-}
-
-
+}

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

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

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

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

app/src/main/AndroidManifest.xml

@@ -51,7 +51,7 @@
     </queries>
     <application
         android:name=".WireGuardAutoTunnel"
-        android:allowBackup="true"
+        android:allowBackup="false"
         android:banner="@drawable/ic_banner"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:enableOnBackInvokedCallback="true"
@@ -60,18 +60,17 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.WireguardAutoTunnel"
+        android:theme="@style/Theme.AppSplashScreen"
         tools:targetApi="tiramisu">
         <activity
-            android:name=".ui.MainActivity"
+            android:name=".ui.SplashActivity"
             android:exported="true"
-            android:theme="@style/Theme.WireguardAutoTunnel">
+            android:theme="@style/Theme.AppSplashScreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
-
                 <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
             </intent-filter>
             <meta-data
@@ -79,17 +78,23 @@
                 android:resource="@xml/shortcuts" />
         </activity>
         <activity
-            android:name=".ui.CaptureActivityPortrait"
-            android:screenOrientation="fullSensor"
-            android:stateNotNeeded="true"
-            android:theme="@style/zxing_CaptureTheme"
-            android:windowSoftInputMode="stateAlwaysHidden"
-            tools:ignore="DiscouragedApi" />
+            android:name=".ui.MainActivity"
+            android:exported="true"
+            android:theme="@style/Theme.WireguardAutoTunnel">
+        </activity>
+        <activity
+            android:name="com.journeyapps.barcodescanner.CaptureActivity"
+            android:screenOrientation="portrait"
+            tools:replace="screenOrientation" />
+
         <activity
             android:name=".service.shortcut.ShortcutsActivity"
             android:enabled="true"
             android:exported="true"
-            android:finishOnTaskLaunch="true"
+			android:noHistory="true"
+			android:excludeFromRecents="true"
+			android:finishOnTaskLaunch="true"
+			android:launchMode="singleInstance"
             android:theme="@android:style/Theme.NoDisplay" />
 
         <service
@@ -173,4 +178,4 @@
             android:name=".receiver.NotificationActionReceiver"
             android:exported="false" />
     </application>
-</manifest>
+</manifest>

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

@@ -3,54 +3,55 @@ package com.zaneschepke.wireguardautotunnel
 import android.app.Application
 import android.content.ComponentName
 import android.content.pm.PackageManager
+import android.os.StrictMode
+import android.os.StrictMode.ThreadPolicy
 import android.service.quicksettings.TileService
 import com.zaneschepke.wireguardautotunnel.service.tile.AutoTunnelControlTile
 import com.zaneschepke.wireguardautotunnel.service.tile.TunnelControlTile
 import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
 import dagger.hilt.android.HiltAndroidApp
-import kotlinx.coroutines.MainScope
-import kotlinx.coroutines.cancel
 import timber.log.Timber
-import xyz.teamgravity.pin_lock_compose.PinManager
 
 @HiltAndroidApp
 class WireGuardAutoTunnel : Application() {
-    override fun onCreate() {
-        super.onCreate()
-        instance = this
-        if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree()) else Timber.plant(ReleaseTree())
-        PinManager.initialize(this)
-    }
+	override fun onCreate() {
+		super.onCreate()
+		instance = this
+		if (BuildConfig.DEBUG) {
+			Timber.plant(Timber.DebugTree())
+			StrictMode.setThreadPolicy(
+				ThreadPolicy.Builder()
+					.detectDiskReads()
+					.detectDiskWrites()
+					.detectNetwork()
+					.penaltyLog()
+					.build(),
+			)
+		} else {
+			Timber.plant(ReleaseTree())
+		}
+	}
 
-    override fun onLowMemory() {
-        super.onLowMemory()
-        applicationScope.cancel("onLowMemory() called by system")
-        applicationScope = MainScope()
-    }
+	companion object {
+		lateinit var instance: WireGuardAutoTunnel
+			private set
 
-    companion object {
+		fun isRunningOnAndroidTv(): Boolean {
+			return instance.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
+		}
 
-        var applicationScope = MainScope()
+		fun requestTunnelTileServiceStateUpdate() {
+			TileService.requestListeningState(
+				instance,
+				ComponentName(instance, TunnelControlTile::class.java),
+			)
+		}
 
-        lateinit var instance: WireGuardAutoTunnel
-            private set
-
-        fun isRunningOnAndroidTv(): Boolean {
-            return instance.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
-        }
-
-        fun requestTunnelTileServiceStateUpdate() {
-            TileService.requestListeningState(
-                instance,
-                ComponentName(instance, TunnelControlTile::class.java),
-            )
-        }
-
-        fun requestAutoTunnelTileServiceUpdate() {
-            TileService.requestListeningState(
-                instance,
-                ComponentName(instance, AutoTunnelControlTile::class.java),
-            )
-        }
-    }
+		fun requestAutoTunnelTileServiceUpdate() {
+			TileService.requestListeningState(
+				instance,
+				ComponentName(instance, AutoTunnelControlTile::class.java),
+			)
+		}
+	}
 }

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

@@ -10,46 +10,46 @@ import com.zaneschepke.wireguardautotunnel.data.domain.Settings
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 
 @Database(
-    entities = [Settings::class, TunnelConfig::class],
-    version = 8,
-    autoMigrations =
-    [
-        AutoMigration(from = 1, to = 2),
-        AutoMigration(from = 2, to = 3),
-        AutoMigration(
-            from = 3,
-            to = 4,
-        ),
-        AutoMigration(
-            from = 4,
-            to = 5,
-        ),
-        AutoMigration(
-            from = 5,
-            to = 6,
-        ),
-        AutoMigration(
-            from = 6,
-            to = 7,
-            spec = RemoveLegacySettingColumnsMigration::class,
-        ),
-        AutoMigration(7, 8)
-    ],
-    exportSchema = true,
+	entities = [Settings::class, TunnelConfig::class],
+	version = 8,
+	autoMigrations =
+	[
+		AutoMigration(from = 1, to = 2),
+		AutoMigration(from = 2, to = 3),
+		AutoMigration(
+			from = 3,
+			to = 4,
+		),
+		AutoMigration(
+			from = 4,
+			to = 5,
+		),
+		AutoMigration(
+			from = 5,
+			to = 6,
+		),
+		AutoMigration(
+			from = 6,
+			to = 7,
+			spec = RemoveLegacySettingColumnsMigration::class,
+		),
+		AutoMigration(7, 8),
+	],
+	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",
+	tableName = "Settings",
+	columnName = "default_tunnel",
 )
 @DeleteColumn(
-    tableName = "Settings",
-    columnName = "is_battery_saver_enabled",
+	tableName = "Settings",
+	columnName = "is_battery_saver_enabled",
 )
 class RemoveLegacySettingColumnsMigration : AutoMigrationSpec

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

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

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

@@ -5,20 +5,20 @@ import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 
 class DatabaseListConverters {
-    @TypeConverter
-    fun listToString(value: MutableList<String>): String {
-        return Json.encodeToString(value)
-    }
+	@TypeConverter
+	fun listToString(value: MutableList<String>): String {
+		return Json.encodeToString(value)
+	}
 
-    @TypeConverter
-    fun stringToList(value: String): MutableList<String> {
-        if (value.isBlank() || value.isEmpty()) return mutableListOf()
-        return try {
-            Json.decodeFromString<MutableList<String>>(value)
-        } catch (e: Exception) {
-            val list = value.split(",").toMutableList()
-            val json = listToString(list)
-            Json.decodeFromString<MutableList<String>>(json)
-        }
-    }
+	@TypeConverter
+	fun stringToList(value: String): MutableList<String> {
+		if (value.isBlank() || value.isEmpty()) return mutableListOf()
+		return try {
+			Json.decodeFromString<MutableList<String>>(value)
+		} catch (e: Exception) {
+			val list = value.split(",").toMutableList()
+			val json = listToString(list)
+			Json.decodeFromString<MutableList<String>>(json)
+		}
+	}
 }

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

@@ -1,35 +1,35 @@
 package com.zaneschepke.wireguardautotunnel.data
 
 object Queries {
-    fun createDefaultSettings(): String {
-        return """
-            INSERT INTO Settings (is_tunnel_enabled,
-                    is_tunnel_on_mobile_data_enabled,
-                    trusted_network_ssids,
-                    is_always_on_vpn_enabled,
-                    is_tunnel_on_ethernet_enabled,
-                    is_shortcuts_enabled,
-                    is_tunnel_on_wifi_enabled,
-                    is_kernel_enabled,
-                    is_restore_on_boot_enabled,
-                    is_multi_tunnel_enabled)
-                    VALUES
-                    ('false',
-                    'false',
-                    'sampleSSID1,sampleSSID2',
-                    'false',
-                    'false',
-                    'false',
-                    'false',
-                    'false',
-                    'false',
-                    'false')
-        """.trimIndent()
-    }
+	fun createDefaultSettings(): String {
+		return """
+		INSERT INTO Settings (is_tunnel_enabled,
+		        is_tunnel_on_mobile_data_enabled,
+		        trusted_network_ssids,
+		        is_always_on_vpn_enabled,
+		        is_tunnel_on_ethernet_enabled,
+		        is_shortcuts_enabled,
+		        is_tunnel_on_wifi_enabled,
+		        is_kernel_enabled,
+		        is_restore_on_boot_enabled,
+		        is_multi_tunnel_enabled)
+		        VALUES
+		        ('false',
+		        'false',
+		        'sampleSSID1,sampleSSID2',
+		        'false',
+		        'false',
+		        'false',
+		        'false',
+		        'false',
+		        'false',
+		        'false')
+		""".trimIndent()
+	}
 
-    fun createTunnelConfig(): String {
-        return """
-            INSERT INTO TunnelConfig (name, wg_quick) VALUES ('test', 'test')
-        """.trimIndent()
-    }
+	fun createTunnelConfig(): String {
+		return """
+		INSERT INTO TunnelConfig (name, wg_quick) VALUES ('test', 'test')
+		""".trimIndent()
+	}
 }

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

@@ -10,27 +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/TunnelConfigDao.kt

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

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

@@ -7,64 +7,75 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.intPreferencesKey
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 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) {
-    companion object {
-        val LOCATION_DISCLOSURE_SHOWN = booleanPreferencesKey("LOCATION_DISCLOSURE_SHOWN")
-        val BATTERY_OPTIMIZE_DISABLE_SHOWN = booleanPreferencesKey("BATTERY_OPTIMIZE_DISABLE_SHOWN")
-        val TUNNEL_RUNNING_FROM_MANUAL_START =
-            booleanPreferencesKey("TUNNEL_RUNNING_FROM_MANUAL_START")
-        val ACTIVE_TUNNEL = intPreferencesKey("ACTIVE_TUNNEL")
-        val CURRENT_SSID = stringPreferencesKey("CURRENT_SSID")
-    }
+class DataStoreManager(
+	private val context: Context,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) {
+	companion object {
+		val LOCATION_DISCLOSURE_SHOWN = booleanPreferencesKey("LOCATION_DISCLOSURE_SHOWN")
+		val BATTERY_OPTIMIZE_DISABLE_SHOWN = booleanPreferencesKey("BATTERY_OPTIMIZE_DISABLE_SHOWN")
+		val TUNNEL_RUNNING_FROM_MANUAL_START =
+			booleanPreferencesKey("TUNNEL_RUNNING_FROM_MANUAL_START")
+		val ACTIVE_TUNNEL = intPreferencesKey("ACTIVE_TUNNEL")
+		val CURRENT_SSID = stringPreferencesKey("CURRENT_SSID")
+		val IS_PIN_LOCK_ENABLED = booleanPreferencesKey("PIN_LOCK_ENABLED")
+	}
 
-    // preferences
-    private val preferencesKey = "preferences"
-    private val Context.dataStore by
-    preferencesDataStore(
-        name = preferencesKey,
-    )
+	// preferences
+	private val preferencesKey = "preferences"
+	private val Context.dataStore by
+		preferencesDataStore(
+			name = preferencesKey,
+		)
 
-    suspend fun init() {
-        try {
-            context.dataStore.data.first()
-        } catch (e: IOException) {
-            Timber.e(e)
-        }
-    }
+	suspend fun init() {
+		withContext(ioDispatcher) {
+			try {
+				context.dataStore.data.first()
+			} catch (e: IOException) {
+				Timber.e(e)
+			}
+		}
+	}
 
-    suspend fun <T> saveToDataStore(key: Preferences.Key<T>, value: T) {
-        try {
-            context.dataStore.edit { it[key] = value }
-        } catch (e: IOException) {
-            Timber.e(e)
-        } catch (e: Exception) {
-            Timber.e(e)
-        }
-    }
+	suspend fun <T> saveToDataStore(key: Preferences.Key<T>, value: T) {
+		withContext(ioDispatcher) {
+			try {
+				context.dataStore.edit { it[key] = value }
+			} catch (e: IOException) {
+				Timber.e(e)
+			} catch (e: Exception) {
+				Timber.e(e)
+			}
+		}
+	}
 
+	fun <T> getFromStoreFlow(key: Preferences.Key<T>) = context.dataStore.data.map { it[key] }
 
-    fun <T> getFromStoreFlow(key: Preferences.Key<T>) = context.dataStore.data.map { it[key] }
+	suspend fun <T> getFromStore(key: Preferences.Key<T>): T? {
+		return withContext(ioDispatcher) {
+			try {
+				context.dataStore.data.map { it[key] }.first()
+			} catch (e: IOException) {
+				Timber.e(e)
+				null
+			}
+		}
+	}
 
-    suspend fun <T> getFromStore(key: Preferences.Key<T>): T? {
-        return try {
-            context.dataStore.data.map { it[key] }.first()
-        } catch (e: IOException) {
-            Timber.e(e)
-            null
-        }
-    }
+	fun <T> getFromStoreBlocking(key: Preferences.Key<T>) = runBlocking {
+		context.dataStore.data.map { it[key] }.first()
+	}
 
-
-    fun <T> getFromStoreBlocking(key: Preferences.Key<T>) = runBlocking {
-        context.dataStore.data.map { it[key] }.first()
-    }
-
-    val preferencesFlow: Flow<Preferences?> = context.dataStore.data
+	val preferencesFlow: Flow<Preferences?> = context.dataStore.data
 }

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

@@ -1,14 +1,16 @@
 package com.zaneschepke.wireguardautotunnel.data.domain
 
 data class GeneralState(
-    val locationDisclosureShown: Boolean = LOCATION_DISCLOSURE_SHOWN_DEFAULT,
-    val batteryOptimizationDisableShown: Boolean = BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
-    val tunnelRunningFromManualStart: Boolean = TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT,
-    val activeTunnelId: Int? = null
+	val isLocationDisclosureShown: Boolean = LOCATION_DISCLOSURE_SHOWN_DEFAULT,
+	val isBatteryOptimizationDisableShown: Boolean = BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
+	val isTunnelRunningFromManualStart: Boolean = TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT,
+	val isPinLockEnabled: Boolean = PIN_LOCK_ENABLED_DEFAULT,
+	val activeTunnelId: Int? = null,
 ) {
-    companion object {
-        const val LOCATION_DISCLOSURE_SHOWN_DEFAULT = false
-        const val BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT = false
-        const val TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT = false
-    }
+	companion object {
+		const val LOCATION_DISCLOSURE_SHOWN_DEFAULT = false
+		const val BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT = false
+		const val TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT = false
+		const val PIN_LOCK_ENABLED_DEFAULT = false
+	}
 }

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

@@ -6,53 +6,53 @@ import androidx.room.PrimaryKey
 
 @Entity
 data class Settings(
-    @PrimaryKey(autoGenerate = true) val id: Int = 0,
-    @ColumnInfo(name = "is_tunnel_enabled") val isAutoTunnelEnabled: Boolean = false,
-    @ColumnInfo(name = "is_tunnel_on_mobile_data_enabled")
-    val isTunnelOnMobileDataEnabled: Boolean = false,
-    @ColumnInfo(name = "trusted_network_ssids")
-    val trustedNetworkSSIDs: MutableList<String> = mutableListOf(),
-    @ColumnInfo(name = "is_always_on_vpn_enabled") val isAlwaysOnVpnEnabled: Boolean = false,
-    @ColumnInfo(name = "is_tunnel_on_ethernet_enabled")
-    val isTunnelOnEthernetEnabled: Boolean = false,
-    @ColumnInfo(
-        name = "is_shortcuts_enabled",
-        defaultValue = "false",
-    )
-    val isShortcutsEnabled: Boolean = false,
-    @ColumnInfo(
-        name = "is_tunnel_on_wifi_enabled",
-        defaultValue = "false",
-    )
-    val isTunnelOnWifiEnabled: Boolean = false,
-    @ColumnInfo(
-        name = "is_kernel_enabled",
-        defaultValue = "false",
-    )
-    val isKernelEnabled: Boolean = false,
-    @ColumnInfo(
-        name = "is_restore_on_boot_enabled",
-        defaultValue = "false",
-    )
-    val isRestoreOnBootEnabled: Boolean = false,
-    @ColumnInfo(
-        name = "is_multi_tunnel_enabled",
-        defaultValue = "false",
-    )
-    val isMultiTunnelEnabled: Boolean = false,
-    @ColumnInfo(
-        name = "is_auto_tunnel_paused",
-        defaultValue = "false",
-    )
-    val isAutoTunnelPaused: Boolean = false,
-    @ColumnInfo(
-        name = "is_ping_enabled",
-        defaultValue = "false",
-    )
-    val isPingEnabled: Boolean = false,
-    @ColumnInfo(
-        name = "is_amnezia_enabled",
-        defaultValue = "false",
-    )
-    val isAmneziaEnabled: Boolean = false,
+	@PrimaryKey(autoGenerate = true) val id: Int = 0,
+	@ColumnInfo(name = "is_tunnel_enabled") val isAutoTunnelEnabled: Boolean = false,
+	@ColumnInfo(name = "is_tunnel_on_mobile_data_enabled")
+	val isTunnelOnMobileDataEnabled: Boolean = false,
+	@ColumnInfo(name = "trusted_network_ssids")
+	val trustedNetworkSSIDs: MutableList<String> = mutableListOf(),
+	@ColumnInfo(name = "is_always_on_vpn_enabled") val isAlwaysOnVpnEnabled: Boolean = false,
+	@ColumnInfo(name = "is_tunnel_on_ethernet_enabled")
+	val isTunnelOnEthernetEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_shortcuts_enabled",
+		defaultValue = "false",
+	)
+	val isShortcutsEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_tunnel_on_wifi_enabled",
+		defaultValue = "false",
+	)
+	val isTunnelOnWifiEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_kernel_enabled",
+		defaultValue = "false",
+	)
+	val isKernelEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_restore_on_boot_enabled",
+		defaultValue = "false",
+	)
+	val isRestoreOnBootEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_multi_tunnel_enabled",
+		defaultValue = "false",
+	)
+	val isMultiTunnelEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_auto_tunnel_paused",
+		defaultValue = "false",
+	)
+	val isAutoTunnelPaused: Boolean = false,
+	@ColumnInfo(
+		name = "is_ping_enabled",
+		defaultValue = "false",
+	)
+	val isPingEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_amnezia_enabled",
+		defaultValue = "false",
+	)
+	val isAmneziaEnabled: Boolean = false,
 )

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

@@ -9,43 +9,45 @@ import java.io.InputStream
 
 @Entity(indices = [Index(value = ["name"], unique = true)])
 data class TunnelConfig(
-    @PrimaryKey(autoGenerate = true) val id: Int = 0,
-    @ColumnInfo(name = "name") val name: String,
-    @ColumnInfo(name = "wg_quick") val wgQuick: String,
-    @ColumnInfo(
-        name = "tunnel_networks",
-        defaultValue = "",
-    )
-    val tunnelNetworks: MutableList<String> = mutableListOf(),
-    @ColumnInfo(
-        name = "is_mobile_data_tunnel",
-        defaultValue = "false",
-    )
-    val isMobileDataTunnel: Boolean = false,
-    @ColumnInfo(
-        name = "is_primary_tunnel",
-        defaultValue = "false",
-    )
-    val isPrimaryTunnel: Boolean = false,
-    @ColumnInfo(
-        name = "am_quick",
-        defaultValue = "",
-    )
-    val amQuick: String = AM_QUICK_DEFAULT,
+	@PrimaryKey(autoGenerate = true) val id: Int = 0,
+	@ColumnInfo(name = "name") val name: String,
+	@ColumnInfo(name = "wg_quick") val wgQuick: String,
+	@ColumnInfo(
+		name = "tunnel_networks",
+		defaultValue = "",
+	)
+	val tunnelNetworks: MutableList<String> = mutableListOf(),
+	@ColumnInfo(
+		name = "is_mobile_data_tunnel",
+		defaultValue = "false",
+	)
+	val isMobileDataTunnel: Boolean = false,
+	@ColumnInfo(
+		name = "is_primary_tunnel",
+		defaultValue = "false",
+	)
+	val isPrimaryTunnel: Boolean = false,
+	@ColumnInfo(
+		name = "am_quick",
+		defaultValue = "",
+	)
+	val amQuick: String = AM_QUICK_DEFAULT,
 ) {
-    companion object {
-        fun configFromWgQuick(wgQuick: String): Config {
-            val inputStream: InputStream = wgQuick.byteInputStream()
-            return inputStream.bufferedReader(Charsets.UTF_8).use {
-                Config.parse(it)
-            }
-        }
-        fun configFromAmQuick(amQuick: String) : org.amnezia.awg.config.Config {
-            val inputStream: InputStream = amQuick.byteInputStream()
-            return inputStream.bufferedReader(Charsets.UTF_8).use {
-                org.amnezia.awg.config.Config.parse(it)
-            }
-        }
-        const val AM_QUICK_DEFAULT = ""
-    }
+	companion object {
+		fun configFromWgQuick(wgQuick: String): Config {
+			val inputStream: InputStream = wgQuick.byteInputStream()
+			return inputStream.bufferedReader(Charsets.UTF_8).use {
+				Config.parse(it)
+			}
+		}
+
+		fun configFromAmQuick(amQuick: String): org.amnezia.awg.config.Config {
+			val inputStream: InputStream = amQuick.byteInputStream()
+			return inputStream.bufferedReader(Charsets.UTF_8).use {
+				org.amnezia.awg.config.Config.parse(it)
+			}
+		}
+
+		const val AM_QUICK_DEFAULT = ""
+	}
 }

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

@@ -3,12 +3,13 @@ package com.zaneschepke.wireguardautotunnel.data.repository
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 
 interface AppDataRepository {
-    suspend fun getPrimaryOrFirstTunnel(): TunnelConfig?
-    suspend fun getStartTunnelConfig(): TunnelConfig?
+	suspend fun getPrimaryOrFirstTunnel(): TunnelConfig?
 
-    suspend fun toggleWatcherServicePause()
+	suspend fun getStartTunnelConfig(): TunnelConfig?
 
-    val settings: SettingsRepository
-    val tunnels: TunnelConfigRepository
-    val appState: AppStateRepository
+	suspend fun toggleWatcherServicePause()
+
+	val settings: SettingsRepository
+	val tunnels: TunnelConfigRepository
+	val appState: AppStateRepository
 }

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

@@ -3,32 +3,36 @@ package com.zaneschepke.wireguardautotunnel.data.repository
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import javax.inject.Inject
 
-class AppDataRoomRepository @Inject constructor(
-    override val settings: SettingsRepository,
-    override val tunnels: TunnelConfigRepository,
-    override val appState: AppStateRepository
+class AppDataRoomRepository
+@Inject
+constructor(
+	override val settings: SettingsRepository,
+	override val tunnels: TunnelConfigRepository,
+	override val appState: AppStateRepository,
 ) : AppDataRepository {
-    override suspend fun getPrimaryOrFirstTunnel(): TunnelConfig? {
-        return tunnels.findPrimary().firstOrNull() ?: tunnels.getAll().firstOrNull()
-    }
+	override suspend fun getPrimaryOrFirstTunnel(): TunnelConfig? {
+		return tunnels.findPrimary().firstOrNull() ?: tunnels.getAll().firstOrNull()
+	}
 
-    override suspend fun getStartTunnelConfig(): TunnelConfig? {
-        return if (appState.isTunnelRunningFromManualStart()) {
-            appState.getActiveTunnelId()?.let {
-                tunnels.getById(it)
-            }
-        } else null
-    }
+	override suspend fun getStartTunnelConfig(): TunnelConfig? {
+		return if (appState.isTunnelRunningFromManualStart()) {
+			appState.getActiveTunnelId()?.let {
+				tunnels.getById(it)
+			}
+		} else {
+			null
+		}
+	}
 
-    override suspend fun toggleWatcherServicePause() {
-        val settings = settings.getSettings()
-        if (settings.isAutoTunnelEnabled) {
-            val pauseAutoTunnel = !settings.isAutoTunnelPaused
-            this.settings.save(
-                settings.copy(
-                    isAutoTunnelPaused = pauseAutoTunnel,
-                ),
-            )
-        }
-    }
+	override suspend fun toggleWatcherServicePause() {
+		val settings = settings.getSettings()
+		if (settings.isAutoTunnelEnabled) {
+			val pauseAutoTunnel = !settings.isAutoTunnelPaused
+			this.settings.save(
+				settings.copy(
+					isAutoTunnelPaused = pauseAutoTunnel,
+				),
+			)
+		}
+	}
 }

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

@@ -4,23 +4,29 @@ import com.zaneschepke.wireguardautotunnel.data.domain.GeneralState
 import kotlinx.coroutines.flow.Flow
 
 interface AppStateRepository {
-    suspend fun isLocationDisclosureShown(): Boolean
-    suspend fun setLocationDisclosureShown(shown: Boolean)
+	suspend fun isLocationDisclosureShown(): Boolean
 
-    suspend fun isBatteryOptimizationDisableShown(): Boolean
-    suspend fun setBatteryOptimizationDisableShown(shown: Boolean)
+	suspend fun setLocationDisclosureShown(shown: Boolean)
 
-    suspend fun isTunnelRunningFromManualStart(): Boolean
-    suspend fun setTunnelRunningFromManualStart(id: Int)
+	suspend fun isPinLockEnabled(): Boolean
 
-    suspend fun setManualStop()
+	suspend fun setPinLockEnabled(enabled: Boolean)
 
-    suspend fun getActiveTunnelId(): Int?
+	suspend fun isBatteryOptimizationDisableShown(): Boolean
 
-    suspend fun getCurrentSsid(): String?
+	suspend fun setBatteryOptimizationDisableShown(shown: Boolean)
 
-    suspend fun setCurrentSsid(ssid: String)
+	suspend fun isTunnelRunningFromManualStart(): Boolean
 
-    val generalStateFlow: Flow<GeneralState>
+	suspend fun setTunnelRunningFromManualStart(id: Int)
 
+	suspend fun setManualStop()
+
+	suspend fun getActiveTunnelId(): Int?
+
+	suspend fun getCurrentSsid(): String?
+
+	suspend fun setCurrentSsid(ssid: String)
+
+	val generalStateFlow: Flow<GeneralState>
 }

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

@@ -7,75 +7,90 @@ import kotlinx.coroutines.flow.map
 import timber.log.Timber
 
 class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager) :
-    AppStateRepository {
-    override suspend fun isLocationDisclosureShown(): Boolean {
-        return dataStoreManager.getFromStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN)
-            ?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT
-    }
+	AppStateRepository {
+	override suspend fun isLocationDisclosureShown(): Boolean {
+		return dataStoreManager.getFromStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN)
+			?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT
+	}
 
-    override suspend fun setLocationDisclosureShown(shown: Boolean) {
-        dataStoreManager.saveToDataStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN, shown)
-    }
+	override suspend fun setLocationDisclosureShown(shown: Boolean) {
+		dataStoreManager.saveToDataStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN, shown)
+	}
 
-    override suspend fun isBatteryOptimizationDisableShown(): Boolean {
-        return dataStoreManager.getFromStore(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN)
-            ?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT
-    }
+	override suspend fun isPinLockEnabled(): Boolean {
+		return dataStoreManager.getFromStore(DataStoreManager.IS_PIN_LOCK_ENABLED)
+			?: GeneralState.PIN_LOCK_ENABLED_DEFAULT
+	}
 
-    override suspend fun setBatteryOptimizationDisableShown(shown: Boolean) {
-        dataStoreManager.saveToDataStore(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN, shown)
-    }
+	override suspend fun setPinLockEnabled(enabled: Boolean) {
+		dataStoreManager.saveToDataStore(DataStoreManager.IS_PIN_LOCK_ENABLED, enabled)
+	}
 
-    override suspend fun isTunnelRunningFromManualStart(): Boolean {
-        return dataStoreManager.getFromStore(DataStoreManager.TUNNEL_RUNNING_FROM_MANUAL_START)
-            ?: GeneralState.TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT
-    }
+	override suspend fun isBatteryOptimizationDisableShown(): Boolean {
+		return dataStoreManager.getFromStore(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN)
+			?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT
+	}
 
-    override suspend fun setTunnelRunningFromManualStart(id: Int) {
-        setTunnelRunningFromManualStart(true)
-        setActiveTunnelId(id)
-    }
+	override suspend fun setBatteryOptimizationDisableShown(shown: Boolean) {
+		dataStoreManager.saveToDataStore(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN, shown)
+	}
 
-    override suspend fun setManualStop() {
-        setTunnelRunningFromManualStart(false)
-    }
+	override suspend fun isTunnelRunningFromManualStart(): Boolean {
+		return dataStoreManager.getFromStore(DataStoreManager.TUNNEL_RUNNING_FROM_MANUAL_START)
+			?: GeneralState.TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT
+	}
 
-    private suspend fun setTunnelRunningFromManualStart(running: Boolean) {
-        dataStoreManager.saveToDataStore(DataStoreManager.TUNNEL_RUNNING_FROM_MANUAL_START, running)
-    }
+	override suspend fun setTunnelRunningFromManualStart(id: Int) {
+		setTunnelRunningFromManualStart(true)
+		setActiveTunnelId(id)
+	}
 
-    override suspend fun getActiveTunnelId(): Int? {
-        return dataStoreManager.getFromStore(DataStoreManager.ACTIVE_TUNNEL)
-    }
+	override suspend fun setManualStop() {
+		setTunnelRunningFromManualStart(false)
+	}
 
-    private suspend fun setActiveTunnelId(id: Int) {
-        dataStoreManager.saveToDataStore(DataStoreManager.ACTIVE_TUNNEL, id)
-    }
+	private suspend fun setTunnelRunningFromManualStart(running: Boolean) {
+		dataStoreManager.saveToDataStore(DataStoreManager.TUNNEL_RUNNING_FROM_MANUAL_START, running)
+	}
 
-    override suspend fun getCurrentSsid(): String? {
-        return dataStoreManager.getFromStore(DataStoreManager.CURRENT_SSID)
-    }
+	override suspend fun getActiveTunnelId(): Int? {
+		return dataStoreManager.getFromStore(DataStoreManager.ACTIVE_TUNNEL)
+	}
 
-    override suspend fun setCurrentSsid(ssid: String) {
-        dataStoreManager.saveToDataStore(DataStoreManager.CURRENT_SSID, ssid)
-    }
+	private suspend fun setActiveTunnelId(id: Int) {
+		dataStoreManager.saveToDataStore(DataStoreManager.ACTIVE_TUNNEL, id)
+	}
 
-    override val generalStateFlow: Flow<GeneralState> =
-        dataStoreManager.preferencesFlow.map { prefs ->
-            prefs?.let { pref ->
-                try {
-                    GeneralState(
-                        locationDisclosureShown = pref[DataStoreManager.LOCATION_DISCLOSURE_SHOWN]
-                            ?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT,
-                        batteryOptimizationDisableShown = pref[DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN]
-                            ?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
-                        tunnelRunningFromManualStart = pref[DataStoreManager.TUNNEL_RUNNING_FROM_MANUAL_START]
-                            ?: GeneralState.TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT,
-                    )
-                } catch (e: IllegalArgumentException) {
-                    Timber.e(e)
-                    GeneralState()
-                }
-            } ?: GeneralState()
-        }
+	override suspend fun getCurrentSsid(): String? {
+		return dataStoreManager.getFromStore(DataStoreManager.CURRENT_SSID)
+	}
+
+	override suspend fun setCurrentSsid(ssid: String) {
+		dataStoreManager.saveToDataStore(DataStoreManager.CURRENT_SSID, ssid)
+	}
+
+	override val generalStateFlow: Flow<GeneralState> =
+		dataStoreManager.preferencesFlow.map { prefs ->
+			prefs?.let { pref ->
+				try {
+					GeneralState(
+						isLocationDisclosureShown =
+						pref[DataStoreManager.LOCATION_DISCLOSURE_SHOWN]
+							?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT,
+						isBatteryOptimizationDisableShown =
+						pref[DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN]
+							?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
+						isTunnelRunningFromManualStart =
+						pref[DataStoreManager.TUNNEL_RUNNING_FROM_MANUAL_START]
+							?: GeneralState.TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT,
+						isPinLockEnabled =
+						pref[DataStoreManager.IS_PIN_LOCK_ENABLED]
+							?: GeneralState.TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT,
+					)
+				} catch (e: IllegalArgumentException) {
+					Timber.e(e)
+					GeneralState()
+				}
+			} ?: GeneralState()
+		}
 }

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

@@ -5,20 +5,19 @@ import com.zaneschepke.wireguardautotunnel.data.domain.Settings
 import kotlinx.coroutines.flow.Flow
 
 class RoomSettingsRepository(private val settingsDoa: SettingsDao) : SettingsRepository {
+	override suspend fun save(settings: Settings) {
+		settingsDoa.save(settings)
+	}
 
-    override suspend fun save(settings: Settings) {
-        settingsDoa.save(settings)
-    }
+	override fun getSettingsFlow(): Flow<Settings> {
+		return settingsDoa.getSettingsFlow()
+	}
 
-    override fun getSettingsFlow(): Flow<Settings> {
-        return settingsDoa.getSettingsFlow()
-    }
+	override suspend fun getSettings(): Settings {
+		return settingsDoa.getAll().firstOrNull() ?: Settings()
+	}
 
-    override suspend fun getSettings(): Settings {
-        return settingsDoa.getAll().firstOrNull() ?: Settings()
-    }
-
-    override suspend fun getAll(): List<Settings> {
-        return settingsDoa.getAll()
-    }
+	override suspend fun getAll(): List<Settings> {
+		return settingsDoa.getAll()
+	}
 }

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

@@ -6,67 +6,66 @@ import com.zaneschepke.wireguardautotunnel.util.TunnelConfigs
 import kotlinx.coroutines.flow.Flow
 
 class RoomTunnelConfigRepository(private val tunnelConfigDao: TunnelConfigDao) :
-    TunnelConfigRepository {
-    override fun getTunnelConfigsFlow(): Flow<TunnelConfigs> {
-        return tunnelConfigDao.getAllFlow()
-    }
+	TunnelConfigRepository {
+	override fun getTunnelConfigsFlow(): Flow<TunnelConfigs> {
+		return tunnelConfigDao.getAllFlow()
+	}
 
-    override suspend fun getAll(): TunnelConfigs {
-        return tunnelConfigDao.getAll()
-    }
+	override suspend fun getAll(): TunnelConfigs {
+		return tunnelConfigDao.getAll()
+	}
 
-    override suspend fun save(tunnelConfig: TunnelConfig) {
-        tunnelConfigDao.save(tunnelConfig)
-    }
+	override suspend fun save(tunnelConfig: TunnelConfig) {
+		tunnelConfigDao.save(tunnelConfig)
+	}
 
-    override suspend fun updatePrimaryTunnel(tunnelConfig: TunnelConfig?) {
-        tunnelConfigDao.resetPrimaryTunnel()
-        tunnelConfig?.let {
-            save(
-                it.copy(
-                    isPrimaryTunnel = true,
-                ),
-            )
-        }
+	override suspend fun updatePrimaryTunnel(tunnelConfig: TunnelConfig?) {
+		tunnelConfigDao.resetPrimaryTunnel()
+		tunnelConfig?.let {
+			save(
+				it.copy(
+					isPrimaryTunnel = true,
+				),
+			)
+		}
+	}
 
-    }
+	override suspend fun updateMobileDataTunnel(tunnelConfig: TunnelConfig?) {
+		tunnelConfigDao.resetMobileDataTunnel()
+		tunnelConfig?.let {
+			save(
+				it.copy(
+					isMobileDataTunnel = true,
+				),
+			)
+		}
+	}
 
-    override suspend fun updateMobileDataTunnel(tunnelConfig: TunnelConfig?) {
-        tunnelConfigDao.resetMobileDataTunnel()
-        tunnelConfig?.let {
-            save(
-                it.copy(
-                    isMobileDataTunnel = true,
-                ),
-            )
-        }
-    }
+	override suspend fun delete(tunnelConfig: TunnelConfig) {
+		tunnelConfigDao.delete(tunnelConfig)
+	}
 
-    override suspend fun delete(tunnelConfig: TunnelConfig) {
-        tunnelConfigDao.delete(tunnelConfig)
-    }
+	override suspend fun getById(id: Int): TunnelConfig? {
+		return tunnelConfigDao.getById(id.toLong())
+	}
 
-    override suspend fun getById(id: Int): TunnelConfig? {
-        return tunnelConfigDao.getById(id.toLong())
-    }
+	override suspend fun count(): Int {
+		return tunnelConfigDao.count().toInt()
+	}
 
-    override suspend fun count(): Int {
-        return tunnelConfigDao.count().toInt()
-    }
+	override suspend fun findByTunnelName(name: String): TunnelConfig? {
+		return tunnelConfigDao.getByName(name)
+	}
 
-    override suspend fun findByTunnelName(name: String): TunnelConfig? {
-        return tunnelConfigDao.getByName(name)
-    }
+	override suspend fun findByTunnelNetworksName(name: String): TunnelConfigs {
+		return tunnelConfigDao.findByTunnelNetworkName(name)
+	}
 
-    override suspend fun findByTunnelNetworksName(name: String): TunnelConfigs {
-        return tunnelConfigDao.findByTunnelNetworkName(name)
-    }
+	override suspend fun findByMobileDataTunnel(): TunnelConfigs {
+		return tunnelConfigDao.findByMobileDataTunnel()
+	}
 
-    override suspend fun findByMobileDataTunnel(): TunnelConfigs {
-        return tunnelConfigDao.findByMobileDataTunnel()
-    }
-
-    override suspend fun findPrimary(): TunnelConfigs {
-        return tunnelConfigDao.findByPrimary()
-    }
+	override suspend fun findPrimary(): TunnelConfigs {
+		return tunnelConfigDao.findByPrimary()
+	}
 }

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

@@ -4,11 +4,11 @@ import com.zaneschepke.wireguardautotunnel.data.domain.Settings
 import kotlinx.coroutines.flow.Flow
 
 interface SettingsRepository {
-    suspend fun save(settings: Settings)
+	suspend fun save(settings: Settings)
 
-    fun getSettingsFlow(): Flow<Settings>
+	fun getSettingsFlow(): Flow<Settings>
 
-    suspend fun getSettings(): Settings
+	suspend fun getSettings(): Settings
 
-    suspend fun getAll(): List<Settings>
+	suspend fun getAll(): List<Settings>
 }

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

@@ -5,28 +5,27 @@ import com.zaneschepke.wireguardautotunnel.util.TunnelConfigs
 import kotlinx.coroutines.flow.Flow
 
 interface TunnelConfigRepository {
+	fun getTunnelConfigsFlow(): Flow<TunnelConfigs>
 
-    fun getTunnelConfigsFlow(): Flow<TunnelConfigs>
+	suspend fun getAll(): TunnelConfigs
 
-    suspend fun getAll(): TunnelConfigs
+	suspend fun save(tunnelConfig: TunnelConfig)
 
-    suspend fun save(tunnelConfig: TunnelConfig)
+	suspend fun updatePrimaryTunnel(tunnelConfig: TunnelConfig?)
 
-    suspend fun updatePrimaryTunnel(tunnelConfig: TunnelConfig?)
+	suspend fun updateMobileDataTunnel(tunnelConfig: TunnelConfig?)
 
-    suspend fun updateMobileDataTunnel(tunnelConfig: TunnelConfig?)
+	suspend fun delete(tunnelConfig: TunnelConfig)
 
-    suspend fun delete(tunnelConfig: TunnelConfig)
+	suspend fun getById(id: Int): TunnelConfig?
 
-    suspend fun getById(id: Int): TunnelConfig?
+	suspend fun count(): Int
 
-    suspend fun count(): Int
+	suspend fun findByTunnelName(name: String): TunnelConfig?
 
-    suspend fun findByTunnelName(name : String) : TunnelConfig?
+	suspend fun findByTunnelNetworksName(name: String): TunnelConfigs
 
-    suspend fun findByTunnelNetworksName(name: String): TunnelConfigs
+	suspend fun findByMobileDataTunnel(): TunnelConfigs
 
-    suspend fun findByMobileDataTunnel(): TunnelConfigs
-
-    suspend fun findPrimary(): TunnelConfigs
+	suspend fun findPrimary(): TunnelConfigs
 }

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

@@ -0,0 +1,30 @@
+package com.zaneschepke.wireguardautotunnel.module
+
+import android.content.Context
+import com.zaneschepke.logcatter.LocalLogCollector
+import com.zaneschepke.logcatter.LogcatUtil
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+class AppModule {
+	@Singleton
+	@ApplicationScope
+	@Provides
+	fun providesApplicationScope(@DefaultDispatcher defaultDispatcher: CoroutineDispatcher): CoroutineScope =
+		CoroutineScope(SupervisorJob() + defaultDispatcher)
+
+	@Singleton
+	@Provides
+	fun provideLogCollect(@ApplicationContext context: Context): LocalLogCollector {
+		return LogcatUtil.init(context = context)
+	}
+}

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

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

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

@@ -0,0 +1,27 @@
+package com.zaneschepke.wireguardautotunnel.module
+
+import javax.inject.Qualifier
+
+@Retention(AnnotationRetention.RUNTIME)
+@Qualifier
+annotation class DefaultDispatcher
+
+@Retention(AnnotationRetention.RUNTIME)
+@Qualifier
+annotation class IoDispatcher
+
+@Retention(AnnotationRetention.RUNTIME)
+@Qualifier
+annotation class MainDispatcher
+
+@Retention(AnnotationRetention.BINARY)
+@Qualifier
+annotation class MainImmediateDispatcher
+
+@Retention(AnnotationRetention.RUNTIME)
+@Qualifier
+annotation class ApplicationScope
+
+@Retention(AnnotationRetention.RUNTIME)
+@Qualifier
+annotation class ServiceScope

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

@@ -0,0 +1,28 @@
+package com.zaneschepke.wireguardautotunnel.module
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Dispatchers
+
+@Module
+@InstallIn(SingletonComponent::class)
+object CoroutinesDispatchersModule {
+	@DefaultDispatcher
+	@Provides
+	fun providesDefaultDispatcher(): CoroutineDispatcher = Dispatchers.Default
+
+	@IoDispatcher
+	@Provides
+	fun providesIoDispatcher(): CoroutineDispatcher = Dispatchers.IO
+
+	@MainDispatcher
+	@Provides
+	fun providesMainDispatcher(): CoroutineDispatcher = Dispatchers.Main
+
+	@MainImmediateDispatcher
+	@Provides
+	fun providesMainImmediateDispatcher(): CoroutineDispatcher = Dispatchers.Main.immediate
+}

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

@@ -1,30 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.module
-
-import android.content.Context
-import androidx.room.Room
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.data.AppDatabase
-import com.zaneschepke.wireguardautotunnel.data.DatabaseCallback
-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
-
-@Module
-@InstallIn(SingletonComponent::class)
-class DatabaseModule {
-    @Provides
-    @Singleton
-    fun provideDatabase(@ApplicationContext context: Context): AppDatabase {
-        return Room.databaseBuilder(
-            context,
-            AppDatabase::class.java,
-            context.getString(R.string.db_name),
-        )
-            .fallbackToDestructiveMigration()
-            .addCallback(DatabaseCallback())
-            .build()
-    }
-}

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

@@ -1,7 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.module
-
-import javax.inject.Qualifier
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class Kernel

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

@@ -1,7 +1,10 @@
 package com.zaneschepke.wireguardautotunnel.module
 
 import android.content.Context
+import androidx.room.Room
+import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
+import com.zaneschepke.wireguardautotunnel.data.DatabaseCallback
 import com.zaneschepke.wireguardautotunnel.data.SettingsDao
 import com.zaneschepke.wireguardautotunnel.data.TunnelConfigDao
 import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
@@ -18,56 +21,68 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineDispatcher
 import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 class RepositoryModule {
-    @Singleton
-    @Provides
-    fun provideSettingsDoa(appDatabase: AppDatabase): SettingsDao {
-        return appDatabase.settingDao()
-    }
+	@Provides
+	@Singleton
+	fun provideDatabase(@ApplicationContext context: Context): AppDatabase {
+		return Room.databaseBuilder(
+			context,
+			AppDatabase::class.java,
+			context.getString(R.string.db_name),
+		)
+			.fallbackToDestructiveMigration()
+			.addCallback(DatabaseCallback())
+			.build()
+	}
 
-    @Singleton
-    @Provides
-    fun provideTunnelConfigDoa(appDatabase: AppDatabase): TunnelConfigDao {
-        return appDatabase.tunnelConfigDoa()
-    }
+	@Singleton
+	@Provides
+	fun provideSettingsDoa(appDatabase: AppDatabase): SettingsDao {
+		return appDatabase.settingDao()
+	}
 
-    @Singleton
-    @Provides
-    fun provideTunnelConfigRepository(tunnelConfigDao: TunnelConfigDao): TunnelConfigRepository {
-        return RoomTunnelConfigRepository(tunnelConfigDao)
-    }
+	@Singleton
+	@Provides
+	fun provideTunnelConfigDoa(appDatabase: AppDatabase): TunnelConfigDao {
+		return appDatabase.tunnelConfigDoa()
+	}
 
-    @Singleton
-    @Provides
-    fun provideSettingsRepository(settingsDao: SettingsDao): SettingsRepository {
-        return RoomSettingsRepository(settingsDao)
-    }
+	@Singleton
+	@Provides
+	fun provideTunnelConfigRepository(tunnelConfigDao: TunnelConfigDao): TunnelConfigRepository {
+		return RoomTunnelConfigRepository(tunnelConfigDao)
+	}
 
-    @Singleton
-    @Provides
-    fun providePreferencesDataStore(@ApplicationContext context: Context): DataStoreManager {
-        return DataStoreManager(context)
-    }
+	@Singleton
+	@Provides
+	fun provideSettingsRepository(settingsDao: SettingsDao): SettingsRepository {
+		return RoomSettingsRepository(settingsDao)
+	}
 
-    @Provides
-    @Singleton
-    fun provideGeneralStateRepository(dataStoreManager: DataStoreManager): AppStateRepository {
-        return DataStoreAppStateRepository(dataStoreManager)
-    }
-
-    @Provides
-    @Singleton
-    fun provideAppDataRepository(
-        settingsRepository: SettingsRepository,
-        tunnelConfigRepository: TunnelConfigRepository,
-        appStateRepository: AppStateRepository
-    ): AppDataRepository {
-        return AppDataRoomRepository(settingsRepository, tunnelConfigRepository, appStateRepository)
-    }
+	@Singleton
+	@Provides
+	fun providePreferencesDataStore(@ApplicationContext context: Context, @IoDispatcher ioDispatcher: CoroutineDispatcher): DataStoreManager {
+		return DataStoreManager(context, ioDispatcher)
+	}
 
+	@Provides
+	@Singleton
+	fun provideGeneralStateRepository(dataStoreManager: DataStoreManager): AppStateRepository {
+		return DataStoreAppStateRepository(dataStoreManager)
+	}
 
+	@Provides
+	@Singleton
+	fun provideAppDataRepository(
+		settingsRepository: SettingsRepository,
+		tunnelConfigRepository: TunnelConfigRepository,
+		appStateRepository: AppStateRepository,
+	): AppDataRepository {
+		return AppDataRoomRepository(settingsRepository, tunnelConfigRepository, appStateRepository)
+	}
 }

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

@@ -15,25 +15,19 @@ import dagger.hilt.android.scopes.ServiceScoped
 @Module
 @InstallIn(ServiceComponent::class)
 abstract class ServiceModule {
-    @Binds
-    @ServiceScoped
-    abstract fun provideNotificationService(
-        wireGuardNotification: WireGuardNotification
-    ): NotificationService
+	@Binds
+	@ServiceScoped
+	abstract fun provideNotificationService(wireGuardNotification: WireGuardNotification): NotificationService
 
-    @Binds
-    @ServiceScoped
-    abstract fun provideWifiService(wifiService: WifiService): NetworkService<WifiService>
+	@Binds
+	@ServiceScoped
+	abstract fun provideWifiService(wifiService: WifiService): NetworkService<WifiService>
 
-    @Binds
-    @ServiceScoped
-    abstract fun provideMobileDataService(
-        mobileDataService: MobileDataService
-    ): NetworkService<MobileDataService>
+	@Binds
+	@ServiceScoped
+	abstract fun provideMobileDataService(mobileDataService: MobileDataService): NetworkService<MobileDataService>
 
-    @Binds
-    @ServiceScoped
-    abstract fun provideEthernetService(
-        ethernetService: EthernetService
-    ): NetworkService<EthernetService>
+	@Binds
+	@ServiceScoped
+	abstract fun provideEthernetService(ethernetService: EthernetService): NetworkService<EthernetService>
 }

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

@@ -15,51 +15,63 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import javax.inject.Provider
 import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 class TunnelModule {
-    @Provides
-    @Singleton
-    fun provideRootShell(@ApplicationContext context: Context): RootShell {
-        return RootShell(context)
-    }
+	@Provides
+	@Singleton
+	fun provideRootShell(@ApplicationContext context: Context): RootShell {
+		return RootShell(context)
+	}
 
-    @Provides
-    @Singleton
-    @Userspace
-    fun provideUserspaceBackend(@ApplicationContext context: Context): Backend {
-        return GoBackend(context)
-    }
+	@Provides
+	@Singleton
+	@Userspace
+	fun provideUserspaceBackend(@ApplicationContext context: Context): Backend {
+		return GoBackend(context)
+	}
 
-    @Provides
-    @Singleton
-    @Kernel
-    fun provideKernelBackend(@ApplicationContext context: Context, rootShell: RootShell): Backend {
-        return WgQuickBackend(context, rootShell, ToolsInstaller(context, rootShell))
-    }
+	@Provides
+	@Singleton
+	@Kernel
+	fun provideKernelBackend(@ApplicationContext context: Context, rootShell: RootShell): Backend {
+		return WgQuickBackend(context, rootShell, ToolsInstaller(context, rootShell))
+	}
 
-    @Provides
-    @Singleton
-    fun provideAmneziaBackend(@ApplicationContext context: Context) : org.amnezia.awg.backend.Backend {
-        return org.amnezia.awg.backend.GoBackend(context)
-    }
+	@Provides
+	@Singleton
+	fun provideAmneziaBackend(@ApplicationContext context: Context): org.amnezia.awg.backend.Backend {
+		return org.amnezia.awg.backend.GoBackend(context)
+	}
 
-    @Provides
-    @Singleton
-    fun provideVpnService(
-        amneziaBackend: org.amnezia.awg.backend.Backend,
-        @Userspace userspaceBackend: Backend,
-        @Kernel kernelBackend: Backend,
-        appDataRepository: AppDataRepository
-    ): VpnService {
-        return WireGuardTunnel(amneziaBackend,userspaceBackend, kernelBackend, appDataRepository)
-    }
+	@Provides
+	@Singleton
+	fun provideVpnService(
+		amneziaBackend: Provider<org.amnezia.awg.backend.Backend>,
+		@Userspace userspaceBackend: Provider<Backend>,
+		@Kernel kernelBackend: Provider<Backend>,
+		appDataRepository: AppDataRepository,
+		@ApplicationScope applicationScope: CoroutineScope,
+		@IoDispatcher ioDispatcher: CoroutineDispatcher,
+	): VpnService {
+		return WireGuardTunnel(
+			amneziaBackend,
+			userspaceBackend,
+			kernelBackend,
+			appDataRepository,
+			applicationScope,
+			ioDispatcher,
+		)
+	}
 
-    @Provides
-    @Singleton
-    fun provideServiceManager(appDataRepository: AppDataRepository): ServiceManager {
-        return ServiceManager(appDataRepository)
-    }
+	@Provides
+	@Singleton
+	fun provideServiceManager(appDataRepository: AppDataRepository, @IoDispatcher ioDispatcher: CoroutineDispatcher): ServiceManager {
+		return ServiceManager(appDataRepository, ioDispatcher)
+	}
 }

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

@@ -0,0 +1,21 @@
+package com.zaneschepke.wireguardautotunnel.module
+
+import android.content.Context
+import com.zaneschepke.wireguardautotunnel.util.FileUtils
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ViewModelComponent
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.android.scopes.ViewModelScoped
+import kotlinx.coroutines.CoroutineDispatcher
+
+@Module
+@InstallIn(ViewModelComponent::class)
+class ViewModelModule {
+	@ViewModelScoped
+	@Provides
+	fun provideFileUtils(@ApplicationContext context: Context, @IoDispatcher ioDispatcher: CoroutineDispatcher): FileUtils {
+		return FileUtils(context, ioDispatcher)
+	}
+}

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

@@ -4,42 +4,52 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.util.goAsync
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class BootReceiver : BroadcastReceiver() {
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
 
-    @Inject
-    lateinit var appDataRepository: AppDataRepository
+	@Inject
+	lateinit var serviceManager: ServiceManager
 
-    @Inject
-    lateinit var serviceManager: ServiceManager
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
 
-    override fun onReceive(context: Context?, intent: Intent?) = goAsync {
-        if (Intent.ACTION_BOOT_COMPLETED != intent?.action) return@goAsync
-        context?.run {
-            val settings = appDataRepository.settings.getSettings()
-            if (settings.isAutoTunnelEnabled) {
-                Timber.i("Starting watcher service from boot")
-                serviceManager.startWatcherServiceForeground(context)
-            }
-            if (appDataRepository.appState.isTunnelRunningFromManualStart()) {
-                appDataRepository.appState.getActiveTunnelId()?.let {
-                    Timber.i("Starting tunnel that was active before reboot")
-                    serviceManager.startVpnServiceForeground(
-                        context,
-                        appDataRepository.tunnels.getById(it)?.id,
-                    )
-                }
-            }
-            if (settings.isAlwaysOnVpnEnabled) {
-                Timber.i("Starting vpn service from boot AOVPN")
-                serviceManager.startVpnServiceForeground(context)
-            }
-        }
-    }
+	override fun onReceive(context: Context?, intent: Intent?) {
+		if (Intent.ACTION_BOOT_COMPLETED != intent?.action) return
+		context?.run {
+			applicationScope.launch {
+				val settings = appDataRepository.settings.getSettings()
+				if (settings.isRestoreOnBootEnabled) {
+					if (settings.isAutoTunnelEnabled) {
+						Timber.i("Starting watcher service from boot")
+						serviceManager.startWatcherServiceForeground(context)
+					}
+					if (appDataRepository.appState.isTunnelRunningFromManualStart()) {
+						appDataRepository.appState.getActiveTunnelId()?.let {
+							Timber.i("Starting tunnel that was active before reboot")
+							serviceManager.startVpnServiceForeground(
+								context,
+								appDataRepository.tunnels.getById(it)?.id,
+							)
+							return@launch
+						}
+					}
+					if (settings.isAlwaysOnVpnEnabled) {
+						Timber.i("Starting vpn service from boot AOVPN")
+						serviceManager.startVpnServiceForeground(context)
+					}
+				}
+			}
+		}
+	}
 }

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

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

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

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

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

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

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

@@ -4,114 +4,114 @@ import android.app.Service
 import android.content.Context
 import android.content.Intent
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.util.Constants
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
 import timber.log.Timber
 
-class ServiceManager(private val appDataRepository: AppDataRepository) {
+class ServiceManager(
+	private val appDataRepository: AppDataRepository,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) {
+	private fun <T : Service> actionOnService(action: Action, context: Context, cls: Class<T>, extras: Map<String, Int>? = null) {
+		val intent =
+			Intent(context, cls).also {
+				it.action = action.name
+				extras?.forEach { (k, v) -> it.putExtra(k, v) }
+			}
+		intent.component?.javaClass
+		try {
+			when (action) {
+				Action.START_FOREGROUND, Action.STOP_FOREGROUND ->
+					context.startForegroundService(
+						intent,
+					)
 
-    private fun <T : Service> actionOnService(
-        action: Action,
-        context: Context,
-        cls: Class<T>,
-        extras: Map<String, Int>? = null
-    ) {
-        val intent =
-            Intent(context, cls).also {
-                it.action = action.name
-                extras?.forEach { (k, v) -> it.putExtra(k, v) }
-            }
-        intent.component?.javaClass
-        try {
-            when (action) {
-                Action.START_FOREGROUND, Action.STOP_FOREGROUND -> context.startForegroundService(intent)
-                Action.START, Action.STOP -> context.startService(intent)
-            }
-        } catch (e: Exception) {
-            Timber.e(e.message)
-        }
-    }
+				Action.START, Action.STOP -> context.startService(intent)
+			}
+		} catch (e: Exception) {
+			Timber.e(e.message)
+		}
+	}
 
-    suspend fun startVpnService(
-        context: Context,
-        tunnelId: Int? = null,
-        isManualStart: Boolean = false
-    ) {
-        if (isManualStart) onManualStart(tunnelId)
-        actionOnService(
-            Action.START,
-            context,
-            WireGuardTunnelService::class.java,
-            tunnelId?.let { mapOf(Constants.TUNNEL_EXTRA_KEY to it) },
-        )
-    }
+	suspend fun startVpnService(context: Context, tunnelId: Int? = null, isManualStart: Boolean = false) {
+		if (isManualStart) onManualStart(tunnelId)
+		actionOnService(
+			Action.START,
+			context,
+			WireGuardTunnelService::class.java,
+			tunnelId?.let { mapOf(Constants.TUNNEL_EXTRA_KEY to it) },
+		)
+	}
 
-    suspend fun stopVpnServiceForeground(context: Context, isManualStop: Boolean = false) {
-        if (isManualStop) onManualStop()
-        Timber.i("Stopping vpn service")
-        actionOnService(
-            Action.STOP_FOREGROUND,
-            context,
-            WireGuardTunnelService::class.java,
-        )
-    }
+	suspend fun stopVpnServiceForeground(context: Context, isManualStop: Boolean = false) {
+		withContext(ioDispatcher) {
+			if (isManualStop) onManualStop()
+			Timber.i("Stopping vpn service")
+			actionOnService(
+				Action.STOP_FOREGROUND,
+				context,
+				WireGuardTunnelService::class.java,
+			)
+		}
+	}
 
-    suspend fun stopVpnService(context: Context, isManualStop: Boolean = false) {
-        if (isManualStop) onManualStop()
-        Timber.i("Stopping vpn service")
-        actionOnService(
-            Action.STOP,
-            context,
-            WireGuardTunnelService::class.java,
-        )
-    }
+	suspend fun stopVpnService(context: Context, isManualStop: Boolean = false) {
+		withContext(ioDispatcher) {
+			if (isManualStop) onManualStop()
+			Timber.i("Stopping vpn service")
+			actionOnService(
+				Action.STOP,
+				context,
+				WireGuardTunnelService::class.java,
+			)
+		}
+	}
 
-    private suspend fun onManualStop() {
-        appDataRepository.appState.setManualStop()
-    }
+	private suspend fun onManualStop() {
+		appDataRepository.appState.setManualStop()
+	}
 
-    private suspend fun onManualStart(tunnelId: Int?) {
-        tunnelId?.let {
-            appDataRepository.appState.setTunnelRunningFromManualStart(it)
-        }
-    }
+	private suspend fun onManualStart(tunnelId: Int?) {
+		tunnelId?.let {
+			appDataRepository.appState.setTunnelRunningFromManualStart(it)
+		}
+	}
 
-    suspend fun startVpnServiceForeground(
-        context: Context,
-        tunnelId: Int? = null,
-        isManualStart: Boolean = false
-    ) {
-        if (isManualStart) onManualStart(tunnelId)
-        actionOnService(
-            Action.START_FOREGROUND,
-            context,
-            WireGuardTunnelService::class.java,
-            tunnelId?.let { mapOf(Constants.TUNNEL_EXTRA_KEY to it) },
-        )
-    }
+	suspend fun startVpnServiceForeground(context: Context, tunnelId: Int? = null, isManualStart: Boolean = false) {
+		withContext(ioDispatcher) {
+			if (isManualStart) onManualStart(tunnelId)
+			actionOnService(
+				Action.START_FOREGROUND,
+				context,
+				WireGuardTunnelService::class.java,
+				tunnelId?.let { mapOf(Constants.TUNNEL_EXTRA_KEY to it) },
+			)
+		}
+	}
 
-    fun startWatcherServiceForeground(
-        context: Context,
-    ) {
-        actionOnService(
-            Action.START_FOREGROUND,
-            context,
-            WireGuardConnectivityWatcherService::class.java,
-        )
-    }
+	fun startWatcherServiceForeground(context: Context) {
+		actionOnService(
+			Action.START_FOREGROUND,
+			context,
+			WireGuardConnectivityWatcherService::class.java,
+		)
+	}
 
-    fun startWatcherService(context: Context) {
-        actionOnService(
-            Action.START,
-            context,
-            WireGuardConnectivityWatcherService::class.java,
-        )
-    }
+	fun startWatcherService(context: Context) {
+		actionOnService(
+			Action.START,
+			context,
+			WireGuardConnectivityWatcherService::class.java,
+		)
+	}
 
-    fun stopWatcherService(context: Context) {
-        actionOnService(
-            Action.STOP,
-            context,
-            WireGuardConnectivityWatcherService::class.java,
-        )
-    }
+	fun stopWatcherService(context: Context) {
+		actionOnService(
+			Action.STOP,
+			context,
+			WireGuardConnectivityWatcherService::class.java,
+		)
+	}
 }

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

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

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

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

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

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

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

@@ -15,118 +15,113 @@ import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.map
 
 abstract class BaseNetworkService<T : BaseNetworkService<T>>(
-    val context: Context,
-    networkCapability: Int
+	val context: Context,
+	networkCapability: Int,
 ) : NetworkService<T> {
-    private val connectivityManager =
-        context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+	private val connectivityManager =
+		context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
 
-    private val wifiManager =
-        context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
+	private val wifiManager =
+		context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
 
-    override val networkStatus = callbackFlow {
-        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) {
-                            trySend(NetworkStatus.Available(network))
-                        }
+	override val networkStatus =
+		callbackFlow {
+			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) {
+								trySend(NetworkStatus.Available(network))
+							}
 
-                        override fun onLost(network: Network) {
-                            trySend(NetworkStatus.Unavailable(network))
-                        }
+							override fun onLost(network: Network) {
+								trySend(NetworkStatus.Unavailable(network))
+							}
 
-                        override fun onCapabilitiesChanged(
-                            network: Network,
-                            networkCapabilities: NetworkCapabilities
-                        ) {
-                            trySend(
-                                NetworkStatus.CapabilitiesChanged(
-                                    network,
-                                    networkCapabilities,
-                                ),
-                            )
-                        }
-                    }
-                }
+							override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
+								trySend(
+									NetworkStatus.CapabilitiesChanged(
+										network,
+										networkCapabilities,
+									),
+								)
+							}
+						}
+					}
 
-                else -> {
-                    object : ConnectivityManager.NetworkCallback() {
-                        override fun onAvailable(network: Network) {
-                            trySend(NetworkStatus.Available(network))
-                        }
+					else -> {
+						object : ConnectivityManager.NetworkCallback() {
+							override fun onAvailable(network: Network) {
+								trySend(NetworkStatus.Available(network))
+							}
 
-                        override fun onLost(network: Network) {
-                            trySend(NetworkStatus.Unavailable(network))
-                        }
+							override fun onLost(network: Network) {
+								trySend(NetworkStatus.Unavailable(network))
+							}
 
-                        override fun onCapabilitiesChanged(
-                            network: Network,
-                            networkCapabilities: NetworkCapabilities
-                        ) {
-                            trySend(
-                                NetworkStatus.CapabilitiesChanged(
-                                    network,
-                                    networkCapabilities,
-                                ),
-                            )
-                        }
-                    }
-                }
-            }
-        val request =
-            NetworkRequest.Builder()
-                .addTransportType(networkCapability)
-                .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-                .addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
-                .build()
-        connectivityManager.registerNetworkCallback(request, networkStatusCallback)
+							override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
+								trySend(
+									NetworkStatus.CapabilitiesChanged(
+										network,
+										networkCapabilities,
+									),
+								)
+							}
+						}
+					}
+				}
+			val request =
+				NetworkRequest.Builder()
+					.addTransportType(networkCapability)
+					.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+					.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
+					.build()
+			connectivityManager.registerNetworkCallback(request, networkStatusCallback)
 
-        awaitClose { connectivityManager.unregisterNetworkCallback(networkStatusCallback) }
-    }
+			awaitClose { connectivityManager.unregisterNetworkCallback(networkStatusCallback) }
+		}
 
-    override fun getNetworkName(networkCapabilities: NetworkCapabilities): String? {
-        var ssid: String? = getWifiNameFromCapabilities(networkCapabilities)
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
-            val info = wifiManager.connectionInfo
-            if (info.supplicantState === SupplicantState.COMPLETED) {
-                ssid = info.ssid
-            }
-        }
-        return ssid?.trim('"')
-    }
+	override fun getNetworkName(networkCapabilities: NetworkCapabilities): String? {
+		var ssid: String? = getWifiNameFromCapabilities(networkCapabilities)
+		if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
+			val info = wifiManager.connectionInfo
+			if (info.supplicantState === SupplicantState.COMPLETED) {
+				ssid = info.ssid
+			}
+		}
+		return ssid?.trim('"')
+	}
 
-    companion object {
-        private fun getWifiNameFromCapabilities(networkCapabilities: NetworkCapabilities): String? {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                val info: WifiInfo
-                if (networkCapabilities.transportInfo is WifiInfo) {
-                    info = networkCapabilities.transportInfo as WifiInfo
-                    return info.ssid
-                }
-            }
-            return null
-        }
-    }
+	companion object {
+		private fun getWifiNameFromCapabilities(networkCapabilities: NetworkCapabilities): String? {
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+				val info: WifiInfo
+				if (networkCapabilities.transportInfo is WifiInfo) {
+					info = networkCapabilities.transportInfo as WifiInfo
+					return info.ssid
+				}
+			}
+			return null
+		}
+	}
 }
 
 inline fun <Result> Flow<NetworkStatus>.map(
-    crossinline onUnavailable: suspend (network: Network) -> Result,
-    crossinline onAvailable: suspend (network: Network) -> Result,
-    crossinline onCapabilitiesChanged:
-    suspend (network: Network, networkCapabilities: NetworkCapabilities) -> Result
+	crossinline onUnavailable: suspend (network: Network) -> Result,
+	crossinline onAvailable: suspend (network: Network) -> Result,
+	crossinline onCapabilitiesChanged:
+	suspend (network: Network, networkCapabilities: NetworkCapabilities) -> Result,
 ): Flow<Result> = map { status ->
-    when (status) {
-        is NetworkStatus.Unavailable -> onUnavailable(status.network)
-        is NetworkStatus.Available -> onAvailable(status.network)
-        is NetworkStatus.CapabilitiesChanged ->
-            onCapabilitiesChanged(
-                status.network,
-                status.networkCapabilities,
-            )
-    }
+	when (status) {
+		is NetworkStatus.Unavailable -> onUnavailable(status.network)
+		is NetworkStatus.Available -> onAvailable(status.network)
+		is NetworkStatus.CapabilitiesChanged ->
+			onCapabilitiesChanged(
+				status.network,
+				status.networkCapabilities,
+			)
+	}
 }

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

@@ -5,5 +5,9 @@ import android.net.NetworkCapabilities
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
-class EthernetService @Inject constructor(@ApplicationContext context: Context) :
-    BaseNetworkService<EthernetService>(context, NetworkCapabilities.TRANSPORT_ETHERNET)
+class EthernetService
+@Inject
+constructor(
+	@ApplicationContext context: Context,
+) :
+	BaseNetworkService<EthernetService>(context, NetworkCapabilities.TRANSPORT_ETHERNET)

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

@@ -5,5 +5,9 @@ import android.net.NetworkCapabilities
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
-class MobileDataService @Inject constructor(@ApplicationContext context: Context) :
-    BaseNetworkService<MobileDataService>(context, NetworkCapabilities.TRANSPORT_CELLULAR)
+class MobileDataService
+@Inject
+constructor(
+	@ApplicationContext context: Context,
+) :
+	BaseNetworkService<MobileDataService>(context, NetworkCapabilities.TRANSPORT_CELLULAR)

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

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

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

@@ -4,10 +4,10 @@ import android.net.Network
 import android.net.NetworkCapabilities
 
 sealed class NetworkStatus {
-    class Available(val network: Network) : NetworkStatus()
+	class Available(val network: Network) : NetworkStatus()
 
-    class Unavailable(val network: Network) : NetworkStatus()
+	class Unavailable(val network: Network) : NetworkStatus()
 
-    class CapabilitiesChanged(val network: Network, val networkCapabilities: NetworkCapabilities) :
-        NetworkStatus()
+	class CapabilitiesChanged(val network: Network, val networkCapabilities: NetworkCapabilities) :
+		NetworkStatus()
 }

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

@@ -5,5 +5,9 @@ import android.net.NetworkCapabilities
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
-class WifiService @Inject constructor(@ApplicationContext context: Context) :
-    BaseNetworkService<WifiService>(context, NetworkCapabilities.TRANSPORT_WIFI)
+class WifiService
+@Inject
+constructor(
+	@ApplicationContext context: Context,
+) :
+	BaseNetworkService<WifiService>(context, NetworkCapabilities.TRANSPORT_WIFI)

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

@@ -5,18 +5,18 @@ import android.app.NotificationManager
 import android.app.PendingIntent
 
 interface NotificationService {
-    fun createNotification(
-        channelId: String,
-        channelName: String,
-        title: String = "",
-        action: PendingIntent? = null,
-        actionText: String? = null,
-        description: String,
-        showTimestamp: Boolean = false,
-        importance: Int = NotificationManager.IMPORTANCE_HIGH,
-        vibration: Boolean = false,
-        onGoing: Boolean = true,
-        lights: Boolean = true,
-        onlyAlertOnce: Boolean = true,
-    ): Notification
+	fun createNotification(
+		channelId: String,
+		channelName: String,
+		title: String = "",
+		action: PendingIntent? = null,
+		actionText: String? = null,
+		description: String,
+		showTimestamp: Boolean = false,
+		importance: Int = NotificationManager.IMPORTANCE_HIGH,
+		vibration: Boolean = false,
+		onGoing: Boolean = true,
+		lights: Boolean = true,
+		onlyAlertOnce: Boolean = true,
+	): Notification
 }

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

@@ -9,93 +9,97 @@ import android.content.Intent
 import android.graphics.Color
 import androidx.core.app.NotificationCompat
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.MainActivity
+import com.zaneschepke.wireguardautotunnel.ui.SplashActivity
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
-class WireGuardNotification @Inject constructor(@ApplicationContext private val context: Context) :
-    NotificationService {
-    private val notificationManager =
-        context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+class WireGuardNotification
+@Inject
+constructor(
+	@ApplicationContext private val context: Context,
+) :
+	NotificationService {
+	private val notificationManager =
+		context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-    private val watcherBuilder: NotificationCompat.Builder =
-        NotificationCompat.Builder(
-            context,
-            context.getString(R.string.watcher_channel_id),
-        )
-    private val tunnelBuilder: NotificationCompat.Builder =
-        NotificationCompat.Builder(
-            context,
-            context.getString(R.string.vpn_channel_id),
-        )
+	private val watcherBuilder: NotificationCompat.Builder =
+		NotificationCompat.Builder(
+			context,
+			context.getString(R.string.watcher_channel_id),
+		)
+	private val tunnelBuilder: NotificationCompat.Builder =
+		NotificationCompat.Builder(
+			context,
+			context.getString(R.string.vpn_channel_id),
+		)
 
-    override fun createNotification(
-        channelId: String,
-        channelName: String,
-        title: String,
-        action: PendingIntent?,
-        actionText: String?,
-        description: String,
-        showTimestamp: Boolean,
-        importance: Int,
-        vibration: Boolean,
-        onGoing: Boolean,
-        lights: Boolean,
-        onlyAlertOnce: Boolean,
-    ): Notification {
-        val channel =
-            NotificationChannel(
-                channelId,
-                channelName,
-                importance,
-            )
-                .let {
-                    it.description = title
-                    it.enableLights(lights)
-                    it.lightColor = Color.RED
-                    it.enableVibration(vibration)
-                    it.vibrationPattern = longArrayOf(100, 200, 300)
-                    it
-                }
-        notificationManager.createNotificationChannel(channel)
-        val pendingIntent: PendingIntent =
-            Intent(context, MainActivity::class.java).let { notificationIntent ->
-                PendingIntent.getActivity(
-                    context,
-                    0,
-                    notificationIntent,
-                    PendingIntent.FLAG_IMMUTABLE,
-                )
-            }
+	override fun createNotification(
+		channelId: String,
+		channelName: String,
+		title: String,
+		action: PendingIntent?,
+		actionText: String?,
+		description: String,
+		showTimestamp: Boolean,
+		importance: Int,
+		vibration: Boolean,
+		onGoing: Boolean,
+		lights: Boolean,
+		onlyAlertOnce: Boolean,
+	): Notification {
+		val channel =
+			NotificationChannel(
+				channelId,
+				channelName,
+				importance,
+			)
+				.let {
+					it.description = title
+					it.enableLights(lights)
+					it.lightColor = Color.RED
+					it.enableVibration(vibration)
+					it.vibrationPattern = longArrayOf(100, 200, 300)
+					it
+				}
+		notificationManager.createNotificationChannel(channel)
+		val pendingIntent: PendingIntent =
+			Intent(context, SplashActivity::class.java).let { notificationIntent ->
+				PendingIntent.getActivity(
+					context,
+					0,
+					notificationIntent,
+					PendingIntent.FLAG_IMMUTABLE,
+				)
+			}
 
-        val builder =
-            when (channelId) {
-                context.getString(R.string.watcher_channel_id) -> watcherBuilder
-                context.getString(R.string.vpn_channel_id) -> tunnelBuilder
-                else -> {
-                    NotificationCompat.Builder(
-                        context,
-                        channelId,
-                    )
-                }
-            }
+		val builder =
+			when (channelId) {
+				context.getString(R.string.watcher_channel_id) -> watcherBuilder
+				context.getString(R.string.vpn_channel_id) -> tunnelBuilder
+				else -> {
+					NotificationCompat.Builder(
+						context,
+						channelId,
+					)
+				}
+			}
 
-        return builder.let {
-            if (action != null && actionText != null) {
-                it.addAction(
-                    NotificationCompat.Action.Builder(0, actionText, action).build(),
-                )
-                it.setAutoCancel(true)
-            }
-            it.setContentTitle(title)
-                .setContentText(description)
-                .setOnlyAlertOnce(onlyAlertOnce)
-                .setContentIntent(pendingIntent)
-                .setOngoing(onGoing)
-                .setPriority(NotificationCompat.PRIORITY_HIGH)
-                .setShowWhen(showTimestamp)
-                .setSmallIcon(R.drawable.ic_launcher)
-                .build()
-        }
-    }
+		return builder.let {
+			if (action != null && actionText != null) {
+				it.addAction(
+					NotificationCompat.Action.Builder(0, actionText, action).build(),
+				)
+				it.setAutoCancel(true)
+			}
+			it.setContentTitle(title)
+				.setContentText(description)
+				.setOnlyAlertOnce(onlyAlertOnce)
+				.setContentIntent(pendingIntent)
+				.setOngoing(onGoing)
+				.setPriority(NotificationCompat.PRIORITY_HIGH)
+				.setShowWhen(showTimestamp)
+				.setSmallIcon(R.drawable.ic_launcher)
+				.build()
+		}
+	}
 }

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

@@ -2,74 +2,84 @@ package com.zaneschepke.wireguardautotunnel.service.shortcut
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.service.foreground.Action
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.foreground.WireGuardConnectivityWatcherService
 import com.zaneschepke.wireguardautotunnel.service.foreground.WireGuardTunnelService
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class ShortcutsActivity : ComponentActivity() {
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
 
-    @Inject
-    lateinit var appDataRepository: AppDataRepository
+	@Inject
+	lateinit var serviceManager: ServiceManager
 
-    @Inject
-    lateinit var serviceManager: ServiceManager
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        WireGuardAutoTunnel.applicationScope.launch(Dispatchers.IO) {
-            val settings = appDataRepository.settings.getSettings()
-            if (settings.isShortcutsEnabled) {
-                when (intent.getStringExtra(CLASS_NAME_EXTRA_KEY)) {
-                    WireGuardTunnelService::class.java.simpleName -> {
-                        val tunnelName = intent.getStringExtra(TUNNEL_NAME_EXTRA_KEY)
-                        val tunnelConfig = tunnelName?.let {
-                            appDataRepository.tunnels.getAll().firstOrNull {
-                                it.name == tunnelName
-                            }
-                        }
-                        when (intent.action) {
-                            Action.START.name -> serviceManager.startVpnServiceForeground(
-                                this@ShortcutsActivity, tunnelConfig?.id, isManualStart = true,
-                            )
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		applicationScope.launch {
+			val settings = appDataRepository.settings.getSettings()
+			if (settings.isShortcutsEnabled) {
+				when (intent.getStringExtra(CLASS_NAME_EXTRA_KEY)) {
+					WireGuardTunnelService::class.java.simpleName -> {
+						val tunnelName = intent.getStringExtra(TUNNEL_NAME_EXTRA_KEY)
+						val tunnelConfig =
+							tunnelName?.let {
+								appDataRepository.tunnels.getAll().firstOrNull {
+									it.name == tunnelName
+								}
+							}
+						when (intent.action) {
+							Action.START.name ->
+								serviceManager.startVpnServiceForeground(
+									this@ShortcutsActivity,
+									tunnelConfig?.id,
+									isManualStart = true,
+								)
 
-                            Action.STOP.name -> serviceManager.stopVpnServiceForeground(
-                                this@ShortcutsActivity,
-                                isManualStop = true,
-                            )
-                        }
-                    }
+							Action.STOP.name ->
+								serviceManager.stopVpnServiceForeground(
+									this@ShortcutsActivity,
+									isManualStop = true,
+								)
+						}
+					}
 
-                    WireGuardConnectivityWatcherService::class.java.simpleName -> {
-                        when (intent.action) {
-                            Action.START.name -> appDataRepository.settings.save(
-                                settings.copy(
-                                    isAutoTunnelPaused = false,
-                                ),
-                            )
+					WireGuardConnectivityWatcherService::class.java.simpleName -> {
+						when (intent.action) {
+							Action.START.name ->
+								appDataRepository.settings.save(
+									settings.copy(
+										isAutoTunnelPaused = false,
+									),
+								)
 
-                            Action.STOP.name -> appDataRepository.settings.save(
-                                settings.copy(
-                                    isAutoTunnelPaused = true,
-                                ),
-                            )
-                        }
-                    }
-                }
-            }
-        }
-        finish()
-    }
+							Action.STOP.name ->
+								appDataRepository.settings.save(
+									settings.copy(
+										isAutoTunnelPaused = true,
+									),
+								)
+						}
+					}
+				}
+			}
+		}
+		finish()
+	}
 
-    companion object {
-        const val TUNNEL_NAME_EXTRA_KEY = "tunnelName"
-        const val CLASS_NAME_EXTRA_KEY = "className"
-    }
+	companion object {
+		const val TUNNEL_NAME_EXTRA_KEY = "tunnelName"
+		const val CLASS_NAME_EXTRA_KEY = "className"
+	}
 }

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

@@ -3,109 +3,102 @@ package com.zaneschepke.wireguardautotunnel.service.tile
 import android.os.Build
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.ServiceLifecycleDispatcher
+import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
-import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class AutoTunnelControlTile : TileService() {
+class AutoTunnelControlTile : TileService(), LifecycleOwner {
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
 
-    @Inject
-    lateinit var appDataRepository: AppDataRepository
+	@Inject
+	lateinit var serviceManager: ServiceManager
 
-    @Inject
-    lateinit var serviceManager: ServiceManager
+	private val dispatcher = ServiceLifecycleDispatcher(this)
 
-    private val scope = CoroutineScope(Dispatchers.IO)
+	private var manualStartConfig: TunnelConfig? = null
 
-    private var manualStartConfig: TunnelConfig? = null
+	override fun onStartListening() {
+		super.onStartListening()
+		lifecycleScope.launch {
+			val settings = appDataRepository.settings.getSettings()
+			when (settings.isAutoTunnelEnabled) {
+				true -> {
+					if (settings.isAutoTunnelPaused) {
+						setInactive()
+						setTileDescription(this@AutoTunnelControlTile.getString(R.string.paused))
+					} else {
+						setActive()
+						setTileDescription(this@AutoTunnelControlTile.getString(R.string.active))
+					}
+				}
 
-    override fun onStartListening() {
-        super.onStartListening()
-        scope.launch {
-            appDataRepository.settings.getSettingsFlow().collectLatest {
-                when (it.isAutoTunnelEnabled) {
-                    true -> {
-                        if (it.isAutoTunnelPaused) {
-                            setInactive()
-                            setTileDescription(this@AutoTunnelControlTile.getString(R.string.paused))
-                        } else {
-                            setActive()
-                            setTileDescription(this@AutoTunnelControlTile.getString(R.string.active))
-                        }
-                    }
+				false -> {
+					setTileDescription(this@AutoTunnelControlTile.getString(R.string.disabled))
+					setUnavailable()
+				}
+			}
+		}
+	}
 
-                    false -> {
-                        setTileDescription(this@AutoTunnelControlTile.getString(R.string.disabled))
-                        setUnavailable()
-                    }
-                }
-            }
-        }
-    }
+	override fun onTileAdded() {
+		super.onTileAdded()
+		onStartListening()
+	}
 
-    override fun onTileAdded() {
-        super.onTileAdded()
-        onStartListening()
-    }
+	override fun onClick() {
+		super.onClick()
+		unlockAndRun {
+			lifecycleScope.launch {
+				try {
+					appDataRepository.toggleWatcherServicePause()
+					onStartListening()
+				} catch (e: Exception) {
+					Timber.e(e.message)
+				} finally {
+					cancel()
+				}
+			}
+		}
+	}
 
-    override fun onDestroy() {
-        super.onDestroy()
-        scope.cancel()
-    }
+	private fun setActive() {
+		qsTile.state = Tile.STATE_ACTIVE
+		qsTile.updateTile()
+	}
 
-    override fun onTileRemoved() {
-        super.onTileRemoved()
-        scope.cancel()
-    }
+	private fun setInactive() {
+		qsTile.state = Tile.STATE_INACTIVE
+		qsTile.updateTile()
+	}
 
-    override fun onClick() {
-        super.onClick()
-        unlockAndRun {
-            scope.launch {
-                try {
-                    appDataRepository.toggleWatcherServicePause()
-                } catch (e: Exception) {
-                    Timber.e(e.message)
-                } finally {
-                    cancel()
-                }
-            }
-        }
-    }
+	private fun setUnavailable() {
+		manualStartConfig = null
+		qsTile.state = Tile.STATE_UNAVAILABLE
+		qsTile.updateTile()
+	}
 
-    private fun setActive() {
-        qsTile.state = Tile.STATE_ACTIVE
-        qsTile.updateTile()
-    }
+	private fun setTileDescription(description: String) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+			qsTile.subtitle = description
+		}
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+			qsTile.stateDescription = description
+		}
+		qsTile.updateTile()
+	}
 
-    private fun setInactive() {
-        qsTile.state = Tile.STATE_INACTIVE
-        qsTile.updateTile()
-    }
-
-    private fun setUnavailable() {
-        manualStartConfig = null
-        qsTile.state = Tile.STATE_UNAVAILABLE
-        qsTile.updateTile()
-    }
-
-    private fun setTileDescription(description: String) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            qsTile.subtitle = description
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            qsTile.stateDescription = description
-        }
-        qsTile.updateTile()
-    }
+	override val lifecycle: Lifecycle
+		get() = dispatcher.lifecycle
 }

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

@@ -3,123 +3,119 @@ package com.zaneschepke.wireguardautotunnel.service.tile
 import android.os.Build
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.ServiceLifecycleDispatcher
+import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class TunnelControlTile : TileService() {
+class TunnelControlTile : TileService(), LifecycleOwner {
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
 
-    @Inject
-    lateinit var appDataRepository: AppDataRepository
+	@Inject
+	lateinit var vpnService: VpnService
 
-    @Inject
-    lateinit var vpnService: VpnService
+	@Inject
+	lateinit var serviceManager: ServiceManager
 
-    @Inject
-    lateinit var serviceManager: ServiceManager
+	private val dispatcher = ServiceLifecycleDispatcher(this)
 
-    private val scope = CoroutineScope(Dispatchers.IO)
+	private var manualStartConfig: TunnelConfig? = null
 
-    private var manualStartConfig: TunnelConfig? = null
+	override fun onStartListening() {
+		super.onStartListening()
+		Timber.d("On start listening called")
+		lifecycleScope.launch {
+			when (vpnService.getState()) {
+				TunnelState.UP -> {
+					setActive()
+					setTileDescription(vpnService.name)
+				}
 
-    override fun onStartListening() {
-        super.onStartListening()
-        Timber.d("On start listening called")
-        scope.launch {
-            vpnService.vpnState.collect { it ->
-                when (it.status) {
-                    TunnelState.UP -> {
-                        setActive()
-                        it.tunnelConfig?.name?.let { name -> setTileDescription(name) }
-                    }
+				TunnelState.DOWN -> {
+					setInactive()
+					val config =
+						appDataRepository.getStartTunnelConfig()?.also { config ->
+							manualStartConfig = config
+						} ?: appDataRepository.getPrimaryOrFirstTunnel()
+					config?.let {
+						setTileDescription(it.name)
+					} ?: setUnavailable()
+				}
 
-                    TunnelState.DOWN -> {
-                        setInactive()
-                        val config = appDataRepository.getStartTunnelConfig()?.also { config ->
-                            manualStartConfig = config
-                        } ?: appDataRepository.getPrimaryOrFirstTunnel()
-                        config?.let {
-                            setTileDescription(it.name)
-                        } ?: setUnavailable()
-                    }
-                    else -> setInactive()
-                }
-            }
-        }
-    }
+				else -> setInactive()
+			}
+		}
+	}
 
-    override fun onDestroy() {
-        super.onDestroy()
-        scope.cancel()
-    }
+	override fun onTileAdded() {
+		super.onTileAdded()
+		onStartListening()
+	}
 
-    override fun onTileRemoved() {
-        super.onTileRemoved()
-        scope.cancel()
-    }
+	override fun onClick() {
+		super.onClick()
+		unlockAndRun {
+			lifecycleScope.launch {
+				try {
+					if (vpnService.getState() == TunnelState.UP) {
+						serviceManager.stopVpnServiceForeground(
+							this@TunnelControlTile,
+							isManualStop = true,
+						)
+					} else {
+						serviceManager.startVpnServiceForeground(
+							this@TunnelControlTile,
+							manualStartConfig?.id,
+							isManualStart = true,
+						)
+					}
+				} catch (e: Exception) {
+					Timber.e(e.message)
+				} finally {
+					cancel()
+				}
+			}
+		}
+	}
 
-    override fun onTileAdded() {
-        super.onTileAdded()
-        onStartListening()
-    }
+	private fun setActive() {
+		qsTile.state = Tile.STATE_ACTIVE
+		qsTile.updateTile()
+	}
 
-    override fun onClick() {
-        super.onClick()
-        unlockAndRun {
-            scope.launch {
-                try {
-                    if (vpnService.getState() == TunnelState.UP) {
-                        serviceManager.stopVpnServiceForeground(
-                            this@TunnelControlTile,
-                            isManualStop = true,
-                        )
-                    } else {
-                        serviceManager.startVpnServiceForeground(
-                            this@TunnelControlTile, manualStartConfig?.id, isManualStart = true,
-                        )
-                    }
-                } catch (e: Exception) {
-                    Timber.e(e.message)
-                } finally {
-                    cancel()
-                }
-            }
-        }
-    }
+	private fun setInactive() {
+		qsTile.state = Tile.STATE_INACTIVE
+		qsTile.updateTile()
+	}
 
-    private fun setActive() {
-        qsTile.state = Tile.STATE_ACTIVE
-        qsTile.updateTile()
-    }
+	private fun setUnavailable() {
+		manualStartConfig = null
+		qsTile.state = Tile.STATE_UNAVAILABLE
+		qsTile.updateTile()
+	}
 
-    private fun setInactive() {
-        qsTile.state = Tile.STATE_INACTIVE
-        qsTile.updateTile()
-    }
+	private fun setTileDescription(description: String) {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+			qsTile.subtitle = description
+		}
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+			qsTile.stateDescription = description
+		}
+		qsTile.updateTile()
+	}
 
-    private fun setUnavailable() {
-        manualStartConfig = null
-        qsTile.state = Tile.STATE_UNAVAILABLE
-        qsTile.updateTile()
-    }
-
-    private fun setTileDescription(description: String) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            qsTile.subtitle = description
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            qsTile.stateDescription = description
-        }
-        qsTile.updateTile()
-    }
+	override val lifecycle: Lifecycle
+		get() = dispatcher.lifecycle
 }

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

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

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

@@ -3,40 +3,42 @@ package com.zaneschepke.wireguardautotunnel.service.tunnel
 import com.wireguard.android.backend.Tunnel
 
 enum class TunnelState {
-    UP,
-    DOWN,
-    TOGGLE;
+	UP,
+	DOWN,
+	TOGGLE,
+	;
 
-    fun toWgState() : Tunnel.State {
-        return when(this) {
-            UP -> Tunnel.State.UP
-            DOWN -> Tunnel.State.DOWN
-            TOGGLE -> Tunnel.State.TOGGLE
-        }
-    }
+	fun toWgState(): Tunnel.State {
+		return when (this) {
+			UP -> Tunnel.State.UP
+			DOWN -> Tunnel.State.DOWN
+			TOGGLE -> Tunnel.State.TOGGLE
+		}
+	}
 
-    fun toAmState() : org.amnezia.awg.backend.Tunnel.State {
-        return when(this) {
-            UP -> org.amnezia.awg.backend.Tunnel.State.UP
-            DOWN -> org.amnezia.awg.backend.Tunnel.State.DOWN
-            TOGGLE -> org.amnezia.awg.backend.Tunnel.State.TOGGLE
-        }
-    }
+	fun toAmState(): org.amnezia.awg.backend.Tunnel.State {
+		return when (this) {
+			UP -> org.amnezia.awg.backend.Tunnel.State.UP
+			DOWN -> org.amnezia.awg.backend.Tunnel.State.DOWN
+			TOGGLE -> org.amnezia.awg.backend.Tunnel.State.TOGGLE
+		}
+	}
 
-    companion object {
-        fun from(state: Tunnel.State) : TunnelState {
-            return when(state) {
-                Tunnel.State.DOWN -> DOWN
-                Tunnel.State.TOGGLE -> TOGGLE
-                Tunnel.State.UP -> UP
-            }
-        }
-        fun from(state: org.amnezia.awg.backend.Tunnel.State) : TunnelState {
-            return when(state) {
-                org.amnezia.awg.backend.Tunnel.State.DOWN -> DOWN
-                org.amnezia.awg.backend.Tunnel.State.TOGGLE -> TOGGLE
-                org.amnezia.awg.backend.Tunnel.State.UP -> UP
-            }
-        }
-    }
+	companion object {
+		fun from(state: Tunnel.State): TunnelState {
+			return when (state) {
+				Tunnel.State.DOWN -> DOWN
+				Tunnel.State.TOGGLE -> TOGGLE
+				Tunnel.State.UP -> UP
+			}
+		}
+
+		fun from(state: org.amnezia.awg.backend.Tunnel.State): TunnelState {
+			return when (state) {
+				org.amnezia.awg.backend.Tunnel.State.DOWN -> DOWN
+				org.amnezia.awg.backend.Tunnel.State.TOGGLE -> TOGGLE
+				org.amnezia.awg.backend.Tunnel.State.UP -> UP
+			}
+		}
+	}
 }

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

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

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

@@ -4,7 +4,7 @@ import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStatistics
 
 data class VpnState(
-    val status: TunnelState = TunnelState.DOWN,
-    val tunnelConfig: TunnelConfig? = null,
-    val statistics: TunnelStatistics? = null
+	val status: TunnelState = TunnelState.DOWN,
+	val tunnelConfig: TunnelConfig? = null,
+	val statistics: TunnelStatistics? = null,
 )

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

@@ -6,6 +6,8 @@ import com.wireguard.android.backend.Tunnel.State
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.module.Kernel
 import com.zaneschepke.wireguardautotunnel.module.Userspace
 import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.AmneziaStatistics
@@ -13,181 +15,219 @@ import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStati
 import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.WireGuardStatistics
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import org.amnezia.awg.backend.Tunnel
 import timber.log.Timber
 import javax.inject.Inject
+import javax.inject.Provider
 
 class WireGuardTunnel
 @Inject
 constructor(
-    private val userspaceAmneziaBackend : org.amnezia.awg.backend.Backend,
-    @Userspace private val userspaceBackend: Backend,
-    @Kernel private val kernelBackend: Backend,
-    private val appDataRepository: AppDataRepository,
+	private val userspaceAmneziaBackend: Provider<org.amnezia.awg.backend.Backend>,
+	@Userspace private val userspaceBackend: Provider<Backend>,
+	@Kernel private val kernelBackend: Provider<Backend>,
+	private val appDataRepository: AppDataRepository,
+	@ApplicationScope private val applicationScope: CoroutineScope,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : VpnService {
-    private val _vpnState = MutableStateFlow(VpnState())
-    override val vpnState: StateFlow<VpnState> = _vpnState.asStateFlow()
+	private val _vpnState = MutableStateFlow(VpnState())
+	override val vpnState: StateFlow<VpnState> = _vpnState.asStateFlow()
 
-    private val scope = CoroutineScope(Dispatchers.IO)
+	private var statsJob: Job? = null
 
-    private var statsJob: Job? = null
+	private var backendIsWgUserspace = true
 
-    private var backend: Backend = userspaceBackend
+	private var backendIsAmneziaUserspace = false
 
-    private var backendIsWgUserspace = true
+	init {
+		applicationScope.launch(ioDispatcher) {
+			appDataRepository.settings.getSettingsFlow().collect {
+				if (it.isKernelEnabled && (backendIsWgUserspace || backendIsAmneziaUserspace)) {
+					Timber.i("Setting kernel backend")
+					backendIsWgUserspace = false
+					backendIsAmneziaUserspace = false
+				} else if (!it.isKernelEnabled && !it.isAmneziaEnabled && !backendIsWgUserspace) {
+					Timber.i("Setting WireGuard userspace backend")
+					backendIsWgUserspace = true
+					backendIsAmneziaUserspace = false
+				} else if (it.isAmneziaEnabled && !backendIsAmneziaUserspace) {
+					Timber.i("Setting Amnezia userspace backend")
+					backendIsAmneziaUserspace = true
+					backendIsWgUserspace = false
+				}
+			}
+		}
+	}
 
-    private var backendIsAmneziaUserspace = false
+	private fun setState(tunnelConfig: TunnelConfig?, tunnelState: TunnelState): TunnelState {
+		return if (backendIsAmneziaUserspace) {
+			Timber.i("Using Amnezia backend")
+			val config =
+				tunnelConfig?.let {
+					if (it.amQuick != "") {
+						TunnelConfig.configFromAmQuick(it.amQuick)
+					} else {
+						Timber.w(
+							"Using backwards compatible wg config, amnezia specific config not found.",
+						)
+						TunnelConfig.configFromAmQuick(it.wgQuick)
+					}
+				}
+			val state =
+				userspaceAmneziaBackend.get().setState(this, tunnelState.toAmState(), config)
+			TunnelState.from(state)
+		} else {
+			Timber.i("Using Wg backend")
+			val wgConfig = tunnelConfig?.let { TunnelConfig.configFromWgQuick(it.wgQuick) }
+			val state =
+				backend().setState(
+					this,
+					tunnelState.toWgState(),
+					wgConfig,
+				)
+			TunnelState.from(state)
+		}
+	}
 
-    init {
-        scope.launch {
-            appDataRepository.settings.getSettingsFlow().collect {
-                if (it.isKernelEnabled && (backendIsWgUserspace || backendIsAmneziaUserspace)) {
-                    Timber.d("Setting kernel backend")
-                    backend = kernelBackend
-                    backendIsWgUserspace = false
-                    backendIsAmneziaUserspace = false
-                } else if (!it.isKernelEnabled && !it.isAmneziaEnabled && !backendIsWgUserspace) {
-                    Timber.d("Setting WireGuard userspace backend")
-                    backend = userspaceBackend
-                    backendIsWgUserspace = true
-                    backendIsAmneziaUserspace = false
-                } else if (it.isAmneziaEnabled && !backendIsAmneziaUserspace) {
-                    Timber.d("Setting Amnezia userspace backend")
-                    backendIsAmneziaUserspace = true
-                    backendIsWgUserspace = false
-                }
-            }
-        }
-    }
+	override suspend fun startTunnel(tunnelConfig: TunnelConfig?): TunnelState {
+		return withContext(ioDispatcher) {
+			try {
+				// TODO we need better error handling here
+				// need to bubble up these errors to the UI
+				val config = tunnelConfig ?: appDataRepository.getPrimaryOrFirstTunnel()
+				if (config != null) {
+					emitTunnelConfig(config)
+					setState(config, TunnelState.UP)
+				} else {
+					throw Exception("No tunnels")
+				}
+			} catch (e: BackendException) {
+				Timber.e("Failed to start tunnel with error: ${e.message}")
+				TunnelState.from(State.DOWN)
+			}
+		}
+	}
 
-    private fun setState(tunnelConfig: TunnelConfig?, tunnelState: TunnelState) : TunnelState {
-        return if(backendIsAmneziaUserspace) {
-            Timber.i("Using Amnezia backend")
-            val config = tunnelConfig?.let {
-                if(it.amQuick != "") TunnelConfig.configFromAmQuick(it.amQuick) else {
-                    Timber.w("Using backwards compatible wg config, amnezia specific config not found.")
-                    TunnelConfig.configFromAmQuick(it.wgQuick)
-                }
-            }
-            val state = userspaceAmneziaBackend.setState(this, tunnelState.toAmState(), config)
-            TunnelState.from(state)
-        } else {
-            Timber.i("Using Wg backend")
-            val wgConfig = tunnelConfig?.let { TunnelConfig.configFromWgQuick(it.wgQuick) }
-            val state = backend.setState(
-                this,
-                tunnelState.toWgState(),
-                wgConfig,
-            )
-            TunnelState.from(state)
-        }
-    }
+	private fun backend(): Backend {
+		return when {
+			backendIsWgUserspace -> {
+				userspaceBackend.get()
+			}
 
-    override suspend fun startTunnel(tunnelConfig: TunnelConfig?): TunnelState {
-        return try {
-            //TODO we need better error handling here
-            val config = tunnelConfig ?: appDataRepository.getPrimaryOrFirstTunnel()
-            if (config != null) {
-                emitTunnelConfig(config)
-                setState(config, TunnelState.UP)
-            } else throw Exception("No tunnels")
-        } catch (e: BackendException) {
-            Timber.e("Failed to start tunnel with error: ${e.message}")
-            TunnelState.from(State.DOWN)
-        }
-    }
+			!backendIsWgUserspace && !backendIsAmneziaUserspace -> {
+				kernelBackend.get()
+			}
 
-    private fun emitTunnelState(state : TunnelState) {
-        _vpnState.tryEmit(
-            _vpnState.value.copy(
-                status = state,
-            ),
-        )
-    }
+			else -> {
+				userspaceBackend.get()
+			}
+		}
+	}
 
-    private fun emitBackendStatistics(statistics: TunnelStatistics) {
-        _vpnState.tryEmit(
-            _vpnState.value.copy(
-                statistics = statistics,
-            ),
-        )
-    }
+	private fun emitTunnelState(state: TunnelState) {
+		_vpnState.tryEmit(
+			_vpnState.value.copy(
+				status = state,
+			),
+		)
+	}
 
-    private suspend fun emitTunnelConfig(tunnelConfig: TunnelConfig?) {
-        _vpnState.emit(
-            _vpnState.value.copy(
-                tunnelConfig = tunnelConfig,
-            ),
-        )
-    }
+	private fun emitBackendStatistics(statistics: TunnelStatistics) {
+		_vpnState.tryEmit(
+			_vpnState.value.copy(
+				statistics = statistics,
+			),
+		)
+	}
 
-    private fun resetVpnState() {
-        _vpnState.tryEmit(VpnState())
-    }
+	private suspend fun emitTunnelConfig(tunnelConfig: TunnelConfig?) {
+		_vpnState.emit(
+			_vpnState.value.copy(
+				tunnelConfig = tunnelConfig,
+			),
+		)
+	}
 
-    override suspend fun stopTunnel() {
-        try {
-            if (getState() == TunnelState.UP) {
-                val state = setState(null, TunnelState.DOWN)
-                resetVpnState()
-                emitTunnelState(state)
-            }
-        } catch (e: BackendException) {
-            Timber.e("Failed to stop wireguard tunnel with error: ${e.message}")
-        } catch (e: org.amnezia.awg.backend.BackendException) {
-            Timber.e("Failed to stop amnezia tunnel with error: ${e.message}")
-        }
-    }
+	private fun resetVpnState() {
+		_vpnState.tryEmit(VpnState())
+	}
 
-    override fun getState(): TunnelState {
-        return if(backendIsAmneziaUserspace) TunnelState.from(userspaceAmneziaBackend.getState(this))
-        else TunnelState.from(backend.getState(this))
-    }
+	override suspend fun stopTunnel() {
+		withContext(ioDispatcher) {
+			try {
+				if (getState() == TunnelState.UP) {
+					val state = setState(null, TunnelState.DOWN)
+					resetVpnState()
+					emitTunnelState(state)
+				}
+			} catch (e: BackendException) {
+				Timber.e("Failed to stop wireguard tunnel with error: ${e.message}")
+			} catch (e: org.amnezia.awg.backend.BackendException) {
+				Timber.e("Failed to stop amnezia tunnel with error: ${e.message}")
+			}
+		}
+	}
 
-    override fun getName(): String {
-        return _vpnState.value.tunnelConfig?.name ?: ""
-    }
+	override fun getState(): TunnelState {
+		return if (backendIsAmneziaUserspace) {
+			TunnelState.from(
+				userspaceAmneziaBackend.get().getState(this),
+			)
+		} else {
+			TunnelState.from(backend().getState(this))
+		}
+	}
 
+	override fun getName(): String {
+		return _vpnState.value.tunnelConfig?.name ?: ""
+	}
 
-    override fun onStateChange(newState: Tunnel.State) {
-        handleStateChange(TunnelState.from(newState))
-    }
+	override fun onStateChange(newState: Tunnel.State) {
+		handleStateChange(TunnelState.from(newState))
+	}
 
-    private fun handleStateChange(state: TunnelState) {
-        val tunnel = this
-        emitTunnelState(state)
-        WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
-        if (state == TunnelState.UP) {
-            statsJob =
-                scope.launch {
-                    while (true) {
-                        if(backendIsAmneziaUserspace) {
-                            emitBackendStatistics(AmneziaStatistics(userspaceAmneziaBackend.getStatistics(tunnel)))
-                        } else {
-                            emitBackendStatistics(WireGuardStatistics(backend.getStatistics(tunnel)))
-                        }
-                        delay(Constants.VPN_STATISTIC_CHECK_INTERVAL)
-                    }
-                }
-        }
-        if (state == TunnelState.DOWN) {
-            try {
-                statsJob?.cancel()
-            } catch (e : CancellationException) {
-                Timber.i("Stats job cancelled")
-            }
-        }
-    }
+	private fun handleStateChange(state: TunnelState) {
+		emitTunnelState(state)
+		WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
+		if (state == TunnelState.UP) {
+			statsJob = startTunnelStatisticsJob()
+		}
+		if (state == TunnelState.DOWN) {
+			try {
+				statsJob?.cancel()
+			} catch (e: CancellationException) {
+				Timber.i("Stats job cancelled")
+			}
+		}
+	}
 
-    override fun onStateChange(state: State) {
-        handleStateChange(TunnelState.from(state))
-    }
+	private fun startTunnelStatisticsJob() = applicationScope.launch(ioDispatcher) {
+		while (true) {
+			if (backendIsAmneziaUserspace) {
+				emitBackendStatistics(
+					AmneziaStatistics(
+						userspaceAmneziaBackend.get().getStatistics(this@WireGuardTunnel),
+					),
+				)
+			} else {
+				emitBackendStatistics(
+					WireGuardStatistics(backend().getStatistics(this@WireGuardTunnel)),
+				)
+			}
+			delay(Constants.VPN_STATISTIC_CHECK_INTERVAL)
+		}
+	}
+
+	override fun onStateChange(state: State) {
+		handleStateChange(TunnelState.from(state))
+	}
 }

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

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

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

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

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

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

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

@@ -1,9 +1,9 @@
 package com.zaneschepke.wireguardautotunnel.ui
 
 data class AppUiState(
-    val snackbarMessage: String = "",
-    val snackbarMessageConsumed: Boolean = true,
-    val vpnPermissionAccepted: Boolean = false,
-    val notificationPermissionAccepted: Boolean = false,
-    val requestPermissions: Boolean = false
+	val snackbarMessage: String = "",
+	val snackbarMessageConsumed: Boolean = true,
+	val vpnPermissionAccepted: Boolean = false,
+	val notificationPermissionAccepted: Boolean = false,
+	val requestPermissions: Boolean = false,
 )

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

@@ -4,156 +4,120 @@ import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import android.widget.Toast
-import androidx.compose.runtime.mutableStateListOf
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
 import com.wireguard.android.backend.GoBackend
-import com.zaneschepke.logcatter.Logcatter
-import com.zaneschepke.logcatter.model.LogMessage
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.FileUtils
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
 import timber.log.Timber
-import java.time.Instant
 import javax.inject.Inject
 
 @HiltViewModel
 class AppViewModel
 @Inject
 constructor() : ViewModel() {
+	val vpnIntent: Intent? = GoBackend.VpnService.prepare(WireGuardAutoTunnel.instance)
 
-    val vpnIntent: Intent? = GoBackend.VpnService.prepare(WireGuardAutoTunnel.instance)
+	private val _appUiState =
+		MutableStateFlow(
+			AppUiState(
+				vpnPermissionAccepted = vpnIntent == null,
+			),
+		)
+	val appUiState = _appUiState.asStateFlow()
 
-    private val _appUiState = MutableStateFlow(
-        AppUiState(
-            vpnPermissionAccepted = vpnIntent == null,
-        ),
-    )
-    val appUiState = _appUiState.asStateFlow()
+	fun isRequiredPermissionGranted(): Boolean {
+		val allAccepted =
+			(_appUiState.value.vpnPermissionAccepted && _appUiState.value.vpnPermissionAccepted)
+		if (!allAccepted) requestPermissions()
+		return allAccepted
+	}
 
+	private fun requestPermissions() {
+		_appUiState.update {
+			it.copy(
+				requestPermissions = true,
+			)
+		}
+	}
 
-    fun isRequiredPermissionGranted(): Boolean {
-        val allAccepted =
-            (_appUiState.value.vpnPermissionAccepted && _appUiState.value.vpnPermissionAccepted)
-        if (!allAccepted) requestPermissions()
-        return allAccepted
-    }
+	fun permissionsRequested() {
+		_appUiState.update {
+			it.copy(
+				requestPermissions = false,
+			)
+		}
+	}
 
-    private fun requestPermissions() {
-        _appUiState.update {
-            it.copy(
-                requestPermissions = true
-            )
-        }
-    }
+	fun openWebPage(url: String, context: Context) {
+		try {
+			val webpage: Uri = Uri.parse(url)
+			val intent =
+				Intent(Intent.ACTION_VIEW, webpage).apply {
+					addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+				}
+			context.startActivity(intent)
+		} catch (e: ActivityNotFoundException) {
+			Timber.e(e)
+			showSnackbarMessage(context.getString(R.string.no_browser_detected))
+		}
+	}
 
-    fun permissionsRequested() {
-        _appUiState.update {
-            it.copy(
-                requestPermissions = false
-            )
-        }
-    }
+	fun onVpnPermissionAccepted() {
+		_appUiState.update {
+			it.copy(
+				vpnPermissionAccepted = true,
+			)
+		}
+	}
 
-    fun openWebPage(url: String, context : Context) {
-        try {
-            val webpage: Uri = Uri.parse(url)
-            val intent = Intent(Intent.ACTION_VIEW, webpage).apply {
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            }
-            context.startActivity(intent)
-        } catch (e: ActivityNotFoundException) {
-            Timber.e(e)
-            showSnackbarMessage(context.getString(R.string.no_browser_detected))
-        }
-    }
+	fun launchEmail(context: Context) {
+		try {
+			val intent =
+				Intent(Intent.ACTION_SENDTO).apply {
+					type = Constants.EMAIL_MIME_TYPE
+					putExtra(Intent.EXTRA_EMAIL, arrayOf(context.getString(R.string.my_email)))
+					putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.email_subject))
+					addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+				}
+			context.startActivity(
+				Intent.createChooser(intent, context.getString(R.string.email_chooser)).apply {
+					addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+				},
+			)
+		} catch (e: ActivityNotFoundException) {
+			Timber.e(e)
+			showSnackbarMessage(context.getString(R.string.no_email_detected))
+		}
+	}
 
-    fun onVpnPermissionAccepted() {
-        _appUiState.update {
-            it.copy(
-                vpnPermissionAccepted = true
-            )
-        }
-    }
+	fun showSnackbarMessage(message: String) {
+		_appUiState.update {
+			it.copy(
+				snackbarMessage = message,
+				snackbarMessageConsumed = false,
+			)
+		}
+	}
 
-    fun launchEmail(context: Context) {
-        try {
-            val intent =
-                Intent(Intent.ACTION_SENDTO).apply {
-                    type = Constants.EMAIL_MIME_TYPE
-                    putExtra(Intent.EXTRA_EMAIL, arrayOf(context.getString(R.string.my_email)))
-                    putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.email_subject))
-                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                }
-            context.startActivity(
-                Intent.createChooser(intent, context.getString(R.string.email_chooser)).apply {
-                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                },
-            )
-        } catch (e: ActivityNotFoundException) {
-            Timber.e(e)
-            showSnackbarMessage(context.getString(R.string.no_email_detected))
-        }
-    }
+	fun snackbarMessageConsumed() {
+		_appUiState.update {
+			it.copy(
+				snackbarMessage = "",
+				snackbarMessageConsumed = true,
+			)
+		}
+	}
 
-    fun showSnackbarMessage(message: String) {
-        _appUiState.update {
-            it.copy(
-                snackbarMessage = message,
-                snackbarMessageConsumed = false,
-            )
-        }
-    }
-
-    fun snackbarMessageConsumed() {
-        _appUiState.update {
-            it.copy(
-                snackbarMessage = "",
-                snackbarMessageConsumed = true,
-            )
-        }
-    }
-
-    val logs = mutableStateListOf<LogMessage>()
-
-    fun readLogCatOutput() =
-        viewModelScope.launch(viewModelScope.coroutineContext + Dispatchers.IO) {
-            launch {
-                Logcatter.logs(callback = {
-                    logs.add(it)
-                    if (logs.size > Constants.LOG_BUFFER_SIZE) {
-                        logs.removeRange(0, (logs.size - Constants.LOG_BUFFER_SIZE).toInt())
-                    }
-                })
-            }
-        }
-
-    fun clearLogs() {
-        logs.clear()
-        Logcatter.clear()
-    }
-
-    fun saveLogsToFile(context: Context) {
-        val fileName = "${Constants.BASE_LOG_FILE_NAME}-${Instant.now().epochSecond}.txt"
-        val content = logs.joinToString(separator = "\n")
-        FileUtils.saveFileToDownloads(context.applicationContext, content, fileName)
-        Toast.makeText(context, context.getString(R.string.logs_saved), Toast.LENGTH_SHORT)
-            .show()
-    }
-
-    fun setNotificationPermissionAccepted(accepted: Boolean) {
-        _appUiState.update {
-            it.copy(
-                notificationPermissionAccepted = accepted,
-            )
-        }
-    }
+	fun setNotificationPermissionAccepted(accepted: Boolean) {
+		_appUiState.update {
+			it.copy(
+				notificationPermissionAccepted = accepted,
+			)
+		}
+	}
 }

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

@@ -1,5 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui
-
-import com.journeyapps.barcodescanner.CaptureActivity
-
-class CaptureActivityPortrait : CaptureActivity()

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

@@ -10,6 +10,8 @@ import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.focusable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.MaterialTheme
@@ -19,15 +21,19 @@ import androidx.compose.material3.SnackbarDuration
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.SnackbarResult
+import androidx.compose.material3.Text
 import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusProperties
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
@@ -41,11 +47,13 @@ import androidx.navigation.navArgument
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
+import com.google.accompanist.permissions.shouldShowRationale
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
+import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
+import com.zaneschepke.wireguardautotunnel.ui.common.dialog.InfoDialog
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavBar
 import com.zaneschepke.wireguardautotunnel.ui.common.prompt.CustomSnackBar
 import com.zaneschepke.wireguardautotunnel.ui.screens.config.ConfigScreen
@@ -61,229 +69,259 @@ import com.zaneschepke.wireguardautotunnel.util.StringValue
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import xyz.teamgravity.pin_lock_compose.PinManager
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
+	@Inject
+	lateinit var appStateRepository: AppStateRepository
 
-    @Inject
-    lateinit var dataStoreManager: DataStoreManager
+	@Inject
+	lateinit var settingsRepository: SettingsRepository
 
-    @Inject
-    lateinit var settingsRepository: SettingsRepository
+	@Inject
+	lateinit var serviceManager: ServiceManager
 
-    @Inject
-    lateinit var serviceManager: ServiceManager
+	@OptIn(
+		ExperimentalPermissionsApi::class,
+	)
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
 
-    @OptIn(
-        ExperimentalPermissionsApi::class,
-    )
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+		val isPinLockEnabled = intent.extras?.getBoolean(SplashActivity.IS_PIN_LOCK_ENABLED_KEY)
 
-        enableEdgeToEdge(navigationBarStyle = SystemBarStyle.dark(Color.Transparent.toArgb()))
+		enableEdgeToEdge(navigationBarStyle = SystemBarStyle.dark(Color.Transparent.toArgb()))
 
-        // load preferences into memory and init data
-        lifecycleScope.launch {
-            dataStoreManager.init()
-            WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
-            val settings = settingsRepository.getSettings()
-            if (settings.isAutoTunnelEnabled) {
-                serviceManager.startWatcherService(application.applicationContext)
-            }
-        }
-        setContent {
-            val appViewModel = hiltViewModel<AppViewModel>()
-            val appUiState by appViewModel.appUiState.collectAsStateWithLifecycle()
-            val navController = rememberNavController()
-            val navBackStackEntry by navController.currentBackStackEntryAsState()
+		lifecycleScope.launch {
+			WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
+			val settings = settingsRepository.getSettings()
+			if (settings.isAutoTunnelEnabled) {
+				serviceManager.startWatcherService(application.applicationContext)
+			}
+		}
 
-            val notificationPermissionState =
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
-                    rememberPermissionState(Manifest.permission.POST_NOTIFICATIONS) else null
+		setContent {
+			val appViewModel = hiltViewModel<AppViewModel>()
+			val appUiState by appViewModel.appUiState.collectAsStateWithLifecycle()
+			val navController = rememberNavController()
+			val navBackStackEntry by navController.currentBackStackEntryAsState()
+			var showVpnPermissionDialog by remember { mutableStateOf(false) }
 
-            val snackbarHostState = remember { SnackbarHostState() }
+			val notificationPermissionState =
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+					rememberPermissionState(Manifest.permission.POST_NOTIFICATIONS)
+				} else {
+					null
+				}
 
-            val vpnActivityResultState =
-                rememberLauncherForActivityResult(
-                    ActivityResultContracts.StartActivityForResult(),
-                    onResult = {
-                        val accepted = (it.resultCode == RESULT_OK)
-                        if (accepted) {
-                            appViewModel.onVpnPermissionAccepted()
-                        }
-                    },
-                )
+			val snackbarHostState = remember { SnackbarHostState() }
 
-            fun showSnackBarMessage(message: StringValue) {
-                lifecycleScope.launch(Dispatchers.Main) {
-                    val result =
-                        snackbarHostState.showSnackbar(
-                            message = message.asString(this@MainActivity),
-                            duration = SnackbarDuration.Short,
-                        )
-                    when (result) {
-                        SnackbarResult.ActionPerformed,
-                        SnackbarResult.Dismissed -> {
-                            snackbarHostState.currentSnackbarData?.dismiss()
-                        }
-                    }
-                }
-            }
+			val vpnActivityResultState =
+				rememberLauncherForActivityResult(
+					ActivityResultContracts.StartActivityForResult(),
+					onResult = {
+						val accepted = (it.resultCode == RESULT_OK)
+						if (accepted) {
+							appViewModel.onVpnPermissionAccepted()
+						} else {
+							showVpnPermissionDialog = true
+						}
+					},
+				)
 
-            LaunchedEffect(appUiState.requestPermissions) {
-                if (appUiState.requestPermissions) {
-                    appViewModel.permissionsRequested()
-                    if (notificationPermissionState != null && !notificationPermissionState.status.isGranted
-                    ) {
-                        showSnackBarMessage(StringValue.StringResource(R.string.notification_permission_required))
-                        return@LaunchedEffect notificationPermissionState.launchPermissionRequest()
-                    }
-                    if (!appUiState.vpnPermissionAccepted) {
-                        return@LaunchedEffect appViewModel.vpnIntent?.let {
-                            vpnActivityResultState.launch(
-                                it
-                            )
-                        }!!
-                    }
-                }
-            }
+			fun showSnackBarMessage(message: StringValue) {
+				lifecycleScope.launch(Dispatchers.Main) {
+					val result =
+						snackbarHostState.showSnackbar(
+							message = message.asString(this@MainActivity),
+							duration = SnackbarDuration.Short,
+						)
+					when (result) {
+						SnackbarResult.ActionPerformed,
+						SnackbarResult.Dismissed,
+						-> {
+							snackbarHostState.currentSnackbarData?.dismiss()
+						}
+					}
+				}
+			}
 
-            WireguardAutoTunnelTheme {
-                LaunchedEffect(Unit) {
-                    appViewModel.setNotificationPermissionAccepted(
-                        notificationPermissionState?.status?.isGranted ?: true,
-                    )
-                    if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) appViewModel.readLogCatOutput()
-                }
+			LaunchedEffect(appUiState.requestPermissions) {
+				if (appUiState.requestPermissions) {
+					appViewModel.permissionsRequested()
+					if (notificationPermissionState != null && !notificationPermissionState.status.isGranted
+					) {
+						notificationPermissionState.launchPermissionRequest()
+						return@LaunchedEffect if (notificationPermissionState.status.shouldShowRationale || !notificationPermissionState.status.isGranted) {
+							showSnackBarMessage(
+								StringValue.StringResource(R.string.notification_permission_required),
+							)
+						} else {
+							Unit
+						}
+					}
+					if (!appUiState.vpnPermissionAccepted) {
+						return@LaunchedEffect appViewModel.vpnIntent?.let {
+							vpnActivityResultState.launch(
+								it,
+							)
+						} ?: Unit
+					}
+				}
+			}
 
-                LaunchedEffect(appUiState.snackbarMessageConsumed) {
-                    if (!appUiState.snackbarMessageConsumed) {
-                        showSnackBarMessage(StringValue.DynamicString(appUiState.snackbarMessage))
-                        appViewModel.snackbarMessageConsumed()
-                    }
-                }
+			WireguardAutoTunnelTheme {
+				LaunchedEffect(Unit) {
+					appViewModel.setNotificationPermissionAccepted(
+						notificationPermissionState?.status?.isGranted ?: true,
+					)
+				}
 
-                val focusRequester = remember { FocusRequester() }
+				LaunchedEffect(appUiState.snackbarMessageConsumed) {
+					if (!appUiState.snackbarMessageConsumed) {
+						showSnackBarMessage(StringValue.DynamicString(appUiState.snackbarMessage))
+						appViewModel.snackbarMessageConsumed()
+					}
+				}
 
-                Scaffold(
-                    snackbarHost = {
-                        SnackbarHost(snackbarHostState) { snackbarData: SnackbarData ->
-                            CustomSnackBar(
-                                snackbarData.visuals.message,
-                                isRtl = false,
-                                containerColor =
-                                MaterialTheme.colorScheme.surfaceColorAtElevation(
-                                    2.dp,
-                                ),
-                            )
-                        }
-                    },
-                    //TODO refactor
-                    modifier = Modifier
-                        .focusable()
-                        .focusProperties {
-                            when (navBackStackEntry?.destination?.route) {
-                                Screen.Lock.route -> Unit
-                                else -> up = focusRequester
-                            }
-                        },
-                    bottomBar = {
-                        BottomNavBar(
-                            navController,
-                            listOf(
-                                Screen.Main.navItem,
-                                Screen.Settings.navItem,
-                                Screen.Support.navItem,
-                            ),
-                        )
-                    },
-                ) { padding ->
-                    NavHost(
-                        navController,
-                        startDestination =
-                        (if (PinManager.pinExists()) Screen.Lock.route else Screen.Main.route),
-                        modifier =
-                        Modifier
-                            .padding(padding)
-                            .fillMaxSize(),
-                    ) {
-                        composable(
-                            Screen.Main.route,
-                        ) {
-                            MainScreen(
-                                focusRequester = focusRequester,
-                                appViewModel = appViewModel,
-                                navController = navController,
-                            )
-                        }
-                        composable(
-                            Screen.Settings.route,
-                        ) {
-                            SettingsScreen(
-                                appViewModel = appViewModel,
-                                navController = navController,
-                                focusRequester = focusRequester,
-                            )
-                        }
-                        composable(
-                            Screen.Support.route,
-                        ) {
-                            SupportScreen(
-                                focusRequester = focusRequester,
-                                appViewModel = appViewModel,
-                                navController = navController,
-                            )
-                        }
-                        composable(Screen.Support.Logs.route) {
-                            LogsScreen(appViewModel)
-                        }
-                            //TODO fix navigation for amnezia
-                        composable("${Screen.Config.route}/{id}?configType={configType}", arguments =
-                        listOf(
-                            navArgument("id") {
-                                type = NavType.StringType
-                                defaultValue = "0"
-                            },
-                            navArgument("configType") {
-                                type = NavType.StringType
-                                defaultValue = ConfigType.WIREGUARD.name
-                            }
-                        )
-                        ) {
-                            val id = it.arguments?.getString("id")
-                            val configType = ConfigType.valueOf( it.arguments?.getString("configType") ?: ConfigType.WIREGUARD.name)
-                            if (!id.isNullOrBlank()) {
-                                ConfigScreen(
-                                    navController = navController,
-                                    tunnelId = id,
-                                    appViewModel = appViewModel,
-                                    focusRequester = focusRequester,
-                                    configType = configType
-                                )
-                            }
-                        }
-                        composable("${Screen.Option.route}/{id}") {
-                            val id = it.arguments?.getString("id")
-                            if (!id.isNullOrBlank()) {
-                                OptionsScreen(
-                                    navController = navController,
-                                    tunnelId = id,
-                                    appViewModel = appViewModel,
-                                    focusRequester = focusRequester,
-                                )
-                            }
-                        }
-                        composable(Screen.Lock.route) {
-                            PinLockScreen(
-                                navController = navController,
-                                appViewModel = appViewModel,
-                            )
-                        }
-                    }
-                }
-            }
-        }
-    }
+				val focusRequester = remember { FocusRequester() }
+
+				if (showVpnPermissionDialog) {
+					InfoDialog(
+						onDismiss = { showVpnPermissionDialog = false },
+						onAttest = { showVpnPermissionDialog = false },
+						title = { Text(text = stringResource(R.string.vpn_denied_dialog_title)) },
+						body = {
+							Column(verticalArrangement = Arrangement.spacedBy(15.dp)) {
+								Text(text = stringResource(R.string.vpn_denied_dialog_message))
+								Text(text = stringResource(R.string.vpn_denied_dialog_message2))
+							}
+						},
+						confirmText = { Text(text = stringResource(R.string.okay)) },
+					)
+				}
+
+				Scaffold(
+					snackbarHost = {
+						SnackbarHost(snackbarHostState) { snackbarData: SnackbarData ->
+							CustomSnackBar(
+								snackbarData.visuals.message,
+								isRtl = false,
+								containerColor =
+								MaterialTheme.colorScheme.surfaceColorAtElevation(
+									2.dp,
+								),
+							)
+						}
+					},
+					// TODO refactor
+					modifier =
+					Modifier
+						.focusable()
+						.focusProperties {
+							when (navBackStackEntry?.destination?.route) {
+								Screen.Lock.route -> Unit
+								else -> up = focusRequester
+							}
+						},
+					bottomBar = {
+						BottomNavBar(
+							navController,
+							listOf(
+								Screen.Main.navItem,
+								Screen.Settings.navItem,
+								Screen.Support.navItem,
+							),
+						)
+					},
+				) { padding ->
+					NavHost(
+						navController,
+						startDestination = (if (isPinLockEnabled == true) Screen.Lock.route else Screen.Main.route),
+						modifier =
+						Modifier
+							.padding(padding)
+							.fillMaxSize(),
+					) {
+						composable(
+							Screen.Main.route,
+						) {
+							MainScreen(
+								focusRequester = focusRequester,
+								appViewModel = appViewModel,
+								navController = navController,
+							)
+						}
+						composable(
+							Screen.Settings.route,
+						) {
+							SettingsScreen(
+								appViewModel = appViewModel,
+								navController = navController,
+								focusRequester = focusRequester,
+							)
+						}
+						composable(
+							Screen.Support.route,
+						) {
+							SupportScreen(
+								focusRequester = focusRequester,
+								appViewModel = appViewModel,
+								navController = navController,
+							)
+						}
+						composable(Screen.Support.Logs.route) {
+							LogsScreen()
+						}
+						composable(
+							"${Screen.Config.route}/{id}?configType={configType}",
+							arguments =
+							listOf(
+								navArgument("id") {
+									type = NavType.StringType
+									defaultValue = "0"
+								},
+								navArgument("configType") {
+									type = NavType.StringType
+									defaultValue = ConfigType.WIREGUARD.name
+								},
+							),
+						) {
+							val id = it.arguments?.getString("id")
+							val configType =
+								ConfigType.valueOf(
+									it.arguments?.getString("configType") ?: ConfigType.WIREGUARD.name,
+								)
+							if (!id.isNullOrBlank()) {
+								ConfigScreen(
+									navController = navController,
+									tunnelId = id,
+									appViewModel = appViewModel,
+									focusRequester = focusRequester,
+									configType = configType,
+								)
+							}
+						}
+						composable("${Screen.Option.route}/{id}") {
+							val id = it.arguments?.getString("id")
+							if (!id.isNullOrBlank()) {
+								OptionsScreen(
+									navController = navController,
+									tunnelId = id,
+									appViewModel = appViewModel,
+									focusRequester = focusRequester,
+								)
+							}
+						}
+						composable(Screen.Lock.route) {
+							PinLockScreen(
+								navController = navController,
+								appViewModel = appViewModel,
+							)
+						}
+					}
+				}
+			}
+		}
+	}
 }

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

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

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

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

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

@@ -12,31 +12,25 @@ 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
-) {
-    TextButton(
-        onClick = onClick,
-        enabled = enabled,
-    ) {
-        Text(text, Modifier.weight(1f, false))
-        Spacer(modifier = Modifier.size(ButtonDefaults.IconSpacing))
-        Icon(
-            imageVector = icon,
-            contentDescription = icon.name,
-            modifier =
-            Modifier
-                .size(ButtonDefaults.IconSize)
-                .weight(1f, false)
-                .clickable {
-                    if (enabled) {
-                        onIconClick()
-                    }
-                },
-        )
-    }
+fun ClickableIconButton(onClick: () -> Unit, onIconClick: () -> Unit, text: String, icon: ImageVector, enabled: Boolean) {
+	TextButton(
+		onClick = onClick,
+		enabled = enabled,
+	) {
+		Text(text, Modifier.weight(1f, false))
+		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/RowListItem.kt

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

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

@@ -26,55 +26,57 @@ 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) }
+	// 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
-    }
+	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 = {
-            Icon(
-                imageVector = Icons.Rounded.Search,
-                tint = MaterialTheme.colorScheme.onBackground,
-                contentDescription = stringResource(id = R.string.search_icon),
-            )
-        },
-        trailingIcon = {
-            if (showClearIcon) {
-                IconButton(onClick = { query = "" }) {
-                    Icon(
-                        imageVector = Icons.Rounded.Clear,
-                        tint = MaterialTheme.colorScheme.onBackground,
-                        contentDescription = stringResource(id = R.string.clear_icon),
-                    )
-                }
-            }
-        },
-        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),
-    )
+	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/config/ConfigurationTextBox.kt

@@ -11,26 +11,26 @@ import androidx.compose.ui.text.input.KeyboardCapitalization
 
 @Composable
 fun ConfigurationTextBox(
-    value: String,
-    hint: String,
-    onValueChange: (String) -> Unit,
-    keyboardActions: KeyboardActions,
-    label: String,
-    modifier: Modifier
+	value: String,
+	hint: String,
+	onValueChange: (String) -> Unit,
+	keyboardActions: KeyboardActions,
+	label: String,
+	modifier: Modifier,
 ) {
-    OutlinedTextField(
-        modifier = modifier,
-        value = value,
-        singleLine = true,
-        onValueChange = { onValueChange(it) },
-        label = { Text(label) },
-        maxLines = 1,
-        placeholder = { Text(hint) },
-        keyboardOptions =
-        KeyboardOptions(
-            capitalization = KeyboardCapitalization.None,
-            imeAction = ImeAction.Done,
-        ),
-        keyboardActions = keyboardActions,
-    )
+	OutlinedTextField(
+		modifier = modifier,
+		value = value,
+		singleLine = true,
+		onValueChange = { onValueChange(it) },
+		label = { Text(label) },
+		maxLines = 1,
+		placeholder = { Text(hint) },
+		keyboardOptions =
+		KeyboardOptions(
+			capitalization = KeyboardCapitalization.None,
+			imeAction = ImeAction.Done,
+		),
+		keyboardActions = keyboardActions,
+	)
 }

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

@@ -13,32 +13,31 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.Dp
 
 @Composable
-fun ConfigurationToggle(
-    label: String,
-    enabled: Boolean,
-    checked: Boolean,
-    padding: Dp,
-    onCheckChanged: () -> Unit,
-    modifier: Modifier = Modifier
-) {
-    Row(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(padding),
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.SpaceBetween,
-    ) {
-        Text(label, textAlign = TextAlign.Start, modifier = Modifier
-            .weight(
-                weight = 1.0f,
-                fill = false,
-            ),
-            softWrap = true)
-        Switch(
-            modifier = modifier,
-            enabled = enabled,
-            checked = checked,
-            onCheckedChange = { onCheckChanged() },
-        )
-    }
+fun ConfigurationToggle(label: String, enabled: Boolean, checked: Boolean, padding: Dp, onCheckChanged: () -> Unit, modifier: Modifier = Modifier) {
+	Row(
+		modifier =
+		Modifier
+			.fillMaxWidth()
+			.padding(padding),
+		verticalAlignment = Alignment.CenterVertically,
+		horizontalArrangement = Arrangement.SpaceBetween,
+	) {
+		Text(
+			label,
+			textAlign = TextAlign.Start,
+			modifier =
+			Modifier
+				.weight(
+					weight = 1.0f,
+					fill = false,
+				),
+			softWrap = true,
+		)
+		Switch(
+			modifier = modifier,
+			enabled = enabled,
+			checked = checked,
+			onCheckedChange = { onCheckChanged() },
+		)
+	}
 }

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

@@ -0,0 +1,37 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.dialog
+
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import com.zaneschepke.wireguardautotunnel.R
+
+@Composable
+fun InfoDialog(
+	onAttest: () -> Unit,
+	onDismiss: () -> Unit,
+	title: @Composable () -> Unit,
+	body: @Composable () -> Unit,
+	confirmText: @Composable () -> Unit,
+) {
+	AlertDialog(
+		onDismissRequest = { onDismiss() },
+		confirmButton = {
+			TextButton(
+				onClick = {
+					onAttest()
+				},
+			) {
+				confirmText()
+			}
+		},
+		dismissButton = {
+			TextButton(onClick = { onDismiss() }) {
+				Text(text = stringResource(R.string.cancel))
+			}
+		},
+		title = { title() },
+		text = { body() },
+	)
+}

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

@@ -18,39 +18,42 @@ import com.zaneschepke.wireguardautotunnel.ui.Screen
 
 @Composable
 fun BottomNavBar(navController: NavController, bottomNavItems: List<BottomNavItem>) {
-    val backStackEntry = navController.currentBackStackEntryAsState()
+	val backStackEntry = navController.currentBackStackEntryAsState()
 
-    var showBottomBar by rememberSaveable { mutableStateOf(true) }
-    val navBackStackEntry by navController.currentBackStackEntryAsState()
+	var showBottomBar by rememberSaveable { mutableStateOf(true) }
+	val navBackStackEntry by navController.currentBackStackEntryAsState()
 
-    //TODO find a better way to hide nav bar
-    showBottomBar = when (navBackStackEntry?.destination?.route) {
-        Screen.Lock.route -> false
-        else -> true
-    }
+	// TODO find a better way to hide nav bar
+	showBottomBar =
+		when (navBackStackEntry?.destination?.route) {
+			Screen.Lock.route -> false
+			else -> true
+		}
 
-    NavigationBar(
-        containerColor = if (!showBottomBar) Color.Transparent else MaterialTheme.colorScheme.background,
-    ) {
-        if (showBottomBar) bottomNavItems.forEach { item ->
-            val selected = item.route == backStackEntry.value?.destination?.route
+	NavigationBar(
+		containerColor = if (!showBottomBar) Color.Transparent else MaterialTheme.colorScheme.background,
+	) {
+		if (showBottomBar) {
+			bottomNavItems.forEach { item ->
+				val selected = item.route == backStackEntry.value?.destination?.route
 
-            NavigationBarItem(
-                selected = selected,
-                onClick = { navController.navigate(item.route) },
-                label = {
-                    Text(
-                        text = item.name,
-                        fontWeight = FontWeight.SemiBold,
-                    )
-                },
-                icon = {
-                    Icon(
-                        imageVector = item.icon,
-                        contentDescription = "${item.name} Icon",
-                    )
-                },
-            )
-        }
-    }
+				NavigationBarItem(
+					selected = selected,
+					onClick = { navController.navigate(item.route) },
+					label = {
+						Text(
+							text = item.name,
+							fontWeight = FontWeight.SemiBold,
+						)
+					},
+					icon = {
+						Icon(
+							imageVector = item.icon,
+							contentDescription = "${item.name} Icon",
+						)
+					},
+				)
+			}
+		}
+	}
 }

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

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

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

@@ -12,78 +12,77 @@ import androidx.fragment.app.FragmentActivity
 
 @Composable
 fun AuthorizationPrompt(onSuccess: () -> Unit, onFailure: () -> Unit, onError: (String) -> Unit) {
-    val context = LocalContext.current
-    val biometricManager = BiometricManager.from(context)
-    val bio = biometricManager.canAuthenticate(BIOMETRIC_WEAK or DEVICE_CREDENTIAL)
-    val isBiometricAvailable = remember {
-        when (bio) {
-            BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE -> {
-                onError("Biometrics not available")
-                false
-            }
+	val context = LocalContext.current
+	val biometricManager = BiometricManager.from(context)
+	val bio = biometricManager.canAuthenticate(BIOMETRIC_WEAK or DEVICE_CREDENTIAL)
+	val isBiometricAvailable =
+		remember {
+			when (bio) {
+				BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE -> {
+					onError("Biometrics not available")
+					false
+				}
 
-            BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED -> {
-                onError("Biometrics not created")
-                false
-            }
+				BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED -> {
+					onError("Biometrics not created")
+					false
+				}
 
-            BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE -> {
-                onError("Biometric hardware not found")
-                false
-            }
+				BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE -> {
+					onError("Biometric hardware not found")
+					false
+				}
 
-            BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED -> {
-                onError("Biometric security update required")
-                false
-            }
+				BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED -> {
+					onError("Biometric security update required")
+					false
+				}
 
-            BiometricManager.BIOMETRIC_ERROR_UNSUPPORTED -> {
-                onError("Biometrics not supported")
-                false
-            }
+				BiometricManager.BIOMETRIC_ERROR_UNSUPPORTED -> {
+					onError("Biometrics not supported")
+					false
+				}
 
-            BiometricManager.BIOMETRIC_STATUS_UNKNOWN -> {
-                onError("Biometrics status unknown")
-                false
-            }
+				BiometricManager.BIOMETRIC_STATUS_UNKNOWN -> {
+					onError("Biometrics status unknown")
+					false
+				}
 
-            BiometricManager.BIOMETRIC_SUCCESS -> true
-            else -> false
-        }
-    }
-    if (isBiometricAvailable) {
-        val executor = remember { ContextCompat.getMainExecutor(context) }
+				BiometricManager.BIOMETRIC_SUCCESS -> true
+				else -> false
+			}
+		}
+	if (isBiometricAvailable) {
+		val executor = remember { ContextCompat.getMainExecutor(context) }
 
-        val promptInfo =
-            BiometricPrompt.PromptInfo.Builder()
-                .setAllowedAuthenticators(BIOMETRIC_WEAK or DEVICE_CREDENTIAL)
-                .setTitle("Biometric Authentication")
-                .setSubtitle("Log in using your biometric credential")
-                .build()
+		val promptInfo =
+			BiometricPrompt.PromptInfo.Builder()
+				.setAllowedAuthenticators(BIOMETRIC_WEAK or DEVICE_CREDENTIAL)
+				.setTitle("Biometric Authentication")
+				.setSubtitle("Log in using your biometric credential")
+				.build()
 
-        val biometricPrompt =
-            BiometricPrompt(
-                context as FragmentActivity,
-                executor,
-                object : BiometricPrompt.AuthenticationCallback() {
-                    override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
-                        super.onAuthenticationError(errorCode, errString)
-                        onFailure()
-                    }
+		val biometricPrompt =
+			BiometricPrompt(
+				context as FragmentActivity,
+				executor,
+				object : BiometricPrompt.AuthenticationCallback() {
+					override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
+						super.onAuthenticationError(errorCode, errString)
+						onFailure()
+					}
 
-                    override fun onAuthenticationSucceeded(
-                        result: BiometricPrompt.AuthenticationResult
-                    ) {
-                        super.onAuthenticationSucceeded(result)
-                        onSuccess()
-                    }
+					override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
+						super.onAuthenticationSucceeded(result)
+						onSuccess()
+					}
 
-                    override fun onAuthenticationFailed() {
-                        super.onAuthenticationFailed()
-                        onFailure()
-                    }
-                },
-            )
-        biometricPrompt.authenticate(promptInfo)
-    }
+					override fun onAuthenticationFailed() {
+						super.onAuthenticationFailed()
+						onFailure()
+					}
+				},
+			)
+		biometricPrompt.authenticate(promptInfo)
+	}
 }

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

@@ -25,40 +25,37 @@ import androidx.compose.ui.unit.dp
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 
 @Composable
-fun CustomSnackBar(
-    message: String,
-    isRtl: Boolean = true,
-    containerColor: Color = MaterialTheme.colorScheme.surface
-) {
-    Snackbar(
-        containerColor = containerColor,
-        modifier =
-        Modifier
-            .fillMaxWidth(
-                if (WireGuardAutoTunnel.isRunningOnAndroidTv()) 1 / 3f else 2 / 3f,
-            )
-            .padding(bottom = 100.dp),
-        shape = RoundedCornerShape(16.dp),
-    ) {
-        CompositionLocalProvider(
-            LocalLayoutDirection provides if (isRtl) LayoutDirection.Rtl else LayoutDirection.Ltr,
-        ) {
-            Row(
-                modifier = Modifier
-                    .width(IntrinsicSize.Max)
-                    .height(IntrinsicSize.Min),
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.Start,
-            ) {
-                val icon = Icons.Rounded.Info
-                Icon(
-                    icon,
-                    contentDescription = icon.name,
-                    tint = Color.White,
-                    modifier = Modifier.padding(end = 10.dp),
-                )
-                Text(message, color = Color.White, modifier = Modifier.padding(end = 5.dp))
-            }
-        }
-    }
+fun CustomSnackBar(message: String, isRtl: Boolean = true, containerColor: Color = MaterialTheme.colorScheme.surface) {
+	Snackbar(
+		containerColor = containerColor,
+		modifier =
+		Modifier
+			.fillMaxWidth(
+				if (WireGuardAutoTunnel.isRunningOnAndroidTv()) 1 / 3f else 2 / 3f,
+			)
+			.padding(bottom = 100.dp),
+		shape = RoundedCornerShape(16.dp),
+	) {
+		CompositionLocalProvider(
+			LocalLayoutDirection provides if (isRtl) LayoutDirection.Rtl else LayoutDirection.Ltr,
+		) {
+			Row(
+				modifier =
+				Modifier
+					.width(IntrinsicSize.Max)
+					.height(IntrinsicSize.Min),
+				verticalAlignment = Alignment.CenterVertically,
+				horizontalArrangement = Arrangement.Start,
+			) {
+				val icon = Icons.Rounded.Info
+				Icon(
+					icon,
+					contentDescription = icon.name,
+					tint = Color.White,
+					modifier = Modifier.padding(end = 10.dp),
+				)
+				Text(message, color = Color.White, modifier = Modifier.padding(end = 5.dp))
+			}
+		}
+	}
 }

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

@@ -13,14 +13,15 @@ import androidx.compose.ui.unit.dp
 
 @Composable
 fun LoadingScreen() {
-    Column(
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Top,
-        modifier = Modifier
-            .fillMaxSize()
-            .focusable()
-            .padding(),
-    ) {
-        Column(modifier = Modifier.padding(120.dp)) { CircularProgressIndicator() }
-    }
+	Column(
+		horizontalAlignment = Alignment.CenterHorizontally,
+		verticalArrangement = Arrangement.Top,
+		modifier =
+		Modifier
+			.fillMaxSize()
+			.focusable()
+			.padding(),
+	) {
+		Column(modifier = Modifier.padding(120.dp)) { CircularProgressIndicator() }
+	}
 }

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

@@ -13,13 +13,14 @@ import androidx.compose.ui.unit.dp
 
 @Composable
 fun LogTypeLabel(color: Color, content: @Composable () -> Unit) {
-    Box(
-        modifier = Modifier
-            .size(20.dp)
-            .clip(RoundedCornerShape(2.dp))
-            .background(color),
-        contentAlignment = Alignment.Center,
-    ) {
-        content()
-    }
+	Box(
+		modifier =
+		Modifier
+			.size(20.dp)
+			.clip(RoundedCornerShape(2.dp))
+			.background(color),
+		contentAlignment = Alignment.Center,
+	) {
+		content()
+	}
 }

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

@@ -13,10 +13,10 @@ import androidx.compose.ui.unit.sp
 
 @Composable
 fun SectionTitle(title: String, padding: Dp) {
-    Text(
-        title,
-        textAlign = TextAlign.Start,
-        style = TextStyle(fontSize = 18.sp, fontWeight = FontWeight.ExtraBold),
-        modifier = Modifier.padding(padding, bottom = 5.dp, top = 5.dp),
-    )
+	Text(
+		title,
+		textAlign = TextAlign.Start,
+		style = TextStyle(fontSize = 18.sp, fontWeight = FontWeight.ExtraBold),
+		modifier = Modifier.padding(padding, bottom = 5.dp, top = 5.dp),
+	)
 }

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

@@ -7,66 +7,67 @@ import com.zaneschepke.wireguardautotunnel.ui.screens.config.model.PeerProxy
 import com.zaneschepke.wireguardautotunnel.util.Packages
 
 data class ConfigUiState(
-    val proxyPeers: List<PeerProxy> = arrayListOf(PeerProxy()),
-    val interfaceProxy: InterfaceProxy = InterfaceProxy(),
-    val packages: Packages = emptyList(),
-    val checkedPackageNames: List<String> = emptyList(),
-    val include: Boolean = true,
-    val isAllApplicationsEnabled: Boolean = false,
-    val loading: Boolean = true,
-    val tunnel: TunnelConfig? = null,
-    val tunnelName: String = "",
-    val isAmneziaEnabled: Boolean = false
+	val proxyPeers: List<PeerProxy> = arrayListOf(PeerProxy()),
+	val interfaceProxy: InterfaceProxy = InterfaceProxy(),
+	val packages: Packages = emptyList(),
+	val checkedPackageNames: List<String> = emptyList(),
+	val include: Boolean = true,
+	val isAllApplicationsEnabled: Boolean = false,
+	val loading: Boolean = true,
+	val tunnel: TunnelConfig? = null,
+	val tunnelName: String = "",
+	val isAmneziaEnabled: Boolean = false,
 ) {
-    companion object {
-        fun from(config : Config) : ConfigUiState {
-            val proxyPeers = config.peers.map { PeerProxy.from(it) }
-            val proxyInterface = InterfaceProxy.from(config.`interface`)
-            var include = true
-            var isAllApplicationsEnabled = false
-            val checkedPackages =
-                if (config.`interface`.includedApplications.isNotEmpty()) {
-                    config.`interface`.includedApplications
-                } else if (config.`interface`.excludedApplications.isNotEmpty()) {
-                    include = false
-                    config.`interface`.excludedApplications
-                } else {
-                    isAllApplicationsEnabled = true
-                    emptySet()
-                }
-            return ConfigUiState(
-                proxyPeers,
-                proxyInterface,
-                emptyList(),
-                checkedPackages.toList(),
-                include,
-                isAllApplicationsEnabled,
-            )
-        }
-        fun from(config: org.amnezia.awg.config.Config) : ConfigUiState {
-            //TODO update with new values
-            val proxyPeers = config.peers.map { PeerProxy.from(it) }
-            val proxyInterface = InterfaceProxy.from(config.`interface`)
-            var include = true
-            var isAllApplicationsEnabled = false
-            val checkedPackages =
-                if (config.`interface`.includedApplications.isNotEmpty()) {
-                    config.`interface`.includedApplications
-                } else if (config.`interface`.excludedApplications.isNotEmpty()) {
-                    include = false
-                    config.`interface`.excludedApplications
-                } else {
-                    isAllApplicationsEnabled = true
-                    emptySet()
-                }
-            return ConfigUiState(
-                proxyPeers,
-                proxyInterface,
-                emptyList(),
-                checkedPackages.toList(),
-                include,
-                isAllApplicationsEnabled,
-            )
-        }
-    }
+	companion object {
+		fun from(config: Config): ConfigUiState {
+			val proxyPeers = config.peers.map { PeerProxy.from(it) }
+			val proxyInterface = InterfaceProxy.from(config.`interface`)
+			var include = true
+			var isAllApplicationsEnabled = false
+			val checkedPackages =
+				if (config.`interface`.includedApplications.isNotEmpty()) {
+					config.`interface`.includedApplications
+				} else if (config.`interface`.excludedApplications.isNotEmpty()) {
+					include = false
+					config.`interface`.excludedApplications
+				} else {
+					isAllApplicationsEnabled = true
+					emptySet()
+				}
+			return ConfigUiState(
+				proxyPeers,
+				proxyInterface,
+				emptyList(),
+				checkedPackages.toList(),
+				include,
+				isAllApplicationsEnabled,
+			)
+		}
+
+		fun from(config: org.amnezia.awg.config.Config): ConfigUiState {
+			// TODO update with new values
+			val proxyPeers = config.peers.map { PeerProxy.from(it) }
+			val proxyInterface = InterfaceProxy.from(config.`interface`)
+			var include = true
+			var isAllApplicationsEnabled = false
+			val checkedPackages =
+				if (config.`interface`.includedApplications.isNotEmpty()) {
+					config.`interface`.includedApplications
+				} else if (config.`interface`.excludedApplications.isNotEmpty()) {
+					include = false
+					config.`interface`.excludedApplications
+				} else {
+					isAllApplicationsEnabled = true
+					emptySet()
+				}
+			return ConfigUiState(
+				proxyPeers,
+				proxyInterface,
+				emptyList(),
+				checkedPackages.toList(),
+				include,
+				isAllApplicationsEnabled,
+			)
+		}
+	}
 }

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

@@ -16,6 +16,7 @@ import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.ui.screens.config.model.PeerProxy
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.ConfigType
 import com.zaneschepke.wireguardautotunnel.util.Constants
@@ -25,7 +26,7 @@ import com.zaneschepke.wireguardautotunnel.util.WgTunnelExceptions
 import com.zaneschepke.wireguardautotunnel.util.removeAt
 import com.zaneschepke.wireguardautotunnel.util.update
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
@@ -37,464 +38,529 @@ import javax.inject.Inject
 class ConfigViewModel
 @Inject
 constructor(
-    private val settingsRepository: SettingsRepository,
-    private val appDataRepository: AppDataRepository
+	private val settingsRepository: SettingsRepository,
+	private val appDataRepository: AppDataRepository,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : ViewModel() {
+	private val packageManager = WireGuardAutoTunnel.instance.packageManager
 
-    private val packageManager = WireGuardAutoTunnel.instance.packageManager
+	private val _uiState = MutableStateFlow(ConfigUiState())
+	val uiState = _uiState.asStateFlow()
 
-    private val _uiState = MutableStateFlow(ConfigUiState())
-    val uiState = _uiState.asStateFlow()
+	fun init(tunnelId: String) = viewModelScope.launch(ioDispatcher) {
+		val packages = getQueriedPackages("")
+		val state =
+			if (tunnelId != Constants.MANUAL_TUNNEL_CONFIG_ID) {
+				val tunnelConfig =
+					appDataRepository.tunnels.getAll()
+						.firstOrNull { it.id.toString() == tunnelId }
+				val isAmneziaEnabled = settingsRepository.getSettings().isAmneziaEnabled
+				if (tunnelConfig != null) {
+					(
+						if (isAmneziaEnabled) {
+							val amConfig =
+								if (tunnelConfig.amQuick == "") tunnelConfig.wgQuick else tunnelConfig.amQuick
+							ConfigUiState.from(TunnelConfig.configFromAmQuick(amConfig))
+						} else {
+							ConfigUiState.from(
+								TunnelConfig.configFromWgQuick(tunnelConfig.wgQuick),
+							)
+						}
+						).copy(
+						packages = packages,
+						loading = false,
+						tunnel = tunnelConfig,
+						tunnelName = tunnelConfig.name,
+						isAmneziaEnabled = isAmneziaEnabled,
+					)
+				} else {
+					ConfigUiState(loading = false, packages = packages)
+				}
+			} else {
+				ConfigUiState(loading = false, packages = packages)
+			}
+		_uiState.value = state
+	}
 
-    fun init(tunnelId: String) =
-        viewModelScope.launch(Dispatchers.IO) {
-            val packages = getQueriedPackages("")
-            val state =
-                if (tunnelId != Constants.MANUAL_TUNNEL_CONFIG_ID) {
-                    val tunnelConfig =
-                        appDataRepository.tunnels.getAll()
-                            .firstOrNull { it.id.toString() == tunnelId }
-                    val isAmneziaEnabled = settingsRepository.getSettings().isAmneziaEnabled
-                    if (tunnelConfig != null) {
-                        (if(isAmneziaEnabled) {
-                            val amConfig = if(tunnelConfig.amQuick == "") tunnelConfig.wgQuick else tunnelConfig.amQuick
-                            ConfigUiState.from(TunnelConfig.configFromAmQuick(amConfig))
-                        } else ConfigUiState.from(TunnelConfig.configFromWgQuick(tunnelConfig.wgQuick))).copy(
-                            packages = packages,
-                            loading = false,
-                            tunnel = tunnelConfig,
-                            tunnelName = tunnelConfig.name,
-                            isAmneziaEnabled = isAmneziaEnabled
-                        )
-                    } else {
-                        ConfigUiState(loading = false, packages = packages)
-                    }
-                } else {
-                    ConfigUiState(loading = false, packages = packages)
-                }
-            _uiState.value = state
-        }
+	fun onTunnelNameChange(name: String) {
+		_uiState.value = _uiState.value.copy(tunnelName = name)
+	}
 
-    fun onTunnelNameChange(name: String) {
-        _uiState.value = _uiState.value.copy(tunnelName = name)
-    }
+	fun onIncludeChange(include: Boolean) {
+		_uiState.value = _uiState.value.copy(include = include)
+	}
 
-    fun onIncludeChange(include: Boolean) {
-        _uiState.value = _uiState.value.copy(include = include)
-    }
+	fun onAddCheckedPackage(packageName: String) {
+		_uiState.value =
+			_uiState.value.copy(
+				checkedPackageNames = _uiState.value.checkedPackageNames + packageName,
+			)
+	}
 
-    fun onAddCheckedPackage(packageName: String) {
-        _uiState.value =
-            _uiState.value.copy(
-                checkedPackageNames = _uiState.value.checkedPackageNames + packageName,
-            )
-    }
+	fun onAllApplicationsChange(isAllApplicationsEnabled: Boolean) {
+		_uiState.value = _uiState.value.copy(isAllApplicationsEnabled = isAllApplicationsEnabled)
+	}
 
-    fun onAllApplicationsChange(isAllApplicationsEnabled: Boolean) {
-        _uiState.value = _uiState.value.copy(isAllApplicationsEnabled = isAllApplicationsEnabled)
-    }
+	fun onRemoveCheckedPackage(packageName: String) {
+		_uiState.value =
+			_uiState.value.copy(
+				checkedPackageNames = _uiState.value.checkedPackageNames - packageName,
+			)
+	}
 
-    fun onRemoveCheckedPackage(packageName: String) {
-        _uiState.value =
-            _uiState.value.copy(
-                checkedPackageNames = _uiState.value.checkedPackageNames - packageName,
-            )
-    }
+	private fun getQueriedPackages(query: String): List<PackageInfo> {
+		return getAllInternetCapablePackages().filter {
+			getPackageLabel(it).lowercase().contains(query.lowercase())
+		}
+	}
 
-    private fun getQueriedPackages(query: String): List<PackageInfo> {
-        return getAllInternetCapablePackages().filter {
-            getPackageLabel(it).lowercase().contains(query.lowercase())
-        }
-    }
+	fun getPackageLabel(packageInfo: PackageInfo): String {
+		return packageInfo.applicationInfo?.loadLabel(packageManager).toString()
+	}
 
-    fun getPackageLabel(packageInfo: PackageInfo): String {
-        return packageInfo.applicationInfo.loadLabel(packageManager).toString()
-    }
+	private fun getAllInternetCapablePackages(): List<PackageInfo> {
+		return getPackagesHoldingPermissions(arrayOf(Manifest.permission.INTERNET))
+	}
 
-    private fun getAllInternetCapablePackages(): List<PackageInfo> {
-        return getPackagesHoldingPermissions(arrayOf(Manifest.permission.INTERNET))
-    }
+	private fun getPackagesHoldingPermissions(permissions: Array<String>): List<PackageInfo> {
+		return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+			packageManager.getPackagesHoldingPermissions(
+				permissions,
+				PackageManager.PackageInfoFlags.of(0L),
+			)
+		} else {
+			packageManager.getPackagesHoldingPermissions(permissions, 0)
+		}
+	}
 
-    private fun getPackagesHoldingPermissions(permissions: Array<String>): List<PackageInfo> {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            packageManager.getPackagesHoldingPermissions(
-                permissions,
-                PackageManager.PackageInfoFlags.of(0L),
-            )
-        } else {
-            packageManager.getPackagesHoldingPermissions(permissions, 0)
-        }
-    }
+	private fun isAllApplicationsEnabled(): Boolean {
+		return _uiState.value.isAllApplicationsEnabled
+	}
 
-    private fun isAllApplicationsEnabled(): Boolean {
-        return _uiState.value.isAllApplicationsEnabled
-    }
+	private fun saveConfig(tunnelConfig: TunnelConfig) = viewModelScope.launch { appDataRepository.tunnels.save(tunnelConfig) }
 
-    private fun saveConfig(tunnelConfig: TunnelConfig) =
-        viewModelScope.launch { appDataRepository.tunnels.save(tunnelConfig) }
+	private fun updateTunnelConfig(tunnelConfig: TunnelConfig?) = viewModelScope.launch {
+		if (tunnelConfig != null) {
+			saveConfig(tunnelConfig).join()
+			WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
+		}
+	}
 
-    private fun updateTunnelConfig(tunnelConfig: TunnelConfig?) =
-        viewModelScope.launch {
-            if (tunnelConfig != null) {
-                saveConfig(tunnelConfig).join()
-                WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
-            }
-        }
+	private fun buildPeerListFromProxyPeers(): List<Peer> {
+		return _uiState.value.proxyPeers.map {
+			val builder = Peer.Builder()
+			if (it.allowedIps.isNotEmpty()) builder.parseAllowedIPs(it.allowedIps.trim())
+			if (it.publicKey.isNotEmpty()) builder.parsePublicKey(it.publicKey.trim())
+			if (it.preSharedKey.isNotEmpty()) builder.parsePreSharedKey(it.preSharedKey.trim())
+			if (it.endpoint.isNotEmpty()) builder.parseEndpoint(it.endpoint.trim())
+			if (it.persistentKeepalive.isNotEmpty()) {
+				builder.parsePersistentKeepalive(it.persistentKeepalive.trim())
+			}
+			builder.build()
+		}
+	}
 
-    private fun buildPeerListFromProxyPeers(): List<Peer> {
-        return _uiState.value.proxyPeers.map {
-            val builder = Peer.Builder()
-            if (it.allowedIps.isNotEmpty()) builder.parseAllowedIPs(it.allowedIps.trim())
-            if (it.publicKey.isNotEmpty()) builder.parsePublicKey(it.publicKey.trim())
-            if (it.preSharedKey.isNotEmpty()) builder.parsePreSharedKey(it.preSharedKey.trim())
-            if (it.endpoint.isNotEmpty()) builder.parseEndpoint(it.endpoint.trim())
-            if (it.persistentKeepalive.isNotEmpty()) {
-                builder.parsePersistentKeepalive(it.persistentKeepalive.trim())
-            }
-            builder.build()
-        }
-    }
+	private fun buildAmPeerListFromProxyPeers(): List<org.amnezia.awg.config.Peer> {
+		return _uiState.value.proxyPeers.map {
+			val builder = org.amnezia.awg.config.Peer.Builder()
+			if (it.allowedIps.isNotEmpty()) builder.parseAllowedIPs(it.allowedIps.trim())
+			if (it.publicKey.isNotEmpty()) builder.parsePublicKey(it.publicKey.trim())
+			if (it.preSharedKey.isNotEmpty()) builder.parsePreSharedKey(it.preSharedKey.trim())
+			if (it.endpoint.isNotEmpty()) builder.parseEndpoint(it.endpoint.trim())
+			if (it.persistentKeepalive.isNotEmpty()) {
+				builder.parsePersistentKeepalive(it.persistentKeepalive.trim())
+			}
+			builder.build()
+		}
+	}
 
-    private fun buildAmPeerListFromProxyPeers(): List<org.amnezia.awg.config.Peer> {
-        return _uiState.value.proxyPeers.map {
-            val builder = org.amnezia.awg.config.Peer.Builder()
-            if (it.allowedIps.isNotEmpty()) builder.parseAllowedIPs(it.allowedIps.trim())
-            if (it.publicKey.isNotEmpty()) builder.parsePublicKey(it.publicKey.trim())
-            if (it.preSharedKey.isNotEmpty()) builder.parsePreSharedKey(it.preSharedKey.trim())
-            if (it.endpoint.isNotEmpty()) builder.parseEndpoint(it.endpoint.trim())
-            if (it.persistentKeepalive.isNotEmpty()) {
-                builder.parsePersistentKeepalive(it.persistentKeepalive.trim())
-            }
-            builder.build()
-        }
-    }
+	private fun emptyCheckedPackagesList() {
+		_uiState.value = _uiState.value.copy(checkedPackageNames = emptyList())
+	}
 
-    private fun emptyCheckedPackagesList() {
-        _uiState.value = _uiState.value.copy(checkedPackageNames = emptyList())
-    }
+	private fun buildInterfaceListFromProxyInterface(): Interface {
+		val builder = Interface.Builder()
+		builder.parsePrivateKey(_uiState.value.interfaceProxy.privateKey.trim())
+		builder.parseAddresses(_uiState.value.interfaceProxy.addresses.trim())
+		if (_uiState.value.interfaceProxy.dnsServers.isNotEmpty()) {
+			builder.parseDnsServers(_uiState.value.interfaceProxy.dnsServers.trim())
+		}
+		if (_uiState.value.interfaceProxy.mtu.isNotEmpty()) {
+			builder.parseMtu(_uiState.value.interfaceProxy.mtu.trim())
+		}
+		if (_uiState.value.interfaceProxy.listenPort.isNotEmpty()) {
+			builder.parseListenPort(_uiState.value.interfaceProxy.listenPort.trim())
+		}
+		if (isAllApplicationsEnabled()) emptyCheckedPackagesList()
+		if (_uiState.value.include) {
+			builder.includeApplications(
+				_uiState.value.checkedPackageNames,
+			)
+		}
+		if (!_uiState.value.include) {
+			builder.excludeApplications(
+				_uiState.value.checkedPackageNames,
+			)
+		}
+		return builder.build()
+	}
 
-    private fun buildInterfaceListFromProxyInterface(): Interface {
-        val builder = Interface.Builder()
-        builder.parsePrivateKey(_uiState.value.interfaceProxy.privateKey.trim())
-        builder.parseAddresses(_uiState.value.interfaceProxy.addresses.trim())
-        if (_uiState.value.interfaceProxy.dnsServers.isNotEmpty()) {
-            builder.parseDnsServers(_uiState.value.interfaceProxy.dnsServers.trim())
-        }
-        if (_uiState.value.interfaceProxy.mtu.isNotEmpty())
-            builder.parseMtu(_uiState.value.interfaceProxy.mtu.trim())
-        if (_uiState.value.interfaceProxy.listenPort.isNotEmpty()) {
-            builder.parseListenPort(_uiState.value.interfaceProxy.listenPort.trim())
-        }
-        if (isAllApplicationsEnabled()) emptyCheckedPackagesList()
-        if (_uiState.value.include) builder.includeApplications(_uiState.value.checkedPackageNames)
-        if (!_uiState.value.include) builder.excludeApplications(_uiState.value.checkedPackageNames)
-        return builder.build()
-    }
+	private fun buildAmInterfaceListFromProxyInterface(): org.amnezia.awg.config.Interface {
+		val builder = org.amnezia.awg.config.Interface.Builder()
+		builder.parsePrivateKey(_uiState.value.interfaceProxy.privateKey.trim())
+		builder.parseAddresses(_uiState.value.interfaceProxy.addresses.trim())
+		if (_uiState.value.interfaceProxy.dnsServers.isNotEmpty()) {
+			builder.parseDnsServers(_uiState.value.interfaceProxy.dnsServers.trim())
+		}
+		if (_uiState.value.interfaceProxy.mtu.isNotEmpty()) {
+			builder.parseMtu(_uiState.value.interfaceProxy.mtu.trim())
+		}
+		if (_uiState.value.interfaceProxy.listenPort.isNotEmpty()) {
+			builder.parseListenPort(_uiState.value.interfaceProxy.listenPort.trim())
+		}
+		if (isAllApplicationsEnabled()) emptyCheckedPackagesList()
+		if (_uiState.value.include) {
+			builder.includeApplications(
+				_uiState.value.checkedPackageNames,
+			)
+		}
+		if (!_uiState.value.include) {
+			builder.excludeApplications(
+				_uiState.value.checkedPackageNames,
+			)
+		}
+		if (_uiState.value.interfaceProxy.junkPacketCount.isNotEmpty()) {
+			builder.setJunkPacketCount(
+				_uiState.value.interfaceProxy.junkPacketCount.trim().toInt(),
+			)
+		}
+		if (_uiState.value.interfaceProxy.junkPacketMinSize.isNotEmpty()) {
+			builder.setJunkPacketMinSize(
+				_uiState.value.interfaceProxy.junkPacketMinSize.trim().toInt(),
+			)
+		}
+		if (_uiState.value.interfaceProxy.junkPacketMaxSize.isNotEmpty()) {
+			builder.setJunkPacketMaxSize(
+				_uiState.value.interfaceProxy.junkPacketMaxSize.trim().toInt(),
+			)
+		}
+		if (_uiState.value.interfaceProxy.initPacketJunkSize.isNotEmpty()) {
+			builder.setInitPacketJunkSize(
+				_uiState.value.interfaceProxy.initPacketJunkSize.trim().toInt(),
+			)
+		}
+		if (_uiState.value.interfaceProxy.responsePacketJunkSize.isNotEmpty()) {
+			builder.setResponsePacketJunkSize(
+				_uiState.value.interfaceProxy.responsePacketJunkSize.trim().toInt(),
+			)
+		}
+		if (_uiState.value.interfaceProxy.initPacketMagicHeader.isNotEmpty()) {
+			builder.setInitPacketMagicHeader(
+				_uiState.value.interfaceProxy.initPacketMagicHeader.trim().toLong(),
+			)
+		}
+		if (_uiState.value.interfaceProxy.responsePacketMagicHeader.isNotEmpty()) {
+			builder.setResponsePacketMagicHeader(
+				_uiState.value.interfaceProxy.responsePacketMagicHeader.trim().toLong(),
+			)
+		}
+		if (_uiState.value.interfaceProxy.transportPacketMagicHeader.isNotEmpty()) {
+			builder.setTransportPacketMagicHeader(
+				_uiState.value.interfaceProxy.transportPacketMagicHeader.trim().toLong(),
+			)
+		}
+		if (_uiState.value.interfaceProxy.underloadPacketMagicHeader.isNotEmpty()) {
+			builder.setUnderloadPacketMagicHeader(
+				_uiState.value.interfaceProxy.underloadPacketMagicHeader.trim().toLong(),
+			)
+		}
+		return builder.build()
+	}
 
-    private fun buildAmInterfaceListFromProxyInterface(): org.amnezia.awg.config.Interface {
-        val builder = org.amnezia.awg.config.Interface.Builder()
-        builder.parsePrivateKey(_uiState.value.interfaceProxy.privateKey.trim())
-        builder.parseAddresses(_uiState.value.interfaceProxy.addresses.trim())
-        if (_uiState.value.interfaceProxy.dnsServers.isNotEmpty()) {
-            builder.parseDnsServers(_uiState.value.interfaceProxy.dnsServers.trim())
-        }
-        if (_uiState.value.interfaceProxy.mtu.isNotEmpty())
-            builder.parseMtu(_uiState.value.interfaceProxy.mtu.trim())
-        if (_uiState.value.interfaceProxy.listenPort.isNotEmpty()) {
-            builder.parseListenPort(_uiState.value.interfaceProxy.listenPort.trim())
-        }
-        if (isAllApplicationsEnabled()) emptyCheckedPackagesList()
-        if (_uiState.value.include) builder.includeApplications(_uiState.value.checkedPackageNames)
-        if (!_uiState.value.include) builder.excludeApplications(_uiState.value.checkedPackageNames)
-        if(_uiState.value.interfaceProxy.junkPacketCount.isNotEmpty()) {
-            builder.setJunkPacketCount(_uiState.value.interfaceProxy.junkPacketCount.trim().toInt())
-        }
-        if(_uiState.value.interfaceProxy.junkPacketMinSize.isNotEmpty()) {
-            builder.setJunkPacketMinSize(_uiState.value.interfaceProxy.junkPacketMinSize.trim().toInt())
-        }
-        if(_uiState.value.interfaceProxy.junkPacketMaxSize.isNotEmpty()) {
-            builder.setJunkPacketMaxSize(_uiState.value.interfaceProxy.junkPacketMaxSize.trim().toInt())
-        }
-        if(_uiState.value.interfaceProxy.initPacketJunkSize.isNotEmpty()) {
-            builder.setInitPacketJunkSize(_uiState.value.interfaceProxy.initPacketJunkSize.trim().toInt())
-        }
-        if(_uiState.value.interfaceProxy.responsePacketJunkSize.isNotEmpty()) {
-            builder.setResponsePacketJunkSize(_uiState.value.interfaceProxy.responsePacketJunkSize.trim().toInt())
-        }
-        if(_uiState.value.interfaceProxy.initPacketMagicHeader.isNotEmpty()) {
-            builder.setInitPacketMagicHeader(_uiState.value.interfaceProxy.initPacketMagicHeader.trim().toLong())
-        }
-        if(_uiState.value.interfaceProxy.responsePacketMagicHeader.isNotEmpty()) {
-            builder.setResponsePacketMagicHeader(_uiState.value.interfaceProxy.responsePacketMagicHeader.trim().toLong())
-        }
-        if(_uiState.value.interfaceProxy.transportPacketMagicHeader.isNotEmpty()) {
-            builder.setTransportPacketMagicHeader(_uiState.value.interfaceProxy.transportPacketMagicHeader.trim().toLong())
-        }
-        if(_uiState.value.interfaceProxy.underloadPacketMagicHeader.isNotEmpty()) {
-            builder.setUnderloadPacketMagicHeader(_uiState.value.interfaceProxy.underloadPacketMagicHeader.trim().toLong())
-        }
-        return builder.build()
-    }
+	private fun buildConfig(): Config {
+		val peerList = buildPeerListFromProxyPeers()
+		val wgInterface = buildInterfaceListFromProxyInterface()
+		return Config.Builder().addPeers(peerList).setInterface(wgInterface).build()
+	}
 
-    private fun buildConfig() : Config {
-        val peerList = buildPeerListFromProxyPeers()
-        val wgInterface = buildInterfaceListFromProxyInterface()
-        return  Config.Builder().addPeers(peerList).setInterface(wgInterface).build()
-    }
+	private fun buildAmConfig(): org.amnezia.awg.config.Config {
+		val peerList = buildAmPeerListFromProxyPeers()
+		val amInterface = buildAmInterfaceListFromProxyInterface()
+		return org.amnezia.awg.config.Config.Builder().addPeers(
+			peerList,
+		).setInterface(amInterface)
+			.build()
+	}
 
-    private fun buildAmConfig() : org.amnezia.awg.config.Config {
-        val peerList = buildAmPeerListFromProxyPeers()
-        val amInterface = buildAmInterfaceListFromProxyInterface()
-        return org.amnezia.awg.config.Config.Builder().addPeers(peerList).setInterface(amInterface).build()
-    }
+	fun onSaveAllChanges(configType: ConfigType): Result<Unit> {
+		return try {
+			val wgQuick = buildConfig().toWgQuickString()
+			val amQuick =
+				if (configType == ConfigType.AMNEZIA) {
+					buildAmConfig().toAwgQuickString()
+				} else {
+					TunnelConfig.AM_QUICK_DEFAULT
+				}
+			val tunnelConfig =
+				when (uiState.value.tunnel) {
+					null ->
+						TunnelConfig(
+							name = _uiState.value.tunnelName,
+							wgQuick = wgQuick,
+							amQuick = amQuick,
+						)
 
-    fun onSaveAllChanges(configType: ConfigType): Result<Unit> {
-        return try {
-            val wgQuick = buildConfig().toWgQuickString()
-            val amQuick = if(configType == ConfigType.AMNEZIA) {
-                buildAmConfig().toAwgQuickString()
-            } else TunnelConfig.AM_QUICK_DEFAULT
-            val tunnelConfig = when (uiState.value.tunnel) {
-                null -> TunnelConfig(
-                    name = _uiState.value.tunnelName,
-                    wgQuick = wgQuick,
-                    amQuick = amQuick
-                )
-                else -> uiState.value.tunnel!!.copy(
-                    name = _uiState.value.tunnelName,
-                    wgQuick = wgQuick,
-                    amQuick = amQuick
-                )
-            }
-            updateTunnelConfig(tunnelConfig)
-            Result.success(Unit)
-        } catch (e: Exception) {
-            Timber.e(e)
-            val message = e.message?.substringAfter(":", missingDelimiterValue = "")
-            val stringValue = message?.let {
-                StringValue.DynamicString(message)
-            } ?: StringValue.StringResource(R.string.unknown_error)
-            Result.failure(WgTunnelExceptions.ConfigParseError(stringValue))
-        }
-    }
+					else ->
+						uiState.value.tunnel!!.copy(
+							name = _uiState.value.tunnelName,
+							wgQuick = wgQuick,
+							amQuick = amQuick,
+						)
+				}
+			updateTunnelConfig(tunnelConfig)
+			Result.success(Unit)
+		} catch (e: Exception) {
+			Timber.e(e)
+			val message = e.message?.substringAfter(":", missingDelimiterValue = "")
+			val stringValue =
+				message?.let {
+					StringValue.DynamicString(message)
+				} ?: StringValue.StringResource(R.string.unknown_error)
+			Result.failure(WgTunnelExceptions.ConfigParseError(stringValue))
+		}
+	}
 
-    fun onPeerPublicKeyChange(index: Int, value: String) {
-        _uiState.update {
-            it.copy(
-                proxyPeers =
-                _uiState.value.proxyPeers.update(
-                    index,
-                    _uiState.value.proxyPeers[index].copy(publicKey = value),
-                ),
-            )
-        }
-    }
+	fun onPeerPublicKeyChange(index: Int, value: String) {
+		_uiState.update {
+			it.copy(
+				proxyPeers =
+				_uiState.value.proxyPeers.update(
+					index,
+					_uiState.value.proxyPeers[index].copy(publicKey = value),
+				),
+			)
+		}
+	}
 
-    fun onPreSharedKeyChange(index: Int, value: String) {
-        _uiState.update {
-            it.copy(
-                proxyPeers =
-                _uiState.value.proxyPeers.update(
-                    index,
-                    _uiState.value.proxyPeers[index].copy(preSharedKey = value),
-                ),
-            )
-        }
-    }
+	fun onPreSharedKeyChange(index: Int, value: String) {
+		_uiState.update {
+			it.copy(
+				proxyPeers =
+				_uiState.value.proxyPeers.update(
+					index,
+					_uiState.value.proxyPeers[index].copy(preSharedKey = value),
+				),
+			)
+		}
+	}
 
-    fun onEndpointChange(index: Int, value: String) {
-        _uiState.update {
-            it.copy(
-                proxyPeers =
-                _uiState.value.proxyPeers.update(
-                    index,
-                    _uiState.value.proxyPeers[index].copy(endpoint = value),
-                ),
-            )
-        }
-    }
+	fun onEndpointChange(index: Int, value: String) {
+		_uiState.update {
+			it.copy(
+				proxyPeers =
+				_uiState.value.proxyPeers.update(
+					index,
+					_uiState.value.proxyPeers[index].copy(endpoint = value),
+				),
+			)
+		}
+	}
 
-    fun onAllowedIpsChange(index: Int, value: String) {
-        _uiState.update {
-            it.copy(
-                proxyPeers =
-                _uiState.value.proxyPeers.update(
-                    index,
-                    _uiState.value.proxyPeers[index].copy(allowedIps = value),
-                ),
-            )
-        }
-    }
+	fun onAllowedIpsChange(index: Int, value: String) {
+		_uiState.update {
+			it.copy(
+				proxyPeers =
+				_uiState.value.proxyPeers.update(
+					index,
+					_uiState.value.proxyPeers[index].copy(allowedIps = value),
+				),
+			)
+		}
+	}
 
-    fun onPersistentKeepaliveChanged(index: Int, value: String) {
-        _uiState.update {
-            it.copy(
-                proxyPeers =
-                _uiState.value.proxyPeers.update(
-                    index,
-                    _uiState.value.proxyPeers[index].copy(persistentKeepalive = value),
-                ),
-            )
-        }
-    }
+	fun onPersistentKeepaliveChanged(index: Int, value: String) {
+		_uiState.update {
+			it.copy(
+				proxyPeers =
+				_uiState.value.proxyPeers.update(
+					index,
+					_uiState.value.proxyPeers[index].copy(persistentKeepalive = value),
+				),
+			)
+		}
+	}
 
-    fun onDeletePeer(index: Int) {
-        _uiState.update {
-            it.copy(
-                proxyPeers = _uiState.value.proxyPeers.removeAt(index),
-            )
-        }
-    }
+	fun onDeletePeer(index: Int) {
+		_uiState.update {
+			it.copy(
+				proxyPeers = _uiState.value.proxyPeers.removeAt(index),
+			)
+		}
+	}
 
-    fun addEmptyPeer() {
-        _uiState.update {
-            it.copy(proxyPeers = _uiState.value.proxyPeers + PeerProxy())
-        }
-    }
+	fun addEmptyPeer() {
+		_uiState.update {
+			it.copy(proxyPeers = _uiState.value.proxyPeers + PeerProxy())
+		}
+	}
 
-    fun generateKeyPair() {
-        val keyPair = KeyPair()
-        _uiState.update {
-            it.copy(
-                interfaceProxy =
-                _uiState.value.interfaceProxy.copy(
-                    privateKey = keyPair.privateKey.toBase64(),
-                    publicKey = keyPair.publicKey.toBase64(),
-                ),
-            )
-        }
-    }
+	fun generateKeyPair() {
+		val keyPair = KeyPair()
+		_uiState.update {
+			it.copy(
+				interfaceProxy =
+				_uiState.value.interfaceProxy.copy(
+					privateKey = keyPair.privateKey.toBase64(),
+					publicKey = keyPair.publicKey.toBase64(),
+				),
+			)
+		}
+	}
 
-    fun onAddressesChanged(value: String) {
-        _uiState.update {
-            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(addresses = value),
-            )
-        }
+	fun onAddressesChanged(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy = _uiState.value.interfaceProxy.copy(addresses = value),
+			)
+		}
+	}
 
-    }
+	fun onListenPortChanged(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy = _uiState.value.interfaceProxy.copy(listenPort = value),
+			)
+		}
+	}
 
-    fun onListenPortChanged(value: String) {
-        _uiState.update {
-            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(listenPort = value),
-            )
-        }
-    }
+	fun onDnsServersChanged(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy = _uiState.value.interfaceProxy.copy(dnsServers = value),
+			)
+		}
+	}
 
-    fun onDnsServersChanged(value: String) {
-        _uiState.update {
-            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(dnsServers = value),
-            )
-        }
-    }
+	fun onMtuChanged(value: String) {
+		_uiState.update {
+			it.copy(interfaceProxy = _uiState.value.interfaceProxy.copy(mtu = value))
+		}
+	}
 
-    fun onMtuChanged(value: String) {
-        _uiState.update {
-            it.copy(interfaceProxy = _uiState.value.interfaceProxy.copy(mtu = value))
-        }
-    }
+	private fun onInterfacePublicKeyChange(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy = _uiState.value.interfaceProxy.copy(publicKey = value),
+			)
+		}
+	}
 
-    private fun onInterfacePublicKeyChange(value: String) {
-        _uiState.update {
-            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(publicKey = value),
-            )
-        }
+	fun onPrivateKeyChange(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy = _uiState.value.interfaceProxy.copy(privateKey = value),
+			)
+		}
+		if (NumberUtils.isValidKey(value)) {
+			val pair = KeyPair(Key.fromBase64(value))
+			onInterfacePublicKeyChange(pair.publicKey.toBase64())
+		} else {
+			onInterfacePublicKeyChange("")
+		}
+	}
 
-    }
+	fun emitQueriedPackages(query: String) {
+		val packages =
+			getAllInternetCapablePackages().filter {
+				getPackageLabel(it).lowercase().contains(query.lowercase())
+			}
+		_uiState.update { it.copy(packages = packages) }
+	}
 
-    fun onPrivateKeyChange(value: String) {
-        _uiState.update {
-            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(privateKey = value),
-            )
-        }
-        if (NumberUtils.isValidKey(value)) {
-            val pair = KeyPair(Key.fromBase64(value))
-            onInterfacePublicKeyChange(pair.publicKey.toBase64())
-        } else {
-            onInterfacePublicKeyChange("")
-        }
-    }
+	fun onJunkPacketCountChanged(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy = _uiState.value.interfaceProxy.copy(junkPacketCount = value),
+			)
+		}
+	}
 
-    fun emitQueriedPackages(query: String) {
-        val packages =
-            getAllInternetCapablePackages().filter {
-                getPackageLabel(it).lowercase().contains(query.lowercase())
-            }
-        _uiState.update { it.copy(packages = packages) }
-    }
+	fun onJunkPacketMinSizeChanged(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy = _uiState.value.interfaceProxy.copy(junkPacketMinSize = value),
+			)
+		}
+	}
 
-    fun onJunkPacketCountChanged(value: String) {
-        _uiState.update {
-            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(junkPacketCount = value)
-            )
-        }
-    }
-    fun onJunkPacketMinSizeChanged(value: String) {
-        _uiState.update {
-            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(junkPacketMinSize = value)
-            )
-        }
-    }
+	fun onJunkPacketMaxSizeChanged(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy = _uiState.value.interfaceProxy.copy(junkPacketMaxSize = value),
+			)
+		}
+	}
 
-    fun onJunkPacketMaxSizeChanged(value: String) {
-        _uiState.update {
-            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(junkPacketMaxSize = value)
-            )
-        }
-    }
+	fun onInitPacketJunkSizeChanged(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy = _uiState.value.interfaceProxy.copy(initPacketJunkSize = value),
+			)
+		}
+	}
 
-    fun onInitPacketJunkSizeChanged(value: String) {
-        _uiState.update {
-            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(initPacketJunkSize = value)
-            )
-        }
-    }
+	fun onResponsePacketJunkSize(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy =
+				_uiState.value.interfaceProxy.copy(
+					responsePacketJunkSize = value,
+				),
+			)
+		}
+	}
 
-    fun onResponsePacketJunkSize(value: String) {
-        _uiState.update {
-            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(responsePacketJunkSize = value)
-            )
-        }
-    }
+	fun onInitPacketMagicHeader(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy =
+				_uiState.value.interfaceProxy.copy(
+					initPacketMagicHeader = value,
+				),
+			)
+		}
+	}
 
-    fun onInitPacketMagicHeader(value: String) {
-        _uiState.update {
-            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(initPacketMagicHeader = value)
-            )
-        }
-    }
+	fun onResponsePacketMagicHeader(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy =
+				_uiState.value.interfaceProxy.copy(
+					responsePacketMagicHeader = value,
+				),
+			)
+		}
+	}
 
-    fun onResponsePacketMagicHeader(value: String) {
-        _uiState.update {
-            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(responsePacketMagicHeader = value)
-            )
-        }
-    }
+	fun onTransportPacketMagicHeader(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy =
+				_uiState.value.interfaceProxy.copy(
+					transportPacketMagicHeader = value,
+				),
+			)
+		}
+	}
 
-    fun onTransportPacketMagicHeader(value: String) {
-        _uiState.update {
-            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(transportPacketMagicHeader = value)
-            )
-        }
-    }
-
-    fun onUnderloadPacketMagicHeader(value: String) {
-        _uiState.update {
-            it.copy(
-                interfaceProxy = _uiState.value.interfaceProxy.copy(underloadPacketMagicHeader = value)
-            )
-        }
-    }
+	fun onUnderloadPacketMagicHeader(value: String) {
+		_uiState.update {
+			it.copy(
+				interfaceProxy =
+				_uiState.value.interfaceProxy.copy(
+					underloadPacketMagicHeader = value,
+				),
+			)
+		}
+	}
 }

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

@@ -3,61 +3,116 @@ package com.zaneschepke.wireguardautotunnel.ui.screens.config.model
 import com.wireguard.config.Interface
 
 data class InterfaceProxy(
-    val privateKey: String = "",
-    val publicKey: String = "",
-    val addresses: String = "",
-    val dnsServers: String = "",
-    val listenPort: String = "",
-    val mtu: String = "",
-    val junkPacketCount: String = "",
-    val junkPacketMinSize: String = "",
-    val junkPacketMaxSize: String = "",
-    val initPacketJunkSize: String = "",
-    val responsePacketJunkSize: String = "",
-    val initPacketMagicHeader: String = "",
-    val responsePacketMagicHeader: String = "",
-    val underloadPacketMagicHeader: String = "",
-    val transportPacketMagicHeader: String = "",
+	val privateKey: String = "",
+	val publicKey: String = "",
+	val addresses: String = "",
+	val dnsServers: String = "",
+	val listenPort: String = "",
+	val mtu: String = "",
+	val junkPacketCount: String = "",
+	val junkPacketMinSize: String = "",
+	val junkPacketMaxSize: String = "",
+	val initPacketJunkSize: String = "",
+	val responsePacketJunkSize: String = "",
+	val initPacketMagicHeader: String = "",
+	val responsePacketMagicHeader: String = "",
+	val underloadPacketMagicHeader: String = "",
+	val transportPacketMagicHeader: String = "",
 ) {
-    companion object {
-        fun from(i: Interface): InterfaceProxy {
-            return InterfaceProxy(
-                publicKey = i.keyPair.publicKey.toBase64().trim(),
-                privateKey = i.keyPair.privateKey.toBase64().trim(),
-                addresses = i.addresses.joinToString(", ").trim(),
-                dnsServers = i.dnsServers.joinToString(", ").replace("/", "").trim(),
-                listenPort =
-                if (i.listenPort.isPresent) {
-                    i.listenPort.get().toString().trim()
-                } else {
-                    ""
-                },
-                mtu = if (i.mtu.isPresent) i.mtu.get().toString().trim() else "",
-            )
-        }
-        fun from(i: org.amnezia.awg.config.Interface) : InterfaceProxy {
-            return InterfaceProxy(
-                publicKey = i.keyPair.publicKey.toBase64().trim(),
-                privateKey = i.keyPair.privateKey.toBase64().trim(),
-                addresses = i.addresses.joinToString(", ").trim(),
-                dnsServers = i.dnsServers.joinToString(", ").replace("/", "").trim(),
-                listenPort =
-                if (i.listenPort.isPresent) {
-                    i.listenPort.get().toString().trim()
-                } else {
-                    ""
-                },
-                mtu = if (i.mtu.isPresent) i.mtu.get().toString().trim() else "",
-                junkPacketCount = if(i.junkPacketCount.isPresent) i.junkPacketCount.get().toString() else "",
-                junkPacketMinSize = if(i.junkPacketMinSize.isPresent) i.junkPacketMinSize.get().toString() else "",
-                junkPacketMaxSize = if(i.junkPacketMaxSize.isPresent) i.junkPacketMaxSize.get().toString() else "",
-                initPacketJunkSize = if(i.initPacketJunkSize.isPresent) i.initPacketJunkSize.get().toString() else "",
-                responsePacketJunkSize = if(i.responsePacketJunkSize.isPresent) i.responsePacketJunkSize.get().toString() else "",
-                initPacketMagicHeader = if(i.initPacketMagicHeader.isPresent) i.initPacketMagicHeader.get().toString() else "",
-                responsePacketMagicHeader = if(i.responsePacketMagicHeader.isPresent) i.responsePacketMagicHeader.get().toString() else "",
-                transportPacketMagicHeader = if(i.transportPacketMagicHeader.isPresent) i.transportPacketMagicHeader.get().toString() else "",
-                underloadPacketMagicHeader = if(i.underloadPacketMagicHeader.isPresent) i.underloadPacketMagicHeader.get().toString() else "",
-            )
-        }
-    }
+	companion object {
+		fun from(i: Interface): InterfaceProxy {
+			return InterfaceProxy(
+				publicKey = i.keyPair.publicKey.toBase64().trim(),
+				privateKey = i.keyPair.privateKey.toBase64().trim(),
+				addresses = i.addresses.joinToString(", ").trim(),
+				dnsServers = i.dnsServers.joinToString(", ").replace("/", "").trim(),
+				listenPort =
+				if (i.listenPort.isPresent) {
+					i.listenPort.get().toString().trim()
+				} else {
+					""
+				},
+				mtu = if (i.mtu.isPresent) i.mtu.get().toString().trim() else "",
+			)
+		}
+
+		fun from(i: org.amnezia.awg.config.Interface): InterfaceProxy {
+			return InterfaceProxy(
+				publicKey = i.keyPair.publicKey.toBase64().trim(),
+				privateKey = i.keyPair.privateKey.toBase64().trim(),
+				addresses = i.addresses.joinToString(", ").trim(),
+				dnsServers = i.dnsServers.joinToString(", ").replace("/", "").trim(),
+				listenPort =
+				if (i.listenPort.isPresent) {
+					i.listenPort.get().toString().trim()
+				} else {
+					""
+				},
+				mtu = if (i.mtu.isPresent) i.mtu.get().toString().trim() else "",
+				junkPacketCount =
+				if (i.junkPacketCount.isPresent) {
+					i.junkPacketCount.get()
+						.toString()
+				} else {
+					""
+				},
+				junkPacketMinSize =
+				if (i.junkPacketMinSize.isPresent) {
+					i.junkPacketMinSize.get()
+						.toString()
+				} else {
+					""
+				},
+				junkPacketMaxSize =
+				if (i.junkPacketMaxSize.isPresent) {
+					i.junkPacketMaxSize.get()
+						.toString()
+				} else {
+					""
+				},
+				initPacketJunkSize =
+				if (i.initPacketJunkSize.isPresent) {
+					i.initPacketJunkSize.get()
+						.toString()
+				} else {
+					""
+				},
+				responsePacketJunkSize =
+				if (i.responsePacketJunkSize.isPresent) {
+					i.responsePacketJunkSize.get()
+						.toString()
+				} else {
+					""
+				},
+				initPacketMagicHeader =
+				if (i.initPacketMagicHeader.isPresent) {
+					i.initPacketMagicHeader.get()
+						.toString()
+				} else {
+					""
+				},
+				responsePacketMagicHeader =
+				if (i.responsePacketMagicHeader.isPresent) {
+					i.responsePacketMagicHeader.get()
+						.toString()
+				} else {
+					""
+				},
+				transportPacketMagicHeader =
+				if (i.transportPacketMagicHeader.isPresent) {
+					i.transportPacketMagicHeader.get()
+						.toString()
+				} else {
+					""
+				},
+				underloadPacketMagicHeader =
+				if (i.underloadPacketMagicHeader.isPresent) {
+					i.underloadPacketMagicHeader.get()
+						.toString()
+				} else {
+					""
+				},
+			)
+		}
+	}
 }

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

@@ -3,96 +3,96 @@ package com.zaneschepke.wireguardautotunnel.ui.screens.config.model
 import com.wireguard.config.Peer
 
 data class PeerProxy(
-    val publicKey: String = "",
-    val preSharedKey: String = "",
-    val persistentKeepalive: String = "",
-    val endpoint: String = "",
-    val allowedIps: String = IPV4_WILDCARD.joinToString(", ").trim()
+	val publicKey: String = "",
+	val preSharedKey: String = "",
+	val persistentKeepalive: String = "",
+	val endpoint: String = "",
+	val allowedIps: String = IPV4_WILDCARD.joinToString(", ").trim(),
 ) {
-    companion object {
-        fun from(peer: Peer): PeerProxy {
-            return PeerProxy(
-                publicKey = peer.publicKey.toBase64(),
-                preSharedKey =
-                if (peer.preSharedKey.isPresent) {
-                    peer.preSharedKey.get().toBase64().trim()
-                } else {
-                    ""
-                },
-                persistentKeepalive =
-                if (peer.persistentKeepalive.isPresent) {
-                    peer.persistentKeepalive.get().toString().trim()
-                } else {
-                    ""
-                },
-                endpoint =
-                if (peer.endpoint.isPresent) {
-                    peer.endpoint.get().toString().trim()
-                } else {
-                    ""
-                },
-                allowedIps = peer.allowedIps.joinToString(", ").trim(),
-            )
-        }
+	companion object {
+		fun from(peer: Peer): PeerProxy {
+			return PeerProxy(
+				publicKey = peer.publicKey.toBase64(),
+				preSharedKey =
+				if (peer.preSharedKey.isPresent) {
+					peer.preSharedKey.get().toBase64().trim()
+				} else {
+					""
+				},
+				persistentKeepalive =
+				if (peer.persistentKeepalive.isPresent) {
+					peer.persistentKeepalive.get().toString().trim()
+				} else {
+					""
+				},
+				endpoint =
+				if (peer.endpoint.isPresent) {
+					peer.endpoint.get().toString().trim()
+				} else {
+					""
+				},
+				allowedIps = peer.allowedIps.joinToString(", ").trim(),
+			)
+		}
 
-        fun from(peer: org.amnezia.awg.config.Peer) : PeerProxy {
-            return PeerProxy(
-                publicKey = peer.publicKey.toBase64(),
-                preSharedKey =
-                if (peer.preSharedKey.isPresent) {
-                    peer.preSharedKey.get().toBase64().trim()
-                } else {
-                    ""
-                },
-                persistentKeepalive =
-                if (peer.persistentKeepalive.isPresent) {
-                    peer.persistentKeepalive.get().toString().trim()
-                } else {
-                    ""
-                },
-                endpoint =
-                if (peer.endpoint.isPresent) {
-                    peer.endpoint.get().toString().trim()
-                } else {
-                    ""
-                },
-                allowedIps = peer.allowedIps.joinToString(", ").trim(),
-            )
-        }
+		fun from(peer: org.amnezia.awg.config.Peer): PeerProxy {
+			return PeerProxy(
+				publicKey = peer.publicKey.toBase64(),
+				preSharedKey =
+				if (peer.preSharedKey.isPresent) {
+					peer.preSharedKey.get().toBase64().trim()
+				} else {
+					""
+				},
+				persistentKeepalive =
+				if (peer.persistentKeepalive.isPresent) {
+					peer.persistentKeepalive.get().toString().trim()
+				} else {
+					""
+				},
+				endpoint =
+				if (peer.endpoint.isPresent) {
+					peer.endpoint.get().toString().trim()
+				} else {
+					""
+				},
+				allowedIps = peer.allowedIps.joinToString(", ").trim(),
+			)
+		}
 
-        val IPV4_PUBLIC_NETWORKS =
-            setOf(
-                "0.0.0.0/5",
-                "8.0.0.0/7",
-                "11.0.0.0/8",
-                "12.0.0.0/6",
-                "16.0.0.0/4",
-                "32.0.0.0/3",
-                "64.0.0.0/2",
-                "128.0.0.0/3",
-                "160.0.0.0/5",
-                "168.0.0.0/6",
-                "172.0.0.0/12",
-                "172.32.0.0/11",
-                "172.64.0.0/10",
-                "172.128.0.0/9",
-                "173.0.0.0/8",
-                "174.0.0.0/7",
-                "176.0.0.0/4",
-                "192.0.0.0/9",
-                "192.128.0.0/11",
-                "192.160.0.0/13",
-                "192.169.0.0/16",
-                "192.170.0.0/15",
-                "192.172.0.0/14",
-                "192.176.0.0/12",
-                "192.192.0.0/10",
-                "193.0.0.0/8",
-                "194.0.0.0/7",
-                "196.0.0.0/6",
-                "200.0.0.0/5",
-                "208.0.0.0/4",
-            )
-        val IPV4_WILDCARD = setOf("0.0.0.0/0")
-    }
+		val IPV4_PUBLIC_NETWORKS =
+			setOf(
+				"0.0.0.0/5",
+				"8.0.0.0/7",
+				"11.0.0.0/8",
+				"12.0.0.0/6",
+				"16.0.0.0/4",
+				"32.0.0.0/3",
+				"64.0.0.0/2",
+				"128.0.0.0/3",
+				"160.0.0.0/5",
+				"168.0.0.0/6",
+				"172.0.0.0/12",
+				"172.32.0.0/11",
+				"172.64.0.0/10",
+				"172.128.0.0/9",
+				"173.0.0.0/8",
+				"174.0.0.0/7",
+				"176.0.0.0/4",
+				"192.0.0.0/9",
+				"192.128.0.0/11",
+				"192.160.0.0/13",
+				"192.169.0.0/16",
+				"192.170.0.0/15",
+				"192.172.0.0/14",
+				"192.176.0.0/12",
+				"192.192.0.0/10",
+				"193.0.0.0/8",
+				"194.0.0.0/7",
+				"196.0.0.0/6",
+				"200.0.0.0/5",
+				"208.0.0.0/4",
+			)
+		val IPV4_WILDCARD = setOf("0.0.0.0/0")
+	}
 }

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

@@ -1,6 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.main
 
 enum class ConfigType {
-    AMNEZIA,
-    WIREGUARD
+	AMNEZIA,
+	WIREGUARD,
 }

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

@@ -5,8 +5,8 @@ import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnState
 import com.zaneschepke.wireguardautotunnel.util.TunnelConfigs
 
 data class MainUiState(
-    val settings: Settings = Settings(),
-    val tunnels: TunnelConfigs = emptyList(),
-    val vpnState: VpnState = VpnState(),
-    val loading: Boolean = true
+	val settings: Settings = Settings(),
+	val tunnels: TunnelConfigs = emptyList(),
+	val vpnState: VpnState = VpnState(),
+	val loading: Boolean = true,
 )

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

@@ -11,6 +11,7 @@ import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.data.domain.Settings
 import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
 import com.zaneschepke.wireguardautotunnel.util.Constants
@@ -18,7 +19,7 @@ import com.zaneschepke.wireguardautotunnel.util.NumberUtils
 import com.zaneschepke.wireguardautotunnel.util.WgTunnelExceptions
 import com.zaneschepke.wireguardautotunnel.util.toWgQuickString
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.stateIn
@@ -33,301 +34,356 @@ import javax.inject.Inject
 class MainViewModel
 @Inject
 constructor(
-    private val appDataRepository: AppDataRepository,
-    private val serviceManager: ServiceManager,
-    val vpnService: VpnService
+	private val appDataRepository: AppDataRepository,
+	private val serviceManager: ServiceManager,
+	val vpnService: VpnService,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : ViewModel() {
+	val uiState =
+		combine(
+			appDataRepository.settings.getSettingsFlow(),
+			appDataRepository.tunnels.getTunnelConfigsFlow(),
+			vpnService.vpnState,
+		) { settings, tunnels, vpnState ->
+			MainUiState(settings, tunnels, vpnState, false)
+		}
+			.stateIn(
+				viewModelScope,
+				SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
+				MainUiState(),
+			)
 
-    val uiState =
-        combine(
-            appDataRepository.settings.getSettingsFlow(),
-            appDataRepository.tunnels.getTunnelConfigsFlow(),
-            vpnService.vpnState,
-        ) { settings, tunnels, vpnState ->
-            MainUiState(settings, tunnels, vpnState, false)
-        }
-            .stateIn(
-                viewModelScope,
-                SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
-                MainUiState(),
-            )
+	private fun stopWatcherService(context: Context) {
+		serviceManager.stopWatcherService(context)
+	}
 
-    private fun stopWatcherService(context: Context) =
-        viewModelScope.launch(Dispatchers.IO) {
-            serviceManager.stopWatcherService(context)
-        }
+	fun onDelete(tunnel: TunnelConfig, context: Context) {
+		viewModelScope.launch {
+			val settings = appDataRepository.settings.getSettings()
+			val isPrimary = tunnel.isPrimaryTunnel
+			if (appDataRepository.tunnels.count() == 1 || isPrimary) {
+				stopWatcherService(context)
+				resetTunnelSetting(settings)
+			}
+			appDataRepository.tunnels.delete(tunnel)
+			WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
+		}
+	}
 
-    fun onDelete(tunnel: TunnelConfig, context: Context) {
-        viewModelScope.launch(Dispatchers.IO) {
-            val settings = appDataRepository.settings.getSettings()
-            val isPrimary = tunnel.isPrimaryTunnel
-            if (appDataRepository.tunnels.count() == 1 || isPrimary) {
-                stopWatcherService(context)
-                resetTunnelSetting(settings)
-            }
-            appDataRepository.tunnels.delete(tunnel)
-            WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
-        }
-    }
+	private fun resetTunnelSetting(settings: Settings) {
+		saveSettings(
+			settings.copy(
+				isAutoTunnelEnabled = false,
+				isAlwaysOnVpnEnabled = false,
+			),
+		)
+	}
 
-    private fun resetTunnelSetting(settings: Settings) {
-        saveSettings(
-            settings.copy(
-                isAutoTunnelEnabled = false,
-                isAlwaysOnVpnEnabled = false,
-            ),
-        )
-    }
+	fun onTunnelStart(tunnelConfig: TunnelConfig, context: Context) = viewModelScope.launch {
+		Timber.d("On start called!")
+		serviceManager.startVpnService(
+			context,
+			tunnelConfig.id,
+			isManualStart = true,
+		)
+	}
 
-    fun onTunnelStart(tunnelConfig: TunnelConfig, context: Context) =
-        viewModelScope.launch(Dispatchers.IO) {
-            Timber.d("On start called!")
-            serviceManager.startVpnService(
-                context,
-                tunnelConfig.id,
-                isManualStart = true,
-            )
-        }
+	fun onTunnelStop(context: Context) = viewModelScope.launch {
+		Timber.i("Stopping active tunnel")
+		serviceManager.stopVpnService(context, isManualStop = true)
+	}
 
+	private fun validateConfigString(config: String, configType: ConfigType) {
+		when (configType) {
+			ConfigType.AMNEZIA -> TunnelConfig.configFromAmQuick(config)
+			ConfigType.WIREGUARD -> TunnelConfig.configFromWgQuick(config)
+		}
+	}
 
-    fun onTunnelStop(context: Context) =
-        viewModelScope.launch(Dispatchers.IO) {
-            Timber.i("Stopping active tunnel")
-            serviceManager.stopVpnService(context, isManualStop = true)
-        }
+	private fun generateQrCodeDefaultName(config: String, configType: ConfigType): String {
+		return try {
+			when (configType) {
+				ConfigType.AMNEZIA -> {
+					TunnelConfig.configFromAmQuick(config).peers[0].endpoint.get().host
+				}
 
-    private fun validateConfigString(config: String, configType: ConfigType) {
-        when(configType) {
-            ConfigType.AMNEZIA -> TunnelConfig.configFromAmQuick(config)
-            ConfigType.WIREGUARD -> TunnelConfig.configFromWgQuick(config)
-        }
-    }
+				ConfigType.WIREGUARD -> {
+					TunnelConfig.configFromWgQuick(config).peers[0].endpoint.get().host
+				}
+			}
+		} catch (e: Exception) {
+			Timber.e(e)
+			NumberUtils.generateRandomTunnelName()
+		}
+	}
 
-    private fun generateQrCodeDefaultName(config : String, configType: ConfigType) : String {
-        return try {
-            when(configType) {
-                ConfigType.AMNEZIA -> {
-                    TunnelConfig.configFromAmQuick(config).peers[0].endpoint.get().host
-                }
-                ConfigType.WIREGUARD -> {
-                    TunnelConfig.configFromWgQuick(config).peers[0].endpoint.get().host
-                }
-            }
-        } catch (e : Exception) {
-            Timber.e(e)
-            NumberUtils.generateRandomTunnelName()
-        }
-    }
+	private fun generateQrCodeTunnelName(config: String, configType: ConfigType): String {
+		var defaultName = generateQrCodeDefaultName(config, configType)
+		val lines = config.lines().toMutableList()
+		val linesIterator = lines.iterator()
+		while (linesIterator.hasNext()) {
+			val next = linesIterator.next()
+			if (next.contains(Constants.QR_CODE_NAME_PROPERTY)) {
+				defaultName = next.substringAfter(Constants.QR_CODE_NAME_PROPERTY).trim()
+				break
+			}
+		}
+		return defaultName
+	}
 
-    private fun generateQrCodeTunnelName(config : String, configType: ConfigType) : String {
-        var defaultName = generateQrCodeDefaultName(config, configType)
-        val lines = config.lines().toMutableList()
-        val linesIterator = lines.iterator()
-        while(linesIterator.hasNext()) {
-            val next = linesIterator.next()
-            if(next.contains(Constants.QR_CODE_NAME_PROPERTY)) {
-                defaultName = next.substringAfter(Constants.QR_CODE_NAME_PROPERTY).trim()
-                break
-            }
-        }
-        return defaultName
-    }
+	suspend fun onTunnelQrResult(result: String, configType: ConfigType): Result<Unit> {
+		return withContext(ioDispatcher) {
+			try {
+				validateConfigString(result, configType)
+				val tunnelName =
+					makeTunnelNameUnique(generateQrCodeTunnelName(result, configType))
+				val tunnelConfig =
+					when (configType) {
+						ConfigType.AMNEZIA -> {
+							TunnelConfig(
+								name = tunnelName,
+								amQuick = result,
+								wgQuick =
+								TunnelConfig.configFromAmQuick(
+									result,
+								).toWgQuickString(),
+							)
+						}
 
-    suspend fun onTunnelQrResult(result: String, configType: ConfigType): Result<Unit> {
-        return try {
-            validateConfigString(result, configType)
-            val tunnelName = makeTunnelNameUnique(generateQrCodeTunnelName(result, configType))
-            val tunnelConfig = when(configType) {
-                ConfigType.AMNEZIA ->{
-                    TunnelConfig(name = tunnelName, amQuick = result,
-                        wgQuick = TunnelConfig.configFromAmQuick(result).toWgQuickString())
-                }
-                ConfigType.WIREGUARD -> TunnelConfig(name = tunnelName, wgQuick = result)
-            }
-            addTunnel(tunnelConfig)
-            Result.success(Unit)
-        } catch (e: Exception) {
-            Timber.e(e)
-            Result.failure(WgTunnelExceptions.InvalidQrCode())
-        }
-    }
+						ConfigType.WIREGUARD ->
+							TunnelConfig(
+								name = tunnelName,
+								wgQuick = result,
+							)
+					}
+				addTunnel(tunnelConfig)
+				Result.success(Unit)
+			} catch (e: Exception) {
+				Timber.e(e)
+				Result.failure(WgTunnelExceptions.InvalidQrCode())
+			}
+		}
+	}
 
-    private suspend fun makeTunnelNameUnique(name : String) : String {
-        val tunnels = appDataRepository.tunnels.getAll()
-        var tunnelName = name
-        var num = 1
-        while (tunnels.any { it.name == tunnelName }) {
-            tunnelName = name + "(${num})"
-            num++
-        }
-        return tunnelName
-    }
+	private suspend fun makeTunnelNameUnique(name: String): String {
+		return withContext(ioDispatcher) {
+			val tunnels = appDataRepository.tunnels.getAll()
+			var tunnelName = name
+			var num = 1
+			while (tunnels.any { it.name == tunnelName }) {
+				tunnelName = name + "($num)"
+				num++
+			}
+			tunnelName
+		}
+	}
 
-    private suspend fun saveTunnelConfigFromStream(stream: InputStream, fileName: String, type: ConfigType) {
-        var amQuick : String? = null
-        val wgQuick = stream.use {
-            when(type) {
-                ConfigType.AMNEZIA -> {
-                    val config = org.amnezia.awg.config.Config.parse(it)
-                    amQuick = config.toAwgQuickString()
-                    config.toWgQuickString()
-                }
-                ConfigType.WIREGUARD -> {
-                    Config.parse(it).toWgQuickString()
-                }
-            }
-        }
-        val tunnelName = makeTunnelNameUnique(getNameFromFileName(fileName))
-        addTunnel(TunnelConfig(name = tunnelName, wgQuick = wgQuick, amQuick = amQuick ?: TunnelConfig.AM_QUICK_DEFAULT))
-    }
+	private fun saveTunnelConfigFromStream(stream: InputStream, fileName: String, type: ConfigType) {
+		var amQuick: String? = null
+		val wgQuick =
+			stream.use {
+				when (type) {
+					ConfigType.AMNEZIA -> {
+						val config = org.amnezia.awg.config.Config.parse(it)
+						amQuick = config.toAwgQuickString()
+						config.toWgQuickString()
+					}
 
-    private fun getInputStreamFromUri(uri: Uri, context: Context): InputStream? {
-        return context.applicationContext.contentResolver.openInputStream(uri)
-    }
+					ConfigType.WIREGUARD -> {
+						Config.parse(it).toWgQuickString()
+					}
+				}
+			}
+		viewModelScope.launch {
+			val tunnelName = makeTunnelNameUnique(getNameFromFileName(fileName))
+			addTunnel(
+				TunnelConfig(
+					name = tunnelName,
+					wgQuick = wgQuick,
+					amQuick = amQuick ?: TunnelConfig.AM_QUICK_DEFAULT,
+				),
+			)
+		}
+	}
 
-    suspend fun onTunnelFileSelected(uri: Uri, configType: ConfigType, context: Context): Result<Unit> {
-        return try {
-            if (isValidUriContentScheme(uri)) {
-                val fileName = getFileName(context, uri)
-                return when (getFileExtensionFromFileName(fileName)) {
-                    Constants.CONF_FILE_EXTENSION ->
-                        saveTunnelFromConfUri(fileName, uri, configType, context)
-                    Constants.ZIP_FILE_EXTENSION -> saveTunnelsFromZipUri(uri, configType, context)
-                    else -> Result.failure(WgTunnelExceptions.InvalidFileExtension())
-                }
-            } else {
-                Result.failure(WgTunnelExceptions.InvalidFileExtension())
-            }
-        } catch (e: Exception) {
-            Timber.e(e)
-            Result.failure(WgTunnelExceptions.FileReadFailed())
-        }
-    }
+	private fun getInputStreamFromUri(uri: Uri, context: Context): InputStream? {
+		return context.applicationContext.contentResolver.openInputStream(uri)
+	}
 
-    private suspend fun saveTunnelsFromZipUri(uri: Uri, configType: ConfigType, context: Context) : Result<Unit> {
-        return ZipInputStream(getInputStreamFromUri(uri, context)).use { zip ->
-            generateSequence { zip.nextEntry }
-                .filterNot {
-                    it.isDirectory ||
-                        getFileExtensionFromFileName(it.name) != Constants.CONF_FILE_EXTENSION
-                }
-                .forEach {
-                    val name = getNameFromFileName(it.name)
-                    withContext(viewModelScope.coroutineContext + Dispatchers.IO) {
-                        try {
-                            var amQuick : String? = null
-                            val wgQuick =
-                                when(configType) {
-                                    ConfigType.AMNEZIA -> {
-                                        val config = org.amnezia.awg.config.Config.parse(zip)
-                                        amQuick = config.toAwgQuickString()
-                                        config.toWgQuickString()
-                                    }
-                                    ConfigType.WIREGUARD -> {
-                                        Config.parse(zip).toWgQuickString()
-                                    }
-                                }
-                            addTunnel(TunnelConfig(name = makeTunnelNameUnique(name), wgQuick = wgQuick, amQuick = amQuick ?: TunnelConfig.AM_QUICK_DEFAULT))
-                            Result.success(Unit)
-                        } catch (e : Exception) {
-                            Result.failure(WgTunnelExceptions.FileReadFailed())
-                        }
-                    }
-                }
-            Result.success(Unit)
-        }
-    }
+	suspend fun onTunnelFileSelected(uri: Uri, configType: ConfigType, context: Context): Result<Unit> {
+		return withContext(ioDispatcher) {
+			try {
+				if (isValidUriContentScheme(uri)) {
+					val fileName = getFileName(context, uri)
+					return@withContext when (getFileExtensionFromFileName(fileName)) {
+						Constants.CONF_FILE_EXTENSION ->
+							saveTunnelFromConfUri(fileName, uri, configType, context)
 
-    private suspend fun saveTunnelFromConfUri(name: String, uri: Uri, configType: ConfigType, context: Context): Result<Unit> {
-        val stream = getInputStreamFromUri(uri, context)
-        return if (stream != null) {
-            saveTunnelConfigFromStream(stream, name, configType)
-            Result.success(Unit)
-        } else {
-            Result.failure(WgTunnelExceptions.FileReadFailed())
-        }
-    }
+						Constants.ZIP_FILE_EXTENSION ->
+							saveTunnelsFromZipUri(
+								uri,
+								configType,
+								context,
+							)
 
-    private suspend fun addTunnel(tunnelConfig: TunnelConfig) {
-        val firstTunnel = appDataRepository.tunnels.count() == 0
-        saveTunnel(tunnelConfig)
-        if (firstTunnel) WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
-    }
+						else -> Result.failure(WgTunnelExceptions.InvalidFileExtension())
+					}
+				} else {
+					Result.failure(WgTunnelExceptions.InvalidFileExtension())
+				}
+			} catch (e: Exception) {
+				Timber.e(e)
+				Result.failure(WgTunnelExceptions.FileReadFailed())
+			}
+		}
+	}
 
-    fun pauseAutoTunneling() =
-        viewModelScope.launch {
-            appDataRepository.settings.save(uiState.value.settings.copy(isAutoTunnelPaused = true))
-            WireGuardAutoTunnel.requestAutoTunnelTileServiceUpdate()
-        }
+	private suspend fun saveTunnelsFromZipUri(uri: Uri, configType: ConfigType, context: Context): Result<Unit> {
+		return withContext(ioDispatcher) {
+			ZipInputStream(getInputStreamFromUri(uri, context)).use { zip ->
+				generateSequence { zip.nextEntry }
+					.filterNot {
+						it.isDirectory ||
+							getFileExtensionFromFileName(it.name) != Constants.CONF_FILE_EXTENSION
+					}
+					.forEach {
+						val name = getNameFromFileName(it.name)
+						withContext(viewModelScope.coroutineContext) {
+							try {
+								var amQuick: String? = null
+								val wgQuick =
+									when (configType) {
+										ConfigType.AMNEZIA -> {
+											val config =
+												org.amnezia.awg.config.Config.parse(
+													zip,
+												)
+											amQuick = config.toAwgQuickString()
+											config.toWgQuickString()
+										}
 
-    fun resumeAutoTunneling() =
-        viewModelScope.launch {
-            appDataRepository.settings.save(uiState.value.settings.copy(isAutoTunnelPaused = false))
-            WireGuardAutoTunnel.requestAutoTunnelTileServiceUpdate()
-        }
+										ConfigType.WIREGUARD -> {
+											Config.parse(zip).toWgQuickString()
+										}
+									}
+								addTunnel(
+									TunnelConfig(
+										name = makeTunnelNameUnique(name),
+										wgQuick = wgQuick,
+										amQuick = amQuick ?: TunnelConfig.AM_QUICK_DEFAULT,
+									),
+								)
+								Result.success(Unit)
+							} catch (e: Exception) {
+								Result.failure(WgTunnelExceptions.FileReadFailed())
+							}
+						}
+					}
+				Result.success(Unit)
+			}
+		}
+	}
 
-    private suspend fun saveTunnel(tunnelConfig: TunnelConfig) {
-        appDataRepository.tunnels.save(tunnelConfig)
-    }
+	private suspend fun saveTunnelFromConfUri(name: String, uri: Uri, configType: ConfigType, context: Context): Result<Unit> {
+		return withContext(ioDispatcher) {
+			val stream = getInputStreamFromUri(uri, context)
+			return@withContext if (stream != null) {
+				try {
+					saveTunnelConfigFromStream(stream, name, configType)
+				} catch (e: Exception) {
+					return@withContext Result.failure(WgTunnelExceptions.ConfigParseError())
+				}
+				Result.success(Unit)
+			} else {
+				Result.failure(WgTunnelExceptions.FileReadFailed())
+			}
+		}
+	}
 
-    private fun getFileNameByCursor(context: Context, uri: Uri): String? {
-        context.contentResolver.query(uri, null, null, null, null)?.use {
-            return getDisplayNameByCursor(it)
-        }
-        return null
-    }
+	private fun addTunnel(tunnelConfig: TunnelConfig) = viewModelScope.launch {
+		val firstTunnel = appDataRepository.tunnels.count() == 0
+		saveTunnel(tunnelConfig)
+		if (firstTunnel) WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
+	}
 
-    private fun getDisplayNameColumnIndex(cursor: Cursor): Int? {
-        val columnIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
-        return if (columnIndex != -1) {
-            return columnIndex
-        } else {
-            null
-        }
-    }
+	fun pauseAutoTunneling() = viewModelScope.launch {
+		appDataRepository.settings.save(
+			uiState.value.settings.copy(isAutoTunnelPaused = true),
+		)
+		WireGuardAutoTunnel.requestAutoTunnelTileServiceUpdate()
+	}
 
-    private fun getDisplayNameByCursor(cursor: Cursor): String? {
-        return if (cursor.moveToFirst()) {
-            val index = getDisplayNameColumnIndex(cursor)
-            if (index != null) {
-                cursor.getString(index)
-            } else null
-        } else null
-    }
+	fun resumeAutoTunneling() = viewModelScope.launch {
+		appDataRepository.settings.save(
+			uiState.value.settings.copy(isAutoTunnelPaused = false),
+		)
+		WireGuardAutoTunnel.requestAutoTunnelTileServiceUpdate()
+	}
 
-    private fun isValidUriContentScheme(uri: Uri): Boolean {
-        return uri.scheme == Constants.URI_CONTENT_SCHEME
-    }
+	private fun saveTunnel(tunnelConfig: TunnelConfig) = viewModelScope.launch {
+		appDataRepository.tunnels.save(tunnelConfig)
+	}
 
-    private fun getFileName(context: Context, uri: Uri): String {
-        return getFileNameByCursor(context, uri) ?: NumberUtils.generateRandomTunnelName()
-    }
+	private fun getFileNameByCursor(context: Context, uri: Uri): String? {
+		context.contentResolver.query(uri, null, null, null, null)?.use {
+			return getDisplayNameByCursor(it)
+		}
+		return null
+	}
 
-    private fun getNameFromFileName(fileName: String): String {
-        return fileName.substring(0, fileName.lastIndexOf('.'))
-    }
+	private fun getDisplayNameColumnIndex(cursor: Cursor): Int? {
+		val columnIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
+		return if (columnIndex != -1) {
+			return columnIndex
+		} else {
+			null
+		}
+	}
 
-    private fun getFileExtensionFromFileName(fileName: String): String? {
-        return try {
-            fileName.substring(fileName.lastIndexOf('.'))
-        } catch (e: Exception) {
-            Timber.e(e)
-            null
-        }
-    }
+	private fun getDisplayNameByCursor(cursor: Cursor): String? {
+		return if (cursor.moveToFirst()) {
+			val index = getDisplayNameColumnIndex(cursor)
+			if (index != null) {
+				cursor.getString(index)
+			} else {
+				null
+			}
+		} else {
+			null
+		}
+	}
 
-    private fun saveSettings(settings: Settings) =
-        viewModelScope.launch(Dispatchers.IO) { appDataRepository.settings.save(settings) }
+	private fun isValidUriContentScheme(uri: Uri): Boolean {
+		return uri.scheme == Constants.URI_CONTENT_SCHEME
+	}
 
+	private fun getFileName(context: Context, uri: Uri): String {
+		return getFileNameByCursor(context, uri) ?: NumberUtils.generateRandomTunnelName()
+	}
 
-    fun onCopyTunnel(tunnel: TunnelConfig?) = viewModelScope.launch {
-        tunnel?.let {
-            saveTunnel(
-                TunnelConfig(
-                    name = it.name.plus(NumberUtils.randomThree()),
-                    wgQuick = it.wgQuick,
-                ),
-            )
-        }
-    }
+	private fun getNameFromFileName(fileName: String): String {
+		return fileName.substring(0, fileName.lastIndexOf('.'))
+	}
+
+	private fun getFileExtensionFromFileName(fileName: String): String? {
+		return try {
+			fileName.substring(fileName.lastIndexOf('.'))
+		} catch (e: Exception) {
+			Timber.e(e)
+			null
+		}
+	}
+
+	private fun saveSettings(settings: Settings) = viewModelScope.launch { appDataRepository.settings.save(settings) }
+
+	fun onCopyTunnel(tunnel: TunnelConfig?) = viewModelScope.launch {
+		tunnel?.let {
+			saveTunnel(
+				TunnelConfig(
+					name = it.name.plus(NumberUtils.randomThree()),
+					wgQuick = it.wgQuick,
+				),
+			)
+		}
+	}
 }

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

@@ -1,7 +1,11 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.options
 
 import android.annotation.SuppressLint
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.focusGroup
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -12,6 +16,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.KeyboardActions
@@ -39,7 +44,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
@@ -73,267 +77,295 @@ import kotlinx.coroutines.launch
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun OptionsScreen(
-    optionsViewModel: OptionsViewModel = hiltViewModel(),
-    navController: NavController,
-    appViewModel: AppViewModel,
-    focusRequester: FocusRequester,
-    tunnelId: String
+	optionsViewModel: OptionsViewModel = hiltViewModel(),
+	navController: NavController,
+	appViewModel: AppViewModel,
+	focusRequester: FocusRequester,
+	tunnelId: String,
 ) {
-    val scrollState = rememberScrollState()
-    val uiState by optionsViewModel.uiState.collectAsStateWithLifecycle()
-    val context = LocalContext.current
+	val scrollState = rememberScrollState()
+	val uiState by optionsViewModel.uiState.collectAsStateWithLifecycle()
+	val context = LocalContext.current
 
-    val interactionSource = remember { MutableInteractionSource() }
-    val scope = rememberCoroutineScope()
-    val focusManager = LocalFocusManager.current
-    val screenPadding = 5.dp
-    val fillMaxWidth = .85f
+	val interactionSource = remember { MutableInteractionSource() }
+	val scope = rememberCoroutineScope()
+	val focusManager = LocalFocusManager.current
+	val screenPadding = 5.dp
+	val fillMaxWidth = .85f
 
-    var currentText by remember { mutableStateOf("") }
+	var currentText by remember { mutableStateOf("") }
 
-    LaunchedEffect(Unit) {
-        optionsViewModel.init(tunnelId)
-        if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-            delay(Constants.FOCUS_REQUEST_DELAY)
-            focusRequester.requestFocus()
-        }
-    }
+	LaunchedEffect(Unit) {
+		optionsViewModel.init(tunnelId)
+		if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+			delay(Constants.FOCUS_REQUEST_DELAY)
+			focusRequester.requestFocus()
+		}
+	}
 
-    fun saveTrustedSSID() {
-        if (currentText.isNotEmpty()) {
-            scope.launch {
-                optionsViewModel.onSaveRunSSID(currentText).onSuccess {
-                    currentText = ""
-                }.onFailure {
-                    appViewModel.showSnackbarMessage(it.getMessage(context))
-                }
-            }
-        }
-    }
+	fun saveTrustedSSID() {
+		if (currentText.isNotEmpty()) {
+			scope.launch {
+				optionsViewModel.onSaveRunSSID(currentText).onSuccess {
+					currentText = ""
+				}.onFailure {
+					appViewModel.showSnackbarMessage(it.getMessage(context))
+				}
+			}
+		}
+	}
 
-    Scaffold(
-        floatingActionButton = {
-            val secondaryColor = MaterialTheme.colorScheme.secondary
-            val hoverColor = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)
-            var fobColor by remember { mutableStateOf(secondaryColor) }
-            MultiFloatingActionButton(
-                modifier =
-                (if (
-                    WireGuardAutoTunnel.isRunningOnAndroidTv()
-                )
-                    Modifier.focusRequester(focusRequester)
-                else Modifier)
-                    .onFocusChanged {
-                        if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                            fobColor = if (it.isFocused) hoverColor else secondaryColor
-                        }
-                    },
-                fabIcon = FabIcon(
-                    iconRes = R.drawable.edit,
-                    iconResAfterRotate = R.drawable.close,
-                    iconRotate = 180f
-                ),
-                fabOption = FabOption(
-                    iconTint = MaterialTheme.colorScheme.background,
-                    backgroundTint = MaterialTheme.colorScheme.primary,
-                ),
-                itemsMultiFab = listOf(
-                    MultiFabItem(
-                        label = {
-                            Text(
-                                stringResource(id = R.string.amnezia),
-                                color = Color.White,
-                                textAlign = TextAlign.Center,
-                                modifier = Modifier.padding(end = 10.dp)
-                            )
-                        },
-                        icon = R.drawable.edit,
-                        value = ConfigType.AMNEZIA.name,
-                    ),
-                    MultiFabItem(
-                        label = {
-                            Text(stringResource(id = R.string.wireguard), color = Color.White, textAlign = TextAlign.Center, modifier = Modifier.padding(end = 10.dp))
-                        },
-                        icon = R.drawable.edit,
-                        value = ConfigType.WIREGUARD.name
-                    ),
-                ),
-                onFabItemClicked = {
-                    val configType = ConfigType.valueOf(it.value)
-                    navController.navigate(
-                        "${Screen.Config.route}/${tunnelId}?configType=${configType.name}",
-                    )
-                },
-                shape = RoundedCornerShape(16.dp),
-            )
-        }
-    ) {
-        Column(
-            horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.Top,
-            modifier =
-            Modifier
-                .fillMaxSize()
-                .verticalScroll(scrollState)
-                .clickable(
-                    indication = null,
-                    interactionSource = interactionSource,
-                ) {
-                    focusManager.clearFocus()
-                },
-        ) {
-            Surface(
-                tonalElevation = 2.dp,
-                shadowElevation = 2.dp,
-                shape = RoundedCornerShape(12.dp),
-                color = MaterialTheme.colorScheme.surface,
-                modifier =
-                (if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                    Modifier
-                        .height(IntrinsicSize.Min)
-                        .fillMaxWidth(fillMaxWidth)
-                        .padding(top = 10.dp)
-                } else {
-                    Modifier
-                        .fillMaxWidth(fillMaxWidth)
-                        .padding(top = 20.dp)
-                })
-                    .padding(bottom = 10.dp),
-            ) {
-                Column(
-                    horizontalAlignment = Alignment.Start,
-                    verticalArrangement = Arrangement.Top,
-                    modifier = Modifier.padding(15.dp),
-                ) {
-                    SectionTitle(
-                        title = stringResource(id = R.string.general),
-                        padding = screenPadding,
-                    )
-                    ConfigurationToggle(
-                        stringResource(R.string.set_primary_tunnel),
-                        enabled = true,
-                        checked = uiState.isDefaultTunnel,
-                        modifier = Modifier
-                            .focusRequester(focusRequester),
-                        padding = screenPadding,
-                        onCheckChanged = { optionsViewModel.onTogglePrimaryTunnel() },
-                    )
-                }
-            }
-            Surface(
-                tonalElevation = 2.dp,
-                shadowElevation = 2.dp,
-                shape = RoundedCornerShape(12.dp),
-                color = MaterialTheme.colorScheme.surface,
-                modifier =
-                (if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                    Modifier
-                        .height(IntrinsicSize.Min)
-                        .fillMaxWidth(fillMaxWidth)
-                        .padding(top = 10.dp)
-                } else {
-                    Modifier
-                        .fillMaxWidth(fillMaxWidth)
-                        .padding(top = 20.dp)
-                })
-                    .padding(bottom = 10.dp),
-            ) {
-                Column(
-                    horizontalAlignment = Alignment.Start,
-                    verticalArrangement = Arrangement.Top,
-                    modifier = Modifier.padding(15.dp),
-                ) {
-                    SectionTitle(
-                        title = stringResource(id = R.string.auto_tunneling),
-                        padding = screenPadding,
-                    )
-                    ConfigurationToggle(
-                        stringResource(R.string.mobile_data_tunnel),
-                        enabled = true,
-                        checked = uiState.tunnel?.isMobileDataTunnel == true,
-                        padding = screenPadding,
-                        onCheckChanged = { optionsViewModel.onToggleIsMobileDataTunnel() },
-                    )
-                    Column {
-                        FlowRow(
-                            modifier = Modifier
-                                .padding(screenPadding)
-                                .fillMaxWidth(),
-                            horizontalArrangement = Arrangement.spacedBy(5.dp),
-                        ) {
-                            uiState.tunnel?.tunnelNetworks?.forEach { ssid ->
-                                ClickableIconButton(
-                                    onClick = {
-                                        if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                                            focusRequester.requestFocus()
-                                            optionsViewModel.onDeleteRunSSID(ssid)
-                                        }
-                                    },
-                                    onIconClick = {
-                                        if (WireGuardAutoTunnel.isRunningOnAndroidTv()) focusRequester.requestFocus()
-                                        optionsViewModel.onDeleteRunSSID(ssid)
-
-                                    },
-                                    text = ssid,
-                                    icon = Icons.Filled.Close,
-                                    enabled = true,
-                                )
-                            }
-                            if (uiState.tunnel == null || uiState.tunnel?.tunnelNetworks?.isEmpty() == true) {
-                                Text(
-                                    stringResource(R.string.no_wifi_names_configured),
-                                    fontStyle = FontStyle.Italic,
-                                    color = Color.Gray,
-                                )
-                            }
-                        }
-                        OutlinedTextField(
-                            enabled = true,
-                            value = currentText,
-                            onValueChange = { currentText = it },
-                            label = { Text(stringResource(id = R.string.use_tunnel_on_wifi_name)) },
-                            modifier =
-                            Modifier
-                                .padding(
-                                    start = screenPadding,
-                                    top = 5.dp,
-                                    bottom = 10.dp,
-                                ),
-                            maxLines = 1,
-                            keyboardOptions =
-                            KeyboardOptions(
-                                capitalization = KeyboardCapitalization.None,
-                                imeAction = ImeAction.Done,
-                            ),
-                            keyboardActions = KeyboardActions(onDone = { saveTrustedSSID() }),
-                            trailingIcon = {
-                                if (currentText != "") {
-                                    IconButton(onClick = { saveTrustedSSID() }) {
-                                        Icon(
-                                            imageVector = Icons.Outlined.Add,
-                                            contentDescription =
-                                            if (currentText == "") {
-                                                stringResource(
-                                                    id =
-                                                    R.string
-                                                        .trusted_ssid_empty_description,
-                                                )
-                                            } else {
-                                                stringResource(
-                                                    id =
-                                                    R.string
-                                                        .trusted_ssid_value_description,
-                                                )
-                                            },
-                                            tint = MaterialTheme.colorScheme.primary,
-                                        )
-                                    }
-                                }
-                            },
-                        )
-                    }
-                }
-            }
-        }
-    }
+	Scaffold(
+		floatingActionButton = {
+			val secondaryColor = MaterialTheme.colorScheme.secondary
+			val tvFobColor = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)
+			val fobColor =
+				if (WireGuardAutoTunnel.isRunningOnAndroidTv()) tvFobColor else secondaryColor
+			val fobIconColor =
+				if (WireGuardAutoTunnel.isRunningOnAndroidTv()) Color.White else MaterialTheme.colorScheme.background
+			AnimatedVisibility(
+				visible = true,
+				enter = slideInVertically(initialOffsetY = { it * 2 }),
+				exit = slideOutVertically(targetOffsetY = { it * 2 }),
+				modifier =
+				Modifier
+					.focusRequester(focusRequester)
+					.focusGroup(),
+			) {
+				MultiFloatingActionButton(
+					fabIcon =
+					FabIcon(
+						iconRes = R.drawable.edit,
+						iconResAfterRotate = R.drawable.close,
+						iconRotate = 180f,
+					),
+					fabOption =
+					FabOption(
+						iconTint = fobIconColor,
+						backgroundTint = fobColor,
+					),
+					itemsMultiFab =
+					listOf(
+						MultiFabItem(
+							label = {
+								Text(
+									stringResource(id = R.string.amnezia),
+									color = Color.White,
+									textAlign = TextAlign.Center,
+									modifier = Modifier.padding(end = 10.dp),
+								)
+							},
+							modifier =
+							Modifier
+								.size(40.dp),
+							icon = R.drawable.edit,
+							value = ConfigType.AMNEZIA.name,
+							miniFabOption =
+							FabOption(
+								backgroundTint = fobColor,
+								fobIconColor,
+							),
+						),
+						MultiFabItem(
+							label = {
+								Text(
+									stringResource(id = R.string.wireguard),
+									color = Color.White,
+									textAlign = TextAlign.Center,
+									modifier = Modifier.padding(end = 10.dp),
+								)
+							},
+							icon = R.drawable.edit,
+							value = ConfigType.WIREGUARD.name,
+							miniFabOption =
+							FabOption(
+								backgroundTint = fobColor,
+								fobIconColor,
+							),
+						),
+					),
+					onFabItemClicked = {
+						val configType = ConfigType.valueOf(it.value)
+						navController.navigate(
+							"${Screen.Config.route}/$tunnelId?configType=${configType.name}",
+						)
+					},
+					shape = RoundedCornerShape(16.dp),
+				)
+			}
+		},
+	) {
+		Column(
+			horizontalAlignment = Alignment.CenterHorizontally,
+			verticalArrangement = Arrangement.Top,
+			modifier =
+			Modifier
+				.fillMaxSize()
+				.verticalScroll(scrollState)
+				.clickable(
+					indication = null,
+					interactionSource = interactionSource,
+				) {
+					focusManager.clearFocus()
+				},
+		) {
+			Surface(
+				tonalElevation = 2.dp,
+				shadowElevation = 2.dp,
+				shape = RoundedCornerShape(12.dp),
+				color = MaterialTheme.colorScheme.surface,
+				modifier =
+				(
+					if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+						Modifier
+							.height(IntrinsicSize.Min)
+							.fillMaxWidth(fillMaxWidth)
+							.padding(top = 10.dp)
+					} else {
+						Modifier
+							.fillMaxWidth(fillMaxWidth)
+							.padding(top = 20.dp)
+					}
+					)
+					.padding(bottom = 10.dp),
+			) {
+				Column(
+					horizontalAlignment = Alignment.Start,
+					verticalArrangement = Arrangement.Top,
+					modifier = Modifier.padding(15.dp),
+				) {
+					SectionTitle(
+						title = stringResource(id = R.string.general),
+						padding = screenPadding,
+					)
+					ConfigurationToggle(
+						stringResource(R.string.set_primary_tunnel),
+						enabled = true,
+						checked = uiState.isDefaultTunnel,
+						modifier =
+						Modifier
+							.focusRequester(focusRequester),
+						padding = screenPadding,
+						onCheckChanged = { optionsViewModel.onTogglePrimaryTunnel() },
+					)
+				}
+			}
+			Surface(
+				tonalElevation = 2.dp,
+				shadowElevation = 2.dp,
+				shape = RoundedCornerShape(12.dp),
+				color = MaterialTheme.colorScheme.surface,
+				modifier =
+				(
+					if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+						Modifier
+							.height(IntrinsicSize.Min)
+							.fillMaxWidth(fillMaxWidth)
+							.padding(top = 10.dp)
+					} else {
+						Modifier
+							.fillMaxWidth(fillMaxWidth)
+							.padding(top = 20.dp)
+					}
+					)
+					.padding(bottom = 10.dp),
+			) {
+				Column(
+					horizontalAlignment = Alignment.Start,
+					verticalArrangement = Arrangement.Top,
+					modifier = Modifier.padding(15.dp),
+				) {
+					SectionTitle(
+						title = stringResource(id = R.string.auto_tunneling),
+						padding = screenPadding,
+					)
+					ConfigurationToggle(
+						stringResource(R.string.mobile_data_tunnel),
+						enabled = true,
+						checked = uiState.tunnel?.isMobileDataTunnel == true,
+						padding = screenPadding,
+						onCheckChanged = { optionsViewModel.onToggleIsMobileDataTunnel() },
+					)
+					Column {
+						FlowRow(
+							modifier =
+							Modifier
+								.padding(screenPadding)
+								.fillMaxWidth(),
+							horizontalArrangement = Arrangement.spacedBy(5.dp),
+						) {
+							uiState.tunnel?.tunnelNetworks?.forEach { ssid ->
+								ClickableIconButton(
+									onClick = {
+										if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+											focusRequester.requestFocus()
+											optionsViewModel.onDeleteRunSSID(ssid)
+										}
+									},
+									onIconClick = {
+										if (WireGuardAutoTunnel.isRunningOnAndroidTv()) focusRequester.requestFocus()
+										optionsViewModel.onDeleteRunSSID(ssid)
+									},
+									text = ssid,
+									icon = Icons.Filled.Close,
+									enabled = true,
+								)
+							}
+							if (uiState.tunnel == null || uiState.tunnel?.tunnelNetworks?.isEmpty() == true) {
+								Text(
+									stringResource(R.string.no_wifi_names_configured),
+									fontStyle = FontStyle.Italic,
+									color = Color.Gray,
+								)
+							}
+						}
+						OutlinedTextField(
+							enabled = true,
+							value = currentText,
+							onValueChange = { currentText = it },
+							label = { Text(stringResource(id = R.string.use_tunnel_on_wifi_name)) },
+							modifier =
+							Modifier
+								.padding(
+									start = screenPadding,
+									top = 5.dp,
+									bottom = 10.dp,
+								),
+							maxLines = 1,
+							keyboardOptions =
+							KeyboardOptions(
+								capitalization = KeyboardCapitalization.None,
+								imeAction = ImeAction.Done,
+							),
+							keyboardActions = KeyboardActions(onDone = { saveTrustedSSID() }),
+							trailingIcon = {
+								if (currentText != "") {
+									IconButton(onClick = { saveTrustedSSID() }) {
+										Icon(
+											imageVector = Icons.Outlined.Add,
+											contentDescription =
+											if (currentText == "") {
+												stringResource(
+													id =
+													R.string
+														.trusted_ssid_empty_description,
+												)
+											} else {
+												stringResource(
+													id =
+													R.string
+														.trusted_ssid_value_description,
+												)
+											},
+											tint = MaterialTheme.colorScheme.primary,
+										)
+									}
+								}
+							},
+						)
+					}
+				}
+			}
+		}
+	}
 }

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

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