feat: auto-tunneling flexibility

build(deps): bump softprops/action-gh-release from 1 to 2

.editorconfig

@@ -0,0 +1,85 @@
+[{*.kt,*.kts}]
+indent_style = space
+insert_final_newline = true
+max_line_length = 100
+indent_size = 4
+ij_continuation_indent_size = 4
+ij_java_names_count_to_use_import_on_demand = 9999
+ij_kotlin_align_in_columns_case_branch = false
+ij_kotlin_align_multiline_binary_operation = false
+ij_kotlin_align_multiline_extends_list = false
+ij_kotlin_align_multiline_method_parentheses = false
+ij_kotlin_align_multiline_parameters = true
+ij_kotlin_align_multiline_parameters_in_calls = false
+ij_kotlin_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
+ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1
+ij_kotlin_block_comment_at_first_column = true
+ij_kotlin_call_parameters_new_line_after_left_paren = true
+ij_kotlin_call_parameters_right_paren_on_new_line = false
+ij_kotlin_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
+ij_kotlin_continuation_indent_in_elvis = false
+ij_kotlin_continuation_indent_in_if_conditions = false
+ij_kotlin_continuation_indent_in_parameter_lists = false
+ij_kotlin_continuation_indent_in_supertype_lists = false
+ij_kotlin_else_on_new_line = false
+ij_kotlin_enum_constants_wrap = off
+ij_kotlin_extends_list_wrap = normal
+ij_kotlin_field_annotation_wrap = split_into_lines
+ij_kotlin_finally_on_new_line = false
+ij_kotlin_if_rparen_on_new_line = false
+ij_kotlin_import_nested_classes = false
+ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
+ij_kotlin_keep_blank_lines_before_right_brace = 2
+ij_kotlin_keep_blank_lines_in_code = 2
+ij_kotlin_keep_blank_lines_in_declarations = 2
+ij_kotlin_keep_first_column_comment = true
+ij_kotlin_keep_indents_on_empty_lines = false
+ij_kotlin_keep_line_breaks = true
+ij_kotlin_lbrace_on_next_line = false
+ij_kotlin_line_comment_add_space = false
+ij_kotlin_line_comment_at_first_column = true
+ij_kotlin_method_annotation_wrap = split_into_lines
+ij_kotlin_method_call_chain_wrap = normal
+ij_kotlin_method_parameters_new_line_after_left_paren = true
+ij_kotlin_method_parameters_right_paren_on_new_line = true
+ij_kotlin_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
+ij_kotlin_space_after_comma = true
+ij_kotlin_space_after_extend_colon = true
+ij_kotlin_space_after_type_colon = true
+ij_kotlin_space_before_catch_parentheses = true
+ij_kotlin_space_before_comma = false
+ij_kotlin_space_before_extend_colon = true
+ij_kotlin_space_before_for_parentheses = true
+ij_kotlin_space_before_if_parentheses = true
+ij_kotlin_space_before_lambda_arrow = true
+ij_kotlin_space_before_type_colon = false
+ij_kotlin_space_before_when_parentheses = true
+ij_kotlin_space_before_while_parentheses = true
+ij_kotlin_spaces_around_additive_operators = true
+ij_kotlin_spaces_around_assignment_operators = true
+ij_kotlin_spaces_around_equality_operators = true
+ij_kotlin_spaces_around_function_type_arrow = true
+ij_kotlin_spaces_around_logical_operators = true
+ij_kotlin_spaces_around_multiplicative_operators = true
+ij_kotlin_spaces_around_range = false
+ij_kotlin_spaces_around_relational_operators = true
+ij_kotlin_spaces_around_unary_operator = false
+ij_kotlin_spaces_around_when_arrow = true
+ij_kotlin_variable_annotation_wrap = off
+ij_kotlin_while_on_new_line = false
+ij_kotlin_wrap_elvis_expressions = 1
+ij_kotlin_wrap_expression_body_functions = 1
+ij_kotlin_wrap_first_method_in_call_chain = false

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+ko_fi: zaneschepke
+liberapay: zaneschepke

.github/ISSUE_TEMPLATE/bug_report.md

@@ -11,12 +11,14 @@ assignees: zaneschepke
 A clear and concise description of what the bug is.
 
 **Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - Android Version: [e.g. iOS8.1]
- - App Version [e.g. 22]
+
+- Device: [e.g. Pixel 4a]
+- Android Version: [e.g. Android 13]
+- App Version [e.g. 3.3.3]
 
 **To Reproduce**
 Steps to reproduce the behavior:
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'

.github/SUPPORT.md

@@ -1,6 +1,6 @@
 # Support
 
-If you are experiencing issues with the app, the following resources are available to help you. 
+If you are experiencing issues with the app, the following resources are available to help you.
 
 <ol>
   <li>

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: daily
+  - package-ecosystem: gradle
+    directory: /
+    schedule:
+      interval: daily

.github/workflows/pre-release.yml

@@ -1,27 +1,31 @@
 # name of the workflow
-name: Android CI Tag Deployment
+name: Android CI Tag Deployment (Pre-release)
 
 on:
+  workflow_dispatch:
   push:
     tags:
-      - '*.*.*'
+      - '*.*.*-**'
 
 jobs:
   build:
     name: Build Signed APK
-    # change to macos because of hilt issues on ubuntu in gradle 8.3
+
     runs-on: ubuntu-latest
 
     env:
-      KEY_STORE_PATH: ${{ secrets.KEY_STORE_PATH }}
       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@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'
@@ -35,10 +39,16 @@ jobs:
         id: decode_keystore
         uses: timheuer/base64-to-file@v1.2
         with:
-          fileName: 'android_keystore.jks'
-          fileDir: ${{ github.workspace }}/app/keystore/
+          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
@@ -52,36 +62,38 @@ jobs:
       - 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@v3.1.2
+        uses: actions/upload-artifact@v4.3.1
         with:
           name: wgtunnel
           path: ${{ steps.apk-path.outputs.path }}
       - name: Download APK from build
-        uses: actions/download-artifact@v1
+        uses: actions/download-artifact@v4
         with:
           name: wgtunnel
       - name: Create Release with Fastlane changelog notes
         id: create_release
-        uses: softprops/action-gh-release@v1
+        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/33100.txt
+          body_path: ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/${{ env.VERSION_CODE }}.txt
           tag_name: ${{ github.ref_name }}
-          name: Release ${{ github.ref_name }}
+          name: ${{ github.ref_name }}
           draft: false
-          prerelease: false
+          prerelease: true
           files: ${{ github.workspace }}/${{ steps.apk-path.outputs.path }}
       - 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/release.yml

@@ -0,0 +1,105 @@
+# name of the workflow
+name: Android CI Tag Deployment (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.1
+        with:
+          name: wgtunnel
+          path: ${{ steps.apk-path.outputs.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
+        with:
+          token: ${{ secrets.PAT }}
+          repository: zaneschepke/fdroid
+          event-type: fdroid-update
+      - 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: 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)
+

README.md

@@ -13,22 +13,18 @@ WG Tunnel
 
 
 [![Google Play](https://img.shields.io/badge/Google_Play-414141?style=for-the-badge&logo=google-play&logoColor=white)](https://play.google.com/store/apps/details?id=com.zaneschepke.wireguardautotunnel)
-[![Fire TV](https://img.shields.io/badge/fire%20tv-fc3b2d?style=for-the-badge&logo=amazon%20fire%20tv&logoColor=white)](https://www.amazon.com/gp/product/B0CFGGL7WK)
 [![F-Droid](https://img.shields.io/static/v1?style=for-the-badge&message=F-Droid&color=1976D2&logo=F-Droid&logoColor=FFFFFF&label=)](https://f-droid.org/packages/com.zaneschepke.wireguardautotunnel/)
 
 
-</div>
-
-<div align="center">
-
-[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/N4N8NMJN2)
-
 </div>
 
 
 <div align="left">
 
-This is an alternative Android Application for [WireGuard](https://www.wireguard.com/) 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.
+This is an alternative Android Application for [WireGuard](https://www.wireguard.com/) 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.
 
 </div>
 
@@ -37,38 +33,50 @@ This is an alternative Android Application for [WireGuard](https://www.wireguard
 ## Screenshots
 
 <p float="center">
-  <img label="Main" style="padding-right:25px" src="asset/main_screen.png" width="200" />
-  <img label="Config" style="padding-left:25px" src="asset/config_screen.png" width="200" />
-  <img label="Settings" style="padding-left:25px" src="asset/settings_screen.png" width="200" />
-  <img label="Support" style="padding-left:25px" src="asset/support_screen.png" width="200" />
+  <img label="Main" style="padding-right:25px" src="fastlane/metadata/android/en-US/images/phoneScreenshots/main_screen.png" width="200" />
+  <img label="Config" style="padding-left:25px" src="fastlane/metadata/android/en-US/images/phoneScreenshots/config_screen.png" width="200" />
+  <img label="Settings" style="padding-left:25px" src="fastlane/metadata/android/en-US/images/phoneScreenshots/settings_screen.png" width="200" />
+  <img label="Support" style="padding-left:25px" src="fastlane/metadata/android/en-US/images/phoneScreenshots/support_screen.png" width="200" />
 </p>
 
 <div align="left">
 
 ## Inspiration
 
-The original inspiration for this app came from the inconvenience of having to manually turn VPN off and on while on different networks. This app was created to offer a free solution to this problem. 
+The original inspiration for this app came from the inconvenience of having to manually turn VPN off
+and on while on different networks. This app was created to offer a free solution to this problem.
 
 ## Features
 
 * Add tunnels via .conf file, zip, manual entry, or QR code
-* Auto connect to VPN based on Wi-Fi SSID
+* Auto connect to VPN based on Wi-Fi SSID, ethernet, or mobile data
 * Split tunneling by application with search
-* Always-on VPN for Android support
+* WireGuard support for kernel and userspace modes
+* Always-On VPN support
 * Export tunnels to zip
 * Quick tile support for VPN toggling
 * Static shortcuts support for primary tunnel for automation integration
 * Intent automation support for all tunnels
-* Optional auto connect on mobile data, ethernet
 * Automatic service restart after reboot
-* Service will stay running in background after app has been closed
+* Battery preservation measures
 
+## Docs (WIP)
+
+Basic documentation of the feature and behaviors of this app can be
+found [here](https://zaneschepke.com/wgtunnel-docs/overview.html).
+
+The repository for these docs can be found [here](https://github.com/zaneschepke/wgtunnel-docs).
 
 ## Building
-    
+
 ```
 $ git clone https://github.com/zaneschepke/wgtunnel
 $ cd wgtunnel
+```
+
+And then build the app:
+
+```
 $ ./gradlew assembleDebug
 ```
 

app/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.hilt.android)
-    id("org.jetbrains.kotlin.plugin.serialization")
+    alias(libs.plugins.kotlinxSerialization)
     alias(libs.plugins.ksp)
 }
 
@@ -19,9 +19,7 @@ android {
         versionCode = Constants.VERSION_CODE
         versionName = Constants.VERSION_NAME
 
-        ksp {
-            arg("room.schemaLocation", "$projectDir/schemas")
-        }
+        ksp { arg("room.schemaLocation", "$projectDir/schemas") }
 
         sourceSets {
             getByName("debug").assets.srcDirs(files("$projectDir/schemas")) // Room
@@ -30,9 +28,7 @@ android {
         resourceConfigurations.addAll(listOf("en"))
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
+        vectorDrawables { useSupportLibrary = true }
     }
 
     signingConfigs {
@@ -47,32 +43,41 @@ android {
                     }
                 }
 
-            // 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)
+            // 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)
-            )
+            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")
+            listOf("libwg-go.so", "libwg-quick.so", "libwg.so"),
         )
 
         applicationVariants.all {
@@ -91,13 +96,11 @@ android {
             isShrinkResources = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
             signingConfig = signingConfigs.getByName(Constants.RELEASE)
         }
-        debug {
-            isDebuggable = true
-        }
+        debug { isDebuggable = true }
     }
     flavorDimensions.add(Constants.TYPE)
     productFlavors {
@@ -108,8 +111,7 @@ android {
         create("general") {
             dimension = Constants.TYPE
             if (BuildHelper.isReleaseBuild(gradle) && BuildHelper.isGeneralFlavor(gradle)) {
-                apply(plugin = "com.google.gms.google-services")
-                apply(plugin = "com.google.firebase.crashlytics")
+                //any plugins general specific
             }
         }
     }
@@ -118,28 +120,24 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
         isCoreLibraryDesugaringEnabled = true
     }
-    kotlinOptions {
-        jvmTarget = Constants.JVM_TARGET
-    }
+    kotlinOptions { jvmTarget = Constants.JVM_TARGET }
     buildFeatures {
         compose = true
         buildConfig = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
-    packaging {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
+    composeOptions { kotlinCompilerExtensionVersion = Constants.COMPOSE_COMPILER_EXTENSION_VERSION }
+    packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
 }
 
 val generalImplementation by configurations
+
 dependencies {
+
+    implementation(project(":logcatter"))
+
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
-    // optional - helpers for implementing LifecycleOwner in a Service
+    // helpers for implementing LifecycleOwner in a Service
     implementation(libs.androidx.lifecycle.service)
     implementation(libs.androidx.activity.compose)
     implementation(platform(libs.androidx.compose.bom))
@@ -160,13 +158,14 @@ dependencies {
     debugImplementation(libs.androidx.compose.ui.tooling)
     debugImplementation(libs.androidx.compose.manifest)
 
-    // wg
+    // get tunnel lib from github packages or mavenLocal
     implementation(libs.tunnel)
     coreLibraryDesugaring(libs.desugar.jdk.libs)
 
     // logging
     implementation(libs.timber)
 
+
     // compose navigation
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.hilt.navigation.compose)
@@ -176,7 +175,6 @@ dependencies {
     ksp(libs.hilt.android.compiler)
 
     // accompanist
-    implementation(libs.accompanist.systemuicontroller)
     implementation(libs.accompanist.permissions)
     implementation(libs.accompanist.flowlayout)
     implementation(libs.accompanist.drawablepainter)
@@ -197,17 +195,13 @@ dependencies {
     // serialization
     implementation(libs.kotlinx.serialization.json)
 
-    // firebase crashlytics
-    generalImplementation(platform(libs.firebase.bom))
-    generalImplementation(libs.google.firebase.crashlytics.ktx)
-    generalImplementation(libs.google.firebase.analytics.ktx)
-
     // barcode scanning
     implementation(libs.zxing.android.embedded)
     implementation(libs.zxing.core)
 
     // bio
     implementation(libs.androidx.biometric.ktx)
+    implementation(libs.pin.lock.compose)
 
     // shortcuts
     implementation(libs.androidx.core)

app/google-services.json

@@ -1,39 +0,0 @@
-{
-  "project_info": {
-    "project_number": "328300975830",
-    "project_id": "wireguard-auto-tunnel",
-    "storage_bucket": "wireguard-auto-tunnel.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:328300975830:android:82cd774598ccb7234b1b77",
-        "android_client_info": {
-          "package_name": "com.zaneschepke.wireguardautotunnel"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "328300975830-m72lc3hr69ddhdqh9ngr27rvc8o0jb2d.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyBsSMY0LlckizXDnuYBy7nXWGSdl8zZedI"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "328300975830-m72lc3hr69ddhdqh9ngr27rvc8o0jb2d.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}

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

@@ -0,0 +1,168 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 6,
+    "identityHash": "625820076477aca948536f7bccccc7ca",
+    "entities": [
+      {
+        "tableName": "Settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_tunnel_enabled` INTEGER NOT NULL, `is_tunnel_on_mobile_data_enabled` INTEGER NOT NULL, `trusted_network_ssids` TEXT NOT NULL, `default_tunnel` TEXT, `is_always_on_vpn_enabled` INTEGER NOT NULL, `is_tunnel_on_ethernet_enabled` INTEGER NOT NULL, `is_shortcuts_enabled` INTEGER NOT NULL DEFAULT false, `is_battery_saver_enabled` INTEGER NOT NULL DEFAULT false, `is_tunnel_on_wifi_enabled` INTEGER NOT NULL DEFAULT false, `is_kernel_enabled` INTEGER NOT NULL DEFAULT false, `is_restore_on_boot_enabled` INTEGER NOT NULL DEFAULT false, `is_multi_tunnel_enabled` INTEGER NOT NULL DEFAULT false, `is_auto_tunnel_paused` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAutoTunnelEnabled",
+            "columnName": "is_tunnel_enabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isTunnelOnMobileDataEnabled",
+            "columnName": "is_tunnel_on_mobile_data_enabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "trustedNetworkSSIDs",
+            "columnName": "trusted_network_ssids",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "defaultTunnel",
+            "columnName": "default_tunnel",
+            "affinity": "TEXT",
+            "notNull": false
+          },
+          {
+            "fieldPath": "isAlwaysOnVpnEnabled",
+            "columnName": "is_always_on_vpn_enabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isTunnelOnEthernetEnabled",
+            "columnName": "is_tunnel_on_ethernet_enabled",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isShortcutsEnabled",
+            "columnName": "is_shortcuts_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isBatterySaverEnabled",
+            "columnName": "is_battery_saver_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isTunnelOnWifiEnabled",
+            "columnName": "is_tunnel_on_wifi_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isKernelEnabled",
+            "columnName": "is_kernel_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isRestoreOnBootEnabled",
+            "columnName": "is_restore_on_boot_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isMultiTunnelEnabled",
+            "columnName": "is_multi_tunnel_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isAutoTunnelPaused",
+            "columnName": "is_auto_tunnel_paused",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isPingEnabled",
+            "columnName": "is_ping_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "TunnelConfig",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `wg_quick` TEXT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wgQuick",
+            "columnName": "wg_quick",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_TunnelConfig_name",
+            "unique": true,
+            "columnNames": [
+              "name"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_TunnelConfig_name` ON `${TABLE_NAME}` (`name`)"
+          }
+        ],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '625820076477aca948536f7bccccc7ca')"
+    ]
+  }
+}

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

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

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

@@ -4,6 +4,7 @@ import androidx.room.testing.MigrationTestHelper
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
+import com.zaneschepke.wireguardautotunnel.data.Queries
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -14,47 +15,21 @@ class MigrationTest {
     private val dbName = "migration-test"
 
     @get:Rule
-    val helper: MigrationTestHelper = MigrationTestHelper(
-        InstrumentationRegistry.getInstrumentation(),
-        AppDatabase::class.java
-    )
+    val helper: MigrationTestHelper =
+        MigrationTestHelper(
+            InstrumentationRegistry.getInstrumentation(),
+            AppDatabase::class.java,
+        )
 
     @Test
     @Throws(IOException::class)
-    fun migrate4To5() {
-        helper.createDatabase(dbName, 4).apply {
+    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(
-                "INSERT INTO Settings (is_tunnel_enabled," +
-                        "is_tunnel_on_mobile_data_enabled," +
-                        "trusted_network_ssids," +
-                        "default_tunnel," +
-                        "is_always_on_vpn_enabled," +
-                        "is_tunnel_on_ethernet_enabled," +
-                        "is_shortcuts_enabled," +
-                        "is_battery_saver_enabled," +
-                        "is_tunnel_on_wifi_enabled," +
-                        "is_kernel_enabled," +
-                        "is_restore_on_boot_enabled," +
-                        "is_multi_tunnel_enabled)" +
-                        " VALUES " +
-                        "('false'," +
-                        "'false'," +
-                        "'[trustedSSID1,trustedSSID2]'," +
-                        "'defaultTunnel'," +
-                        "'false'," +
-                        "'false'," +
-                        "'false'," +
-                        "'false'," +
-                        "'false'," +
-                        "'false'," +
-                        "'false'," +
-                        "'false')"
-            )
-            execSQL(
-                "INSERT INTO TunnelConfig (name, wg_quick)" +
-                        " VALUES ('hello', 'hello')"
+                Queries.createTunnelConfig(),
             )
             // Prepare for the next version.
             close()
@@ -62,7 +37,7 @@ class MigrationTest {
 
         // Re-open the database with version 2 and provide
         // MIGRATION_1_2 as the migration process.
-        helper.runMigrationsAndValidate(dbName, 5, true)
+        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

@@ -1,56 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
+
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="32"
         tools:ignore="ScopedStorage" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"
+    <uses-permission
+        android:name="android.permission.ACCESS_WIFI_STATE"
         android:maxSdkVersion="30"
         tools:ignore="LeanbackUsesWifi" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <!--foreground service exempt android 14-->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED"/>
-    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
 
     <!--foreground service permissions-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     <!--start service on boot permission-->
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <!--android tv support-->
-    <uses-feature android:name="android.software.leanback"
+    <uses-feature
+        android:name="android.software.leanback"
         android:required="false" />
-    <uses-feature android:name="android.hardware.touchscreen"
+    <uses-feature
+        android:name="android.hardware.touchscreen"
         android:required="false" />
     <uses-feature
         android:name="android.hardware.location.gps"
         android:required="false" />
     <uses-feature
-    android:name="android.hardware.screen.portrait"
-    android:required="false" />
+        android:name="android.hardware.screen.portrait"
+        android:required="false" />
+
     <queries>
         <intent>
             <action android:name="android.intent.action.MAIN" />
         </intent>
     </queries>
     <application
-        android:allowBackup="true"
-        android:enableOnBackInvokedCallback="true"
         android:name=".WireGuardAutoTunnel"
+        android:allowBackup="true"
+        android:banner="@mipmap/ic_banner"
         android:dataExtractionRules="@xml/data_extraction_rules"
+        android:enableOnBackInvokedCallback="true"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
-        android:banner="@mipmap/ic_banner"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
@@ -62,11 +68,14 @@
             android:theme="@style/Theme.WireguardAutoTunnel">
             <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"/>
+
+                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
             </intent-filter>
-            <meta-data android:name="android.app.shortcuts"
+            <meta-data
+                android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
         </activity>
         <activity
@@ -74,67 +83,94 @@
             android:screenOrientation="fullSensor"
             android:stateNotNeeded="true"
             android:theme="@style/zxing_CaptureTheme"
-            android:windowSoftInputMode="stateAlwaysHidden" />
+            android:windowSoftInputMode="stateAlwaysHidden"
+            tools:ignore="DiscouragedApi" />
         <activity
-            android:finishOnTaskLaunch="true"
+            android:name=".service.shortcut.ShortcutsActivity"
             android:enabled="true"
             android:exported="true"
-            android:theme="@android:style/Theme.NoDisplay"
-            android:name=".service.shortcut.ShortcutsActivity"/>
+            android:finishOnTaskLaunch="true"
+            android:theme="@android:style/Theme.NoDisplay" />
+
         <service
             android:name=".service.foreground.ForegroundService"
             android:enabled="true"
-            android:foregroundServiceType="systemExempted|specialUse"
-            tools:node="merge"
-            android:exported="false">
+            android:exported="false"
+            android:foregroundServiceType="systemExempted"
+            tools:node="merge" />
+        <service
+            android:name=".service.tile.TunnelControlTile"
+            android:exported="true"
+            android:icon="@drawable/ic_launcher"
+            android:label="Tunnel control"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+            <meta-data
+                android:name="android.service.quicksettings.ACTIVE_TILE"
+                android:value="true" />
+            <meta-data
+                android:name="android.service.quicksettings.TOGGLEABLE_TILE"
+                android:value="true" />
+
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
         </service>
         <service
+            android:name=".service.tile.AutoTunnelControlTile"
             android:exported="true"
-            android:name=".service.tile.TunnelControlTile"
-            android:icon="@drawable/shield"
-            android:label="WG Tunnel"
+            android:icon="@drawable/ic_launcher"
+            android:label="Auto-tunnel"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
-            <meta-data android:name="android.service.quicksettings.ACTIVE_TILE"
+            <meta-data
+                android:name="android.service.quicksettings.ACTIVE_TILE"
                 android:value="true" />
-            <meta-data android:name="android.service.quicksettings.TOGGLEABLE_TILE"
+            <meta-data
+                android:name="android.service.quicksettings.TOGGLEABLE_TILE"
                 android:value="true" />
+
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
         </service>
         <service
             android:name=".service.foreground.WireGuardTunnelService"
-            android:permission="android.permission.BIND_VPN_SERVICE"
             android:enabled="true"
+            android:exported="false"
+            android:foregroundServiceType="systemExempted"
+            android:permission="android.permission.BIND_VPN_SERVICE"
             android:persistent="true"
-            android:foregroundServiceType="systemExempted|specialUse"
-            tools:node="merge"
-            android:exported="false">
+            tools:node="merge">
             <intent-filter>
-                <action android:name="android.net.VpnService"/>
+                <action android:name="android.net.VpnService" />
             </intent-filter>
-            <meta-data android:name="android.net.VpnService.SUPPORTS_ALWAYS_ON"
+            <meta-data
+                android:name="android.net.VpnService.SUPPORTS_ALWAYS_ON"
                 android:value="true" />
         </service>
         <service
             android:name=".service.foreground.WireGuardConnectivityWatcherService"
             android:enabled="true"
-            android:stopWithTask="false"
+            android:exported="false"
+            android:foregroundServiceType="systemExempted"
             android:persistent="true"
-            android:foregroundServiceType="systemExempted|specialUse"
-            tools:node="merge"
-            android:exported="false">
-        </service>
-        <receiver android:enabled="true" android:name=".receiver.BootReceiver"
+            android:stopWithTask="false"
+            tools:node="merge" />
+
+        <receiver
+            android:name=".receiver.BootReceiver"
+            android:enabled="true"
             android:exported="false">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.ACTION_BOOT_COMPLETED" />
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
                 <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
             </intent-filter>
         </receiver>
-        <receiver android:exported="false" android:name=".receiver.NotificationActionReceiver"/>
+        <receiver
+            android:name=".receiver.NotificationActionReceiver"
+            android:exported="false" />
     </application>
 </manifest>

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

@@ -2,63 +2,45 @@ package com.zaneschepke.wireguardautotunnel
 
 import android.app.Application
 import android.content.ComponentName
+import android.content.Context
 import android.content.pm.PackageManager
 import android.service.quicksettings.TileService
-import androidx.lifecycle.ProcessLifecycleOwner
-import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
-import com.zaneschepke.wireguardautotunnel.data.model.Settings
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+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.launch
 import timber.log.Timber
-import java.io.IOException
-import javax.inject.Inject
+import xyz.teamgravity.pin_lock_compose.PinManager
 
 @HiltAndroidApp
 class WireGuardAutoTunnel : Application() {
-    @Inject
-    lateinit var settingsRepository: SettingsRepository
-
-    @Inject
-    lateinit var dataStoreManager: DataStoreManager
-
     override fun onCreate() {
         super.onCreate()
         instance = this
-        if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree())
-        initSettings()
-        with(ProcessLifecycleOwner.get()) {
-            lifecycleScope.launch {
-                try {
-                    // load preferences into memory
-                    dataStoreManager.init()
-                    requestTileServiceStateUpdate()
-                } catch (e: IOException) {
-                    Timber.e("Failed to load preferences")
-                }
-            }
-        }
-    }
-
-    private fun initSettings() {
-        with(ProcessLifecycleOwner.get()) {
-            lifecycleScope.launch {
-                if (settingsRepository.getAll().isEmpty()) {
-                    settingsRepository.save(Settings())
-                }
-            }
-        }
+        if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree()) else Timber.plant(ReleaseTree())
+        PinManager.initialize(this)
     }
 
     companion object {
-        lateinit var instance: WireGuardAutoTunnel private set
+        lateinit var instance: WireGuardAutoTunnel
+            private set
+
         fun isRunningOnAndroidTv(): Boolean {
             return instance.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
         }
-        fun requestTileServiceStateUpdate() {
-            TileService.requestListeningState(instance, ComponentName(instance, TunnelControlTile::class.java))
+
+        fun requestTunnelTileServiceStateUpdate(context: Context) {
+            TileService.requestListeningState(
+                context,
+                ComponentName(instance, TunnelControlTile::class.java),
+            )
+        }
+
+        fun requestAutoTunnelTileServiceUpdate(context: Context) {
+            TileService.requestListeningState(
+                context,
+                ComponentName(instance, AutoTunnelControlTile::class.java),
+            )
         }
     }
 }

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

@@ -2,24 +2,39 @@ package com.zaneschepke.wireguardautotunnel.data
 
 import androidx.room.AutoMigration
 import androidx.room.Database
+import androidx.room.DeleteColumn
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
+import androidx.room.migration.AutoMigrationSpec
 import com.zaneschepke.wireguardautotunnel.data.model.Settings
 import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 
 @Database(
     entities = [Settings::class, TunnelConfig::class],
-    version = 5,
-    autoMigrations = [
-        AutoMigration(from = 1, to = 2), AutoMigration(from = 2, to = 3), AutoMigration(
+    version = 7,
+    autoMigrations =
+    [
+        AutoMigration(from = 1, to = 2),
+        AutoMigration(from = 2, to = 3),
+        AutoMigration(
             from = 3,
-            to = 4
-        ),AutoMigration(
+            to = 4,
+        ),
+        AutoMigration(
             from = 4,
-            to = 5
-        )
+            to = 5,
+        ),
+        AutoMigration(
+            from = 5,
+            to = 6,
+        ),
+        AutoMigration(
+            from = 6,
+            to = 7,
+            spec = RemoveLegacySettingColumnsMigration::class,
+        ),
     ],
-    exportSchema = true
+    exportSchema = true,
 )
 @TypeConverters(DatabaseListConverters::class)
 abstract class AppDatabase : RoomDatabase() {
@@ -27,3 +42,13 @@ abstract class AppDatabase : RoomDatabase() {
 
     abstract fun tunnelConfigDoa(): TunnelConfigDao
 }
+
+@DeleteColumn(
+    tableName = "Settings",
+    columnName = "default_tunnel",
+)
+@DeleteColumn(
+    tableName = "Settings",
+    columnName = "is_battery_saver_enabled",
+)
+class RemoveLegacySettingColumnsMigration : AutoMigrationSpec

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

@@ -0,0 +1,21 @@
+package com.zaneschepke.wireguardautotunnel.data
+
+import androidx.room.RoomDatabase
+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()
+        }
+    }
+}

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

@@ -12,7 +12,7 @@ class DatabaseListConverters {
 
     @TypeConverter
     fun stringToList(value: String): MutableList<String> {
-        if (value.isEmpty()) return mutableListOf()
+        if (value.isBlank() || value.isEmpty()) return mutableListOf()
         return try {
             Json.decodeFromString<MutableList<String>>(value)
         } catch (e: Exception) {

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

@@ -0,0 +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 createTunnelConfig(): String {
+        return """
+            INSERT INTO TunnelConfig (name, wg_quick) VALUES ('test', 'test')
+        """.trimIndent()
+    }
+}

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

@@ -6,6 +6,7 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.util.TunnelConfigs
 import kotlinx.coroutines.flow.Flow
 
 @Dao
@@ -14,13 +15,13 @@ interface TunnelConfigDao {
     suspend fun save(t: TunnelConfig)
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun saveAll(t: List<TunnelConfig>)
+    suspend fun saveAll(t: TunnelConfigs)
 
     @Query("SELECT * FROM TunnelConfig WHERE id=:id")
     suspend fun getById(id: Long): TunnelConfig?
 
     @Query("SELECT * FROM TunnelConfig")
-    suspend fun getAll(): List<TunnelConfig>
+    suspend fun getAll(): TunnelConfigs
 
     @Delete
     suspend fun delete(t: TunnelConfig)
@@ -28,6 +29,21 @@ interface TunnelConfigDao {
     @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("UPDATE TunnelConfig SET is_primary_tunnel = 0 WHERE is_primary_tunnel =1")
+    fun resetPrimaryTunnel()
+
+    @Query("UPDATE TunnelConfig SET is_mobile_data_tunnel = 0 WHERE is_mobile_data_tunnel =1")
+    fun resetMobileDataTunnel()
+
+    @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")
     fun getAllFlow(): Flow<MutableList<TunnelConfig>>
 }

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

@@ -1,39 +1,70 @@
 package com.zaneschepke.wireguardautotunnel.data.datastore
+
 import android.content.Context
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.intPreferencesKey
+import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.runBlocking
+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")
     }
 
     // preferences
     private val preferencesKey = "preferences"
-    private val Context.dataStore by preferencesDataStore(
-        name = preferencesKey
+    private val Context.dataStore by
+    preferencesDataStore(
+        name = preferencesKey,
     )
 
     suspend fun init() {
-        context.dataStore.data.first()
+        try {
+            context.dataStore.data.first()
+        } catch (e: IOException) {
+            Timber.e(e)
+        }
     }
 
-    suspend fun <T> saveToDataStore(key: Preferences.Key<T>, value: T) =
-        context.dataStore.edit {
-        it[key] = value
-    }
-    fun <T> getFromStoreFlow(key: Preferences.Key<T>) = context.dataStore.data.map {
-        it[key]
+    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> getFromStore(key: Preferences.Key<T>) = context.dataStore.data.first { it.contains(key) }[key]
 
-    val locationDisclosureFlow: Flow<Boolean?> = context.dataStore.data.map {
-        it[LOCATION_DISCLOSURE_SHOWN]
+    fun <T> getFromStoreFlow(key: Preferences.Key<T>) = context.dataStore.data.map { it[key] }
+
+    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()
+    }
+
+    val preferencesFlow: Flow<Preferences?> = context.dataStore.data
 }

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

@@ -0,0 +1,14 @@
+package com.zaneschepke.wireguardautotunnel.data.model
+
+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
+) {
+    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
+    }
+}

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

@@ -7,47 +7,47 @@ import androidx.room.PrimaryKey
 @Entity
 data class Settings(
     @PrimaryKey(autoGenerate = true) val id: Int = 0,
-    @ColumnInfo(name = "is_tunnel_enabled") var isAutoTunnelEnabled: Boolean = false,
-    @ColumnInfo(name = "is_tunnel_on_mobile_data_enabled") var isTunnelOnMobileDataEnabled: Boolean = false,
-    @ColumnInfo(name = "trusted_network_ssids") var trustedNetworkSSIDs: MutableList<String> = mutableListOf(),
-    @ColumnInfo(name = "default_tunnel") var defaultTunnel: String? = null,
-    @ColumnInfo(name = "is_always_on_vpn_enabled") var isAlwaysOnVpnEnabled: Boolean = false,
-    @ColumnInfo(name = "is_tunnel_on_ethernet_enabled") var isTunnelOnEthernetEnabled: Boolean = false,
+    @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"
-    ) var isShortcutsEnabled: Boolean = false,
-    @ColumnInfo(
-        name = "is_battery_saver_enabled",
-        defaultValue = "false"
-    ) var isBatterySaverEnabled: Boolean = false,
+        defaultValue = "false",
+    )
+    val isShortcutsEnabled: Boolean = false,
     @ColumnInfo(
         name = "is_tunnel_on_wifi_enabled",
-        defaultValue = "false"
-    ) var isTunnelOnWifiEnabled: Boolean = false,
+        defaultValue = "false",
+    )
+    val isTunnelOnWifiEnabled: Boolean = false,
     @ColumnInfo(
         name = "is_kernel_enabled",
-        defaultValue = "false"
-    ) var isKernelEnabled: Boolean = false,
+        defaultValue = "false",
+    )
+    val isKernelEnabled: Boolean = false,
     @ColumnInfo(
-    name = "is_restore_on_boot_enabled",
-    defaultValue = "false"
-    ) var isRestoreOnBootEnabled: Boolean = false,
+        name = "is_restore_on_boot_enabled",
+        defaultValue = "false",
+    )
+    val isRestoreOnBootEnabled: Boolean = false,
     @ColumnInfo(
-    name = "is_multi_tunnel_enabled",
-    defaultValue = "false"
-    ) var isMultiTunnelEnabled: Boolean = false,
+        name = "is_multi_tunnel_enabled",
+        defaultValue = "false",
+    )
+    val isMultiTunnelEnabled: Boolean = false,
     @ColumnInfo(
         name = "is_auto_tunnel_paused",
-        defaultValue = "false"
-    ) var isAutoTunnelPaused: Boolean = false,
-) {
-    fun isTunnelConfigDefault(tunnelConfig: TunnelConfig): Boolean {
-        return if (defaultTunnel != null) {
-            val defaultConfig = TunnelConfig.from(defaultTunnel!!)
-            (tunnelConfig.id == defaultConfig.id)
-        } else {
-            false
-        }
-    }
-}
+        defaultValue = "false",
+    )
+    val isAutoTunnelPaused: Boolean = false,
+    @ColumnInfo(
+        name = "is_ping_enabled",
+        defaultValue = "false",
+    )
+    val isPingEnabled: Boolean = false,
+)

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

@@ -5,26 +5,30 @@ import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
 import com.wireguard.config.Config
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
 import java.io.InputStream
 
 @Entity(indices = [Index(value = ["name"], unique = true)])
-@Serializable
 data class TunnelConfig(
     @PrimaryKey(autoGenerate = true) val id: Int = 0,
-    @ColumnInfo(name = "name") var name: String,
-    @ColumnInfo(name = "wg_quick") var wgQuick: String
+    @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,
 ) {
-    override fun toString(): String {
-        return Json.encodeToString(serializer(), this)
-    }
-
     companion object {
-        fun from(string: String): TunnelConfig {
-            return Json.decodeFromString<TunnelConfig>(string)
-        }
-
         fun configFromQuick(wgQuick: String): Config {
             val inputStream: InputStream = wgQuick.byteInputStream()
             val reader = inputStream.bufferedReader(Charsets.UTF_8)

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

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

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

@@ -0,0 +1,34 @@
+package com.zaneschepke.wireguardautotunnel.data.repository
+
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import javax.inject.Inject
+
+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 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,
+                ),
+            )
+        }
+    }
+}

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

@@ -0,0 +1,26 @@
+package com.zaneschepke.wireguardautotunnel.data.repository
+
+import com.zaneschepke.wireguardautotunnel.data.model.GeneralState
+import kotlinx.coroutines.flow.Flow
+
+interface AppStateRepository {
+    suspend fun isLocationDisclosureShown(): Boolean
+    suspend fun setLocationDisclosureShown(shown: Boolean)
+
+    suspend fun isBatteryOptimizationDisableShown(): Boolean
+    suspend fun setBatteryOptimizationDisableShown(shown: Boolean)
+
+    suspend fun isTunnelRunningFromManualStart(): Boolean
+    suspend fun setTunnelRunningFromManualStart(id: Int)
+
+    suspend fun setManualStop()
+
+    suspend fun getActiveTunnelId(): Int?
+
+    suspend fun getCurrentSsid(): String?
+
+    suspend fun setCurrentSsid(ssid: String)
+
+    val generalStateFlow: Flow<GeneralState>
+
+}

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

@@ -0,0 +1,81 @@
+package com.zaneschepke.wireguardautotunnel.data.repository
+
+import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
+import com.zaneschepke.wireguardautotunnel.data.model.GeneralState
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import timber.log.Timber
+
+class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager) :
+    AppStateRepository {
+    override suspend fun isLocationDisclosureShown(): Boolean {
+        return dataStoreManager.getFromStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN)
+            ?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT
+    }
+
+    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 setBatteryOptimizationDisableShown(shown: Boolean) {
+        dataStoreManager.saveToDataStore(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN, shown)
+    }
+
+    override suspend fun isTunnelRunningFromManualStart(): Boolean {
+        return dataStoreManager.getFromStore(DataStoreManager.TUNNEL_RUNNING_FROM_MANUAL_START)
+            ?: GeneralState.TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT
+    }
+
+    override suspend fun setTunnelRunningFromManualStart(id: Int) {
+        setTunnelRunningFromManualStart(true)
+        setActiveTunnelId(id)
+    }
+
+    override suspend fun setManualStop() {
+        setTunnelRunningFromManualStart(false)
+    }
+
+    private suspend fun setTunnelRunningFromManualStart(running: Boolean) {
+        dataStoreManager.saveToDataStore(DataStoreManager.TUNNEL_RUNNING_FROM_MANUAL_START, running)
+    }
+
+    override suspend fun getActiveTunnelId(): Int? {
+        return dataStoreManager.getFromStore(DataStoreManager.ACTIVE_TUNNEL)
+    }
+
+    private suspend fun setActiveTunnelId(id: Int) {
+        dataStoreManager.saveToDataStore(DataStoreManager.ACTIVE_TUNNEL, id)
+    }
+
+    override suspend fun getCurrentSsid(): String? {
+        return dataStoreManager.getFromStore(DataStoreManager.CURRENT_SSID)
+    }
+
+    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(
+                        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()
+        }
+}

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

@@ -4,7 +4,7 @@ import com.zaneschepke.wireguardautotunnel.data.SettingsDao
 import com.zaneschepke.wireguardautotunnel.data.model.Settings
 import kotlinx.coroutines.flow.Flow
 
-class SettingsRepositoryImpl(private val settingsDoa: SettingsDao) : SettingsRepository {
+class RoomSettingsRepository(private val settingsDoa: SettingsDao) : SettingsRepository {
 
     override suspend fun save(settings: Settings) {
         settingsDoa.save(settings)
@@ -21,4 +21,4 @@ class SettingsRepositoryImpl(private val settingsDoa: SettingsDao) : SettingsRep
     override suspend fun getAll(): List<Settings> {
         return settingsDoa.getAll()
     }
-}
+}

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

@@ -0,0 +1,68 @@
+package com.zaneschepke.wireguardautotunnel.data.repository
+
+import com.zaneschepke.wireguardautotunnel.data.TunnelConfigDao
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+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()
+    }
+
+    override suspend fun getAll(): TunnelConfigs {
+        return tunnelConfigDao.getAll()
+    }
+
+    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 updateMobileDataTunnel(tunnelConfig: TunnelConfig?) {
+        tunnelConfigDao.resetMobileDataTunnel()
+        tunnelConfig?.let {
+            save(
+                it.copy(
+                    isMobileDataTunnel = true,
+                ),
+            )
+        }
+    }
+
+    override suspend fun delete(tunnelConfig: TunnelConfig) {
+        tunnelConfigDao.delete(tunnelConfig)
+    }
+
+    override suspend fun getById(id: Int): TunnelConfig? {
+        return tunnelConfigDao.getById(id.toLong())
+    }
+
+    override suspend fun count(): Int {
+        return tunnelConfigDao.count().toInt()
+    }
+
+    override suspend fun findByTunnelNetworksName(name: String): TunnelConfigs {
+        return tunnelConfigDao.findByTunnelNetworkName(name)
+    }
+
+    override suspend fun findByMobileDataTunnel(): TunnelConfigs {
+        return tunnelConfigDao.findByMobileDataTunnel()
+    }
+
+    override suspend fun findPrimary(): TunnelConfigs {
+        return tunnelConfigDao.findByPrimary()
+    }
+}

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

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

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

@@ -6,9 +6,25 @@ import kotlinx.coroutines.flow.Flow
 
 interface TunnelConfigRepository {
 
-    fun getTunnelConfigsFlow() : Flow<TunnelConfigs>
-    suspend fun getAll() : TunnelConfigs
+    fun getTunnelConfigsFlow(): Flow<TunnelConfigs>
+
+    suspend fun getAll(): TunnelConfigs
+
     suspend fun save(tunnelConfig: TunnelConfig)
+
+    suspend fun updatePrimaryTunnel(tunnelConfig: TunnelConfig?)
+
+    suspend fun updateMobileDataTunnel(tunnelConfig: TunnelConfig?)
+
     suspend fun delete(tunnelConfig: TunnelConfig)
-    suspend fun count() : Int
-}
+
+    suspend fun getById(id: Int): TunnelConfig?
+
+    suspend fun count(): Int
+
+    suspend fun findByTunnelNetworksName(name: String): TunnelConfigs
+
+    suspend fun findByMobileDataTunnel(): TunnelConfigs
+
+    suspend fun findPrimary(): TunnelConfigs
+}

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

@@ -1,28 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.repository
-
-import com.zaneschepke.wireguardautotunnel.data.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.util.TunnelConfigs
-import kotlinx.coroutines.flow.Flow
-
-class TunnelConfigRepositoryImpl(private val tunnelConfigDao: TunnelConfigDao) : TunnelConfigRepository {
-    override fun getTunnelConfigsFlow(): Flow<TunnelConfigs> {
-        return tunnelConfigDao.getAllFlow()
-    }
-
-    override suspend fun getAll(): TunnelConfigs {
-        return tunnelConfigDao.getAll()
-    }
-
-    override suspend fun save(tunnelConfig: TunnelConfig) {
-        tunnelConfigDao.save(tunnelConfig)
-    }
-
-    override suspend fun delete(tunnelConfig: TunnelConfig) {
-        tunnelConfigDao.delete(tunnelConfig)
-    }
-
-    override suspend fun count(): Int {
-        return tunnelConfigDao.count().toInt()
-    }
-}

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

@@ -4,6 +4,7 @@ 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
@@ -16,15 +17,14 @@ import javax.inject.Singleton
 class DatabaseModule {
     @Provides
     @Singleton
-    fun provideDatabase(
-        @ApplicationContext context: Context
-    ): AppDatabase {
+    fun provideDatabase(@ApplicationContext context: Context): AppDatabase {
         return Room.databaseBuilder(
             context,
             AppDatabase::class.java,
-            context.getString(R.string.db_name)
+            context.getString(R.string.db_name),
         )
             .fallbackToDestructiveMigration()
+            .addCallback(DatabaseCallback())
             .build()
     }
 }

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

@@ -5,10 +5,14 @@ import com.zaneschepke.wireguardautotunnel.data.AppDatabase
 import com.zaneschepke.wireguardautotunnel.data.SettingsDao
 import com.zaneschepke.wireguardautotunnel.data.TunnelConfigDao
 import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRoomRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.DataStoreAppStateRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.RoomSettingsRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.RoomTunnelConfigRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepositoryImpl
 import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepositoryImpl
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -34,13 +38,13 @@ class RepositoryModule {
     @Singleton
     @Provides
     fun provideTunnelConfigRepository(tunnelConfigDao: TunnelConfigDao): TunnelConfigRepository {
-        return TunnelConfigRepositoryImpl(tunnelConfigDao)
+        return RoomTunnelConfigRepository(tunnelConfigDao)
     }
 
     @Singleton
     @Provides
     fun provideSettingsRepository(settingsDao: SettingsDao): SettingsRepository {
-        return SettingsRepositoryImpl(settingsDao)
+        return RoomSettingsRepository(settingsDao)
     }
 
     @Singleton
@@ -48,4 +52,22 @@ class RepositoryModule {
     fun providePreferencesDataStore(@ApplicationContext context: Context): DataStoreManager {
         return DataStoreManager(context)
     }
+
+    @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

@@ -17,7 +17,9 @@ import dagger.hilt.android.scopes.ServiceScoped
 abstract class ServiceModule {
     @Binds
     @ServiceScoped
-    abstract fun provideNotificationService(wireGuardNotification: WireGuardNotification): NotificationService
+    abstract fun provideNotificationService(
+        wireGuardNotification: WireGuardNotification
+    ): NotificationService
 
     @Binds
     @ServiceScoped
@@ -25,9 +27,13 @@ abstract class ServiceModule {
 
     @Binds
     @ServiceScoped
-    abstract fun provideMobileDataService(mobileDataService: MobileDataService): NetworkService<MobileDataService>
+    abstract fun provideMobileDataService(
+        mobileDataService: MobileDataService
+    ): NetworkService<MobileDataService>
 
     @Binds
     @ServiceScoped
-    abstract fun provideEthernetService(ethernetService: EthernetService): NetworkService<EthernetService>
+    abstract fun provideEthernetService(
+        ethernetService: EthernetService
+    ): NetworkService<EthernetService>
 }

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

@@ -6,7 +6,8 @@ import com.wireguard.android.backend.GoBackend
 import com.wireguard.android.backend.WgQuickBackend
 import com.wireguard.android.util.RootShell
 import com.wireguard.android.util.ToolsInstaller
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.WireGuardTunnel
 import dagger.Module
@@ -21,28 +22,21 @@ import javax.inject.Singleton
 class TunnelModule {
     @Provides
     @Singleton
-    fun provideRootShell(
-        @ApplicationContext context: Context
-    ): RootShell {
+    fun provideRootShell(@ApplicationContext context: Context): RootShell {
         return RootShell(context)
     }
 
     @Provides
     @Singleton
     @Userspace
-    fun provideUserspaceBackend(
-        @ApplicationContext context: Context
-    ): Backend {
+    fun provideUserspaceBackend(@ApplicationContext context: Context): Backend {
         return GoBackend(context)
     }
 
     @Provides
     @Singleton
     @Kernel
-    fun provideKernelBackend(
-        @ApplicationContext context: Context,
-        rootShell: RootShell
-    ): Backend {
+    fun provideKernelBackend(@ApplicationContext context: Context, rootShell: RootShell): Backend {
         return WgQuickBackend(context, rootShell, ToolsInstaller(context, rootShell))
     }
 
@@ -51,8 +45,14 @@ class TunnelModule {
     fun provideVpnService(
         @Userspace userspaceBackend: Backend,
         @Kernel kernelBackend: Backend,
-        settingsRepository : SettingsRepository
+        appDataRepository: AppDataRepository
     ): VpnService {
-        return WireGuardTunnel(userspaceBackend, kernelBackend, settingsRepository)
+        return WireGuardTunnel(userspaceBackend, kernelBackend, appDataRepository)
+    }
+
+    @Provides
+    @Singleton
+    fun provideServiceManager(appDataRepository: AppDataRepository): ServiceManager {
+        return ServiceManager(appDataRepository)
     }
 }

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

@@ -3,23 +3,43 @@ package com.zaneschepke.wireguardautotunnel.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.util.goAsync
 import dagger.hilt.android.AndroidEntryPoint
+import timber.log.Timber
 import javax.inject.Inject
 
-
 @AndroidEntryPoint
 class BootReceiver : BroadcastReceiver() {
 
     @Inject
-    lateinit var settingsRepository: SettingsRepository
+    lateinit var appDataRepository: AppDataRepository
+
+    @Inject
+    lateinit var serviceManager: ServiceManager
+
     override fun onReceive(context: Context?, intent: Intent?) = goAsync {
         if (Intent.ACTION_BOOT_COMPLETED != intent?.action) return@goAsync
-        if(settingsRepository.getSettings().isAutoTunnelEnabled) {
-            ServiceManager.startWatcherServiceForeground(context!!)
+        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)
+            }
         }
     }
-
 }

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

@@ -10,6 +10,7 @@ import com.zaneschepke.wireguardautotunnel.util.goAsync
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
+import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -17,17 +18,17 @@ class NotificationActionReceiver : BroadcastReceiver() {
     @Inject
     lateinit var settingsRepository: SettingsRepository
 
-    override fun onReceive(
-        context: Context,
-        intent: Intent?
-    ) = goAsync {
+    @Inject
+    lateinit var serviceManager: ServiceManager
+
+    override fun onReceive(context: Context, intent: Intent?) = goAsync {
         try {
-            val settings = settingsRepository.getSettings()
-            if (settings.defaultTunnel != null) {
-                ServiceManager.stopVpnService(context)
-                delay(Constants.TOGGLE_TUNNEL_DELAY)
-                ServiceManager.startVpnService(context, settings.defaultTunnel.toString())
-            }
+            //TODO fix for manual start changes when enabled
+            serviceManager.stopVpnService(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/ForegroundService.kt

@@ -4,6 +4,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.os.IBinder
 import androidx.lifecycle.LifecycleService
+import com.zaneschepke.wireguardautotunnel.util.Constants
 import timber.log.Timber
 
 open class ForegroundService : LifecycleService() {
@@ -15,28 +16,26 @@ open class ForegroundService : LifecycleService() {
         return null
     }
 
-    override fun onStartCommand(
-        intent: Intent?,
-        flags: Int,
-        startId: Int
-    ): Int {
+    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
-            Timber.d("using an intent with action $action")
             when (action) {
-                Action.START.name, Action.START_FOREGROUND.name -> startService(intent.extras)
+                Action.START.name,
+                Action.START_FOREGROUND.name -> startService(intent.extras)
+
                 Action.STOP.name -> stopService(intent.extras)
-                "android.net.VpnService" -> {
-                    Timber.d("Always-on VPN starting service")
+                Constants.ALWAYS_ON_VPN_ACTION -> {
+                    Timber.i("Always-on VPN starting service")
                     startService(intent.extras)
                 }
+
                 else -> Timber.d("This should never happen. No action in the received intent")
             }
         } else {
             Timber.d(
-                "with a null intent. It has been probably restarted by the system."
+                "with a null intent. It has been probably restarted by the system.",
             )
         }
         // by returning this we make sure the service is restarted if the system kills the service
@@ -60,7 +59,7 @@ open class ForegroundService : LifecycleService() {
             stopForeground(STOP_FOREGROUND_REMOVE)
             stopSelf()
         } catch (e: Exception) {
-            Timber.d("Service stopped without being started: ${e.message}")
+            Timber.e(e)
         }
         isServiceStarted = false
     }

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

@@ -1,43 +1,24 @@
 package com.zaneschepke.wireguardautotunnel.service.foreground
 
-import android.app.ActivityManager
 import android.app.Service
 import android.content.Context
-import android.content.Context.ACTIVITY_SERVICE
 import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.util.Constants
 import timber.log.Timber
 
-object ServiceManager {
-    @Suppress("DEPRECATION")
-    private // Deprecated for third party Services.
-    fun <T> Context.isServiceRunning(service: Class<T>) =
-        (getSystemService(ACTIVITY_SERVICE) as ActivityManager)
-            .getRunningServices(Integer.MAX_VALUE)
-            .any { it.service.className == service.name }
-
-    fun <T : Service> getServiceState(
-        context: Context,
-        cls: Class<T>
-    ): ServiceState {
-        val isServiceRunning = context.isServiceRunning(cls)
-        return if (isServiceRunning) ServiceState.STARTED else ServiceState.STOPPED
-    }
+class ServiceManager(private val appDataRepository: AppDataRepository) {
 
     private fun <T : Service> actionOnService(
         action: Action,
         context: Context,
         cls: Class<T>,
-        extras: Map<String, String>? = null
+        extras: Map<String, Int>? = null
     ) {
-        if (getServiceState(context, cls) == ServiceState.STOPPED && action == Action.STOP) return
-        if (getServiceState(context, cls) == ServiceState.STARTED && action == Action.START) return
         val intent =
             Intent(context, cls).also {
                 it.action = action.name
-                extras?.forEach { (k, v) ->
-                    it.putExtra(k, v)
-                }
+                extras?.forEach { (k, v) -> it.putExtra(k, v) }
             }
         intent.component?.javaClass
         try {
@@ -57,35 +38,51 @@ object ServiceManager {
         }
     }
 
-    fun startVpnService(
+    suspend fun startVpnService(
         context: Context,
-        tunnelConfig: String
+        tunnelId: Int? = null,
+        isManualStart: Boolean = false
     ) {
+        if (isManualStart) onManualStart(tunnelId)
         actionOnService(
             Action.START,
             context,
             WireGuardTunnelService::class.java,
-            mapOf(context.getString(R.string.tunnel_extras_key) to tunnelConfig)
+            tunnelId?.let { mapOf(Constants.TUNNEL_EXTRA_KEY to it) },
         )
     }
 
-    fun stopVpnService(context: Context) {
+    suspend fun stopVpnService(context: Context, isManualStop: Boolean = false) {
+        if (isManualStop) onManualStop()
+        Timber.d("Stopping vpn service action")
         actionOnService(
             Action.STOP,
             context,
-            WireGuardTunnelService::class.java
+            WireGuardTunnelService::class.java,
         )
     }
 
-    fun startVpnServiceForeground(
+    private suspend fun onManualStop() {
+        appDataRepository.appState.setManualStop()
+    }
+
+    private suspend fun onManualStart(tunnelId: Int?) {
+        tunnelId?.let {
+            appDataRepository.appState.setTunnelRunningFromManualStart(it)
+        }
+    }
+
+    suspend fun startVpnServiceForeground(
         context: Context,
-        tunnelConfig: String
+        tunnelId: Int? = null,
+        isManualStart: Boolean = false
     ) {
+        if (isManualStart) onManualStart(tunnelId)
         actionOnService(
             Action.START_FOREGROUND,
             context,
             WireGuardTunnelService::class.java,
-            mapOf(context.getString(R.string.tunnel_extras_key) to tunnelConfig)
+            tunnelId?.let { mapOf(Constants.TUNNEL_EXTRA_KEY to it) },
         )
     }
 
@@ -95,17 +92,15 @@ object ServiceManager {
         actionOnService(
             Action.START_FOREGROUND,
             context,
-            WireGuardConnectivityWatcherService::class.java
+            WireGuardConnectivityWatcherService::class.java,
         )
     }
 
-    fun startWatcherService(
-        context: Context
-    ) {
+    fun startWatcherService(context: Context) {
         actionOnService(
             Action.START,
             context,
-            WireGuardConnectivityWatcherService::class.java
+            WireGuardConnectivityWatcherService::class.java,
         )
     }
 
@@ -113,7 +108,7 @@ object ServiceManager {
         actionOnService(
             Action.STOP,
             context,
-            WireGuardConnectivityWatcherService::class.java
+            WireGuardConnectivityWatcherService::class.java,
         )
     }
 }

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

@@ -0,0 +1,84 @@
+package com.zaneschepke.wireguardautotunnel.service.foreground
+
+import com.wireguard.android.backend.Tunnel
+import com.zaneschepke.wireguardautotunnel.data.model.Settings
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+
+data class WatcherState(
+    val isWifiConnected: Boolean = false,
+    val config: TunnelConfig? = null,
+    val vpnStatus: Tunnel.State = Tunnel.State.DOWN,
+    val isEthernetConnected: Boolean = false,
+    val isMobileDataConnected: Boolean = false,
+    val currentNetworkSSID: String = "",
+    val settings: Settings = Settings()
+) {
+
+    private fun isVpnConnected() = vpnStatus == Tunnel.State.UP
+    fun isEthernetConditionMet(): Boolean {
+        return (isEthernetConnected &&
+            settings.isTunnelOnEthernetEnabled &&
+            !isVpnConnected())
+    }
+
+    fun isMobileDataConditionMet(): Boolean {
+        return (!isEthernetConnected &&
+            settings.isTunnelOnMobileDataEnabled &&
+            !isWifiConnected &&
+            isMobileDataConnected &&
+            !isVpnConnected())
+    }
+
+    fun isTunnelNotMobileDataPreferredConditionMet(): Boolean {
+        return (!isEthernetConnected &&
+            settings.isTunnelOnMobileDataEnabled &&
+            !isWifiConnected &&
+            isMobileDataConnected &&
+            config?.isMobileDataTunnel == false && isVpnConnected())
+    }
+
+    fun isTunnelOffOnMobileDataConditionMet(): Boolean {
+        return (!isEthernetConnected &&
+            !settings.isTunnelOnMobileDataEnabled &&
+            isMobileDataConnected &&
+            !isWifiConnected &&
+            isVpnConnected())
+    }
+
+    fun isUntrustedWifiConditionMet(): Boolean {
+        return (!isEthernetConnected &&
+            isWifiConnected &&
+            !settings.trustedNetworkSSIDs.contains(currentNetworkSSID) &&
+            settings.isTunnelOnWifiEnabled
+            && !isVpnConnected())
+    }
+
+    fun isTunnelNotWifiNamePreferredMet(ssid: String): Boolean {
+        return (!isEthernetConnected &&
+            isWifiConnected &&
+            !settings.trustedNetworkSSIDs.contains(currentNetworkSSID) &&
+            settings.isTunnelOnWifiEnabled && config?.tunnelNetworks?.contains(ssid) == false && isVpnConnected())
+    }
+
+    fun isTrustedWifiConditionMet(): Boolean {
+        return (!isEthernetConnected &&
+            (isWifiConnected &&
+                settings.trustedNetworkSSIDs.contains(currentNetworkSSID)) &&
+            (isVpnConnected()))
+    }
+
+    fun isTunnelOffOnWifiConditionMet(): Boolean {
+        return (!isEthernetConnected &&
+            (isWifiConnected &&
+                !settings.isTunnelOnWifiEnabled &&
+                (isVpnConnected())))
+    }
+
+    fun isTunnelOffOnNoConnectivityMet(): Boolean {
+        return (!isEthernetConnected &&
+            !isWifiConnected &&
+            !isMobileDataConnected &&
+            (isVpnConnected()))
+    }
+}
+

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

@@ -1,18 +1,14 @@
 package com.zaneschepke.wireguardautotunnel.service.foreground
 
-import android.app.AlarmManager
-import android.app.PendingIntent
 import android.content.Context
-import android.content.Intent
 import android.os.Bundle
 import android.os.PowerManager
-import android.os.SystemClock
 import androidx.core.app.ServiceCompat
 import androidx.lifecycle.lifecycleScope
 import com.wireguard.android.backend.Tunnel
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.data.model.Settings
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.service.network.EthernetService
 import com.zaneschepke.wireguardautotunnel.service.network.MobileDataService
 import com.zaneschepke.wireguardautotunnel.service.network.NetworkService
@@ -28,340 +24,402 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.collectLatest
 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 settingsRepository: SettingsRepository
+    @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
 
-  private val networkEventsFlow = MutableStateFlow(WatcherState())
-  data class WatcherState(
-      val isWifiConnected: Boolean = false,
-      val isVpnConnected : Boolean = false,
-      val isEthernetConnected: Boolean = false,
-      val isMobileDataConnected: Boolean = false,
-      val currentNetworkSSID: String = "",
-      val settings: Settings = Settings()
-  )
+    @Inject
+    lateinit var serviceManager: ServiceManager
 
-  private lateinit var watcherJob: Job
+    private val networkEventsFlow = MutableStateFlow(WatcherState())
 
-  private var wakeLock: PowerManager.WakeLock? = null
-  private val tag = this.javaClass.name
+    private lateinit var watcherJob: Job
 
-  override fun onCreate() {
-    super.onCreate()
-    lifecycleScope.launch(Dispatchers.Main) {
-      try {
-          if(settingsRepository.getSettings().isAutoTunnelPaused) {
-              launchWatcherPausedNotification()
-          } else launchWatcherNotification()
-      } catch (e: Exception) {
-        Timber.e("Failed to start watcher service, not enough permissions")
-      }
+    private var wakeLock: PowerManager.WakeLock? = null
+    private val tag = this.javaClass.name
+
+    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")
+            }
+        }
     }
-  }
 
-  override fun startService(extras: Bundle?) {
-    super.startService(extras)
-    try {
-      // we need this lock so our service gets not affected by Doze Mode
-      lifecycleScope.launch { initWakeLock() }
-      cancelWatcherJob()
-      startWatcherJob()
-    } catch (e: Exception) {
-      Timber.e("Failed to launch watcher service, no permissions")
+    override fun startService(extras: Bundle?) {
+        super.startService(extras)
+        try {
+            // we need this lock so our service gets not affected by Doze Mode
+            lifecycleScope.launch { initWakeLock() }
+            cancelWatcherJob()
+            startWatcherJob()
+        } catch (e: Exception) {
+            Timber.e("Failed to launch watcher service, no permissions")
+        }
     }
-  }
 
-  override fun stopService(extras: Bundle?) {
-    super.stopService(extras)
-    wakeLock?.let {
-      if (it.isHeld) {
-        it.release()
-      }
+    override fun stopService(extras: Bundle?) {
+        super.stopService(extras)
+        wakeLock?.let {
+            if (it.isHeld) {
+                it.release()
+            }
+        }
+        cancelWatcherJob()
+        stopSelf()
     }
-    cancelWatcherJob()
-    stopSelf()
-  }
 
-  private fun launchWatcherNotification(description: String = getString(R.string.watcher_notification_text_active)) {
-    val notification =
-        notificationService.createNotification(
-            channelId = getString(R.string.watcher_channel_id),
-            channelName = getString(R.string.watcher_channel_name),
-            title = getString(R.string.auto_tunnel_title),
-            description = description)
-    ServiceCompat.startForeground(
-        this, foregroundId, notification, Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID)
-  }
+    private fun launchWatcherNotification(
+        description: String = getString(R.string.watcher_notification_text_active)
+    ) {
+        val notification =
+            notificationService.createNotification(
+                channelId = getString(R.string.watcher_channel_id),
+                channelName = getString(R.string.watcher_channel_name),
+                title = getString(R.string.auto_tunnel_title),
+                description = description,
+            )
+        ServiceCompat.startForeground(
+            this,
+            foregroundId,
+            notification,
+            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+        )
+    }
 
     private fun launchWatcherPausedNotification() {
         launchWatcherNotification(getString(R.string.watcher_notification_text_paused))
     }
 
-  // TODO could this be restarting service in a bad state?
-  // try to start task again if killed
-  override fun onTaskRemoved(rootIntent: Intent) {
-    Timber.d("Task Removed called")
-    val restartServiceIntent = Intent(rootIntent)
-    val restartServicePendingIntent: PendingIntent =
-        PendingIntent.getService(
-            this,
-            1,
-            restartServiceIntent,
-            PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE)
-    applicationContext.getSystemService(Context.ALARM_SERVICE)
-    val alarmService: AlarmManager =
-        applicationContext.getSystemService(Context.ALARM_SERVICE) as AlarmManager
-    alarmService.set(
-        AlarmManager.ELAPSED_REALTIME,
-        SystemClock.elapsedRealtime() + 1000,
-        restartServicePendingIntent)
-  }
-
-  private suspend fun initWakeLock() {
-    val isBatterySaverOn =
-        withContext(lifecycleScope.coroutineContext) {
-          settingsRepository.getSettings().isBatterySaverEnabled
-        }
-    wakeLock =
-        (getSystemService(Context.POWER_SERVICE) as PowerManager).run {
-          newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "$tag::lock").apply {
-            if (isBatterySaverOn) {
-              Timber.d("Initiating wakelock with timeout")
-              acquire(Constants.BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT)
-            } else {
-              Timber.d("Initiating wakelock with zero timeout")
-              acquire(Constants.DEFAULT_WATCHER_WAKE_LOCK_TIMEOUT)
+    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() {
-    if (this::watcherJob.isInitialized) {
-      watcherJob.cancel()
     }
-  }
 
-  private fun startWatcherJob() {
-    watcherJob =
-        lifecycleScope.launch(Dispatchers.IO) {
-          val setting = settingsRepository.getSettings()
-          launch {
-            Timber.d("Starting wifi watcher")
-            watchForWifiConnectivityChanges()
-          }
-          if (setting.isTunnelOnMobileDataEnabled) {
-            launch {
-              Timber.d("Starting mobile data watcher")
-              watchForMobileDataConnectivityChanges()
-            }
-          }
-          if (setting.isTunnelOnEthernetEnabled) {
-            launch {
-              Timber.d("Starting ethernet data watcher")
-              watchForEthernetConnectivityChanges()
-            }
-          }
-            launch {
-                Timber.d("Starting vpn state watcher")
-                watchForVpnConnectivityChanges()
-            }
-            launch {
-                Timber.d("Starting settings watcher")
-                watchForSettingsChanges()
-            }
-          launch {
-            Timber.d("Starting management watcher")
-            manageVpn()
-          }
+    private fun cancelWatcherJob() {
+        if (this::watcherJob.isInitialized) {
+            watcherJob.cancel()
         }
-  }
-
-  private suspend fun watchForMobileDataConnectivityChanges() {
-    mobileDataService.networkStatus.collect {
-      when (it) {
-        is NetworkStatus.Available -> {
-          Timber.d("Gained Mobile data connection")
-            networkEventsFlow.value = networkEventsFlow.value.copy(
-                isMobileDataConnected = true
-            )
-        }
-        is NetworkStatus.CapabilitiesChanged -> {
-            networkEventsFlow.value = networkEventsFlow.value.copy(
-                isMobileDataConnected = true
-            )
-          Timber.d("Mobile data capabilities changed")
-        }
-        is NetworkStatus.Unavailable -> {
-            networkEventsFlow.value = networkEventsFlow.value.copy(
-                isMobileDataConnected = false
-            )
-          Timber.d("Lost mobile data connection")
-        }
-      }
     }
-  }
+
+    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 vpn state watcher")
+                    watchForVpnConnectivityChanges()
+                }
+                launch {
+                    Timber.i("Starting settings watcher")
+                    watchForSettingsChanges()
+                }
+                if (setting.isPingEnabled) {
+                    launch {
+                        Timber.i("Starting ping watcher")
+                        watchForPingFailure()
+                    }
+                }
+                launch {
+                    Timber.i("Starting management watcher")
+                    manageVpn()
+                }
+
+            }
+    }
+
+    private suspend fun watchForMobileDataConnectivityChanges() {
+        mobileDataService.networkStatus.collect {
+            when (it) {
+                is NetworkStatus.Available -> {
+                    Timber.i("Gained Mobile data connection")
+                    networkEventsFlow.value =
+                        networkEventsFlow.value.copy(
+                            isMobileDataConnected = true,
+                        )
+                }
+
+                is NetworkStatus.CapabilitiesChanged -> {
+                    networkEventsFlow.value =
+                        networkEventsFlow.value.copy(
+                            isMobileDataConnected = true,
+                        )
+                    Timber.i("Mobile data capabilities changed")
+                }
+
+                is NetworkStatus.Unavailable -> {
+                    networkEventsFlow.value =
+                        networkEventsFlow.value.copy(
+                            isMobileDataConnected = false,
+                        )
+                    Timber.i("Lost mobile data connection")
+                }
+            }
+        }
+    }
+
+    private suspend fun watchForPingFailure() {
+        try {
+            do {
+                if (vpnService.vpnState.value.status == Tunnel.State.UP) {
+                    val tunnelConfig = vpnService.vpnState.value.tunnelConfig
+                    tunnelConfig?.let {
+                        val config = TunnelConfig.configFromQuick(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.BACKUP_PING_HOST
+                            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.stopVpnService(this)
+                            delay(Constants.VPN_RESTART_DELAY)
+                            serviceManager.startVpnServiceForeground(this)
+                            delay(Constants.PING_COOLDOWN)
+                        }
+                    }
+                }
+                delay(Constants.PING_INTERVAL)
+            } while (true)
+        } catch (e: Exception) {
+            Timber.e(e)
+        }
+    }
+
     private suspend fun watchForSettingsChanges() {
-        settingsRepository.getSettingsFlow().collect {
-            if(networkEventsFlow.value.settings.isAutoTunnelPaused != it.isAutoTunnelPaused) {
-                when(it.isAutoTunnelPaused) {
+        appDataRepository.settings.getSettingsFlow().collect {
+            if (networkEventsFlow.value.settings.isAutoTunnelPaused != it.isAutoTunnelPaused) {
+                when (it.isAutoTunnelPaused) {
                     true -> launchWatcherPausedNotification()
                     false -> launchWatcherNotification()
                 }
             }
-            networkEventsFlow.value = networkEventsFlow.value.copy(
-                settings = it
-            )
+            networkEventsFlow.value =
+                networkEventsFlow.value.copy(
+                    settings = it,
+                )
         }
     }
 
     private suspend fun watchForVpnConnectivityChanges() {
         vpnService.vpnState.collect {
-            when(it.status) {
-                Tunnel.State.DOWN -> networkEventsFlow.value = networkEventsFlow.value.copy(
-                    isVpnConnected = false
+            networkEventsFlow.value =
+                networkEventsFlow.value.copy(
+                    vpnStatus = it.status,
+                    config = it.tunnelConfig,
                 )
-                Tunnel.State.UP -> networkEventsFlow.value = networkEventsFlow.value.copy(
-                    isVpnConnected = true
-                )
-                else -> {}
+        }
+    }
+
+    private suspend fun watchForEthernetConnectivityChanges() {
+        ethernetService.networkStatus.collect {
+            when (it) {
+                is NetworkStatus.Available -> {
+                    Timber.i("Gained Ethernet connection")
+                    networkEventsFlow.value =
+                        networkEventsFlow.value.copy(
+                            isEthernetConnected = true,
+                        )
+                }
+
+                is NetworkStatus.CapabilitiesChanged -> {
+                    Timber.i("Ethernet capabilities changed")
+                    networkEventsFlow.value =
+                        networkEventsFlow.value.copy(
+                            isEthernetConnected = true,
+                        )
+                }
+
+                is NetworkStatus.Unavailable -> {
+                    networkEventsFlow.value =
+                        networkEventsFlow.value.copy(
+                            isEthernetConnected = false,
+                        )
+                    Timber.i("Lost Ethernet connection")
+                }
             }
         }
     }
 
-  private suspend fun watchForEthernetConnectivityChanges() {
-    ethernetService.networkStatus.collect {
-      when (it) {
-        is NetworkStatus.Available -> {
-          Timber.d("Gained Ethernet connection")
-            networkEventsFlow.value = networkEventsFlow.value.copy(
-                isEthernetConnected = true
-            )
-        }
-        is NetworkStatus.CapabilitiesChanged -> {
-          Timber.d("Ethernet capabilities changed")
-            networkEventsFlow.value = networkEventsFlow.value.copy(
-                isEthernetConnected = true
-            )
-        }
-        is NetworkStatus.Unavailable -> {
-            networkEventsFlow.value = networkEventsFlow.value.copy(
-                isEthernetConnected = false
-            )
-          Timber.d("Lost Ethernet connection")
-        }
-      }
-    }
-  }
+    private suspend fun watchForWifiConnectivityChanges() {
+        wifiService.networkStatus.collect {
+            when (it) {
+                is NetworkStatus.Available -> {
+                    Timber.i("Gained Wi-Fi connection")
+                    networkEventsFlow.value =
+                        networkEventsFlow.value.copy(
+                            isWifiConnected = true,
+                        )
+                }
 
-  private suspend fun watchForWifiConnectivityChanges() {
-    wifiService.networkStatus.collect {
-      when (it) {
-        is NetworkStatus.Available -> {
-          Timber.d("Gained Wi-Fi connection")
-            networkEventsFlow.value = networkEventsFlow.value.copy(
-                isWifiConnected = true
-            )
-        }
-        is NetworkStatus.CapabilitiesChanged -> {
-          Timber.d("Wifi capabilities changed")
-            networkEventsFlow.value = networkEventsFlow.value.copy(
-                isWifiConnected = true
-            )
-          val ssid = wifiService.getNetworkName(it.networkCapabilities) ?: ""
-          Timber.d("Detected SSID: $ssid")
-            networkEventsFlow.value = networkEventsFlow.value.copy(
-                currentNetworkSSID = ssid
-            )
-        }
-        is NetworkStatus.Unavailable -> {
-          networkEventsFlow.value = networkEventsFlow.value.copy(
-              isWifiConnected = false
-          )
-          Timber.d("Lost Wi-Fi connection")
-        }
-      }
-    }
-  }
+                is NetworkStatus.CapabilitiesChanged -> {
+                    Timber.i("Wifi capabilities changed")
+                    networkEventsFlow.value =
+                        networkEventsFlow.value.copy(
+                            isWifiConnected = true,
+                        )
+                    val ssid = wifiService.getNetworkName(it.networkCapabilities)
+                    ssid?.let {
+                        Timber.i("Detected SSID: $ssid")
+                        appDataRepository.appState.setCurrentSsid(ssid)
+                        networkEventsFlow.value =
+                            networkEventsFlow.value.copy(
+                                currentNetworkSSID = ssid,
+                            )
+                    } ?: Timber.w("Failed to read ssid")
+                }
 
-    //TODO clean this up
-  private suspend fun manageVpn() {
-    networkEventsFlow.collectLatest {
-        Timber.i("New watcher state: $it")
-        if (!it.settings.isAutoTunnelPaused && it.settings.defaultTunnel != null) {
-        delay(Constants.TOGGLE_TUNNEL_DELAY)
-            when {
-                ((it.isEthernetConnected &&
-                        it.settings.isTunnelOnEthernetEnabled &&
-                        !it.isVpnConnected)) -> {
-                    ServiceManager.startVpnService(this, it.settings.defaultTunnel!!)
-                    Timber.i("Condition 1 met")
-                }
-                (!it.isEthernetConnected &&
-                        it.settings.isTunnelOnMobileDataEnabled &&
-                        !it.isWifiConnected &&
-                        it.isMobileDataConnected &&
-                        !it.isVpnConnected) -> {
-                    ServiceManager.startVpnService(this, it.settings.defaultTunnel!!)
-                    Timber.i("Condition 2 met")
-                }
-                (!it.isEthernetConnected &&
-                        !it.settings.isTunnelOnMobileDataEnabled &&
-                        !it.isWifiConnected &&
-                        it.isVpnConnected) -> {
-                    ServiceManager.stopVpnService(this)
-                    Timber.i("Condition 3 met")
-                }
-                (!it.isEthernetConnected &&
-                        it.isWifiConnected &&
-                        !it.settings.trustedNetworkSSIDs.contains(it.currentNetworkSSID) &&
-                        it.settings.isTunnelOnWifiEnabled &&
-                        (!it.isVpnConnected)) -> {
-                    ServiceManager.startVpnService(this, it.settings.defaultTunnel!!)
-                    Timber.i("Condition 4 met")
-                }
-                (!it.isEthernetConnected &&
-                        (it.isWifiConnected && it.settings.trustedNetworkSSIDs.contains(it.currentNetworkSSID)) &&
-                        (it.isVpnConnected)) -> {
-                    ServiceManager.stopVpnService(this)
-                    Timber.i("Condition 5 met")
-                }
-                (!it.isEthernetConnected &&
-                        (it.isWifiConnected &&
-                                !it.settings.isTunnelOnWifiEnabled &&
-                                (it.isVpnConnected))) -> {
-                    ServiceManager.stopVpnService(this)
-                    Timber.i("Condition 6 met")
-                }
-                (!it.isEthernetConnected &&
-                        !it.isWifiConnected &&
-                        !it.isMobileDataConnected &&
-                        (it.isVpnConnected)) -> {
-                    ServiceManager.stopVpnService(this)
-                    Timber.i("Condition 7 met")
-                }
-                else -> {
-                    Timber.i("No condition met")
+                is NetworkStatus.Unavailable -> {
+                    networkEventsFlow.value =
+                        networkEventsFlow.value.copy(
+                            isWifiConnected = false,
+                        )
+                    Timber.i("Lost Wi-Fi connection")
+                }
+            }
+        }
+    }
+
+    private suspend fun getMobileDataTunnel(): TunnelConfig? {
+        return appDataRepository.tunnels.findByMobileDataTunnel().firstOrNull()
+    }
+
+    private suspend fun getSsidTunnel(ssid: String): TunnelConfig? {
+        return appDataRepository.tunnels.findByTunnelNetworksName(ssid).firstOrNull()
+    }
+
+    private 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)
+                when {
+                    watcherState.isEthernetConditionMet() -> {
+                        Timber.i("$autoTunnel - tunnel on on ethernet condition met")
+                        serviceManager.startVpnServiceForeground(this)
+                    }
+
+                    watcherState.isMobileDataConditionMet() -> {
+                        Timber.i("$autoTunnel - tunnel on on mobile data condition met")
+                        serviceManager.startVpnServiceForeground(this, getMobileDataTunnel()?.id)
+                    }
+
+                    watcherState.isTunnelNotMobileDataPreferredConditionMet() -> {
+                        getMobileDataTunnel()?.let {
+                            Timber.i("$autoTunnel - tunnel connected on mobile data is not preferred condition met, switching to preferred")
+                            serviceManager.startVpnServiceForeground(
+                                this,
+                                getMobileDataTunnel()?.id,
+                            )
+                        }
+                    }
+
+                    watcherState.isTunnelOffOnMobileDataConditionMet() -> {
+                        Timber.i("$autoTunnel - tunnel off on mobile data met, turning vpn off")
+                        serviceManager.stopVpnService(this)
+                    }
+
+                    watcherState.isTunnelNotWifiNamePreferredMet(watcherState.currentNetworkSSID) -> {
+                        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")
+                            serviceManager.startVpnServiceForeground(this, it.id)
+                        } ?: suspend {
+                            Timber.i("No tunnel associated with this SSID, using defaults")
+                            if (appDataRepository.getPrimaryOrFirstTunnel()?.name != vpnService.name) {
+                                serviceManager.startVpnServiceForeground(this)
+                            }
+                        }.invoke()
+                    }
+
+                    watcherState.isUntrustedWifiConditionMet() -> {
+                        Timber.i("$autoTunnel - tunnel on untrusted wifi condition met")
+                        serviceManager.startVpnServiceForeground(
+                            this,
+                            getSsidTunnel(watcherState.currentNetworkSSID)?.id,
+                        )
+                    }
+
+                    watcherState.isTrustedWifiConditionMet() -> {
+                        Timber.i("$autoTunnel - tunnel off on trusted wifi condition met, turning vpn off")
+                        serviceManager.stopVpnService(this)
+                    }
+
+                    watcherState.isTunnelOffOnWifiConditionMet() -> {
+                        Timber.i("$autoTunnel - tunnel off on wifi condition met, turning vpn off")
+                        serviceManager.stopVpnService(this)
+                    }
+
+                    watcherState.isTunnelOffOnNoConnectivityMet() -> {
+                        Timber.i("$autoTunnel - tunnel off on no connectivity met, turning vpn off")
+                        serviceManager.stopVpnService(this)
+                    }
+
+                    else -> {
+                        Timber.i("$autoTunnel - no condition met")
+                    }
                 }
             }
         }
     }
-  }
 }

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

@@ -5,10 +5,9 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.core.app.ServiceCompat
 import androidx.lifecycle.lifecycleScope
+import com.wireguard.android.backend.Tunnel
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.receiver.NotificationActionReceiver
 import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.HandshakeStatus
@@ -21,7 +20,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -32,23 +30,20 @@ class WireGuardTunnelService : ForegroundService() {
     lateinit var vpnService: VpnService
 
     @Inject
-    lateinit var settingsRepository: SettingsRepository
-
-    @Inject
-    lateinit var tunnelConfigRepository: TunnelConfigRepository
+    lateinit var appDataRepository: AppDataRepository
 
     @Inject
     lateinit var notificationService: NotificationService
 
     private lateinit var job: Job
 
-    private var tunnelName: String = ""
     private var didShowConnected = false
 
     override fun onCreate() {
         super.onCreate()
         lifecycleScope.launch(Dispatchers.Main) {
-            if(tunnelConfigRepository.getAll().isNotEmpty()) {
+            //TODO fix this to not launch if AOVPN
+            if (appDataRepository.tunnels.count() != 0) {
                 launchVpnNotification()
             }
         }
@@ -57,66 +52,71 @@ class WireGuardTunnelService : ForegroundService() {
     override fun startService(extras: Bundle?) {
         super.startService(extras)
         cancelJob()
-        val tunnelConfigString = extras?.getString(getString(R.string.tunnel_extras_key))
-        val tunnelConfig = tunnelConfigString?.let {
-            TunnelConfig.from(it)
-        }
-        tunnelName = tunnelConfig?.name ?: ""
-        job = lifecycleScope.launch(Dispatchers.IO) {
+        job =
+            lifecycleScope.launch(Dispatchers.IO) {
                 launch {
-                    if (tunnelConfig != null) {
-                        try {
-                            tunnelName = tunnelConfig.name
-                            vpnService.startTunnel(tunnelConfig)
-                        } catch (e: Exception) {
-                            Timber.e("Problem starting tunnel: ${e.message}")
-                            stopService(extras)
-                        }
-                    } else {
-                        Timber.d("Tunnel config null, starting default tunnel or first")
-                        val settings = settingsRepository.getSettings()
-                        val tunnels = tunnelConfigRepository.getAll()
-                        if (settings.isAlwaysOnVpnEnabled) {
-                            val tunnel = if(settings.defaultTunnel != null) {
-                                TunnelConfig.from(settings.defaultTunnel!!)
-                            } else if(tunnels.isNotEmpty()) {
-                                tunnels.first()
-                            } else {
-                                null
-                            }
-                            if(tunnel != null) {
-                                tunnelName = tunnel.name
-                                vpnService.startTunnel(tunnel)
-                            }
-
-                        }
+                    val tunnelId = extras?.getInt(Constants.TUNNEL_EXTRA_KEY)
+                    if (vpnService.getState() == Tunnel.State.UP) {
+                        vpnService.stopTunnel()
                     }
+                    vpnService.startTunnel(
+                        tunnelId?.let {
+                            appDataRepository.tunnels.getById(it)
+                        },
+                    )
                 }
-                //TODO add failed to connect notification
                 launch {
-                    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)
-                                            launchVpnNotification(getString(R.string.tunnel_start_title),"${getString(R.string.tunnel_start_text)} $tunnelName")
-                                            didShowConnected = true
-                                        }
-                                    }
-                                    statuses?.any { it == HandshakeStatus.STALE } == true -> {}
-                                    statuses?.all { it == HandshakeStatus.NOT_STARTED } == true -> {}
-                                    else -> {}
-                                }
-                            }
-                    }
+                    handshakeNotifications()
                 }
             }
     }
 
+    //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
+                            }
+                        }
+
+                        statuses?.any { it == HandshakeStatus.STALE } == true -> {}
+                        statuses?.all { it == HandshakeStatus.NOT_STARTED } ==
+                            true -> {
+                        }
+
+                        else -> {}
+                    }
+                }
+            if (state.status == Tunnel.State.UP && state.tunnelConfig?.name != tunnelName) {
+                tunnelName = state.tunnelConfig?.name
+                launchVpnNotification(
+                    getString(R.string.tunnel_start_title),
+                    "${getString(R.string.tunnel_start_text)} - $tunnelName",
+                )
+            }
+        }
+    }
+
+    private fun launchAlwaysOnDisabledNotification() {
+        launchVpnNotification(
+            title = this.getString(R.string.vpn_connection_failed),
+            description = this.getString(R.string.always_on_disabled),
+        )
+    }
+
     override fun stopService(extras: Bundle?) {
         super.stopService(extras)
         lifecycleScope.launch(Dispatchers.IO) {
@@ -127,7 +127,10 @@ class WireGuardTunnelService : ForegroundService() {
         stopSelf()
     }
 
-    private fun launchVpnNotification(title : String = getString(R.string.vpn_starting),description : String = getString(R.string.attempt_connection)) {
+    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),
@@ -136,13 +139,13 @@ class WireGuardTunnelService : ForegroundService() {
                 onGoing = false,
                 vibration = false,
                 showTimestamp = true,
-                description = description
+                description = description,
             )
         ServiceCompat.startForeground(
             this,
             foregroundId,
             notification,
-            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID
+            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
         )
     }
 
@@ -156,20 +159,20 @@ class WireGuardTunnelService : ForegroundService() {
                     this,
                     0,
                     Intent(this, NotificationActionReceiver::class.java),
-                    PendingIntent.FLAG_IMMUTABLE
+                    PendingIntent.FLAG_IMMUTABLE,
                 ),
                 actionText = getString(R.string.restart),
                 title = getString(R.string.vpn_connection_failed),
                 onGoing = false,
                 vibration = true,
                 showTimestamp = true,
-                description = message
+                description = message,
             )
         ServiceCompat.startForeground(
             this,
             foregroundId,
             notification,
-            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID
+            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
         )
     }
 

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

@@ -24,72 +24,70 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
     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 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 onCapabilitiesChanged(
-                                network: Network,
-                                networkCapabilities: NetworkCapabilities
-                            ) {
-                                trySend(
-                                    NetworkStatus.CapabilitiesChanged(
-                                        network,
-                                        networkCapabilities
-                                    )
-                                )
-                            }
+                        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
-                                    )
-                                )
-                            }
+                        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)
+                else -> {
+                    object : ConnectivityManager.NetworkCallback() {
+                        override fun onAvailable(network: Network) {
+                            trySend(NetworkStatus.Available(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)
+
+        awaitClose { connectivityManager.unregisterNetworkCallback(networkStatusCallback) }
+    }
 
     override fun getNetworkName(networkCapabilities: NetworkCapabilities): String? {
         var ssid: String? = getWifiNameFromCapabilities(networkCapabilities)
@@ -119,18 +117,16 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
 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
-): Flow<Result> =
-    map { status ->
-        when (status) {
-            is NetworkStatus.Unavailable -> onUnavailable(status.network)
-            is NetworkStatus.Available -> onAvailable(status.network)
-            is NetworkStatus.CapabilitiesChanged -> onCapabilitiesChanged(
+    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
+                status.networkCapabilities,
             )
-        }
     }
+}

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

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

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

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

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

@@ -3,7 +3,6 @@ package com.zaneschepke.wireguardautotunnel.service.notification
 import android.app.Notification
 import android.app.NotificationManager
 import android.app.PendingIntent
-import androidx.core.app.NotificationCompat
 
 interface NotificationService {
     fun createNotification(

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

@@ -13,23 +13,21 @@ import com.zaneschepke.wireguardautotunnel.ui.MainActivity
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
-class WireGuardNotification
-@Inject
-constructor(
-    @ApplicationContext private val context: Context
-) : NotificationService {
+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)
+            context.getString(R.string.watcher_channel_id),
+        )
+    private val tunnelBuilder: NotificationCompat.Builder =
+        NotificationCompat.Builder(
+            context,
+            context.getString(R.string.vpn_channel_id),
         )
-    private val tunnelBuilder: NotificationCompat.Builder = NotificationCompat.Builder(
-        context,
-        context.getString(R.string.vpn_channel_id)
-    )
 
     override fun createNotification(
         channelId: String,
@@ -49,15 +47,16 @@ constructor(
             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
-            }
+                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 ->
@@ -65,26 +64,26 @@ constructor(
                     context,
                     0,
                     notificationIntent,
-                    PendingIntent.FLAG_IMMUTABLE
+                    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()
+                    NotificationCompat.Action.Builder(0, actionText, action).build(),
                 )
                 it.setAutoCancel(true)
             }
@@ -95,7 +94,7 @@ constructor(
                 .setOngoing(onGoing)
                 .setPriority(NotificationCompat.PRIORITY_HIGH)
                 .setShowWhen(showTimestamp)
-                .setSmallIcon(R.mipmap.ic_launcher_foreground)
+                .setSmallIcon(R.drawable.ic_launcher)
                 .build()
         }
     }

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

@@ -1,75 +1,66 @@
 package com.zaneschepke.wireguardautotunnel.service.shortcut
 
 import android.os.Bundle
-import android.view.View
 import androidx.activity.ComponentActivity
 import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 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.async
 import kotlinx.coroutines.launch
-import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class ShortcutsActivity : ComponentActivity() {
-    @Inject
-    lateinit var settingsRepository: SettingsRepository
 
     @Inject
-    lateinit var tunnelConfigRepository: TunnelConfigRepository
+    lateinit var appDataRepository: AppDataRepository
 
-    private suspend fun toggleWatcherServicePause() {
-            val settings = settingsRepository.getSettings()
-            if (settings.isAutoTunnelEnabled) {
-                val pauseAutoTunnel = !settings.isAutoTunnelPaused
-                settingsRepository.save(settings.copy(
-                    isAutoTunnelPaused = pauseAutoTunnel
-                ))
-            }
-        }
+    @Inject
+    lateinit var serviceManager: ServiceManager
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(View(this))
-        if (intent.getStringExtra(CLASS_NAME_EXTRA_KEY)
-                .equals(WireGuardTunnelService::class.java.simpleName)
-        ) {
-            lifecycleScope.launch(Dispatchers.Main) {
-                val settings = settingsRepository.getSettings()
-                if (settings.isShortcutsEnabled) {
-                    try {
+        lifecycleScope.launch(Dispatchers.Main) {
+            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 =
-                            if (tunnelName != null) {
-                                tunnelConfigRepository.getAll().firstOrNull { it.name == tunnelName }
-                            } else {
-                                if (settings.defaultTunnel == null) {
-                                    tunnelConfigRepository.getAll().first()
-                                } else {
-                                    TunnelConfig.from(settings.defaultTunnel!!)
-                                }
+                        val tunnelConfig = tunnelName?.let {
+                            appDataRepository.tunnels.getAll().firstOrNull {
+                                it.name == tunnelName
                             }
-                        tunnelConfig ?: return@launch
-                        toggleWatcherServicePause()
+                        }
                         when (intent.action) {
-                            Action.STOP.name -> ServiceManager.stopVpnService(
-                                this@ShortcutsActivity
+                            Action.START.name -> serviceManager.startVpnServiceForeground(
+                                this@ShortcutsActivity, tunnelConfig?.id, isManualStart = true,
                             )
-                            Action.START.name -> ServiceManager.startVpnService(
+
+                            Action.STOP.name -> serviceManager.stopVpnService(
                                 this@ShortcutsActivity,
-                                tunnelConfig.toString()
+                                isManualStop = true,
+                            )
+                        }
+                    }
+
+                    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,
+                                ),
                             )
                         }
-                    } catch (e: Exception) {
-                        Timber.e(e.message)
-                        finish()
                     }
                 }
             }

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

@@ -0,0 +1,106 @@
+package com.zaneschepke.wireguardautotunnel.service.tile
+
+import android.os.Build
+import android.service.quicksettings.Tile
+import android.service.quicksettings.TileService
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.data.model.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() {
+
+    @Inject
+    lateinit var appDataRepository: AppDataRepository
+
+    @Inject
+    lateinit var serviceManager: ServiceManager
+
+    private val scope = CoroutineScope(Dispatchers.IO)
+
+    private var manualStartConfig: TunnelConfig? = null
+
+    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()
+                    }
+                }
+            }
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        scope.cancel()
+    }
+
+    override fun onTileRemoved() {
+        super.onTileRemoved()
+        scope.cancel()
+    }
+
+    override fun onClick() {
+        super.onClick()
+        unlockAndRun {
+            scope.launch {
+                try {
+                    appDataRepository.toggleWatcherServicePause()
+                } catch (e: Exception) {
+                    Timber.e(e.message)
+                } finally {
+                    cancel()
+                }
+            }
+        }
+    }
+
+    private fun setActive() {
+        qsTile.state = Tile.STATE_ACTIVE
+        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()
+    }
+}

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

@@ -5,8 +5,7 @@ import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
 import com.wireguard.android.backend.Tunnel
 import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
 import dagger.hilt.android.AndroidEntryPoint
@@ -18,46 +17,48 @@ import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class TunnelControlTile() : TileService() {
+class TunnelControlTile : TileService() {
 
     @Inject
-    lateinit var tunnelConfigRepository: TunnelConfigRepository
-
-    @Inject
-    lateinit var settingsRepository: SettingsRepository
+    lateinit var appDataRepository: AppDataRepository
 
     @Inject
     lateinit var vpnService: VpnService
 
+    @Inject
+    lateinit var serviceManager: ServiceManager
+
     private val scope = CoroutineScope(Dispatchers.IO)
 
-    private var tunnelName : String? = null
+    private var manualStartConfig: TunnelConfig? = null
 
     override fun onStartListening() {
         super.onStartListening()
         Timber.d("On start listening called")
         scope.launch {
-            vpnService.vpnState.collect {
-                when(it.status) {
-                    Tunnel.State.UP -> setActive()
-                    Tunnel.State.DOWN -> setInactive()
+            vpnService.vpnState.collect { it ->
+                when (it.status) {
+                    Tunnel.State.UP -> {
+                        setActive()
+                        it.tunnelConfig?.name?.let { name -> setTileDescription(name) }
+                    }
+
+                    Tunnel.State.DOWN -> {
+                        setInactive()
+                        val config = appDataRepository.getStartTunnelConfig()?.also { config ->
+                            manualStartConfig = config
+                        } ?: appDataRepository.getPrimaryOrFirstTunnel()
+                        config?.let {
+                            setTileDescription(it.name)
+                        } ?: setUnavailable()
+                    }
+
                     else -> setInactive()
                 }
-                val tunnels = tunnelConfigRepository.getAll()
-                if(tunnels.isEmpty()) {
-                    setUnavailable()
-                    return@collect
-                }
-                tunnelName = it.name.ifBlank {
-                    val settings = settingsRepository.getSettings()
-                    if (settings.defaultTunnel != null) {
-                        TunnelConfig.from(settings.defaultTunnel!!).name
-                    } else tunnels.firstOrNull()?.name
-                }
-                setTileDescription(tunnelName ?: "")
             }
         }
     }
+
     override fun onDestroy() {
         super.onDestroy()
         scope.cancel()
@@ -73,14 +74,11 @@ class TunnelControlTile() : TileService() {
         unlockAndRun {
             scope.launch {
                 try {
-                    val tunnelConfig = tunnelConfigRepository.getAll().first { it.name == tunnelName }
-                    toggleWatcherServicePause()
                     if (vpnService.getState() == Tunnel.State.UP) {
-                        ServiceManager.stopVpnService(this@TunnelControlTile)
+                        serviceManager.stopVpnService(this@TunnelControlTile, isManualStop = true)
                     } else {
-                        ServiceManager.startVpnServiceForeground(
-                            this@TunnelControlTile,
-                            tunnelConfig.toString()
+                        serviceManager.startVpnServiceForeground(
+                            this@TunnelControlTile, manualStartConfig?.id, isManualStart = true,
                         )
                     }
                 } catch (e: Exception) {
@@ -92,18 +90,6 @@ class TunnelControlTile() : TileService() {
         }
     }
 
-    private fun toggleWatcherServicePause() {
-        scope.launch {
-            val settings = settingsRepository.getSettings()
-            if (settings.isAutoTunnelEnabled) {
-                val pauseAutoTunnel = !settings.isAutoTunnelPaused
-                settingsRepository.save(settings.copy(
-                    isAutoTunnelPaused = pauseAutoTunnel
-                ))
-            }
-        }
-    }
-
     private fun setActive() {
         qsTile.state = Tile.STATE_ACTIVE
         qsTile.updateTile()
@@ -115,6 +101,7 @@ class TunnelControlTile() : TileService() {
     }
 
     private fun setUnavailable() {
+        manualStartConfig = null
         qsTile.state = Tile.STATE_UNAVAILABLE
         qsTile.updateTile()
     }

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

@@ -4,13 +4,13 @@ enum class HandshakeStatus {
     HEALTHY,
     STALE,
     UNKNOWN,
-    NOT_STARTED
-    ;
+    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 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/VpnService.kt

@@ -5,7 +5,7 @@ import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 import kotlinx.coroutines.flow.StateFlow
 
 interface VpnService : Tunnel {
-    suspend fun startTunnel(tunnelConfig: TunnelConfig): Tunnel.State
+    suspend fun startTunnel(tunnelConfig: TunnelConfig? = null): Tunnel.State
 
     suspend fun stopTunnel()
 

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

@@ -2,9 +2,10 @@ package com.zaneschepke.wireguardautotunnel.service.tunnel
 
 import com.wireguard.android.backend.Statistics
 import com.wireguard.android.backend.Tunnel
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 
 data class VpnState(
-    val status : Tunnel.State = Tunnel.State.DOWN,
-    val name : String = "",
-    val statistics : Statistics? = null
+    val status: Tunnel.State = Tunnel.State.DOWN,
+    val tunnelConfig: TunnelConfig? = null,
+    val statistics: Statistics? = null
 )

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

@@ -4,10 +4,9 @@ import com.wireguard.android.backend.Backend
 import com.wireguard.android.backend.BackendException
 import com.wireguard.android.backend.Statistics
 import com.wireguard.android.backend.Tunnel.State
-import com.wireguard.config.Config
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.module.Kernel
 import com.zaneschepke.wireguardautotunnel.module.Userspace
 import com.zaneschepke.wireguardautotunnel.util.Constants
@@ -27,7 +26,7 @@ class WireGuardTunnel
 constructor(
     @Userspace private val userspaceBackend: Backend,
     @Kernel private val kernelBackend: Backend,
-    private val settingsRepository: SettingsRepository
+    private val appDataRepository: AppDataRepository,
 ) : VpnService {
     private val _vpnState = MutableStateFlow(VpnState())
     override val vpnState: StateFlow<VpnState> = _vpnState.asStateFlow()
@@ -36,15 +35,13 @@ constructor(
 
     private lateinit var statsJob: Job
 
-    private var config: Config? = null
-
     private var backend: Backend = userspaceBackend
 
     private var backendIsUserspace = true
 
     init {
         scope.launch {
-            settingsRepository.getSettingsFlow().collect {
+            appDataRepository.settings.getSettingsFlow().collect {
                 if (it.isKernelEnabled && backendIsUserspace) {
                     Timber.d("Setting kernel backend")
                     backend = kernelBackend
@@ -58,20 +55,22 @@ constructor(
         }
     }
 
-    override suspend fun startTunnel(tunnelConfig: TunnelConfig): State {
+    override suspend fun startTunnel(tunnelConfig: TunnelConfig?): State {
         return try {
-            stopTunnelOnConfigChange(tunnelConfig)
-            emitTunnelName(tunnelConfig.name)
-            config = TunnelConfig.configFromQuick(tunnelConfig.wgQuick)
-            val state =
-                backend.setState(
-                    this,
-                    State.UP,
-                    config
-                )
-            emitTunnelState(state)
-            state
-        } catch (e: Exception) {
+            //TODO we need better error handling here
+            val config = tunnelConfig ?: appDataRepository.getPrimaryOrFirstTunnel()
+            if (config != null) {
+                emitTunnelConfig(config)
+                val wgConfig = TunnelConfig.configFromQuick(config.wgQuick)
+                val state =
+                    backend.setState(
+                        this,
+                        State.UP,
+                        wgConfig,
+                    )
+                state
+            } else throw Exception("No tunnels")
+        } catch (e: BackendException) {
             Timber.e("Failed to start tunnel with error: ${e.message}")
             State.DOWN
         }
@@ -80,37 +79,27 @@ constructor(
     private fun emitTunnelState(state: State) {
         _vpnState.tryEmit(
             _vpnState.value.copy(
-                status = state
-            )
+                status = state,
+            ),
         )
     }
 
     private fun emitBackendStatistics(statistics: Statistics) {
         _vpnState.tryEmit(
             _vpnState.value.copy(
-                statistics = statistics
-            )
+                statistics = statistics,
+            ),
         )
     }
 
-    private suspend fun emitTunnelName(name: String) {
+    private suspend fun emitTunnelConfig(tunnelConfig: TunnelConfig?) {
         _vpnState.emit(
             _vpnState.value.copy(
-                name = name
-            )
+                tunnelConfig = tunnelConfig,
+            ),
         )
     }
 
-    private suspend fun stopTunnelOnConfigChange(tunnelConfig: TunnelConfig) {
-        if (getState() == State.UP && _vpnState.value.name != tunnelConfig.name) {
-            stopTunnel()
-        }
-    }
-
-    override fun getName(): String {
-        return _vpnState.value.name
-    }
-
     override suspend fun stopTunnel() {
         try {
             if (getState() == State.UP) {
@@ -126,10 +115,14 @@ constructor(
         return backend.getState(this)
     }
 
+    override fun getName(): String {
+        return _vpnState.value.tunnelConfig?.name ?: ""
+    }
+
     override fun onStateChange(state: State) {
         val tunnel = this
         emitTunnelState(state)
-        WireGuardAutoTunnel.requestTileServiceStateUpdate()
+        WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate(WireGuardAutoTunnel.instance)
         if (state == State.UP) {
             statsJob =
                 scope.launch {

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

@@ -1,13 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui
-
-import androidx.lifecycle.ViewModel
-import com.zaneschepke.wireguardautotunnel.data.SettingsDao
-import dagger.hilt.android.lifecycle.HiltViewModel
-import javax.inject.Inject
-
-@HiltViewModel
-class ActivityViewModel @Inject constructor(
-    private val settingsRepo: SettingsDao,
-) : ViewModel() {
-
-}

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

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

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

@@ -0,0 +1,148 @@
+package com.zaneschepke.wireguardautotunnel.ui
+
+import android.app.Application
+import android.content.ActivityNotFoundException
+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.launch
+import timber.log.Timber
+import java.time.Instant
+import javax.inject.Inject
+
+@HiltViewModel
+class AppViewModel
+@Inject
+constructor(
+    private val application: Application,
+) : ViewModel() {
+
+    val vpnIntent: Intent? = GoBackend.VpnService.prepare(WireGuardAutoTunnel.instance)
+
+    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.value = _appUiState.value.copy(
+            requestPermissions = true,
+        )
+    }
+
+    fun permissionsRequested() {
+        _appUiState.value = _appUiState.value.copy(
+            requestPermissions = false,
+        )
+    }
+
+    fun openWebPage(url: String) {
+        try {
+            val webpage: Uri = Uri.parse(url)
+            val intent = Intent(Intent.ACTION_VIEW, webpage).apply {
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            }
+            application.startActivity(intent)
+        } catch (e: ActivityNotFoundException) {
+            Timber.e(e)
+            showSnackbarMessage(application.getString(R.string.no_browser_detected))
+        }
+    }
+
+    fun onVpnPermissionAccepted() {
+        _appUiState.value = _appUiState.value.copy(
+            vpnPermissionAccepted = true,
+        )
+    }
+
+    fun launchEmail() {
+        try {
+            val intent =
+                Intent(Intent.ACTION_SENDTO).apply {
+                    type = Constants.EMAIL_MIME_TYPE
+                    putExtra(Intent.EXTRA_EMAIL, arrayOf(application.getString(R.string.my_email)))
+                    putExtra(Intent.EXTRA_SUBJECT, application.getString(R.string.email_subject))
+                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                }
+            application.startActivity(
+                Intent.createChooser(intent, application.getString(R.string.email_chooser)).apply {
+                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                },
+            )
+        } catch (e: ActivityNotFoundException) {
+            Timber.e(e)
+            showSnackbarMessage(application.getString(R.string.no_email_detected))
+        }
+    }
+
+    fun showSnackbarMessage(message: String) {
+        _appUiState.value = _appUiState.value.copy(
+            snackbarMessage = message,
+            snackbarMessageConsumed = false,
+        )
+    }
+
+    fun snackbarMessageConsumed() {
+        _appUiState.value = _appUiState.value.copy(
+            snackbarMessage = "",
+            snackbarMessageConsumed = true,
+        )
+    }
+
+    val logs = mutableStateListOf<LogMessage>()
+
+    fun readLogCatOutput() =
+        viewModelScope.launch(viewModelScope.coroutineContext + Dispatchers.IO) {
+            launch {
+                Logcatter.logs {
+                    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() {
+        val fileName = "${Constants.BASE_LOG_FILE_NAME}-${Instant.now().epochSecond}.txt"
+        val content = logs.joinToString(separator = "\n")
+        FileUtils.saveFileToDownloads(application.applicationContext, content, fileName)
+        Toast.makeText(application, application.getString(R.string.logs_saved), Toast.LENGTH_SHORT)
+            .show()
+    }
+
+    fun setNotificationPermissionAccepted(accepted: Boolean) {
+        _appUiState.value = _appUiState.value.copy(
+            notificationPermissionAccepted = accepted,
+        )
+    }
+}

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

@@ -1,16 +1,17 @@
 package com.zaneschepke.wireguardautotunnel.ui
 
 import android.Manifest
-import android.content.Intent
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
-import android.provider.Settings
+import androidx.activity.SystemBarStyle
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
+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.fillMaxSize
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarData
@@ -21,96 +22,143 @@ import androidx.compose.material3.SnackbarResult
 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.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
+import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
-import com.wireguard.android.backend.GoBackend
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.common.PermissionRequestFailedScreen
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
+import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavBar
 import com.zaneschepke.wireguardautotunnel.ui.common.prompt.CustomSnackBar
 import com.zaneschepke.wireguardautotunnel.ui.screens.config.ConfigScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.MainScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.options.OptionsScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.pinlock.PinLockScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.SettingsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.SupportScreen
-import com.zaneschepke.wireguardautotunnel.ui.theme.TransparentSystemBars
+import com.zaneschepke.wireguardautotunnel.ui.screens.support.logs.LogsScreen
 import com.zaneschepke.wireguardautotunnel.ui.theme.WireguardAutoTunnelTheme
-import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.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 dataStoreManager: DataStoreManager
+
+    @Inject
+    lateinit var settingsRepository: SettingsRepository
+
+    @Inject
+    lateinit var serviceManager: ServiceManager
+
     @OptIn(
-        ExperimentalPermissionsApi::class
+        ExperimentalPermissionsApi::class,
     )
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContent {
-//            val activityViewModel = hiltViewModel<ActivityViewModel>()
 
+        enableEdgeToEdge(navigationBarStyle = SystemBarStyle.dark(Color.Transparent.toArgb()))
+
+        // load preferences into memory and init data
+        lifecycleScope.launch {
+            dataStoreManager.init()
+            WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate(this@MainActivity)
+            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 focusRequester = remember { FocusRequester()}
+            val navBackStackEntry by navController.currentBackStackEntryAsState()
+
+            val notificationPermissionState =
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
+                    rememberPermissionState(Manifest.permission.POST_NOTIFICATIONS) else null
+
+            val snackbarHostState = remember { SnackbarHostState() }
+
+            val vpnActivityResultState =
+                rememberLauncherForActivityResult(
+                    ActivityResultContracts.StartActivityForResult(),
+                    onResult = {
+                        val accepted = (it.resultCode == RESULT_OK)
+                        if (accepted) {
+                            appViewModel.onVpnPermissionAccepted()
+                        }
+                    },
+                )
+
+            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()
+                        }
+                    }
+                }
+            }
+
+            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 vpnActivityResultState.launch(appViewModel.vpnIntent)
+                    }
+                }
+            }
 
             WireguardAutoTunnelTheme {
-                TransparentSystemBars()
-
-                val snackbarHostState = remember { SnackbarHostState() }
-
-                val notificationPermissionState =
-                    rememberPermissionState(Manifest.permission.POST_NOTIFICATIONS)
-
-                fun requestNotificationPermission() {
-                    if (!notificationPermissionState.status.isGranted && Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                        notificationPermissionState.launchPermissionRequest()
-                    }
-                }
-
-                var vpnIntent by remember { mutableStateOf(GoBackend.VpnService.prepare(this)) }
-                val vpnActivityResultState =
-                    rememberLauncherForActivityResult(
-                        ActivityResultContracts.StartActivityForResult(),
-                        onResult = {
-                            val accepted = (it.resultCode == RESULT_OK)
-                            if (accepted) {
-                                vpnIntent = null
-                            }
-                        }
+                LaunchedEffect(Unit) {
+                    appViewModel.setNotificationPermissionAccepted(
+                        notificationPermissionState?.status?.isGranted ?: true,
                     )
-                LaunchedEffect(vpnIntent) {
-                    if (vpnIntent != null) {
-                        vpnActivityResultState.launch(vpnIntent)
-                    } else {
-                        requestNotificationPermission()
+                    if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) appViewModel.readLogCatOutput()
+                }
+
+                LaunchedEffect(appUiState.snackbarMessageConsumed) {
+                    if (!appUiState.snackbarMessageConsumed) {
+                        showSnackBarMessage(StringValue.DynamicString(appUiState.snackbarMessage))
+                        appViewModel.snackbarMessageConsumed()
                     }
                 }
 
-                fun showSnackBarMessage(message: String) {
-                    lifecycleScope.launch(Dispatchers.Main) {
-                        val result = snackbarHostState.showSnackbar(
-                                message = message,
-                                actionLabel = applicationContext.getString(R.string.okay),
-                                duration = SnackbarDuration.Short
-                            )
-                        when (result) {
-                            SnackbarResult.ActionPerformed, SnackbarResult.Dismissed -> {
-                                snackbarHostState.currentSnackbarData?.dismiss()
-                            }
-                        }
-                    }
-                }
+                val focusRequester = remember { FocusRequester() }
 
                 Scaffold(
                     snackbarHost = {
@@ -118,86 +166,100 @@ class MainActivity : AppCompatActivity() {
                             CustomSnackBar(
                                 snackbarData.visuals.message,
                                 isRtl = false,
-                                containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(
-                                    2.dp
-                                )
+                                containerColor =
+                                MaterialTheme.colorScheme.surfaceColorAtElevation(
+                                    2.dp,
+                                ),
                             )
                         }
                     },
-                    modifier = Modifier.focusable().focusProperties { up = focusRequester },
-                    bottomBar =
-                    if (vpnIntent == null && notificationPermissionState.status.isGranted) {
-                        { BottomNavBar(navController, listOf(
-                            Screen.Main.navItem,
-                            Screen.Settings.navItem,
-                            Screen.Support.navItem)) }
-                    } else {
-                        {}
-                    }
+                    //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 ->
-                    if (vpnIntent != null) {
-                        PermissionRequestFailedScreen(
-                            padding = padding,
-                            onRequestAgain = { vpnActivityResultState.launch(vpnIntent) },
-                            message = getString(R.string.vpn_permission_required),
-                            getString(R.string.retry)
-                        )
-                        return@Scaffold
-                    }
-                    if (!notificationPermissionState.status.isGranted) {
-                        PermissionRequestFailedScreen(
-                            padding = padding,
-                            onRequestAgain = {
-                                val intentSettings =
-                                    Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-                                intentSettings.data =
-                                    Uri.fromParts(
-                                        Constants.URI_PACKAGE_SCHEME,
-                                        this.packageName,
-                                        null
-                                    )
-                                startActivity(intentSettings)
-                            },
-                            message = getString(R.string.notification_permission_required),
-                            getString(R.string.open_settings)
-                        )
-                        return@Scaffold
-                    }
-                    NavHost(navController, startDestination = Screen.Main.route) {
+                    NavHost(
+                        navController,
+                        startDestination =
+                        (if (PinManager.pinExists()) Screen.Lock.route else Screen.Main.route),
+                        modifier =
+                        Modifier
+                            .padding(padding)
+                            .fillMaxSize(),
+                    ) {
                         composable(
                             Screen.Main.route,
                         ) {
-                            MainScreen(padding = padding, focusRequester = focusRequester, showSnackbarMessage = { message ->
-                                showSnackBarMessage(message)
-                            }, navController = navController)
+                            MainScreen(
+                                focusRequester = focusRequester,
+                                appViewModel = appViewModel,
+                                navController = navController,
+                            )
                         }
-                        composable(Screen.Settings.route,
+                        composable(
+                            Screen.Settings.route,
                         ) {
-                            SettingsScreen(padding = padding, showSnackbarMessage = { message ->
-                                showSnackBarMessage(message)
-                            }, focusRequester = focusRequester)
+                            SettingsScreen(
+                                appViewModel = appViewModel,
+                                navController = navController,
+                                focusRequester = focusRequester,
+                            )
                         }
-                        composable(Screen.Support.route,
+                        composable(
+                            Screen.Support.route,
                         ) {
-                            SupportScreen(padding = padding, focusRequester = focusRequester,
-                                showSnackbarMessage = { message ->
-                                    showSnackBarMessage(message)
-                                })
+                            SupportScreen(
+                                focusRequester = focusRequester,
+                                appViewModel = appViewModel,
+                                navController = navController,
+                            )
+                        }
+                        composable(Screen.Support.Logs.route) {
+                            LogsScreen(appViewModel)
                         }
                         composable("${Screen.Config.route}/{id}") {
                             val id = it.arguments?.getString("id")
                             if (!id.isNullOrBlank()) {
-                                //https://dagger.dev/hilt/view-model#assisted-injection
                                 ConfigScreen(
                                     navController = navController,
-                                    id = id,
-                                    showSnackbarMessage = { message ->
-                                        showSnackBarMessage(message)
-                                    },
-                                    focusRequester = focusRequester
+                                    tunnelId = id,
+                                    appViewModel = appViewModel,
+                                    focusRequester = focusRequester,
                                 )
                             }
                         }
+                        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

@@ -6,28 +6,38 @@ import androidx.compose.material.icons.rounded.QuestionMark
 import androidx.compose.material.icons.rounded.Settings
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavItem
 
-sealed class Screen(val route : String) {
-    data object Main: Screen("main") {
-        val navItem = BottomNavItem(
-        name = "Tunnels",
-        route = route,
-        icon = Icons.Rounded.Home
-        )
+sealed class Screen(val route: String) {
+    data object Main : Screen("main") {
+        val navItem =
+            BottomNavItem(
+                name = "Tunnels",
+                route = route,
+                icon = Icons.Rounded.Home,
+            )
     }
-    data object Settings: Screen("settings") {
-        val navItem = BottomNavItem(
-        name = "Settings",
-        route = route,
-        icon = Icons.Rounded.Settings
-        )
-    }
-    data object Support: Screen("support") {
-        val navItem = BottomNavItem(
-        name = "Support",
-        route = route,
-        icon = Icons.Rounded.QuestionMark
-        )
-    }
-    data object Config : Screen("config")
 
-}
+    data object Settings : Screen("settings") {
+        val navItem =
+            BottomNavItem(
+                name = "Settings",
+                route = route,
+                icon = Icons.Rounded.Settings,
+            )
+    }
+
+    data object Support : Screen("support") {
+        val navItem =
+            BottomNavItem(
+                name = "Support",
+                route = route,
+                icon = Icons.Rounded.QuestionMark,
+            )
+
+        data object Logs : Screen("support/logs")
+    }
+
+    data object Config : Screen("config")
+    data object Lock : Screen("lock")
+
+    data object Option : Screen("option")
+}

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

@@ -10,8 +10,6 @@ import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.res.stringResource
-import com.zaneschepke.wireguardautotunnel.R
 
 @Composable
 fun ClickableIconButton(
@@ -23,19 +21,22 @@ fun ClickableIconButton(
 ) {
     TextButton(
         onClick = onClick,
-        enabled = enabled
+        enabled = enabled,
     ) {
         Text(text, Modifier.weight(1f, false))
         Spacer(modifier = Modifier.size(ButtonDefaults.IconSpacing))
         Icon(
             imageVector = icon,
-            contentDescription = stringResource(R.string.delete),
+            contentDescription = icon.name,
             modifier =
-            Modifier.size(ButtonDefaults.IconSize).weight(1f, false).clickable {
-                if (enabled) {
-                    onIconClick()
-                }
-            }
+            Modifier
+                .size(ButtonDefaults.IconSize)
+                .weight(1f, false)
+                .clickable {
+                    if (enabled) {
+                        onIconClick()
+                    }
+                },
         )
     }
 }

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

@@ -1,43 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common
-
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Button
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.dp
-import kotlinx.coroutines.launch
-
-@Composable
-fun PermissionRequestFailedScreen(
-    padding: PaddingValues,
-    onRequestAgain: () -> Unit,
-    message: String,
-    buttonText: String
-) {
-    val scope = rememberCoroutineScope()
-    Column(
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Center,
-        modifier =
-        Modifier
-            .fillMaxSize()
-            .padding(padding)
-    ) {
-        Text(message, textAlign = TextAlign.Center, modifier = Modifier.padding(15.dp))
-        Button(onClick = {
-            scope.launch {
-                onRequestAgain()
-            }
-        }) {
-            Text(buttonText)
-        }
-    }
-}

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

@@ -38,26 +38,20 @@ fun RowListItem(
             .animateContentSize()
             .clip(RoundedCornerShape(30.dp))
             .combinedClickable(
-                onClick = {
-                    onClick()
-                },
-                onLongClick = {
-                    onHold()
-                }
-            )
+                onClick = { onClick() },
+                onLongClick = { onHold() },
+            ),
     ) {
         Column {
             Row(
-                modifier =
-                Modifier
+                modifier = Modifier
                     .fillMaxWidth()
                     .padding(horizontal = 15.dp, vertical = 5.dp),
                 verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.SpaceBetween
+                horizontalArrangement = Arrangement.SpaceBetween,
             ) {
                 Row(
                     verticalAlignment = Alignment.CenterVertically,
-                    modifier = Modifier.fillMaxWidth(.60f)
                 ) {
                     icon()
                     Text(text)
@@ -72,8 +66,9 @@ fun RowListItem(
                             .fillMaxWidth()
                             .padding(end = 10.dp, bottom = 10.dp, start = 10.dp),
                         verticalAlignment = Alignment.CenterVertically,
-                        horizontalArrangement = Arrangement.SpaceEvenly
+                        horizontalArrangement = Arrangement.SpaceEvenly,
                     ) {
+                        //TODO change these to string resources
                         val handshakeEpoch = statistics.peer(it)!!.latestHandshakeEpochMillis
                         val peerTx = statistics.peer(it)!!.txBytes
                         val peerRx = statistics.peer(it)!!.rxBytes

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

@@ -47,7 +47,7 @@ fun SearchBar(onQuery: (queryString: String) -> Unit) {
             Icon(
                 imageVector = Icons.Rounded.Search,
                 tint = MaterialTheme.colorScheme.onBackground,
-                contentDescription = stringResource(id = R.string.search_icon)
+                contentDescription = stringResource(id = R.string.search_icon),
             )
         },
         trailingIcon = {
@@ -56,7 +56,7 @@ fun SearchBar(onQuery: (queryString: String) -> Unit) {
                     Icon(
                         imageVector = Icons.Rounded.Clear,
                         tint = MaterialTheme.colorScheme.onBackground,
-                        contentDescription = stringResource(id = R.string.clear_icon)
+                        contentDescription = stringResource(id = R.string.clear_icon),
                     )
                 }
             }
@@ -66,7 +66,7 @@ fun SearchBar(onQuery: (queryString: String) -> Unit) {
         TextFieldDefaults.colors(
             focusedContainerColor = Color.Transparent,
             unfocusedContainerColor = Color.Transparent,
-            disabledContainerColor = Color.Transparent
+            disabledContainerColor = Color.Transparent,
         ),
         placeholder = { Text(text = stringResource(R.string.hint_search_packages)) },
         textStyle = MaterialTheme.typography.bodySmall,
@@ -75,6 +75,6 @@ fun SearchBar(onQuery: (queryString: String) -> Unit) {
         modifier =
         Modifier
             .fillMaxWidth()
-            .background(color = MaterialTheme.colorScheme.background, shape = RectangleShape)
+            .background(color = MaterialTheme.colorScheme.background, shape = RectangleShape),
     )
 }

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

@@ -22,19 +22,15 @@ fun ConfigurationTextBox(
         modifier = modifier,
         value = value,
         singleLine = true,
-        onValueChange = {
-            onValueChange(it)
-        },
+        onValueChange = { onValueChange(it) },
         label = { Text(label) },
         maxLines = 1,
-        placeholder = {
-            Text(hint)
-        },
+        placeholder = { Text(hint) },
         keyboardOptions =
         KeyboardOptions(
             capitalization = KeyboardCapitalization.None,
-            imeAction = ImeAction.Done
+            imeAction = ImeAction.Done,
         ),
-        keyboardActions = keyboardActions
+        keyboardActions = keyboardActions,
     )
 }

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

@@ -9,6 +9,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.Dp
 
 @Composable
@@ -21,21 +22,18 @@ fun ConfigurationToggle(
     modifier: Modifier = Modifier
 ) {
     Row(
-        modifier =
-        Modifier
+        modifier = Modifier
             .fillMaxWidth()
             .padding(padding),
         verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.SpaceBetween
+        horizontalArrangement = Arrangement.SpaceBetween,
     ) {
-        Text(label)
+        Text(label, textAlign = TextAlign.Start)
         Switch(
             modifier = modifier,
             enabled = enabled,
             checked = checked,
-            onCheckedChange = {
-                onCheckChanged()
-            }
+            onCheckedChange = { onCheckChanged() },
         )
     }
 }

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

@@ -6,21 +6,33 @@ import androidx.compose.material3.NavigationBar
 import androidx.compose.material3.NavigationBarItem
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.navigation.NavController
 import androidx.navigation.compose.currentBackStackEntryAsState
+import com.zaneschepke.wireguardautotunnel.ui.Screen
 
 @Composable
-fun BottomNavBar(
-    navController: NavController,
-    bottomNavItems: List<BottomNavItem>
-) {
+fun BottomNavBar(navController: NavController, bottomNavItems: List<BottomNavItem>) {
     val backStackEntry = navController.currentBackStackEntryAsState()
 
+    var showBottomBar by rememberSaveable { mutableStateOf(true) }
+    val navBackStackEntry by navController.currentBackStackEntryAsState()
+
+    //TODO find a better way to hide nav bar
+    showBottomBar = when (navBackStackEntry?.destination?.route) {
+        Screen.Lock.route -> false
+        else -> true
+    }
+
     NavigationBar(
-        containerColor = MaterialTheme.colorScheme.background
+        containerColor = if (!showBottomBar) Color.Transparent else MaterialTheme.colorScheme.background,
     ) {
-        bottomNavItems.forEach { item ->
+        if (showBottomBar) bottomNavItems.forEach { item ->
             val selected = item.route == backStackEntry.value?.destination?.route
 
             NavigationBarItem(
@@ -29,15 +41,15 @@ fun BottomNavBar(
                 label = {
                     Text(
                         text = item.name,
-                        fontWeight = FontWeight.SemiBold
+                        fontWeight = FontWeight.SemiBold,
                     )
                 },
                 icon = {
                     Icon(
                         imageVector = item.icon,
-                        contentDescription = "${item.name} Icon"
+                        contentDescription = "${item.name} Icon",
                     )
-                }
+                },
             )
         }
     }

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

@@ -11,51 +11,46 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
 
 @Composable
-fun AuthorizationPrompt(
-    onSuccess: () -> Unit,
-    onFailure: () -> Unit,
-    onError: (String) -> Unit
-) {
+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
-                }
-
-                BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED -> {
-                    onError("Biometrics not created")
-                    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_UNSUPPORTED -> {
-                    onError("Biometrics not supported")
-                    false
-                }
-
-                BiometricManager.BIOMETRIC_STATUS_UNKNOWN -> {
-                    onError("Biometrics status unknown")
-                    false
-                }
-
-                BiometricManager.BIOMETRIC_SUCCESS -> true
-                else -> false
+    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_NO_HARDWARE -> {
+                onError("Biometric hardware not found")
+                false
+            }
+
+            BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED -> {
+                onError("Biometric security update required")
+                false
+            }
+
+            BiometricManager.BIOMETRIC_ERROR_UNSUPPORTED -> {
+                onError("Biometrics not supported")
+                false
+            }
+
+            BiometricManager.BIOMETRIC_STATUS_UNKNOWN -> {
+                onError("Biometrics status unknown")
+                false
+            }
+
+            BiometricManager.BIOMETRIC_SUCCESS -> true
+            else -> false
         }
+    }
     if (isBiometricAvailable) {
         val executor = remember { ContextCompat.getMainExecutor(context) }
 
@@ -71,10 +66,7 @@ fun AuthorizationPrompt(
                 context as FragmentActivity,
                 executor,
                 object : BiometricPrompt.AuthenticationCallback() {
-                    override fun onAuthenticationError(
-                        errorCode: Int,
-                        errString: CharSequence
-                    ) {
+                    override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
                         super.onAuthenticationError(errorCode, errString)
                         onFailure()
                     }
@@ -90,7 +82,7 @@ fun AuthorizationPrompt(
                         super.onAuthenticationFailed()
                         onFailure()
                     }
-                }
+                },
             )
         biometricPrompt.authenticate(promptInfo)
     }

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

@@ -19,12 +19,9 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLayoutDirection
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 
 @Composable
@@ -33,29 +30,32 @@ fun CustomSnackBar(
     isRtl: Boolean = true,
     containerColor: Color = MaterialTheme.colorScheme.surface
 ) {
-    val context = LocalContext.current
     Snackbar(
         containerColor = containerColor,
         modifier =
-        Modifier.fillMaxWidth(
-            if (WireGuardAutoTunnel.isRunningOnAndroidTv()) 1 / 3f else 2 / 3f
-        ).padding(bottom = 100.dp),
-        shape = RoundedCornerShape(16.dp)
+        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
+            LocalLayoutDirection provides if (isRtl) LayoutDirection.Rtl else LayoutDirection.Ltr,
         ) {
             Row(
-                modifier = Modifier.width(IntrinsicSize.Max).height(IntrinsicSize.Min),
+                modifier = Modifier
+                    .width(IntrinsicSize.Max)
+                    .height(IntrinsicSize.Min),
                 verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.Start
+                horizontalArrangement = Arrangement.Start,
             ) {
+                val icon = Icons.Rounded.Info
                 Icon(
-                    Icons.Rounded.Info,
-                    contentDescription = stringResource(R.string.info),
+                    icon,
+                    contentDescription = icon.name,
                     tint = Color.White,
-                    modifier = Modifier.padding(end = 10.dp)
+                    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,10 +13,14 @@ 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

@@ -0,0 +1,25 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.text
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+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.graphics.Color
+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()
+    }
+}

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

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

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/models/InterfaceProxy.kt

@@ -17,13 +17,13 @@ data class InterfaceProxy(
                 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()
+                listenPort =
+                if (i.listenPort.isPresent) {
+                    i.listenPort.get().toString().trim()
                 } else {
                     ""
                 },
-                mtu = if (i.mtu.isPresent) i.mtu.get().toString().trim() else ""
+                mtu = if (i.mtu.isPresent) i.mtu.get().toString().trim() else "",
             )
         }
     }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/models/PeerProxy.kt

@@ -13,36 +13,60 @@ data class PeerProxy(
         fun from(peer: Peer): PeerProxy {
             return PeerProxy(
                 publicKey = peer.publicKey.toBase64(),
-                preSharedKey = if (peer.preSharedKey.isPresent) {
-                    peer.preSharedKey.get().toBase64()
-                    .trim()
+                preSharedKey =
+                if (peer.preSharedKey.isPresent) {
+                    peer.preSharedKey.get().toBase64().trim()
                 } else {
                     ""
                 },
-                persistentKeepalive = if (peer.persistentKeepalive.isPresent) {
-                    peer.persistentKeepalive.get()
-                    .toString().trim()
+                persistentKeepalive =
+                if (peer.persistentKeepalive.isPresent) {
+                    peer.persistentKeepalive.get().toString().trim()
                 } else {
                     ""
                 },
-                endpoint = if (peer.endpoint.isPresent) {
-                    peer.endpoint.get().toString()
-                    .trim()
+                endpoint =
+                if (peer.endpoint.isPresent) {
+                    peer.endpoint.get().toString().trim()
                 } else {
                     ""
                 },
-                allowedIps = peer.allowedIps.joinToString(", ").trim()
+                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"
+                "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/config/ConfigScreen.kt

@@ -1,7 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.config
 
 import android.annotation.SuppressLint
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.focusGroup
@@ -29,7 +28,7 @@ import androidx.compose.material.icons.rounded.ContentCopy
 import androidx.compose.material.icons.rounded.Delete
 import androidx.compose.material.icons.rounded.Refresh
 import androidx.compose.material.icons.rounded.Save
-import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.BasicAlertDialog
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FabPosition
@@ -51,7 +50,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
@@ -63,6 +61,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
@@ -73,6 +72,7 @@ import androidx.navigation.NavController
 import com.google.accompanist.drawablepainter.DrawablePainter
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
 import com.zaneschepke.wireguardautotunnel.ui.Screen
 import com.zaneschepke.wireguardautotunnel.ui.common.SearchBar
 import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationTextBox
@@ -86,465 +86,548 @@ import kotlinx.coroutines.delay
 
 @SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
 @OptIn(
-    ExperimentalComposeUiApi::class,
     ExperimentalMaterial3Api::class,
-    ExperimentalFoundationApi::class)
+)
 @Composable
 fun ConfigScreen(
     viewModel: ConfigViewModel = hiltViewModel(),
     focusRequester: FocusRequester,
     navController: NavController,
-    showSnackbarMessage: (String) -> Unit,
-    id: String
+    appViewModel: AppViewModel,
+    tunnelId: String
 ) {
-  val context = LocalContext.current
-  val clipboardManager: ClipboardManager = LocalClipboardManager.current
-  val keyboardController = LocalSoftwareKeyboardController.current
-  var showApplicationsDialog by remember { mutableStateOf(false) }
-  var showAuthPrompt by remember { mutableStateOf(false) }
-  var isAuthenticated by remember { mutableStateOf(false) }
+    val context = LocalContext.current
+    val clipboardManager: ClipboardManager = LocalClipboardManager.current
+    val keyboardController = LocalSoftwareKeyboardController.current
+    var showApplicationsDialog by remember { mutableStateOf(false) }
+    var showAuthPrompt by remember { mutableStateOf(false) }
+    var isAuthenticated by remember { mutableStateOf(false) }
 
-  val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
-    LaunchedEffect(Unit) {
-        viewModel.init(id)
-    }
+    LaunchedEffect(Unit) { viewModel.init(tunnelId) }
 
-  LaunchedEffect(uiState.loading) {
-    if(!uiState.loading && WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-        delay(Constants.FOCUS_REQUEST_DELAY)
-        focusRequester.requestFocus()
-    }
-  }
-
-  if (uiState.loading) {
-    LoadingScreen()
-      return
-  }
-
-  val keyboardActions = KeyboardActions(onDone = { keyboardController?.hide() })
-
-  val keyboardOptions =
-      KeyboardOptions(imeAction = ImeAction.Done)
-
-  val fillMaxHeight = .85f
-  val fillMaxWidth = .85f
-  val screenPadding = 5.dp
-
-  val applicationButtonText = {
-    "Tunneling apps: " +
-        if (uiState.isAllApplicationsEnabled) {
-          "all"
-        } else {
-          "${uiState.checkedPackageNames.size} " + (if (uiState.include) "included" else "excluded")
+    LaunchedEffect(uiState.loading) {
+        if (!uiState.loading && WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+            delay(Constants.FOCUS_REQUEST_DELAY)
+            focusRequester.requestFocus()
         }
-  }
+    }
 
-  if (showAuthPrompt) {
-    AuthorizationPrompt(
-        onSuccess = {
-          showAuthPrompt = false
-          isAuthenticated = true
-        },
-        onError = { error ->
-          showAuthPrompt = false
-          showSnackbarMessage(Event.Error.AuthenticationFailed.message)
-        },
-        onFailure = {
-          showAuthPrompt = false
-          showSnackbarMessage(Event.Error.AuthorizationFailed.message)
-        })
-  }
+    if (uiState.loading) {
+        LoadingScreen()
+        return
+    }
 
-  if (showApplicationsDialog) {
-    val sortedPackages =
-        remember(uiState.packages) { uiState.packages.sortedBy { viewModel.getPackageLabel(it) } }
-    AlertDialog(onDismissRequest = { showApplicationsDialog = false }) {
-      Surface(
-          tonalElevation = 2.dp,
-          shadowElevation = 2.dp,
-          shape = RoundedCornerShape(12.dp),
-          color = MaterialTheme.colorScheme.surface,
-          modifier =
-              Modifier.fillMaxWidth()
-                  .fillMaxHeight(if (uiState.isAllApplicationsEnabled) 1 / 5f else 4 / 5f)) {
-            Column(modifier = Modifier.fillMaxWidth()) {
-              Row(
-                  modifier = Modifier.fillMaxWidth().padding(horizontal = 20.dp, vertical = 7.dp),
-                  verticalAlignment = Alignment.CenterVertically,
-                  horizontalArrangement = Arrangement.SpaceBetween) {
-                    Text(stringResource(id = R.string.tunnel_all))
-                    Switch(
-                        checked = uiState.isAllApplicationsEnabled,
-                        onCheckedChange = { viewModel.onAllApplicationsChange(it) })
-                  }
-              if (!uiState.isAllApplicationsEnabled) {
-                Row(
-                    modifier = Modifier.fillMaxWidth().padding(horizontal = 20.dp, vertical = 7.dp),
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.SpaceBetween) {
-                      Row(
-                          verticalAlignment = Alignment.CenterVertically,
-                          horizontalArrangement = Arrangement.SpaceBetween) {
-                            Text(stringResource(id = R.string.include))
-                            Checkbox(
-                                checked = uiState.include,
-                                onCheckedChange = { viewModel.onIncludeChange(!uiState.include) })
-                          }
-                      Row(
-                          verticalAlignment = Alignment.CenterVertically,
-                          horizontalArrangement = Arrangement.SpaceBetween) {
-                            Text(stringResource(id = R.string.exclude))
-                            Checkbox(
-                                checked = !uiState.include,
-                                onCheckedChange = { viewModel.onIncludeChange(!uiState.include) })
-                          }
+    val keyboardActions = KeyboardActions(onDone = { keyboardController?.hide() })
+
+    val keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done)
+
+    val fillMaxHeight = .85f
+    val fillMaxWidth = .85f
+    val screenPadding = 5.dp
+
+    val applicationButtonText = buildAnnotatedString {
+        append(stringResource(id = R.string.tunneling_apps))
+        append(": ")
+        if (uiState.isAllApplicationsEnabled) {
+            append(stringResource(id = R.string.all))
+        } else {
+            append("${uiState.checkedPackageNames.size} ")
+            (if (uiState.include) append(stringResource(id = R.string.included)) else append(
+                stringResource(id = R.string.excluded),
+            ))
+        }
+    }
+
+    if (showAuthPrompt) {
+        AuthorizationPrompt(
+            onSuccess = {
+                showAuthPrompt = false
+                isAuthenticated = true
+            },
+            onError = {
+                showAuthPrompt = false
+                appViewModel.showSnackbarMessage(Event.Error.AuthenticationFailed.message)
+            },
+            onFailure = {
+                showAuthPrompt = false
+                appViewModel.showSnackbarMessage(Event.Error.AuthorizationFailed.message)
+            },
+        )
+    }
+
+    if (showApplicationsDialog) {
+        val sortedPackages =
+            remember(uiState.packages) {
+                uiState.packages.sortedBy { viewModel.getPackageLabel(it) }
+            }
+        BasicAlertDialog(onDismissRequest = { showApplicationsDialog = false }) {
+            Surface(
+                tonalElevation = 2.dp,
+                shadowElevation = 2.dp,
+                shape = RoundedCornerShape(12.dp),
+                color = MaterialTheme.colorScheme.surface,
+                modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .fillMaxHeight(if (uiState.isAllApplicationsEnabled) 1 / 5f else 4 / 5f),
+            ) {
+                Column(
+                    modifier = Modifier
+                        .fillMaxWidth(),
+                ) {
+                    Row(
+                        modifier =
+                        Modifier
+                            .fillMaxWidth()
+                            .padding(horizontal = 20.dp, vertical = 7.dp),
+                        verticalAlignment = Alignment.CenterVertically,
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                    ) {
+                        Text(stringResource(id = R.string.tunnel_all))
+                        Switch(
+                            checked = uiState.isAllApplicationsEnabled,
+                            onCheckedChange = { viewModel.onAllApplicationsChange(it) },
+                        )
                     }
-                Row(
-                    modifier = Modifier.fillMaxWidth().padding(horizontal = 20.dp, vertical = 7.dp),
-                    verticalAlignment = Alignment.CenterVertically,
-                    horizontalArrangement = Arrangement.SpaceBetween) {
-                      SearchBar(viewModel::emitQueriedPackages)
-                    }
-                Spacer(Modifier.padding(5.dp))
-                LazyColumn(
-                    horizontalAlignment = Alignment.Start,
-                    verticalArrangement = Arrangement.Top,
-                    modifier = Modifier.fillMaxHeight(4 / 5f)) {
-                      items(sortedPackages, key = { it.packageName }) { pack ->
+                    if (!uiState.isAllApplicationsEnabled) {
                         Row(
+                            modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .padding(horizontal = 20.dp, vertical = 7.dp),
                             verticalAlignment = Alignment.CenterVertically,
                             horizontalArrangement = Arrangement.SpaceBetween,
-                            modifier = Modifier.fillMaxSize().padding(5.dp)) {
-                              Row(modifier = Modifier.fillMaxWidth(fillMaxWidth)) {
-                                val drawable =
-                                    pack.applicationInfo?.loadIcon(context.packageManager)
-                                if (drawable != null) {
-                                  Image(
-                                      painter = DrawablePainter(drawable),
-                                      stringResource(id = R.string.icon),
-                                      modifier = Modifier.size(50.dp, 50.dp))
-                                } else {
-                                  Icon(
-                                      Icons.Rounded.Android,
-                                      stringResource(id = R.string.edit),
-                                      modifier = Modifier.size(50.dp, 50.dp))
-                                }
-                                Text(
-                                    viewModel.getPackageLabel(pack),
-                                    modifier = Modifier.padding(5.dp))
-                              }
-                              Checkbox(
-                                  modifier = Modifier.fillMaxSize(),
-                                  checked =
-                                      (uiState.checkedPackageNames.contains(pack.packageName)),
-                                  onCheckedChange = {
-                                    if (it) {
-                                      viewModel.onAddCheckedPackage(pack.packageName)
-                                    } else {
-                                      viewModel.onRemoveCheckedPackage(pack.packageName)
-                                    }
-                                  })
+                        ) {
+                            Row(
+                                verticalAlignment = Alignment.CenterVertically,
+                                horizontalArrangement = Arrangement.SpaceBetween,
+                            ) {
+                                Text(stringResource(id = R.string.include))
+                                Checkbox(
+                                    checked = uiState.include,
+                                    onCheckedChange = {
+                                        viewModel.onIncludeChange(!uiState.include)
+                                    },
+                                )
                             }
-                      }
+                            Row(
+                                verticalAlignment = Alignment.CenterVertically,
+                                horizontalArrangement = Arrangement.SpaceBetween,
+                            ) {
+                                Text(stringResource(id = R.string.exclude))
+                                Checkbox(
+                                    checked = !uiState.include,
+                                    onCheckedChange = {
+                                        viewModel.onIncludeChange(!uiState.include)
+                                    },
+                                )
+                            }
+                        }
+                        Row(
+                            modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .padding(horizontal = 20.dp, vertical = 7.dp),
+                            verticalAlignment = Alignment.CenterVertically,
+                            horizontalArrangement = Arrangement.SpaceBetween,
+                        ) {
+                            SearchBar(viewModel::emitQueriedPackages)
+                        }
+                        Spacer(Modifier.padding(5.dp))
+                        LazyColumn(
+                            horizontalAlignment = Alignment.Start,
+                            verticalArrangement = Arrangement.Top,
+                            modifier = Modifier.fillMaxHeight(4 / 5f),
+                        ) {
+                            items(sortedPackages, key = { it.packageName }) { pack ->
+                                Row(
+                                    verticalAlignment = Alignment.CenterVertically,
+                                    horizontalArrangement = Arrangement.SpaceBetween,
+                                    modifier = Modifier
+                                        .fillMaxSize()
+                                        .padding(5.dp),
+                                ) {
+                                    Row(modifier = Modifier.fillMaxWidth(fillMaxWidth)) {
+                                        val drawable =
+                                            pack.applicationInfo?.loadIcon(context.packageManager)
+                                        if (drawable != null) {
+                                            Image(
+                                                painter = DrawablePainter(drawable),
+                                                stringResource(id = R.string.icon),
+                                                modifier = Modifier.size(50.dp, 50.dp),
+                                            )
+                                        } else {
+                                            val icon = Icons.Rounded.Android
+                                            Icon(
+                                                icon,
+                                                icon.name,
+                                                modifier = Modifier.size(50.dp, 50.dp),
+                                            )
+                                        }
+                                        Text(
+                                            viewModel.getPackageLabel(pack),
+                                            modifier = Modifier.padding(5.dp),
+                                        )
+                                    }
+                                    Checkbox(
+                                        modifier = Modifier.fillMaxSize(),
+                                        checked =
+                                        (uiState.checkedPackageNames.contains(
+                                            pack.packageName,
+                                        )),
+                                        onCheckedChange = {
+                                            if (it) {
+                                                viewModel.onAddCheckedPackage(pack.packageName)
+                                            } else {
+                                                viewModel.onRemoveCheckedPackage(pack.packageName)
+                                            }
+                                        },
+                                    )
+                                }
+                            }
+                        }
                     }
-              }
-              Row(
-                  verticalAlignment = Alignment.CenterVertically,
-                  modifier = Modifier.fillMaxSize().padding(top = 5.dp),
-                  horizontalArrangement = Arrangement.Center) {
-                    TextButton(onClick = { showApplicationsDialog = false }) {
-                      Text(stringResource(R.string.done))
+                    Row(
+                        verticalAlignment = Alignment.CenterVertically,
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .padding(top = 5.dp),
+                        horizontalArrangement = Arrangement.Center,
+                    ) {
+                        TextButton(onClick = { showApplicationsDialog = false }) {
+                            Text(stringResource(R.string.done))
+                        }
                     }
-                  }
+                }
             }
-          }
+        }
     }
-  }
 
     Scaffold(
         floatingActionButtonPosition = FabPosition.End,
         floatingActionButton = {
-          val secondaryColor = MaterialTheme.colorScheme.secondary
-          val hoverColor = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)
-          var fobColor by remember { mutableStateOf(secondaryColor) }
-          FloatingActionButton(
-              modifier =
-                  Modifier.padding(bottom = 90.dp).onFocusChanged {
+            val secondaryColor = MaterialTheme.colorScheme.secondary
+            val hoverColor = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)
+            var fobColor by remember { mutableStateOf(secondaryColor) }
+            FloatingActionButton(
+                modifier =
+                Modifier.onFocusChanged {
                     if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                      fobColor = if (it.isFocused) hoverColor else secondaryColor
+                        fobColor = if (it.isFocused) hoverColor else secondaryColor
                     }
-                  },
-              onClick = {
-                viewModel.onSaveAllChanges().let {
-                  when (it) {
-                    is Result.Success -> {
-                      showSnackbarMessage(it.data.message)
-                      navController.navigate(Screen.Main.route)
+                },
+                onClick = {
+                    viewModel.onSaveAllChanges().let {
+                        when (it) {
+                            is Result.Success -> {
+                                appViewModel.showSnackbarMessage(it.data.message)
+                                navController.navigate(Screen.Main.route)
+                            }
+
+                            is Result.Error -> appViewModel.showSnackbarMessage(it.error.message)
+                        }
                     }
-                    is Result.Error -> showSnackbarMessage(it.error.message)
-                  }
-                }
-              },
-              containerColor = fobColor,
-              shape = RoundedCornerShape(16.dp)) {
+                },
+                containerColor = fobColor,
+                shape = RoundedCornerShape(16.dp),
+            ) {
                 Icon(
                     imageVector = Icons.Rounded.Save,
                     contentDescription = stringResource(id = R.string.save_changes),
-                    tint = Color.DarkGray)
-              }
-        }) {
-          Column {
+                    tint = Color.DarkGray,
+                )
+            }
+        },
+    ) {
+        Column {
             Column(
                 horizontalAlignment = Alignment.CenterHorizontally,
                 verticalArrangement = Arrangement.Top,
                 modifier =
-                    Modifier.verticalScroll(rememberScrollState()).weight(1f, true).fillMaxSize()) {
-                  Surface(
-                      tonalElevation = 2.dp,
-                      shadowElevation = 2.dp,
-                      shape = RoundedCornerShape(12.dp),
-                      color = MaterialTheme.colorScheme.surface,
-                      modifier =
-                          (if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                                Modifier.fillMaxHeight(fillMaxHeight).fillMaxWidth(fillMaxWidth)
-                              } else {
-                                Modifier.fillMaxWidth(fillMaxWidth)
-                              })
-                              .padding(top = 50.dp, bottom = 10.dp)) {
-                        Column(
-                            horizontalAlignment = Alignment.Start,
-                            verticalArrangement = Arrangement.Top,
-                            modifier = Modifier.padding(15.dp).focusGroup()) {
-                              SectionTitle(
-                                  stringResource(R.string.interface_), padding = screenPadding)
-                              ConfigurationTextBox(
-                                  value = uiState.tunnelName,
-                                  onValueChange = { value -> viewModel.onTunnelNameChange(value) },
-                                  keyboardActions = keyboardActions,
-                                  label = stringResource(R.string.name),
-                                  hint = stringResource(R.string.tunnel_name).lowercase(),
-                                  modifier =
-                                      Modifier
-                                          .fillMaxWidth()
-                                          .focusRequester(focusRequester))
-                              OutlinedTextField(
-                                  modifier =
-                                      Modifier.fillMaxWidth().clickable {
-                                        showAuthPrompt = true
-                                      },
-                                  value = uiState.interfaceProxy.privateKey,
-                                  visualTransformation =
-                                      if ((id == Constants.MANUAL_TUNNEL_CONFIG_ID) ||
-                                          isAuthenticated)
-                                          VisualTransformation.None
-                                      else PasswordVisualTransformation(),
-                                  enabled =
-                                      (id == Constants.MANUAL_TUNNEL_CONFIG_ID) || isAuthenticated,
-                                  onValueChange = { value -> viewModel.onPrivateKeyChange(value) },
-                                  trailingIcon = {
-                                    IconButton(
-                                        modifier = Modifier.focusRequester(FocusRequester.Default),
-                                        onClick = { viewModel.generateKeyPair() }) {
-                                          Icon(
-                                              Icons.Rounded.Refresh,
-                                              stringResource(R.string.rotate_keys),
-                                              tint = Color.White)
-                                        }
-                                  },
-                                  label = { Text(stringResource(R.string.private_key)) },
-                                  singleLine = true,
-                                  placeholder = { Text(stringResource(R.string.base64_key)) },
-                                  keyboardOptions = keyboardOptions,
-                                  keyboardActions = keyboardActions)
-                              OutlinedTextField(
-                                  modifier =
-                                      Modifier
-                                          .fillMaxWidth()
-                                          .focusRequester(FocusRequester.Default),
-                                  value = uiState.interfaceProxy.publicKey,
-                                  enabled = false,
-                                  onValueChange = {},
-                                  trailingIcon = {
-                                    IconButton(
-                                        modifier = Modifier.focusRequester(FocusRequester.Default),
-                                        onClick = {
-                                          clipboardManager.setText(
-                                              AnnotatedString(uiState.interfaceProxy.publicKey))
-                                        }) {
-                                          Icon(
-                                              Icons.Rounded.ContentCopy,
-                                              stringResource(R.string.copy_public_key),
-                                              tint = Color.White)
-                                        }
-                                  },
-                                  label = { Text(stringResource(R.string.public_key)) },
-                                  singleLine = true,
-                                  placeholder = { Text(stringResource(R.string.base64_key)) },
-                                  keyboardOptions = keyboardOptions,
-                                  keyboardActions = keyboardActions)
-                              Row(modifier = Modifier.fillMaxWidth()) {
-                                ConfigurationTextBox(
-                                    value = uiState.interfaceProxy.addresses,
-                                    onValueChange = { value ->
-                                      viewModel.onAddressesChanged(value)
+                Modifier
+                    .verticalScroll(rememberScrollState())
+                    .weight(1f, true)
+                    .fillMaxSize(),
+            ) {
+                Surface(
+                    tonalElevation = 2.dp,
+                    shadowElevation = 2.dp,
+                    shape = RoundedCornerShape(12.dp),
+                    color = MaterialTheme.colorScheme.surface,
+                    modifier =
+                    (if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+                        Modifier
+                            .fillMaxHeight(fillMaxHeight)
+                            .fillMaxWidth(fillMaxWidth)
+                    } else {
+                        Modifier.fillMaxWidth(fillMaxWidth)
+                    })
+                        .padding(bottom = 10.dp),
+                ) {
+                    Column(
+                        horizontalAlignment = Alignment.Start,
+                        verticalArrangement = Arrangement.Top,
+                        modifier = Modifier
+                            .padding(15.dp)
+                            .focusGroup(),
+                    ) {
+                        SectionTitle(
+                            stringResource(R.string.interface_),
+                            padding = screenPadding,
+                        )
+                        ConfigurationTextBox(
+                            value = uiState.tunnelName,
+                            onValueChange = { value -> viewModel.onTunnelNameChange(value) },
+                            keyboardActions = keyboardActions,
+                            label = stringResource(R.string.name),
+                            hint = stringResource(R.string.tunnel_name).lowercase(),
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .focusRequester(focusRequester),
+                        )
+                        OutlinedTextField(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .clickable { showAuthPrompt = true },
+                            value = uiState.interfaceProxy.privateKey,
+                            visualTransformation =
+                            if ((tunnelId == Constants.MANUAL_TUNNEL_CONFIG_ID) || isAuthenticated)
+                                VisualTransformation.None
+                            else PasswordVisualTransformation(),
+                            enabled = (tunnelId == Constants.MANUAL_TUNNEL_CONFIG_ID) || isAuthenticated,
+                            onValueChange = { value -> viewModel.onPrivateKeyChange(value) },
+                            trailingIcon = {
+                                IconButton(
+                                    modifier = Modifier.focusRequester(FocusRequester.Default),
+                                    onClick = { viewModel.generateKeyPair() },
+                                ) {
+                                    Icon(
+                                        Icons.Rounded.Refresh,
+                                        stringResource(R.string.rotate_keys),
+                                        tint = Color.White,
+                                    )
+                                }
+                            },
+                            label = { Text(stringResource(R.string.private_key)) },
+                            singleLine = true,
+                            placeholder = { Text(stringResource(R.string.base64_key)) },
+                            keyboardOptions = keyboardOptions,
+                            keyboardActions = keyboardActions,
+                        )
+                        OutlinedTextField(
+                            modifier =
+                            Modifier
+                                .fillMaxWidth()
+                                .focusRequester(FocusRequester.Default),
+                            value = uiState.interfaceProxy.publicKey,
+                            enabled = false,
+                            onValueChange = {},
+                            trailingIcon = {
+                                IconButton(
+                                    modifier = Modifier.focusRequester(FocusRequester.Default),
+                                    onClick = {
+                                        clipboardManager.setText(
+                                            AnnotatedString(uiState.interfaceProxy.publicKey),
+                                        )
                                     },
-                                    keyboardActions = keyboardActions,
-                                    label = stringResource(R.string.addresses),
-                                    hint = stringResource(R.string.comma_separated_list),
-                                    modifier =
-                                        Modifier
-                                            .fillMaxWidth(3 / 5f)
-                                            .padding(end = 5.dp))
-                                ConfigurationTextBox(
-                                    value = uiState.interfaceProxy.listenPort,
-                                    onValueChange = { value ->
-                                      viewModel.onListenPortChanged(value)
-                                    },
-                                    keyboardActions = keyboardActions,
-                                    label = stringResource(R.string.listen_port),
-                                    hint = stringResource(R.string.random),
-                                    modifier = Modifier.width(IntrinsicSize.Min))
-                              }
-                              Row(modifier = Modifier.fillMaxWidth()) {
-                                ConfigurationTextBox(
-                                    value = uiState.interfaceProxy.dnsServers,
-                                    onValueChange = { value ->
-                                      viewModel.onDnsServersChanged(value)
-                                    },
-                                    keyboardActions = keyboardActions,
-                                    label = stringResource(R.string.dns_servers),
-                                    hint = stringResource(R.string.comma_separated_list),
-                                    modifier =
-                                        Modifier
-                                            .fillMaxWidth(3 / 5f)
-                                            .padding(end = 5.dp))
-                                ConfigurationTextBox(
-                                    value = uiState.interfaceProxy.mtu,
-                                    onValueChange = { value -> viewModel.onMtuChanged(value) },
-                                    keyboardActions = keyboardActions,
-                                    label = stringResource(R.string.mtu),
-                                    hint = stringResource(R.string.auto),
-                                    modifier = Modifier.width(IntrinsicSize.Min))
-                              }
-                              Row(
-                                  verticalAlignment = Alignment.CenterVertically,
-                                  modifier = Modifier.fillMaxSize().padding(top = 5.dp),
-                                  horizontalArrangement = Arrangement.Center) {
-                                    TextButton(onClick = { showApplicationsDialog = true }) {
-                                      Text(applicationButtonText())
-                                    }
-                                  }
+                                ) {
+                                    Icon(
+                                        Icons.Rounded.ContentCopy,
+                                        stringResource(R.string.copy_public_key),
+                                        tint = Color.White,
+                                    )
+                                }
+                            },
+                            label = { Text(stringResource(R.string.public_key)) },
+                            singleLine = true,
+                            placeholder = { Text(stringResource(R.string.base64_key)) },
+                            keyboardOptions = keyboardOptions,
+                            keyboardActions = keyboardActions,
+                        )
+                        Row(modifier = Modifier.fillMaxWidth()) {
+                            ConfigurationTextBox(
+                                value = uiState.interfaceProxy.addresses,
+                                onValueChange = { value -> viewModel.onAddressesChanged(value) },
+                                keyboardActions = keyboardActions,
+                                label = stringResource(R.string.addresses),
+                                hint = stringResource(R.string.comma_separated_list),
+                                modifier = Modifier
+                                    .fillMaxWidth(3 / 5f)
+                                    .padding(end = 5.dp),
+                            )
+                            ConfigurationTextBox(
+                                value = uiState.interfaceProxy.listenPort,
+                                onValueChange = { value -> viewModel.onListenPortChanged(value) },
+                                keyboardActions = keyboardActions,
+                                label = stringResource(R.string.listen_port),
+                                hint = stringResource(R.string.random),
+                                modifier = Modifier.width(IntrinsicSize.Min),
+                            )
+                        }
+                        Row(modifier = Modifier.fillMaxWidth()) {
+                            ConfigurationTextBox(
+                                value = uiState.interfaceProxy.dnsServers,
+                                onValueChange = { value -> viewModel.onDnsServersChanged(value) },
+                                keyboardActions = keyboardActions,
+                                label = stringResource(R.string.dns_servers),
+                                hint = stringResource(R.string.comma_separated_list),
+                                modifier = Modifier
+                                    .fillMaxWidth(3 / 5f)
+                                    .padding(end = 5.dp),
+                            )
+                            ConfigurationTextBox(
+                                value = uiState.interfaceProxy.mtu,
+                                onValueChange = { value -> viewModel.onMtuChanged(value) },
+                                keyboardActions = keyboardActions,
+                                label = stringResource(R.string.mtu),
+                                hint = stringResource(R.string.auto),
+                                modifier = Modifier.width(IntrinsicSize.Min),
+                            )
+                        }
+                        Row(
+                            verticalAlignment = Alignment.CenterVertically,
+                            modifier = Modifier
+                                .fillMaxSize()
+                                .padding(top = 5.dp),
+                            horizontalArrangement = Arrangement.Center,
+                        ) {
+                            TextButton(onClick = { showApplicationsDialog = true }) {
+                                Text(applicationButtonText.text)
                             }
-                      }
-                  uiState.proxyPeers.forEachIndexed { index, peer ->
+                        }
+                    }
+                }
+                uiState.proxyPeers.forEachIndexed { index, peer ->
                     Surface(
                         tonalElevation = 2.dp,
                         shadowElevation = 2.dp,
                         shape = RoundedCornerShape(12.dp),
                         color = MaterialTheme.colorScheme.surface,
                         modifier =
-                            (if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                                  Modifier.fillMaxHeight(fillMaxHeight).fillMaxWidth(fillMaxWidth)
-                                } else {
-                                  Modifier.fillMaxWidth(fillMaxWidth)
-                                })
-                                .padding(top = 10.dp, bottom = 10.dp)) {
-                          Column(
-                              horizontalAlignment = Alignment.Start,
-                              verticalArrangement = Arrangement.Top,
-                              modifier =
-                                  Modifier.padding(horizontal = 15.dp).padding(bottom = 10.dp)) {
-                                Row(
-                                    horizontalArrangement = Arrangement.SpaceBetween,
-                                    verticalAlignment = Alignment.CenterVertically,
-                                    modifier = Modifier.fillMaxWidth().padding(horizontal = 5.dp)) {
-                                      SectionTitle(
-                                          stringResource(R.string.peer), padding = screenPadding)
-                                      IconButton(onClick = { viewModel.onDeletePeer(index) }) {
-                                        Icon(Icons.Rounded.Delete, stringResource(R.string.delete))
-                                      }
-                                    }
-
-                                ConfigurationTextBox(
-                                    value = peer.publicKey,
-                                    onValueChange = { value ->
-                                      viewModel.onPeerPublicKeyChange(index, value)
-                                    },
-                                    keyboardActions = keyboardActions,
-                                    label = stringResource(R.string.public_key),
-                                    hint = stringResource(R.string.base64_key),
-                                    modifier = Modifier.fillMaxWidth())
-                                ConfigurationTextBox(
-                                    value = peer.preSharedKey,
-                                    onValueChange = { value ->
-                                      viewModel.onPreSharedKeyChange(index, value)
-                                    },
-                                    keyboardActions = keyboardActions,
-                                    label = stringResource(R.string.preshared_key),
-                                    hint = stringResource(R.string.optional),
-                                    modifier = Modifier.fillMaxWidth())
-                                OutlinedTextField(
-                                    modifier = Modifier.fillMaxWidth(),
-                                    value = peer.persistentKeepalive,
-                                    enabled = true,
-                                    onValueChange = { value ->
-                                      viewModel.onPersistentKeepaliveChanged(index, value)
-                                    },
-                                    trailingIcon = {
-                                      Text(
-                                          stringResource(R.string.seconds),
-                                          modifier = Modifier.padding(end = 10.dp))
-                                    },
-                                    label = { Text(stringResource(R.string.persistent_keepalive)) },
-                                    singleLine = true,
-                                    placeholder = {
-                                      Text(stringResource(R.string.optional_no_recommend))
-                                    },
-                                    keyboardOptions = keyboardOptions,
-                                    keyboardActions = keyboardActions)
-                                ConfigurationTextBox(
-                                    value = peer.endpoint,
-                                    onValueChange = { value ->
-                                      viewModel.onEndpointChange(index, value)
-                                    },
-                                    keyboardActions = keyboardActions,
-                                    label = stringResource(R.string.endpoint),
-                                    hint = stringResource(R.string.endpoint).lowercase(),
-                                    modifier = Modifier.fillMaxWidth())
-                                OutlinedTextField(
-                                    modifier = Modifier.fillMaxWidth(),
-                                    value = peer.allowedIps,
-                                    enabled = true,
-                                    onValueChange = { value ->
-                                      viewModel.onAllowedIpsChange(index, value)
-                                    },
-                                    label = { Text(stringResource(R.string.allowed_ips)) },
-                                    singleLine = true,
-                                    placeholder = {
-                                      Text(stringResource(R.string.comma_separated_list))
-                                    },
-                                    keyboardOptions = keyboardOptions,
-                                    keyboardActions = keyboardActions)
-                              }
-                        }
-                  }
-                  Row(
-                      horizontalArrangement = Arrangement.SpaceEvenly,
-                      verticalAlignment = Alignment.CenterVertically,
-                      modifier = Modifier.fillMaxSize().padding(bottom = 140.dp)) {
-                        Row(
-                            verticalAlignment = Alignment.CenterVertically,
-                            horizontalArrangement = Arrangement.Center) {
-                              TextButton(onClick = { viewModel.addEmptyPeer() }) {
-                                Text(stringResource(R.string.add_peer))
-                              }
+                        (if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+                            Modifier
+                                .fillMaxHeight(fillMaxHeight)
+                                .fillMaxWidth(fillMaxWidth)
+                        } else {
+                            Modifier.fillMaxWidth(fillMaxWidth)
+                        })
+                            .padding(top = 10.dp, bottom = 10.dp),
+                    ) {
+                        Column(
+                            horizontalAlignment = Alignment.Start,
+                            verticalArrangement = Arrangement.Top,
+                            modifier = Modifier
+                                .padding(horizontal = 15.dp)
+                                .padding(bottom = 10.dp),
+                        ) {
+                            Row(
+                                horizontalArrangement = Arrangement.SpaceBetween,
+                                verticalAlignment = Alignment.CenterVertically,
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .padding(horizontal = 5.dp),
+                            ) {
+                                SectionTitle(
+                                    stringResource(R.string.peer),
+                                    padding = screenPadding,
+                                )
+                                IconButton(onClick = { viewModel.onDeletePeer(index) }) {
+                                    val icon = Icons.Rounded.Delete
+                                    Icon(icon, icon.name)
+                                }
                             }
-                      }
+
+                            ConfigurationTextBox(
+                                value = peer.publicKey,
+                                onValueChange = { value ->
+                                    viewModel.onPeerPublicKeyChange(index, value)
+                                },
+                                keyboardActions = keyboardActions,
+                                label = stringResource(R.string.public_key),
+                                hint = stringResource(R.string.base64_key),
+                                modifier = Modifier.fillMaxWidth(),
+                            )
+                            ConfigurationTextBox(
+                                value = peer.preSharedKey,
+                                onValueChange = { value ->
+                                    viewModel.onPreSharedKeyChange(index, value)
+                                },
+                                keyboardActions = keyboardActions,
+                                label = stringResource(R.string.preshared_key),
+                                hint = stringResource(R.string.optional),
+                                modifier = Modifier.fillMaxWidth(),
+                            )
+                            OutlinedTextField(
+                                modifier = Modifier.fillMaxWidth(),
+                                value = peer.persistentKeepalive,
+                                enabled = true,
+                                onValueChange = { value ->
+                                    viewModel.onPersistentKeepaliveChanged(index, value)
+                                },
+                                trailingIcon = {
+                                    Text(
+                                        stringResource(R.string.seconds),
+                                        modifier = Modifier.padding(end = 10.dp),
+                                    )
+                                },
+                                label = { Text(stringResource(R.string.persistent_keepalive)) },
+                                singleLine = true,
+                                placeholder = {
+                                    Text(stringResource(R.string.optional_no_recommend))
+                                },
+                                keyboardOptions = keyboardOptions,
+                                keyboardActions = keyboardActions,
+                            )
+                            ConfigurationTextBox(
+                                value = peer.endpoint,
+                                onValueChange = { value ->
+                                    viewModel.onEndpointChange(index, value)
+                                },
+                                keyboardActions = keyboardActions,
+                                label = stringResource(R.string.endpoint),
+                                hint = stringResource(R.string.endpoint).lowercase(),
+                                modifier = Modifier.fillMaxWidth(),
+                            )
+                            OutlinedTextField(
+                                modifier = Modifier.fillMaxWidth(),
+                                value = peer.allowedIps,
+                                enabled = true,
+                                onValueChange = { value ->
+                                    viewModel.onAllowedIpsChange(index, value)
+                                },
+                                label = { Text(stringResource(R.string.allowed_ips)) },
+                                singleLine = true,
+                                placeholder = {
+                                    Text(stringResource(R.string.comma_separated_list))
+                                },
+                                keyboardOptions = keyboardOptions,
+                                keyboardActions = keyboardActions,
+                            )
+                        }
+                    }
+                }
+                Row(
+                    horizontalArrangement = Arrangement.SpaceEvenly,
+                    verticalAlignment = Alignment.CenterVertically,
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .padding(bottom = 140.dp),
+                ) {
+                    Row(
+                        verticalAlignment = Alignment.CenterVertically,
+                        horizontalArrangement = Arrangement.Center,
+                    ) {
+                        TextButton(onClick = { viewModel.addEmptyPeer() }) {
+                            Text(stringResource(R.string.add_peer))
+                        }
+                    }
                 }
-            if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-              Spacer(modifier = Modifier.weight(.17f))
             }
-          }
+            if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+                Spacer(modifier = Modifier.weight(.17f))
+            }
         }
+    }
 }

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

@@ -11,8 +11,8 @@ data class ConfigUiState(
     val packages: Packages = emptyList(),
     val checkedPackageNames: List<String> = emptyList(),
     val include: Boolean = true,
-    val isAllApplicationsEnabled : Boolean = false,
+    val isAllApplicationsEnabled: Boolean = false,
     val loading: Boolean = true,
     val tunnel: TunnelConfig? = null,
     val tunnelName: String = ""
-)
+)

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

@@ -14,8 +14,7 @@ import com.wireguard.crypto.Key
 import com.wireguard.crypto.KeyPair
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.ui.models.InterfaceProxy
 import com.zaneschepke.wireguardautotunnel.ui.models.PeerProxy
 import com.zaneschepke.wireguardautotunnel.util.Constants
@@ -28,8 +27,8 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
+import timber.log.Timber
 import javax.inject.Inject
 
 @HiltViewModel
@@ -37,276 +36,314 @@ class ConfigViewModel
 @Inject
 constructor(
     private val application: Application,
-    private val tunnelConfigRepository: TunnelConfigRepository,
-    private val settingsRepository: SettingsRepository,
+    private val appDataRepository: AppDataRepository
 ) : ViewModel() {
 
-  private val packageManager = application.packageManager
+    private val packageManager = application.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(Dispatchers.IO) {
-        val packages = getQueriedPackages("")
-        val state = if(tunnelId != Constants.MANUAL_TUNNEL_CONFIG_ID) {
-            val tunnelConfig =
-                tunnelConfigRepository.getAll().firstOrNull { it.id.toString() == tunnelId }
-            if (tunnelConfig != null) {
-                val config = TunnelConfig.configFromQuick(tunnelConfig.wgQuick)
-                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
+    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 }
+                    if (tunnelConfig != null) {
+                        val config = TunnelConfig.configFromQuick(tunnelConfig.wgQuick)
+                        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()
+                            }
+                        ConfigUiState(
+                            proxyPeers,
+                            proxyInterface,
+                            packages,
+                            checkedPackages.toList(),
+                            include,
+                            isAllApplicationsEnabled,
+                            false,
+                            tunnelConfig,
+                            tunnelConfig.name,
+                        )
                     } else {
-                        isAllApplicationsEnabled = true
-                        emptySet()
+                        ConfigUiState(loading = false, packages = packages)
                     }
-                ConfigUiState(
-                    proxyPeers,
-                    proxyInterface,
-                    packages,
-                    checkedPackages.toList(),
-                    include,
-                    isAllApplicationsEnabled,
-                    false,
-                    tunnelConfig,
-                    tunnelConfig.name)
-            } 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 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 onAllApplicationsChange(isAllApplicationsEnabled: Boolean) {
+        _uiState.value = _uiState.value.copy(isAllApplicationsEnabled = isAllApplicationsEnabled)
+    }
+
+    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())
+        }
+    }
+
+    fun getPackageLabel(packageInfo: PackageInfo): String {
+        return packageInfo.applicationInfo.loadLabel(application.packageManager).toString()
+    }
+
+    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 {
-            ConfigUiState(loading = false, packages = packages)
+            packageManager.getPackagesHoldingPermissions(permissions, 0)
         }
-        _uiState.value = state
     }
-  fun onTunnelNameChange(name: String) {
-    _uiState.value = _uiState.value.copy(tunnelName = name)
-  }
 
-  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 onAllApplicationsChange(isAllApplicationsEnabled: Boolean) {
-    _uiState.value = _uiState.value.copy(isAllApplicationsEnabled = isAllApplicationsEnabled)
-  }
-
-  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 isAllApplicationsEnabled(): Boolean {
+        return _uiState.value.isAllApplicationsEnabled
     }
-  }
 
-  fun getPackageLabel(packageInfo: PackageInfo): String {
-    return packageInfo.applicationInfo.loadLabel(application.packageManager).toString()
-  }
+    private fun saveConfig(tunnelConfig: TunnelConfig) =
+        viewModelScope.launch { appDataRepository.tunnels.save(tunnelConfig) }
 
-  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 isAllApplicationsEnabled(): Boolean {
-    return _uiState.value.isAllApplicationsEnabled
-  }
-
-  private fun saveConfig(tunnelConfig: TunnelConfig) =
-      viewModelScope.launch {
-          tunnelConfigRepository.save(tunnelConfig)
-      }
-
-  private fun updateTunnelConfig(tunnelConfig: TunnelConfig?) =
-      viewModelScope.launch {
-        if (tunnelConfig != null) {
-          saveConfig(tunnelConfig).join()
-          WireGuardAutoTunnel.requestTileServiceStateUpdate()
-          updateSettingsDefaultTunnel(tunnelConfig)
+    private fun updateTunnelConfig(tunnelConfig: TunnelConfig?) =
+        viewModelScope.launch {
+            if (tunnelConfig != null) {
+                saveConfig(tunnelConfig).join()
+                WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate(application)
+            }
         }
-      }
 
-  private suspend fun updateSettingsDefaultTunnel(tunnelConfig: TunnelConfig) {
-    val settings = settingsRepository.getSettingsFlow().first()
-    if (settings.defaultTunnel != null) {
-      if (tunnelConfig.id == TunnelConfig.from(settings.defaultTunnel!!).id) {
-        settingsRepository.save(settings.copy(defaultTunnel = tunnelConfig.toString()))
-      }
+    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 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())
-    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())
+    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()
     }
-    if (isAllApplicationsEnabled()) emptyCheckedPackagesList()
-    if (_uiState.value.include) builder.includeApplications(_uiState.value.checkedPackageNames)
-    if (!_uiState.value.include) builder.excludeApplications(_uiState.value.checkedPackageNames)
-    return builder.build()
-  }
 
-  fun onSaveAllChanges(): Result<Event> {
-      return try {
-          val peerList = buildPeerListFromProxyPeers()
-          val wgInterface = buildInterfaceListFromProxyInterface()
-          val config = Config.Builder().addPeers(peerList).setInterface(wgInterface).build()
-          val tunnelConfig =
-              _uiState.value.tunnel?.copy(
-                  name = _uiState.value.tunnelName, wgQuick = config.toWgQuickString())
-          updateTunnelConfig(tunnelConfig)
-          Result.Success(Event.Message.ConfigSaved)
-      } catch (e: Exception) {
-          Result.Error(Event.Error.Exception(e))
-      }
-  }
+    fun onSaveAllChanges(): Result<Event> {
+        return try {
+            val peerList = buildPeerListFromProxyPeers()
+            val wgInterface = buildInterfaceListFromProxyInterface()
+            val config = Config.Builder().addPeers(peerList).setInterface(wgInterface).build()
+            val tunnelConfig = when (uiState.value.tunnel) {
+                null -> TunnelConfig(
+                    name = _uiState.value.tunnelName,
+                    wgQuick = config.toWgQuickString(),
+                )
 
-  fun onPeerPublicKeyChange(index: Int, value: String) {
-    _uiState.value =
-        _uiState.value.copy(
-            proxyPeers =
+                else -> uiState.value.tunnel!!.copy(
+                    name = _uiState.value.tunnelName,
+                    wgQuick = config.toWgQuickString(),
+                )
+            }
+            updateTunnelConfig(tunnelConfig)
+            Result.Success(Event.Message.ConfigSaved)
+        } catch (e: Exception) {
+            Timber.e(e)
+            val message = e.message?.substringAfter(":", missingDelimiterValue = "")
+            Result.Error(Event.Error.ConfigParseError(message ?: ""))
+        }
+    }
+
+    fun onPeerPublicKeyChange(index: Int, value: String) {
+        _uiState.value =
+            _uiState.value.copy(
+                proxyPeers =
                 _uiState.value.proxyPeers.update(
-                    index, _uiState.value.proxyPeers[index].copy(publicKey = value)))
-  }
+                    index,
+                    _uiState.value.proxyPeers[index].copy(publicKey = value),
+                ),
+            )
+    }
 
-  fun onPreSharedKeyChange(index: Int, value: String) {
-    _uiState.value =
-        _uiState.value.copy(
-            proxyPeers =
+    fun onPreSharedKeyChange(index: Int, value: String) {
+        _uiState.value =
+            _uiState.value.copy(
+                proxyPeers =
                 _uiState.value.proxyPeers.update(
-                    index, _uiState.value.proxyPeers[index].copy(preSharedKey = value)))
-  }
+                    index,
+                    _uiState.value.proxyPeers[index].copy(preSharedKey = value),
+                ),
+            )
+    }
 
-  fun onEndpointChange(index: Int, value: String) {
-    _uiState.value =
-        _uiState.value.copy(
-            proxyPeers =
+    fun onEndpointChange(index: Int, value: String) {
+        _uiState.value =
+            _uiState.value.copy(
+                proxyPeers =
                 _uiState.value.proxyPeers.update(
-                    index, _uiState.value.proxyPeers[index].copy(endpoint = value)))
-  }
+                    index,
+                    _uiState.value.proxyPeers[index].copy(endpoint = value),
+                ),
+            )
+    }
 
-  fun onAllowedIpsChange(index: Int, value: String) {
-    _uiState.value =
-        _uiState.value.copy(
-            proxyPeers =
+    fun onAllowedIpsChange(index: Int, value: String) {
+        _uiState.value =
+            _uiState.value.copy(
+                proxyPeers =
                 _uiState.value.proxyPeers.update(
-                    index, _uiState.value.proxyPeers[index].copy(allowedIps = value)))
-  }
+                    index,
+                    _uiState.value.proxyPeers[index].copy(allowedIps = value),
+                ),
+            )
+    }
 
-  fun onPersistentKeepaliveChanged(index: Int, value: String) {
-    _uiState.value =
-        _uiState.value.copy(
-            proxyPeers =
+    fun onPersistentKeepaliveChanged(index: Int, value: String) {
+        _uiState.value =
+            _uiState.value.copy(
+                proxyPeers =
                 _uiState.value.proxyPeers.update(
-                    index, _uiState.value.proxyPeers[index].copy(persistentKeepalive = value)))
-  }
+                    index,
+                    _uiState.value.proxyPeers[index].copy(persistentKeepalive = value),
+                ),
+            )
+    }
 
-  fun onDeletePeer(index: Int) {
-      _uiState.value = _uiState.value.copy(
-          proxyPeers = _uiState.value.proxyPeers.removeAt(index)
-      )
-  }
+    fun onDeletePeer(index: Int) {
+        _uiState.value =
+            _uiState.value.copy(
+                proxyPeers = _uiState.value.proxyPeers.removeAt(index),
+            )
+    }
 
-  fun addEmptyPeer() {
-    _uiState.value = _uiState.value.copy(proxyPeers = _uiState.value.proxyPeers + PeerProxy())
-  }
+    fun addEmptyPeer() {
+        _uiState.value = _uiState.value.copy(proxyPeers = _uiState.value.proxyPeers + PeerProxy())
+    }
 
-  fun generateKeyPair() {
-    val keyPair = KeyPair()
-    _uiState.value =
-        _uiState.value.copy(
-            interfaceProxy =
+    fun generateKeyPair() {
+        val keyPair = KeyPair()
+        _uiState.value =
+            _uiState.value.copy(
+                interfaceProxy =
                 _uiState.value.interfaceProxy.copy(
                     privateKey = keyPair.privateKey.toBase64(),
-                    publicKey = keyPair.publicKey.toBase64()))
-  }
-
-  fun onAddressesChanged(value: String) {
-    _uiState.value =
-        _uiState.value.copy(interfaceProxy = _uiState.value.interfaceProxy.copy(addresses = value))
-  }
-
-  fun onListenPortChanged(value: String) {
-    _uiState.value =
-        _uiState.value.copy(interfaceProxy = _uiState.value.interfaceProxy.copy(listenPort = value))
-  }
-
-  fun onDnsServersChanged(value: String) {
-    _uiState.value =
-        _uiState.value.copy(interfaceProxy = _uiState.value.interfaceProxy.copy(dnsServers = value))
-  }
-
-  fun onMtuChanged(value: String) {
-    _uiState.value =
-        _uiState.value.copy(interfaceProxy = _uiState.value.interfaceProxy.copy(mtu = value))
-  }
-
-  private fun onInterfacePublicKeyChange(value: String) {
-    _uiState.value =
-        _uiState.value.copy(interfaceProxy = _uiState.value.interfaceProxy.copy(publicKey = value))
-  }
-
-  fun onPrivateKeyChange(value: String) {
-    _uiState.value =
-        _uiState.value.copy(interfaceProxy = _uiState.value.interfaceProxy.copy(privateKey = value))
-    if (NumberUtils.isValidKey(value)) {
-      val pair = KeyPair(Key.fromBase64(value))
-      onInterfacePublicKeyChange(pair.publicKey.toBase64())
-    } else {
-      onInterfacePublicKeyChange("")
+                    publicKey = keyPair.publicKey.toBase64(),
+                ),
+            )
     }
-  }
 
-  fun emitQueriedPackages(query: String) {
-    val packages =
-        getAllInternetCapablePackages().filter {
-          getPackageLabel(it).lowercase().contains(query.lowercase())
+    fun onAddressesChanged(value: String) {
+        _uiState.value =
+            _uiState.value.copy(
+                interfaceProxy = _uiState.value.interfaceProxy.copy(addresses = value),
+            )
+    }
+
+    fun onListenPortChanged(value: String) {
+        _uiState.value =
+            _uiState.value.copy(
+                interfaceProxy = _uiState.value.interfaceProxy.copy(listenPort = value),
+            )
+    }
+
+    fun onDnsServersChanged(value: String) {
+        _uiState.value =
+            _uiState.value.copy(
+                interfaceProxy = _uiState.value.interfaceProxy.copy(dnsServers = value),
+            )
+    }
+
+    fun onMtuChanged(value: String) {
+        _uiState.value =
+            _uiState.value.copy(interfaceProxy = _uiState.value.interfaceProxy.copy(mtu = value))
+    }
+
+    private fun onInterfacePublicKeyChange(value: String) {
+        _uiState.value =
+            _uiState.value.copy(
+                interfaceProxy = _uiState.value.interfaceProxy.copy(publicKey = value),
+            )
+    }
+
+    fun onPrivateKeyChange(value: String) {
+        _uiState.value =
+            _uiState.value.copy(
+                interfaceProxy = _uiState.value.interfaceProxy.copy(privateKey = value),
+            )
+        if (NumberUtils.isValidKey(value)) {
+            val pair = KeyPair(Key.fromBase64(value))
+            onInterfacePublicKeyChange(pair.publicKey.toBase64())
+        } else {
+            onInterfacePublicKeyChange("")
         }
-    _uiState.value = _uiState.value.copy(packages = packages)
-  }
+    }
+
+    fun emitQueriedPackages(query: String) {
+        val packages =
+            getAllInternetCapablePackages().filter {
+                getPackageLabel(it).lowercase().contains(query.lowercase())
+            }
+        _uiState.value = _uiState.value.copy(packages = packages)
+    }
 }

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

@@ -19,13 +19,10 @@ import androidx.compose.foundation.gestures.ScrollableDefaults
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.requiredWidth
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
@@ -39,25 +36,25 @@ import androidx.compose.material.icons.filled.QrCode
 import androidx.compose.material.icons.rounded.Add
 import androidx.compose.material.icons.rounded.Bolt
 import androidx.compose.material.icons.rounded.Circle
+import androidx.compose.material.icons.rounded.CopyAll
 import androidx.compose.material.icons.rounded.Delete
-import androidx.compose.material.icons.rounded.Edit
 import androidx.compose.material.icons.rounded.Info
+import androidx.compose.material.icons.rounded.Settings
+import androidx.compose.material.icons.rounded.Smartphone
 import androidx.compose.material.icons.rounded.Star
 import androidx.compose.material3.AlertDialog
-import androidx.compose.material3.Divider
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FabPosition
 import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.MaterialTheme.typography
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
-import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.rememberModalBottomSheetState
 import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
@@ -77,10 +74,10 @@ import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -93,6 +90,7 @@ import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.service.tunnel.HandshakeStatus
+import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
 import com.zaneschepke.wireguardautotunnel.ui.CaptureActivityPortrait
 import com.zaneschepke.wireguardautotunnel.ui.Screen
 import com.zaneschepke.wireguardautotunnel.ui.common.RowListItem
@@ -104,6 +102,7 @@ import com.zaneschepke.wireguardautotunnel.util.Event
 import com.zaneschepke.wireguardautotunnel.util.Result
 import com.zaneschepke.wireguardautotunnel.util.handshakeStatus
 import com.zaneschepke.wireguardautotunnel.util.mapPeerStats
+import com.zaneschepke.wireguardautotunnel.util.truncateWithEllipsis
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
@@ -113,375 +112,452 @@ import kotlinx.coroutines.launch
 @Composable
 fun MainScreen(
     viewModel: MainViewModel = hiltViewModel(),
-    padding: PaddingValues,
+    appViewModel: AppViewModel,
     focusRequester: FocusRequester,
-    showSnackbarMessage: (String) -> Unit,
     navController: NavController
 ) {
-  val haptic = LocalHapticFeedback.current
-  val context = LocalContext.current
-  val isVisible = rememberSaveable { mutableStateOf(true) }
-  val scope = rememberCoroutineScope { Dispatchers.IO }
+    val haptic = LocalHapticFeedback.current
+    val context = LocalContext.current
+    val isVisible = rememberSaveable { mutableStateOf(true) }
+    val scope = rememberCoroutineScope { Dispatchers.IO }
 
-  val sheetState = rememberModalBottomSheetState()
-  var showBottomSheet by remember { mutableStateOf(false) }
+    val sheetState = rememberModalBottomSheetState()
+    var showBottomSheet by remember { mutableStateOf(false) }
 
-  var showPrimaryChangeAlertDialog by remember { mutableStateOf(false) }
-  var selectedTunnel by remember { mutableStateOf<TunnelConfig?>(null) }
-  val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+    var showDeleteTunnelAlertDialog by remember { mutableStateOf(false) }
+    var selectedTunnel by remember { mutableStateOf<TunnelConfig?>(null) }
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
-  LaunchedEffect(uiState.loading) {
-    if (!uiState.loading && WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-      delay(Constants.FOCUS_REQUEST_DELAY)
-      focusRequester.requestFocus()
+    LaunchedEffect(Unit) {
+        if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+            delay(Constants.FOCUS_REQUEST_DELAY)
+            focusRequester.requestFocus()
+        }
     }
-  }
 
-  if (uiState.loading) {
-    LoadingScreen()
-    return
-  }
+    val tunnelFileImportResultLauncher =
+        rememberLauncherForActivityResult(
+            object : ActivityResultContracts.GetContent() {
+                override fun createIntent(context: Context, input: String): Intent {
+                    val intent = super.createIntent(context, input)
 
-  val tunnelFileImportResultLauncher =
-      rememberLauncherForActivityResult(
-          object : ActivityResultContracts.GetContent() {
-            override fun createIntent(context: Context, input: String): Intent {
-              val intent = super.createIntent(context, input)
-
-              /* AndroidTV now comes with stubs that do nothing but display a Toast less helpful than
-               * what we can do, so detect this and throw an exception that we can catch later. */
-              val activitiesToResolveIntent =
-                  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                    context.packageManager.queryIntentActivities(
-                        intent,
-                        PackageManager.ResolveInfoFlags.of(
-                            PackageManager.MATCH_DEFAULT_ONLY.toLong()))
-                  } else {
-                    context.packageManager.queryIntentActivities(
-                        intent, PackageManager.MATCH_DEFAULT_ONLY)
-                  }
-              if (activitiesToResolveIntent.all {
-                val name = it.activityInfo.packageName
-                name.startsWith(Constants.GOOGLE_TV_EXPLORER_STUB) ||
-                    name.startsWith(Constants.ANDROID_TV_EXPLORER_STUB)
-              }) {
-                showSnackbarMessage(Event.Error.FileExplorerRequired.message)
-              }
-              return intent
-            }
-          }) { data ->
+                    /* AndroidTV now comes with stubs that do nothing but display a Toast less helpful than
+                     * what we can do, so detect this and throw an exception that we can catch later. */
+                    val activitiesToResolveIntent =
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                            context.packageManager.queryIntentActivities(
+                                intent,
+                                PackageManager.ResolveInfoFlags.of(
+                                    PackageManager.MATCH_DEFAULT_ONLY.toLong(),
+                                ),
+                            )
+                        } else {
+                            context.packageManager.queryIntentActivities(
+                                intent,
+                                PackageManager.MATCH_DEFAULT_ONLY,
+                            )
+                        }
+                    if (
+                        activitiesToResolveIntent.all {
+                            val name = it.activityInfo.packageName
+                            name.startsWith(Constants.GOOGLE_TV_EXPLORER_STUB) ||
+                                name.startsWith(Constants.ANDROID_TV_EXPLORER_STUB)
+                        }
+                    ) {
+                        appViewModel.showSnackbarMessage(Event.Error.FileExplorerRequired.message)
+                    }
+                    return intent
+                }
+            },
+        ) { data ->
             if (data == null) return@rememberLauncherForActivityResult
             scope.launch {
-              viewModel.onTunnelFileSelected(data).let {
-                when (it) {
-                  is Result.Error -> showSnackbarMessage(it.error.message)
-                  is Result.Success -> {}
+                viewModel.onTunnelFileSelected(data).let {
+                    when (it) {
+                        is Result.Error -> appViewModel.showSnackbarMessage(it.error.message)
+                        is Result.Success -> {}
+                    }
                 }
-              }
             }
-          }
-  val scanLauncher =
-      rememberLauncherForActivityResult(
-          contract = ScanContract(),
-          onResult = {
-            if (it.contents != null) {
-              scope.launch {
-                viewModel.onTunnelQrResult(it.contents).let { result ->
-                  when (result) {
-                    is Result.Success -> {}
-                    is Result.Error -> showSnackbarMessage(result.error.message)
-                  }
+        }
+    val scanLauncher =
+        rememberLauncherForActivityResult(
+            contract = ScanContract(),
+            onResult = {
+                if (it.contents != null) {
+                    scope.launch {
+                        viewModel.onTunnelQrResult(it.contents).let { result ->
+                            when (result) {
+                                is Result.Success -> {}
+                                is Result.Error -> appViewModel.showSnackbarMessage(result.error.message)
+                            }
+                        }
+                    }
                 }
-              }
-            }
-          })
+            },
+        )
 
-  AnimatedVisibility(showPrimaryChangeAlertDialog) {
-    AlertDialog(
-        onDismissRequest = { showPrimaryChangeAlertDialog = false },
-        confirmButton = {
-          TextButton(
-              onClick = {
-                viewModel.onDefaultTunnelChange(selectedTunnel)
-                showPrimaryChangeAlertDialog = false
-                selectedTunnel = null
-              }) {
-                Text(text = stringResource(R.string.okay))
-              }
-        },
-        dismissButton = {
-          TextButton(onClick = { showPrimaryChangeAlertDialog = false }) {
-            Text(text = stringResource(R.string.cancel))
-          }
-        },
-        title = { Text(text = stringResource(R.string.primary_tunnel_change)) },
-        text = { Text(text = stringResource(R.string.primary_tunnel_change_question)) })
-  }
+    AnimatedVisibility(showDeleteTunnelAlertDialog) {
+        AlertDialog(
+            onDismissRequest = { showDeleteTunnelAlertDialog = false },
+            confirmButton = {
+                TextButton(
+                    onClick = {
+                        selectedTunnel?.let { viewModel.onDelete(it) }
+                        showDeleteTunnelAlertDialog = false
+                        selectedTunnel = null
+                    },
+                ) {
+                    Text(text = stringResource(R.string.yes))
+                }
+            },
+            dismissButton = {
+                TextButton(onClick = { showDeleteTunnelAlertDialog = false }) {
+                    Text(text = stringResource(R.string.cancel))
+                }
+            },
+            title = { Text(text = stringResource(R.string.delete_tunnel)) },
+            text = { Text(text = stringResource(R.string.delete_tunnel_message)) },
+        )
+    }
 
-  fun onTunnelToggle(checked: Boolean, tunnel: TunnelConfig) {
-    if (checked) viewModel.onTunnelStart(tunnel) else viewModel.onTunnelStop()
-  }
+    fun onTunnelToggle(checked: Boolean, tunnel: TunnelConfig) {
+        if (appViewModel.isRequiredPermissionGranted()) {
+            if (checked) viewModel.onTunnelStart(tunnel) else viewModel.onTunnelStop()
+        }
+    }
 
-  Scaffold(
-      modifier =
-          Modifier.pointerInput(Unit) {
+    if (uiState.loading) {
+        return LoadingScreen()
+    }
+
+    Scaffold(
+        modifier =
+        Modifier.pointerInput(Unit) {
             detectTapGestures(
                 onTap = {
-                  if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) selectedTunnel = null
-                })
-          },
-      floatingActionButtonPosition = FabPosition.End,
-      topBar = {
-        if (uiState.settings.isAutoTunnelEnabled)
-            TopAppBar(
-                title = {
-                  Row(
-                      horizontalArrangement = Arrangement.SpaceBetween,
-                      verticalAlignment = Alignment.CenterVertically,
-                      modifier = Modifier.requiredWidth(LocalConfiguration.current.screenWidthDp.dp).padding(end = 5.dp)) {
-                        Row {
-                          Icon(
-                              Icons.Rounded.Bolt,
-                              stringResource(id = R.string.auto),
-                              modifier = Modifier.size(25.dp),
-                              tint = if(uiState.settings.isAutoTunnelPaused) Color.Gray else mint)
-                          Text(
-                              "Auto-tunneling: ${if(uiState.settings.isAutoTunnelPaused) "paused" else "active" }",
-                              style = typography.bodyLarge,
-                              modifier = Modifier.padding(start = 10.dp))
-                        }
-                        if(uiState.settings.isAutoTunnelPaused) TextButton(
-                            onClick = { viewModel.resumeAutoTunneling()  },
-                            modifier = Modifier.padding(end = 10.dp)) {
-                              Text("Resume")
-                            } else TextButton(
-                            onClick = { viewModel.pauseAutoTunneling()  },
-                            modifier = Modifier.padding(end = 10.dp)) {
-                            Text("Pause")
-                        }
-                      }
+                    selectedTunnel = null
                 },
             )
-      },
-      floatingActionButton = {
-        AnimatedVisibility(
-            visible = isVisible.value,
-            enter = slideInVertically(initialOffsetY = { it * 2 }),
-            exit = slideOutVertically(targetOffsetY = { it * 2 })) {
-              val secondaryColor = MaterialTheme.colorScheme.secondary
-              val hoverColor = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)
-              var fobColor by remember { mutableStateOf(secondaryColor) }
-              FloatingActionButton(
-                  modifier =
-                      (if (WireGuardAutoTunnel.isRunningOnAndroidTv() &&
-                              uiState.tunnels.isEmpty())
-                              Modifier.focusRequester(focusRequester)
-                          else Modifier)
-                          .padding(bottom = 90.dp)
-                          .onFocusChanged {
+        },
+        floatingActionButtonPosition = FabPosition.End,
+        floatingActionButton = {
+            AnimatedVisibility(
+                visible = isVisible.value,
+                enter = slideInVertically(initialOffsetY = { it * 2 }),
+                exit = slideOutVertically(targetOffsetY = { it * 2 }),
+            ) {
+                val secondaryColor = MaterialTheme.colorScheme.secondary
+                val hoverColor = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)
+                var fobColor by remember { mutableStateOf(secondaryColor) }
+                FloatingActionButton(
+                    modifier =
+                    (if (
+                        WireGuardAutoTunnel.isRunningOnAndroidTv() &&
+                        uiState.tunnels.isEmpty()
+                    )
+                        Modifier.focusRequester(focusRequester)
+                    else Modifier)
+                        .onFocusChanged {
                             if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                              fobColor = if (it.isFocused) hoverColor else secondaryColor
+                                fobColor = if (it.isFocused) hoverColor else secondaryColor
                             }
-                          },
-                  onClick = { showBottomSheet = true },
-                  containerColor = fobColor,
-                  shape = RoundedCornerShape(16.dp)) {
+                        },
+                    onClick = { showBottomSheet = true },
+                    containerColor = fobColor,
+                    shape = RoundedCornerShape(16.dp),
+                ) {
                     Icon(
                         imageVector = Icons.Rounded.Add,
                         contentDescription = stringResource(id = R.string.add_tunnel),
-                        tint = Color.DarkGray)
-                  }
+                        tint = Color.DarkGray,
+                    )
+                }
             }
-      }) { innerPadding ->
+        },
+    ) {
         AnimatedVisibility(uiState.tunnels.isEmpty(), exit = fadeOut(), enter = fadeIn()) {
-          Column(
-              horizontalAlignment = Alignment.CenterHorizontally,
-              verticalArrangement = Arrangement.Center,
-              modifier = Modifier.fillMaxSize().padding(padding)) {
+            Column(
+                horizontalAlignment = Alignment.CenterHorizontally,
+                verticalArrangement = Arrangement.Center,
+                modifier = Modifier
+                    .fillMaxSize(),
+            ) {
                 Text(text = stringResource(R.string.no_tunnels), fontStyle = FontStyle.Italic)
-              }
+            }
         }
         if (showBottomSheet) {
-          ModalBottomSheet(
-              onDismissRequest = { showBottomSheet = false }, sheetState = sheetState) {
+            ModalBottomSheet(
+                onDismissRequest = { showBottomSheet = false },
+                sheetState = sheetState,
+            ) {
                 // Sheet content
                 Row(
                     modifier =
-                        Modifier.fillMaxWidth()
-                            .clickable {
-                              showBottomSheet = false
-                              tunnelFileImportResultLauncher.launch(Constants.ALLOWED_FILE_TYPES)
-                            }
-                            .padding(10.dp)) {
-                      Icon(
-                          Icons.Filled.FileOpen,
-                          contentDescription = stringResource(id = R.string.open_file),
-                          modifier = Modifier.padding(10.dp))
-                      Text(
-                          stringResource(id = R.string.add_tunnels_text),
-                          modifier = Modifier.padding(10.dp))
-                    }
+                    Modifier
+                        .fillMaxWidth()
+                        .clickable {
+                            showBottomSheet = false
+                            tunnelFileImportResultLauncher.launch(Constants.ALLOWED_FILE_TYPES)
+                        }
+                        .padding(10.dp),
+                ) {
+                    Icon(
+                        Icons.Filled.FileOpen,
+                        contentDescription = stringResource(id = R.string.open_file),
+                        modifier = Modifier.padding(10.dp),
+                    )
+                    Text(
+                        stringResource(id = R.string.add_tunnels_text),
+                        modifier = Modifier.padding(10.dp),
+                    )
+                }
                 if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                  Divider()
-                  Row(
-                      modifier =
-                          Modifier.fillMaxWidth()
-                              .clickable {
+                    HorizontalDivider()
+                    Row(
+                        modifier =
+                        Modifier
+                            .fillMaxWidth()
+                            .clickable {
                                 scope.launch {
-                                  showBottomSheet = false
-                                  val scanOptions = ScanOptions()
-                                  scanOptions.setDesiredBarcodeFormats(ScanOptions.QR_CODE)
-                                  scanOptions.setOrientationLocked(true)
-                                  scanOptions.setPrompt(context.getString(R.string.scanning_qr))
-                                  scanOptions.setBeepEnabled(false)
-                                  scanOptions.captureActivity = CaptureActivityPortrait::class.java
-                                  scanLauncher.launch(scanOptions)
+                                    showBottomSheet = false
+                                    val scanOptions = ScanOptions()
+                                    scanOptions.setDesiredBarcodeFormats(ScanOptions.QR_CODE)
+                                    scanOptions.setOrientationLocked(true)
+                                    scanOptions.setPrompt(
+                                        context.getString(R.string.scanning_qr),
+                                    )
+                                    scanOptions.setBeepEnabled(false)
+                                    scanOptions.captureActivity =
+                                        CaptureActivityPortrait::class.java
+                                    scanLauncher.launch(scanOptions)
                                 }
-                              }
-                              .padding(10.dp)) {
+                            }
+                            .padding(10.dp),
+                    ) {
                         Icon(
                             Icons.Filled.QrCode,
                             contentDescription = stringResource(id = R.string.qr_scan),
-                            modifier = Modifier.padding(10.dp))
+                            modifier = Modifier.padding(10.dp),
+                        )
                         Text(
                             stringResource(id = R.string.add_from_qr),
-                            modifier = Modifier.padding(10.dp))
-                      }
+                            modifier = Modifier.padding(10.dp),
+                        )
+                    }
                 }
-                Divider()
+                HorizontalDivider()
                 Row(
                     modifier =
-                        Modifier.fillMaxWidth()
-                            .clickable {
-                              showBottomSheet = false
-                              navController.navigate(
-                                  "${Screen.Config.route}/${Constants.MANUAL_TUNNEL_CONFIG_ID}")
-                            }
-                            .padding(10.dp)) {
-                      Icon(
-                          Icons.Filled.Create,
-                          contentDescription = stringResource(id = R.string.create_import),
-                          modifier = Modifier.padding(10.dp))
-                      Text(
-                          stringResource(id = R.string.create_import),
-                          modifier = Modifier.padding(10.dp))
-                    }
-              }
+                    Modifier
+                        .fillMaxWidth()
+                        .clickable {
+                            showBottomSheet = false
+                            navController.navigate(
+                                "${Screen.Config.route}/${Constants.MANUAL_TUNNEL_CONFIG_ID}",
+                            )
+                        }
+                        .padding(10.dp),
+                ) {
+                    Icon(
+                        Icons.Filled.Create,
+                        contentDescription = stringResource(id = R.string.create_import),
+                        modifier = Modifier.padding(10.dp),
+                    )
+                    Text(
+                        stringResource(id = R.string.create_import),
+                        modifier = Modifier.padding(10.dp),
+                    )
+                }
+            }
         }
 
         LazyColumn(
             horizontalAlignment = Alignment.Start,
             verticalArrangement = Arrangement.Top,
             modifier =
-                Modifier.fillMaxWidth().fillMaxHeight(.90f).overscroll(ScrollableDefaults.overscrollEffect()).padding(innerPadding),
+            Modifier
+                .fillMaxWidth()
+                .overscroll(ScrollableDefaults.overscrollEffect()),
             state = rememberLazyListState(0, uiState.tunnels.count()),
             userScrollEnabled = true,
-            reverseLayout = true,
-            flingBehavior = ScrollableDefaults.flingBehavior()) {
-              items(uiState.tunnels,
-                  key = { tunnel -> tunnel.id }) { tunnel ->
-                    val leadingIconColor =
-                        (if (uiState.vpnState.name == tunnel.name &&
-                            uiState.vpnState.status == Tunnel.State.UP) {
-                          uiState.vpnState.statistics
-                              ?.mapPeerStats()
-                              ?.map { it.value?.handshakeStatus() }
-                              .let { statuses ->
-                                when {
-                                  statuses?.all { it == HandshakeStatus.HEALTHY } == true -> mint
-                                  statuses?.any { it == HandshakeStatus.STALE } == true -> corn
-                                  statuses?.all { it == HandshakeStatus.NOT_STARTED } == true ->
-                                      Color.Gray
-                                  else -> {
-                                    Color.Gray
-                                  }
-                                }
-                              }
-                        } else {
-                          Color.Gray
-                        })
-                    val expanded = remember { mutableStateOf(false) }
+            reverseLayout = false,
+            flingBehavior = ScrollableDefaults.flingBehavior(),
+        ) {
+            item {
+                if (uiState.settings.isAutoTunnelEnabled) {
+                    val autoTunnelingLabel = buildAnnotatedString {
+                        append(stringResource(id = R.string.auto_tunneling))
+                        append(": ")
+                        if (uiState.settings.isAutoTunnelPaused) append(
+                            stringResource(id = R.string.paused),
+                        ) else append(
+                            stringResource(id = R.string.active),
+                        )
+                    }
                     RowListItem(
                         icon = {
-                          if (uiState.settings.isTunnelConfigDefault(tunnel)) {
+                            val icon = Icons.Rounded.Bolt
                             Icon(
-                                Icons.Rounded.Star,
-                                stringResource(R.string.status),
-                                tint = leadingIconColor,
-                                modifier = Modifier.padding(end = 10.dp).size(20.dp))
-                          } else {
-                            Icon(
-                                Icons.Rounded.Circle,
-                                stringResource(R.string.status),
-                                tint = leadingIconColor,
-                                modifier = Modifier.padding(end = 15.dp).size(15.dp))
-                          }
+                                icon,
+                                icon.name,
+                                modifier = Modifier
+                                    .padding(end = 8.5.dp)
+                                    .size(25.dp),
+                                tint =
+                                if (uiState.settings.isAutoTunnelPaused) Color.Gray
+                                else mint,
+                            )
                         },
-                        text = tunnel.name,
-                        onHold = {
-                          if ((uiState.vpnState.status == Tunnel.State.UP) &&
-                              (tunnel.name == uiState.vpnState.name)) {
-                            showSnackbarMessage(Event.Message.TunnelOffAction.message)
-                            return@RowListItem
-                          }
-                          haptic.performHapticFeedback(HapticFeedbackType.LongPress)
-                          selectedTunnel = tunnel
-                        },
-                        onClick = {
-                          if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                            if (uiState.vpnState.status == Tunnel.State.UP &&
-                                (uiState.vpnState.name == tunnel.name)) {
-                              expanded.value = !expanded.value
+                        text = autoTunnelingLabel.text,
+                        rowButton = {
+                            if (uiState.settings.isAutoTunnelPaused) {
+                                TextButton(
+                                    onClick = { viewModel.resumeAutoTunneling() },
+                                ) {
+                                    Text(stringResource(id = R.string.resume))
+                                }
+                            } else {
+                                TextButton(
+                                    onClick = { viewModel.pauseAutoTunneling() },
+                                ) {
+                                    Text(stringResource(id = R.string.pause))
+                                }
                             }
-                          } else {
+                        },
+                        onClick = {},
+                        onHold = {},
+                        expanded = false,
+                        statistics = null,
+                    )
+                }
+            }
+            items(
+                uiState.tunnels,
+                key = { tunnel -> tunnel.id },
+            ) { tunnel ->
+                val leadingIconColor =
+                    (if (
+                        uiState.vpnState.tunnelConfig?.name == tunnel.name &&
+                        uiState.vpnState.status == Tunnel.State.UP
+                    ) {
+                        uiState.vpnState.statistics
+                            ?.mapPeerStats()
+                            ?.map { it.value?.handshakeStatus() }
+                            .let { statuses ->
+                                when {
+                                    statuses?.all { it == HandshakeStatus.HEALTHY } == true -> mint
+                                    statuses?.any { it == HandshakeStatus.STALE } == true -> corn
+                                    statuses?.all { it == HandshakeStatus.NOT_STARTED } == true ->
+                                        Color.Gray
+
+                                    else -> {
+                                        Color.Gray
+                                    }
+                                }
+                            }
+                    } else {
+                        Color.Gray
+                    })
+                val expanded = remember { mutableStateOf(false) }
+                RowListItem(
+                    icon = {
+                        val circleIcon = Icons.Rounded.Circle
+                        val icon = if (tunnel.isPrimaryTunnel) {
+                            Icons.Rounded.Star
+                        } else if (tunnel.isMobileDataTunnel) {
+                            Icons.Rounded.Smartphone
+                        } else {
+                            circleIcon
+                        }
+                        Icon(
+                            icon,
+                            icon.name,
+                            tint = leadingIconColor,
+                            modifier = Modifier
+                                .padding(
+                                    end = if (icon == circleIcon) 12.5.dp else 10.dp,
+                                    start = if (icon == circleIcon) 2.5.dp else 0.dp,
+                                )
+                                .size(if (icon == circleIcon) 15.dp else 20.dp),
+                        )
+                    },
+                    text = tunnel.name.truncateWithEllipsis(Constants.ALLOWED_DISPLAY_NAME_LENGTH),
+                    onHold = {
+                        if (
+                            (uiState.vpnState.status == Tunnel.State.UP) &&
+                            (tunnel.name == uiState.vpnState.tunnelConfig?.name)
+                        ) {
+                            appViewModel.showSnackbarMessage(Event.Message.TunnelOffAction.message)
+                            return@RowListItem
+                        }
+                        haptic.performHapticFeedback(HapticFeedbackType.LongPress)
+                        selectedTunnel = tunnel
+                    },
+                    onClick = {
+                        if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+                            if (
+                                uiState.vpnState.status == Tunnel.State.UP &&
+                                (uiState.vpnState.tunnelConfig?.name == tunnel.name)
+                            ) {
+                                expanded.value = !expanded.value
+                            }
+                        } else {
                             selectedTunnel = tunnel
                             focusRequester.requestFocus()
-                          }
-                        },
-                        statistics = uiState.vpnState.statistics,
-                        expanded = expanded.value,
-                        rowButton = {
-                          if (tunnel.id == selectedTunnel?.id &&
-                              !WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+                        }
+                    },
+                    statistics = uiState.vpnState.statistics,
+                    expanded = expanded.value,
+                    rowButton = {
+                        if (
+                            tunnel.id == selectedTunnel?.id &&
+                            !WireGuardAutoTunnel.isRunningOnAndroidTv()
+                        ) {
                             Row {
-                              if (!uiState.settings.isTunnelConfigDefault(tunnel)) {
                                 IconButton(
                                     onClick = {
-                                      if (uiState.settings.isAutoTunnelEnabled && !uiState.settings.isAutoTunnelPaused) {
-                                        showSnackbarMessage(
-                                            Event.Message.AutoTunnelOffAction.message)
-                                      } else {
-                                        showPrimaryChangeAlertDialog = true
-                                      }
-                                    }) {
-                                      Icon(
-                                          Icons.Rounded.Star,
-                                          stringResource(id = R.string.set_primary))
-                                    }
-                              }
-                              IconButton(
-                                  onClick = {
-                                      if (uiState.settings.isAutoTunnelEnabled && uiState.settings.isTunnelConfigDefault(tunnel)
-                                          && !uiState.settings.isAutoTunnelPaused) {
-                                          showSnackbarMessage(
-                                              Event.Message.AutoTunnelOffAction.message)
-                                      } else navController.navigate(
-                                        "${Screen.Config.route}/${selectedTunnel?.id}")
-                                  }) {
-                                    Icon(Icons.Rounded.Edit, stringResource(id = R.string.edit))
-                                  }
-                              IconButton(
-                                  modifier = Modifier.focusable(),
-                                  onClick = { viewModel.onDelete(tunnel) }) {
-                                    Icon(Icons.Rounded.Delete, stringResource(id = R.string.delete))
-                                  }
+                                        if (
+                                            uiState.settings.isAutoTunnelEnabled &&
+                                            !uiState.settings.isAutoTunnelPaused
+                                        ) {
+                                            appViewModel.showSnackbarMessage(
+                                                Event.Message.AutoTunnelOffAction.message,
+                                            )
+                                        } else {
+                                            navController.navigate(
+                                                "${Screen.Option.route}/${selectedTunnel?.id}",
+                                            )
+                                        }
+                                    },
+                                ) {
+                                    val icon = Icons.Rounded.Settings
+                                    Icon(
+                                        icon,
+                                        icon.name,
+                                    )
+                                }
+                                IconButton(
+                                    modifier = Modifier.focusable(),
+                                    onClick = { viewModel.onCopyTunnel(selectedTunnel) },
+                                ) {
+                                    val icon = Icons.Rounded.CopyAll
+                                    Icon(icon, icon.name)
+                                }
+                                IconButton(
+                                    modifier = Modifier.focusable(),
+                                    onClick = { showDeleteTunnelAlertDialog = true },
+                                ) {
+                                    val icon = Icons.Rounded.Delete
+                                    Icon(icon, icon.name)
+                                }
                             }
-                          } else {
+                        } else {
                             val checked by remember {
-                              derivedStateOf {
-                                (uiState.vpnState.status == Tunnel.State.UP &&
-                                    tunnel.name == uiState.vpnState.name)
-                              }
+                                derivedStateOf {
+                                    (uiState.vpnState.status == Tunnel.State.UP &&
+                                        tunnel.name == uiState.vpnState.tunnelConfig?.name)
+                                }
                             }
                             if (!checked) expanded.value = false
 
@@ -491,72 +567,86 @@ fun MainScreen(
                                     modifier = Modifier.focusRequester(focusRequester),
                                     checked = checked,
                                     onCheckedChange = { checked ->
-                                      if (!checked) expanded.value = false
-                                      onTunnelToggle(checked, tunnel)
-                                    })
+                                        if (!checked) expanded.value = false
+                                        onTunnelToggle(checked, tunnel)
+                                    },
+                                )
                             if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                              Row {
-                                if (!uiState.settings.isTunnelConfigDefault(tunnel)) {
-                                  IconButton(
-                                      onClick = {
-                                        if (uiState.settings.isAutoTunnelEnabled) {
-                                          showSnackbarMessage(
-                                              Event.Message.AutoTunnelOffAction.message)
-                                        } else {
-                                          selectedTunnel = tunnel
-                                          showPrimaryChangeAlertDialog = true
-                                        }
-                                      }) {
+                                Row {
+                                    IconButton(
+                                        onClick = {
+                                            if (uiState.settings.isAutoTunnelEnabled) {
+                                                appViewModel.showSnackbarMessage(
+                                                    Event.Message.AutoTunnelOffAction.message,
+                                                )
+                                            } else {
+                                                selectedTunnel = tunnel
+                                                navController.navigate(
+                                                    "${Screen.Option.route}/${selectedTunnel?.id}",
+                                                )
+                                            }
+                                        },
+                                    ) {
+                                        val icon = Icons.Rounded.Settings
                                         Icon(
-                                            Icons.Rounded.Star,
-                                            stringResource(id = R.string.set_primary))
-                                      }
+                                            icon,
+                                            icon.name,
+                                        )
+                                    }
+                                    IconButton(
+                                        modifier = Modifier.focusRequester(focusRequester),
+                                        onClick = {
+                                            if (
+                                                uiState.vpnState.status == Tunnel.State.UP &&
+                                                (uiState.vpnState.tunnelConfig?.name == tunnel.name)
+                                            ) {
+                                                expanded.value = !expanded.value
+                                            } else {
+                                                appViewModel.showSnackbarMessage(
+                                                    Event.Message.TunnelOnAction.message,
+                                                )
+                                            }
+                                        },
+                                    ) {
+                                        val icon = Icons.Rounded.Info
+                                        Icon(icon, icon.name)
+                                    }
+                                    IconButton(
+                                        onClick = { viewModel.onCopyTunnel(tunnel) },
+                                    ) {
+                                        val icon = Icons.Rounded.CopyAll
+                                        Icon(icon, icon.name)
+                                    }
+                                    IconButton(
+                                        onClick = {
+                                            if (
+                                                uiState.vpnState.status == Tunnel.State.UP &&
+                                                tunnel.name == uiState.vpnState.tunnelConfig?.name
+                                            ) {
+                                                appViewModel.showSnackbarMessage(
+                                                    Event.Message.TunnelOffAction.message,
+                                                )
+                                            } else {
+                                                selectedTunnel = tunnel
+                                                showDeleteTunnelAlertDialog = true
+                                            }
+                                        },
+                                    ) {
+                                        val icon = Icons.Rounded.Delete
+                                        Icon(
+                                            icon,
+                                            icon.name,
+                                        )
+                                    }
+                                    TunnelSwitch()
                                 }
-                                IconButton(
-                                    modifier = Modifier.focusRequester(focusRequester),
-                                    onClick = {
-                                      if (uiState.vpnState.status == Tunnel.State.UP &&
-                                          (uiState.vpnState.name == tunnel.name)) {
-                                        expanded.value = !expanded.value
-                                      } else {
-                                        showSnackbarMessage(Event.Message.TunnelOnAction.message)
-                                      }
-                                    }) {
-                                      Icon(Icons.Rounded.Info, stringResource(R.string.info))
-                                    }
-                                IconButton(
-                                    onClick = {
-                                      if (uiState.vpnState.status == Tunnel.State.UP &&
-                                          tunnel.name == uiState.vpnState.name) {
-                                        showSnackbarMessage(Event.Message.TunnelOffAction.message)
-                                      } else {
-                                        navController.navigate(
-                                            "${Screen.Config.route}/${tunnel.id}")
-                                      }
-                                    }) {
-                                      Icon(Icons.Rounded.Edit, stringResource(id = R.string.edit))
-                                    }
-                                IconButton(
-                                    onClick = {
-                                      if (uiState.vpnState.status == Tunnel.State.UP &&
-                                          tunnel.name == uiState.vpnState.name) {
-                                        showSnackbarMessage(Event.Message.TunnelOffAction.message)
-                                      } else {
-                                        viewModel.onDelete(tunnel)
-                                      }
-                                    }) {
-                                      Icon(
-                                          Icons.Rounded.Delete,
-                                          stringResource(id = R.string.delete))
-                                    }
-                                TunnelSwitch()
-                              }
                             } else {
-                              TunnelSwitch()
+                                TunnelSwitch()
                             }
-                          }
-                        })
-                  }
+                        }
+                    },
+                )
             }
-      }
+        }
+    }
 }

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 settings: Settings = Settings(),
+    val tunnels: TunnelConfigs = emptyList(),
     val vpnState: VpnState = VpnState(),
-    val loading : Boolean = true
+    val loading: Boolean = true
 )

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

@@ -11,27 +11,21 @@ import com.wireguard.config.Config
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.data.model.Settings
 import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceState
-import com.zaneschepke.wireguardautotunnel.service.foreground.WireGuardConnectivityWatcherService
-import com.zaneschepke.wireguardautotunnel.service.foreground.WireGuardTunnelService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
-import com.zaneschepke.wireguardautotunnel.service.tunnel.WireGuardTunnel
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.Event
 import com.zaneschepke.wireguardautotunnel.util.NumberUtils
 import com.zaneschepke.wireguardautotunnel.util.Result
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.async
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import timber.log.Timber
 import java.io.InputStream
 import java.util.zip.ZipInputStream
 import javax.inject.Inject
@@ -41,221 +35,231 @@ class MainViewModel
 @Inject
 constructor(
     private val application: Application,
-    private val tunnelConfigRepository: TunnelConfigRepository,
-    private val settingsRepository: SettingsRepository,
-    private val vpnService: VpnService
+    private val appDataRepository: AppDataRepository,
+    private val serviceManager: ServiceManager,
+    val vpnService: VpnService
 ) : ViewModel() {
 
-  val uiState =
-      combine(
-              settingsRepository.getSettingsFlow(),
-              tunnelConfigRepository.getTunnelConfigsFlow(),
-              vpnService.vpnState,
-          ) { settings, tunnels, vpnState ->
-            validateWatcherServiceState(settings)
+    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 validateWatcherServiceState(settings: Settings) = viewModelScope.launch(Dispatchers.IO) {
-    val watcherState =
-        ServiceManager.getServiceState(
-            application.applicationContext, WireGuardConnectivityWatcherService::class.java)
-    if (settings.isAutoTunnelEnabled &&
-        watcherState == ServiceState.STOPPED) {
-      ServiceManager.startWatcherService(application.applicationContext)
-    }
-  }
-
-    private fun stopWatcherService() = viewModelScope.launch(Dispatchers.IO) {
-        ServiceManager.stopWatcherService(application.applicationContext)
-    }
-  fun onDelete(tunnel: TunnelConfig) {
-    viewModelScope.launch(Dispatchers.IO) {
-      if (tunnelConfigRepository.count() == 1) {
-        stopWatcherService()
-        val settings = settingsRepository.getSettings()
-          settings.defaultTunnel = null
-          settings.isAutoTunnelEnabled = false
-          settings.isAlwaysOnVpnEnabled = false
-          saveSettings(settings)
-      }
-      tunnelConfigRepository.delete(tunnel)
-      WireGuardAutoTunnel.requestTileServiceStateUpdate()
-    }
-  }
-
-  fun onTunnelStart(tunnelConfig: TunnelConfig) = viewModelScope.launch(Dispatchers.IO) {
-        stopActiveTunnel().await()
-        startTunnel(tunnelConfig)
-  }
-
-  private fun startTunnel(tunnelConfig: TunnelConfig) = viewModelScope.launch(Dispatchers.IO) {
-      ServiceManager.startVpnService(application.applicationContext, tunnelConfig.toString())
-  }
-
-  private fun stopActiveTunnel() =
-      viewModelScope.async(Dispatchers.IO) {
-        if (ServiceManager.getServiceState(
-            application.applicationContext, WireGuardTunnelService::class.java) ==
-            ServiceState.STARTED) {
-          onTunnelStop()
-          delay(Constants.TOGGLE_TUNNEL_DELAY)
         }
-      }
+            .stateIn(
+                viewModelScope,
+                SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
+                MainUiState(),
+            )
 
-  fun onTunnelStop() = viewModelScope.launch(Dispatchers.IO) {
-    ServiceManager.stopVpnService(application.applicationContext)
-  }
+    private fun stopWatcherService() =
+        viewModelScope.launch(Dispatchers.IO) {
+            serviceManager.stopWatcherService(application.applicationContext)
+        }
 
-  private fun validateConfigString(config: String) {
-    TunnelConfig.configFromQuick(config)
-  }
+    fun onDelete(tunnel: TunnelConfig) {
+        viewModelScope.launch(Dispatchers.IO) {
+            val settings = appDataRepository.settings.getSettings()
+            val isPrimary = tunnel.isPrimaryTunnel
+            if (appDataRepository.tunnels.count() == 1 || isPrimary) {
+                stopWatcherService()
+                resetTunnelSetting(settings)
+            }
+            appDataRepository.tunnels.delete(tunnel)
+            WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate(application)
+        }
+    }
 
-  suspend fun onTunnelQrResult(result: String) : Result<Unit> {
+    private fun resetTunnelSetting(settings: Settings) {
+        saveSettings(
+            settings.copy(
+                isAutoTunnelEnabled = false,
+                isAlwaysOnVpnEnabled = false,
+            ),
+        )
+    }
+
+    fun onTunnelStart(tunnelConfig: TunnelConfig) =
+        viewModelScope.launch(Dispatchers.IO) {
+            Timber.d("On start called!")
+            serviceManager.startVpnService(
+                application.applicationContext,
+                tunnelConfig.id,
+                isManualStart = true,
+            )
+        }
+
+
+    fun onTunnelStop() =
+        viewModelScope.launch(Dispatchers.IO) {
+            Timber.i("Stopping active tunnel")
+            serviceManager.stopVpnService(application.applicationContext, isManualStop = true)
+        }
+
+    private fun validateConfigString(config: String) {
+        TunnelConfig.configFromQuick(config)
+    }
+
+    suspend fun onTunnelQrResult(result: String): Result<Unit> {
         return try {
-          validateConfigString(result)
-          val tunnelConfig =
-              TunnelConfig(name = NumberUtils.generateRandomTunnelName(), wgQuick = result)
-          addTunnel(tunnelConfig)
+            validateConfigString(result)
+            val tunnelConfig =
+                TunnelConfig(name = NumberUtils.generateRandomTunnelName(), wgQuick = result)
+            addTunnel(tunnelConfig)
             Result.Success(Unit)
         } catch (e: Exception) {
+            Timber.e(e)
             Result.Error(Event.Error.InvalidQrCode)
         }
-      }
+    }
 
-  private suspend fun saveTunnelConfigFromStream(stream: InputStream, fileName: String) {
-    val bufferReader = stream.bufferedReader(charset = Charsets.UTF_8)
-    val config = Config.parse(bufferReader)
-    val tunnelName = getNameFromFileName(fileName)
-    addTunnel(TunnelConfig(name = tunnelName, wgQuick = config.toWgQuickString()))
-    withContext(Dispatchers.IO) { stream.close() }
-  }
+    private suspend fun saveTunnelConfigFromStream(stream: InputStream, fileName: String) {
+        val bufferReader = stream.bufferedReader(charset = Charsets.UTF_8)
+        val config = Config.parse(bufferReader)
+        val tunnelName = getNameFromFileName(fileName)
+        addTunnel(TunnelConfig(name = tunnelName, wgQuick = config.toWgQuickString()))
+        withContext(Dispatchers.IO) { stream.close() }
+    }
 
-  private fun getInputStreamFromUri(uri: Uri): InputStream? {
-    return application.applicationContext.contentResolver.openInputStream(uri)
-  }
+    private fun getInputStreamFromUri(uri: Uri): InputStream? {
+        return application.applicationContext.contentResolver.openInputStream(uri)
+    }
 
-  suspend fun onTunnelFileSelected(uri: Uri) : Result<Unit> {
+    suspend fun onTunnelFileSelected(uri: Uri): Result<Unit> {
         try {
-            if(isValidUriContentScheme(uri)){
+            if (isValidUriContentScheme(uri)) {
                 val fileName = getFileName(application.applicationContext, uri)
                 when (getFileExtensionFromFileName(fileName)) {
-                    Constants.CONF_FILE_EXTENSION -> saveTunnelFromConfUri(fileName, uri).let {
-                        when(it) {
-                            is Result.Error -> return Result.Error(Event.Error.FileReadFailed)
-                            is Result.Success -> return it
+                    Constants.CONF_FILE_EXTENSION ->
+                        saveTunnelFromConfUri(fileName, uri).let {
+                            when (it) {
+                                is Result.Error -> return Result.Error(Event.Error.FileReadFailed)
+                                is Result.Success -> return it
+                            }
                         }
-                    }
+
                     Constants.ZIP_FILE_EXTENSION -> saveTunnelsFromZipUri(uri)
                     else -> return Result.Error(Event.Error.InvalidFileExtension)
                 }
                 return Result.Success(Unit)
-          } else {
-             return Result.Error(Event.Error.InvalidFileExtension)
+            } else {
+                return Result.Error(Event.Error.InvalidFileExtension)
             }
         } catch (e: Exception) {
+            Timber.e(e)
             return Result.Error(Event.Error.FileReadFailed)
         }
-      }
-
-  private suspend fun saveTunnelsFromZipUri(uri: Uri) {
-    ZipInputStream(getInputStreamFromUri(uri)).use { zip ->
-      generateSequence { zip.nextEntry }
-          .filterNot {
-            it.isDirectory || getFileExtensionFromFileName(it.name) != Constants.CONF_FILE_EXTENSION
-          }
-          .forEach {
-            val name = getNameFromFileName(it.name)
-            val config = Config.parse(zip)
-            viewModelScope.launch(Dispatchers.IO) {
-              addTunnel(TunnelConfig(name = name, wgQuick = config.toWgQuickString()))
-            }
-          }
-    }
-  }
-
-  private suspend fun saveTunnelFromConfUri(name: String, uri: Uri) : Result<Unit> {
-      val stream = getInputStreamFromUri(uri)
-      return if(stream != null) {
-          saveTunnelConfigFromStream(stream, name)
-          Result.Success(Unit)
-      } else {
-          Result.Error(Event.Error.FileReadFailed)
-      }
-  }
-
-  private suspend fun addTunnel(tunnelConfig: TunnelConfig) {
-    saveTunnel(tunnelConfig)
-    WireGuardAutoTunnel.requestTileServiceStateUpdate()
-  }
-
-    fun pauseAutoTunneling() = viewModelScope.launch {
-        settingsRepository.save(uiState.value.settings.copy(isAutoTunnelPaused = true))
     }
 
-    fun resumeAutoTunneling() = viewModelScope.launch {
-        settingsRepository.save(uiState.value.settings.copy(isAutoTunnelPaused = false))
+    private suspend fun saveTunnelsFromZipUri(uri: Uri) {
+        ZipInputStream(getInputStreamFromUri(uri)).use { zip ->
+            generateSequence { zip.nextEntry }
+                .filterNot {
+                    it.isDirectory ||
+                        getFileExtensionFromFileName(it.name) != Constants.CONF_FILE_EXTENSION
+                }
+                .forEach {
+                    val name = getNameFromFileName(it.name)
+                    val config = Config.parse(zip)
+                    viewModelScope.launch(Dispatchers.IO) {
+                        addTunnel(TunnelConfig(name = name, wgQuick = config.toWgQuickString()))
+                    }
+                }
+        }
     }
 
-  private suspend fun saveTunnel(tunnelConfig: TunnelConfig) {
-    tunnelConfigRepository.save(tunnelConfig)
-  }
-
-  private fun getFileNameByCursor(context: Context, uri: Uri): String? {
-    context.contentResolver.query(uri, null, null, null, null)?.use {
-      return getDisplayNameByCursor(it)
+    private suspend fun saveTunnelFromConfUri(name: String, uri: Uri): Result<Unit> {
+        val stream = getInputStreamFromUri(uri)
+        return if (stream != null) {
+            saveTunnelConfigFromStream(stream, name)
+            Result.Success(Unit)
+        } else {
+            Result.Error(Event.Error.FileReadFailed)
+        }
     }
-      return null
-  }
 
-  private fun getDisplayNameColumnIndex(cursor: Cursor): Int? {
-    val columnIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
-    return if (columnIndex != -1) {
-      return columnIndex
-    } else {
-      null
+    private suspend fun addTunnel(tunnelConfig: TunnelConfig) {
+        val firstTunnel = appDataRepository.tunnels.count() == 0
+        saveTunnel(tunnelConfig)
+        if (firstTunnel) WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate(application)
     }
-  }
 
-  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 pauseAutoTunneling() =
+        viewModelScope.launch {
+            appDataRepository.settings.save(uiState.value.settings.copy(isAutoTunnelPaused = true))
+            WireGuardAutoTunnel.requestAutoTunnelTileServiceUpdate(application)
+        }
 
-  private fun isValidUriContentScheme(uri: Uri): Boolean {
-    return uri.scheme == Constants.URI_CONTENT_SCHEME
-  }
-  private fun getFileName(context: Context, uri: Uri): String {
+    fun resumeAutoTunneling() =
+        viewModelScope.launch {
+            appDataRepository.settings.save(uiState.value.settings.copy(isAutoTunnelPaused = false))
+            WireGuardAutoTunnel.requestAutoTunnelTileServiceUpdate(application)
+        }
+
+    private suspend fun saveTunnel(tunnelConfig: TunnelConfig) {
+        appDataRepository.tunnels.save(tunnelConfig)
+    }
+
+    private fun getFileNameByCursor(context: Context, uri: Uri): String? {
+        context.contentResolver.query(uri, null, null, null, null)?.use {
+            return getDisplayNameByCursor(it)
+        }
+        return null
+    }
+
+    private fun getDisplayNameColumnIndex(cursor: Cursor): Int? {
+        val columnIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
+        return if (columnIndex != -1) {
+            return columnIndex
+        } else {
+            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 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()
-  }
-
-  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) {
-      ""
     }
-  }
 
-  private fun saveSettings(settings: Settings) =
-      viewModelScope.launch(Dispatchers.IO) { settingsRepository.save(settings) }
-
-  fun onDefaultTunnelChange(selectedTunnel: TunnelConfig?) = viewModelScope.launch {
-    if (selectedTunnel != null) {
-      saveSettings(uiState.value.settings.copy(defaultTunnel = selectedTunnel.toString())).join()
-      WireGuardAutoTunnel.requestTileServiceStateUpdate()
+    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)
+            ""
+        }
+    }
+
+    private fun saveSettings(settings: Settings) =
+        viewModelScope.launch(Dispatchers.IO) { 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

@@ -0,0 +1,287 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.options
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.Row
+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.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardActions
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.material.icons.outlined.Add
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation.NavController
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
+import com.zaneschepke.wireguardautotunnel.ui.Screen
+import com.zaneschepke.wireguardautotunnel.ui.common.ClickableIconButton
+import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationToggle
+import com.zaneschepke.wireguardautotunnel.ui.common.text.SectionTitle
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.Result
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+@OptIn(ExperimentalLayoutApi::class)
+@Composable
+fun OptionsScreen(
+    optionsViewModel: OptionsViewModel = hiltViewModel(),
+    navController: NavController,
+    appViewModel: AppViewModel,
+    focusRequester: FocusRequester,
+    tunnelId: String
+) {
+    val scrollState = rememberScrollState()
+    val uiState by optionsViewModel.uiState.collectAsStateWithLifecycle()
+    val interactionSource = remember { MutableInteractionSource() }
+    val scope = rememberCoroutineScope()
+    val focusManager = LocalFocusManager.current
+    val screenPadding = 5.dp
+    val fillMaxWidth = .85f
+
+    var currentText by remember { mutableStateOf("") }
+
+    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).let {
+                    when (it) {
+                        is Result.Success -> currentText = ""
+                        is Result.Error -> appViewModel.showSnackbarMessage(it.error.message)
+                    }
+                }
+            }
+        }
+    }
+
+    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() },
+                )
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .padding(top = 5.dp),
+                    horizontalArrangement = Arrangement.Center,
+                ) {
+                    TextButton(
+                        onClick = {
+                            navController.navigate(
+                                "${Screen.Config.route}/${tunnelId}",
+                            )
+                        },
+                    ) {
+                        Text(stringResource(R.string.edit_tunnel))
+                    }
+                }
+            }
+        }
+        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

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

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

@@ -0,0 +1,101 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.options
+
+import androidx.compose.ui.util.fastFirstOrNull
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.Event
+import com.zaneschepke.wireguardautotunnel.util.Result
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+
+@HiltViewModel
+class OptionsViewModel @Inject
+constructor(
+    private val appDataRepository: AppDataRepository
+) : ViewModel() {
+
+    private val _optionState = MutableStateFlow(OptionsUiState())
+
+    val uiState = combine(
+        appDataRepository.tunnels.getTunnelConfigsFlow(),
+        _optionState,
+    ) { tunnels, optionState ->
+        if (optionState.id != null) {
+            val tunnelConfig = tunnels.fastFirstOrNull { it.id.toString() == optionState.id }
+            val isPrimaryTunnel = tunnelConfig?.isPrimaryTunnel == true
+            OptionsUiState(optionState.id, tunnelConfig, isPrimaryTunnel)
+        } else OptionsUiState()
+    }.stateIn(
+        viewModelScope,
+        SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
+        OptionsUiState(),
+    )
+
+    fun init(tunnelId: String) {
+        _optionState.value = _optionState.value.copy(
+            id = tunnelId,
+        )
+    }
+
+    fun onDeleteRunSSID(ssid: String) = viewModelScope.launch(Dispatchers.IO) {
+        uiState.value.tunnel?.let {
+            appDataRepository.tunnels.save(
+                tunnelConfig = it.copy(
+                    tunnelNetworks = (uiState.value.tunnel!!.tunnelNetworks - ssid).toMutableList(),
+                ),
+            )
+        }
+    }
+
+    private fun saveTunnel(tunnelConfig: TunnelConfig?) = viewModelScope.launch(Dispatchers.IO) {
+        tunnelConfig?.let {
+            appDataRepository.tunnels.save(it)
+        }
+    }
+
+    suspend fun onSaveRunSSID(ssid: String): Result<Unit> {
+        val trimmed = ssid.trim()
+        val tunnelsWithName = withContext(viewModelScope.coroutineContext) {
+            appDataRepository.tunnels.findByTunnelNetworksName(trimmed)
+        }
+        return if (uiState.value.tunnel?.tunnelNetworks?.contains(trimmed) != true &&
+            tunnelsWithName.isEmpty()) {
+            uiState.value.tunnel?.tunnelNetworks?.add(trimmed)
+            saveTunnel(uiState.value.tunnel)
+            Result.Success(Unit)
+        } else {
+            Result.Error(Event.Error.SsidConflict)
+        }
+    }
+
+    fun onToggleIsMobileDataTunnel() = viewModelScope.launch(Dispatchers.IO) {
+        uiState.value.tunnel?.let {
+            if (it.isMobileDataTunnel) {
+                appDataRepository.tunnels.updateMobileDataTunnel(null)
+            } else appDataRepository.tunnels.updateMobileDataTunnel(it)
+        }
+    }
+
+    fun onTogglePrimaryTunnel() = viewModelScope.launch(Dispatchers.IO) {
+        if (uiState.value.tunnel != null) {
+            appDataRepository.tunnels.updatePrimaryTunnel(
+                when (uiState.value.isDefaultTunnel) {
+                    true -> null
+                    false -> uiState.value.tunnel
+                },
+            )
+            WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate(WireGuardAutoTunnel.instance)
+        }
+    }
+}

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

@@ -0,0 +1,53 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.pinlock
+
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.navigation.NavController
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
+import com.zaneschepke.wireguardautotunnel.ui.Screen
+import com.zaneschepke.wireguardautotunnel.util.StringValue
+import xyz.teamgravity.pin_lock_compose.PinLock
+
+@Composable
+fun PinLockScreen(navController: NavController, appViewModel: AppViewModel) {
+    val context = LocalContext.current
+    PinLock(
+        title = { pinExists ->
+            Text(
+                text = if (pinExists) stringResource(id = R.string.enter_pin) else stringResource(
+                    id = R.string.create_pin,
+                ),
+            )
+        },
+        color = MaterialTheme.colorScheme.surface,
+        onPinCorrect = {
+            // pin is correct, navigate or hide pin lock
+            if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+                navController.navigate(Screen.Main.route)
+            } else {
+                val isPopped = navController.popBackStack()
+                if (!isPopped) {
+                    navController.navigate(Screen.Main.route)
+                }
+            }
+
+        },
+        onPinIncorrect = {
+            // pin is incorrect, show error
+            appViewModel.showSnackbarMessage(
+                StringValue.StringResource(R.string.incorrect_pin).asString(context),
+            )
+        },
+        onPinCreated = {
+            // pin created for the first time, navigate or hide pin lock
+            appViewModel.showSnackbarMessage(
+                StringValue.StringResource(R.string.pin_created).asString(context),
+            )
+        },
+    )
+}

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

@@ -1,10 +1,17 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.settings
 
 import android.Manifest
+import android.app.Activity
+import android.content.Context.POWER_SERVICE
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
+import android.os.PowerManager
+import android.provider.Settings
 import android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
@@ -13,9 +20,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.IntrinsicSize
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -48,7 +53,6 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusProperties
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
@@ -62,6 +66,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation.NavController
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
@@ -69,114 +74,150 @@ import com.wireguard.android.backend.Tunnel
 import com.wireguard.android.backend.WgQuickBackend
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
+import com.zaneschepke.wireguardautotunnel.ui.Screen
 import com.zaneschepke.wireguardautotunnel.ui.common.ClickableIconButton
 import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationToggle
 import com.zaneschepke.wireguardautotunnel.ui.common.prompt.AuthorizationPrompt
-import com.zaneschepke.wireguardautotunnel.ui.common.screen.LoadingScreen
 import com.zaneschepke.wireguardautotunnel.ui.common.text.SectionTitle
 import com.zaneschepke.wireguardautotunnel.util.Event
 import com.zaneschepke.wireguardautotunnel.util.FileUtils
 import com.zaneschepke.wireguardautotunnel.util.Result
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import timber.log.Timber
+import xyz.teamgravity.pin_lock_compose.PinManager
 import java.io.File
 
 @OptIn(
     ExperimentalPermissionsApi::class,
-    ExperimentalLayoutApi::class)
+    ExperimentalLayoutApi::class,
+)
 @Composable
 fun SettingsScreen(
     viewModel: SettingsViewModel = hiltViewModel(),
-    padding: PaddingValues,
-    showSnackbarMessage: (String) -> Unit,
-    focusRequester: FocusRequester
+    appViewModel: AppViewModel,
+    navController: NavController,
+    focusRequester: FocusRequester,
 ) {
-  val scope = rememberCoroutineScope { Dispatchers.IO }
-  val context = LocalContext.current
-  val focusManager = LocalFocusManager.current
-  val scrollState = rememberScrollState()
-  val interactionSource = remember { MutableInteractionSource() }
+    val scope = rememberCoroutineScope { Dispatchers.IO }
+    val context = LocalContext.current
+    val focusManager = LocalFocusManager.current
+    val scrollState = rememberScrollState()
+    val interactionSource = remember { MutableInteractionSource() }
+    val pinExists = remember { mutableStateOf(PinManager.pinExists()) }
 
-  val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
-  val fineLocationState = rememberPermissionState(Manifest.permission.ACCESS_FINE_LOCATION)
-  var currentText by remember { mutableStateOf("") }
-  var isBackgroundLocationGranted by remember { mutableStateOf(true) }
+    val fineLocationState = rememberPermissionState(Manifest.permission.ACCESS_FINE_LOCATION)
+    var currentText by remember { mutableStateOf("") }
+    var isBackgroundLocationGranted by remember { mutableStateOf(true) }
     var showLocationServicesAlertDialog by remember { mutableStateOf(false) }
-  var didExportFiles by remember { mutableStateOf(false) }
-  var showAuthPrompt by remember { mutableStateOf(false) }
-    val focusRequester2 = remember { FocusRequester() }
+    var didExportFiles by remember { mutableStateOf(false) }
+    var showAuthPrompt by remember { mutableStateOf(false) }
 
-  val screenPadding = 5.dp
-  val fillMaxWidth = .85f
+    val screenPadding = 5.dp
+    val fillMaxWidth = .85f
 
-  if (uiState.loading) {
-    LoadingScreen()
-      return
-  }
-
-  fun exportAllConfigs() {
-    try {
-      val files = uiState.tunnels.map { File(context.cacheDir, "${it.name}.conf") }
-      files.forEachIndexed { index, file ->
-        file.outputStream().use { it.write(uiState.tunnels[index].wgQuick.toByteArray()) }
-      }
-      FileUtils.saveFilesToZip(context, files)
-      didExportFiles = true
-      showSnackbarMessage(Event.Message.ConfigsExported.message)
-    } catch (e: Exception) {
-      showSnackbarMessage(Event.Error.Exception(e).message)
-    }
-  }
-
-  fun saveTrustedSSID() {
-    if (currentText.isNotEmpty()) {
-      viewModel.onSaveTrustedSSID(currentText).let {
-          when(it) {
-              is Result.Success -> currentText = ""
-              is Result.Error -> showSnackbarMessage(it.error.message)
-          }
-      }
-    }
-  }
-
-  fun openSettings() {
-    scope.launch {
-      val intentSettings = Intent(ACTION_APPLICATION_DETAILS_SETTINGS)
-      intentSettings.data = Uri.fromParts("package", context.packageName, null)
-      context.startActivity(intentSettings)
-    }
-  }
-
-  fun checkFineLocationGranted() {
-    isBackgroundLocationGranted =
-        if (!fineLocationState.status.isGranted) {
-          false
-        } else {
-          viewModel.setLocationDisclosureShown()
-          true
+    val startForResult =
+        rememberLauncherForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
+            if (result.resultCode == Activity.RESULT_OK) {
+                result.data
+                // Handle the Intent
+            }
+            viewModel.setBatteryOptimizeDisableShown()
         }
-  }
 
-  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-      if(WireGuardAutoTunnel.isRunningOnAndroidTv() && Build.VERSION.SDK_INT == Build.VERSION_CODES.Q){
-          checkFineLocationGranted()
-      } else {
-          val backgroundLocationState =
-              rememberPermissionState(Manifest.permission.ACCESS_BACKGROUND_LOCATION)
-          isBackgroundLocationGranted =
-              if (!backgroundLocationState.status.isGranted) {
-                  false
-              } else {
-                  SideEffect { viewModel.setLocationDisclosureShown() }
-                  true
-              }
-      }
-  }
+    fun exportAllConfigs() {
+        try {
+            val files = uiState.tunnels.map { File(context.cacheDir, "${it.name}.conf") }
+            files.forEachIndexed { index, file ->
+                file.outputStream().use { it.write(uiState.tunnels[index].wgQuick.toByteArray()) }
+            }
+            FileUtils.saveFilesToZip(context, files)
+            didExportFiles = true
+            appViewModel.showSnackbarMessage(Event.Message.ConfigsExported.message)
+        } catch (e: Exception) {
+            Timber.e(e)
+            appViewModel.showSnackbarMessage(Event.Error.Exception(e).message)
+        }
+    }
 
-  if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) {
-    checkFineLocationGranted()
-  }
+    fun isBatteryOptimizationsDisabled(): Boolean {
+        val pm = context.getSystemService(POWER_SERVICE) as PowerManager
+        return pm.isIgnoringBatteryOptimizations(context.packageName)
+    }
+
+    fun requestBatteryOptimizationsDisabled() {
+        val intent =
+            Intent().apply {
+                this.action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
+                data = Uri.fromParts("package", context.packageName, null)
+            }
+        startForResult.launch(intent)
+    }
+
+    fun handleAutoTunnelToggle() {
+        if (uiState.isBatteryOptimizeDisableShown || isBatteryOptimizationsDisabled()) {
+            if (appViewModel.isRequiredPermissionGranted()) {
+                viewModel.onToggleAutoTunnel()
+            }
+        } else {
+            requestBatteryOptimizationsDisabled()
+        }
+    }
+
+    fun saveTrustedSSID() {
+        if (currentText.isNotEmpty()) {
+            viewModel.onSaveTrustedSSID(currentText).let {
+                when (it) {
+                    is Result.Success -> currentText = ""
+                    is Result.Error -> appViewModel.showSnackbarMessage(it.error.message)
+                }
+            }
+        }
+    }
+
+    fun openSettings() {
+        scope.launch {
+            val intentSettings = Intent(ACTION_APPLICATION_DETAILS_SETTINGS)
+            intentSettings.data = Uri.fromParts("package", context.packageName, null)
+            context.startActivity(intentSettings)
+        }
+    }
+
+    fun checkFineLocationGranted() {
+        isBackgroundLocationGranted =
+            if (!fineLocationState.status.isGranted) {
+                false
+            } else {
+                viewModel.setLocationDisclosureShown()
+                true
+            }
+    }
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+        if (
+            WireGuardAutoTunnel.isRunningOnAndroidTv() &&
+            Build.VERSION.SDK_INT == Build.VERSION_CODES.Q
+        ) {
+            checkFineLocationGranted()
+        } else {
+            val backgroundLocationState =
+                rememberPermissionState(Manifest.permission.ACCESS_BACKGROUND_LOCATION)
+            isBackgroundLocationGranted =
+                if (!backgroundLocationState.status.isGranted) {
+                    false
+                } else {
+                    SideEffect { viewModel.setLocationDisclosureShown() }
+                    true
+                }
+        }
+    }
+
+    if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.P) {
+        checkFineLocationGranted()
+    }
 
     AnimatedVisibility(showLocationServicesAlertDialog) {
         AlertDialog(
@@ -185,8 +226,9 @@ fun SettingsScreen(
                 TextButton(
                     onClick = {
                         showLocationServicesAlertDialog = false
-                        viewModel.toggleAutoTunnel()
-                    }) {
+                        handleAutoTunnelToggle()
+                    },
+                ) {
                     Text(text = stringResource(R.string.okay))
                 }
             },
@@ -196,313 +238,425 @@ fun SettingsScreen(
                 }
             },
             title = { Text(text = stringResource(R.string.location_services_not_detected)) },
-            text = { Text(text = stringResource(R.string.location_services_missing_message)) })
+            text = { Text(text = stringResource(R.string.location_services_missing_message)) },
+        )
     }
 
-  if (!uiState.isLocationDisclosureShown) {
-    Column(
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Top,
-        modifier = Modifier.fillMaxSize().verticalScroll(scrollState).padding(padding)) {
-          Icon(
-              Icons.Rounded.LocationOff,
-              contentDescription = stringResource(id = R.string.map),
-              modifier = Modifier.padding(30.dp).size(128.dp))
-          Text(
-              stringResource(R.string.prominent_background_location_title),
-              textAlign = TextAlign.Center,
-              modifier = Modifier.padding(30.dp),
-              fontSize = 20.sp)
-          Text(
-              stringResource(R.string.prominent_background_location_message),
-              textAlign = TextAlign.Center,
-              modifier = Modifier.padding(30.dp),
-              fontSize = 15.sp)
-          Row(
-              modifier =
-                  if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                    Modifier.fillMaxWidth().padding(10.dp)
-                  } else {
-                    Modifier.fillMaxWidth().padding(30.dp)
-                  },
-              verticalAlignment = Alignment.CenterVertically,
-              horizontalArrangement = Arrangement.SpaceEvenly) {
+    if (!uiState.isLocationDisclosureShown) {
+        Column(
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Top,
+            modifier = Modifier
+                .fillMaxSize()
+                .verticalScroll(scrollState),
+        ) {
+            Icon(
+                Icons.Rounded.LocationOff,
+                contentDescription = stringResource(id = R.string.map),
+                modifier = Modifier
+                    .padding(30.dp)
+                    .size(128.dp),
+            )
+            Text(
+                stringResource(R.string.prominent_background_location_title),
+                textAlign = TextAlign.Center,
+                modifier = Modifier.padding(30.dp),
+                fontSize = 20.sp,
+            )
+            Text(
+                stringResource(R.string.prominent_background_location_message),
+                textAlign = TextAlign.Center,
+                modifier = Modifier.padding(30.dp),
+                fontSize = 15.sp,
+            )
+            Row(
+                modifier =
+                if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+                    Modifier
+                        .fillMaxWidth()
+                        .padding(10.dp)
+                } else {
+                    Modifier
+                        .fillMaxWidth()
+                        .padding(30.dp)
+                },
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.SpaceEvenly,
+            ) {
                 TextButton(onClick = { viewModel.setLocationDisclosureShown() }) {
-                  Text(stringResource(id = R.string.no_thanks))
+                    Text(stringResource(id = R.string.no_thanks))
                 }
                 TextButton(
                     modifier = Modifier.focusRequester(focusRequester),
                     onClick = {
-                      openSettings()
-                      viewModel.setLocationDisclosureShown()
-                    }) {
-                      Text(stringResource(id = R.string.turn_on))
-                    }
-              }
-        }
-  }
-
-  if(showAuthPrompt) {
-    AuthorizationPrompt(
-        onSuccess = {
-          showAuthPrompt = false
-          exportAllConfigs()
-        },
-        onError = { _ ->
-          showAuthPrompt = false
-          showSnackbarMessage(Event.Error.AuthenticationFailed.message)
-        },
-        onFailure = {
-          showAuthPrompt = false
-          showSnackbarMessage(Event.Error.AuthorizationFailed.message)
-        })
-  }
-
-  if (uiState.tunnels.isEmpty() && uiState.isLocationDisclosureShown) {
-    Column(
-        horizontalAlignment = Alignment.CenterHorizontally,
-        verticalArrangement = Arrangement.Center,
-        modifier = Modifier.fillMaxSize().padding(padding)) {
-          Text(
-              stringResource(R.string.one_tunnel_required),
-              textAlign = TextAlign.Center,
-              modifier = Modifier.padding(15.dp),
-              fontStyle = FontStyle.Italic)
-        }
-  }
-  if (uiState.isLocationDisclosureShown && uiState.tunnels.isNotEmpty()) {
-    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 = 60.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(id = R.string.tunnel_on_wifi),
-                          enabled =
-                              !(uiState.settings.isAutoTunnelEnabled ||
-                                  uiState.settings.isAlwaysOnVpnEnabled),
-                          checked = uiState.settings.isTunnelOnWifiEnabled,
-                          padding = screenPadding,
-                          onCheckChanged = { viewModel.onToggleTunnelOnWifi() },
-                          modifier = if(uiState.settings.isAutoTunnelEnabled) Modifier else Modifier.focusRequester(focusRequester).focusProperties { down = focusRequester2 })
-                      AnimatedVisibility(visible = uiState.settings.isTunnelOnWifiEnabled) {
-                        Column {
-                          FlowRow(
-                              modifier = Modifier.padding(screenPadding).fillMaxWidth(),
-                              horizontalArrangement = Arrangement.spacedBy(5.dp)) {
-                                uiState.settings.trustedNetworkSSIDs.forEach { ssid ->
-                                  ClickableIconButton(
-                                      onClick = { if(WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-                                          viewModel.onDeleteTrustedSSID(ssid)
-                                          focusRequester2.requestFocus()
-                                      }},
-                                      onIconClick = { viewModel.onDeleteTrustedSSID(ssid) },
-                                      text = ssid,
-                                      icon = Icons.Filled.Close,
-                                      enabled =
-                                          !(uiState.settings.isAutoTunnelEnabled ||
-                                              uiState.settings.isAlwaysOnVpnEnabled))
-                                }
-                                if (uiState.settings.trustedNetworkSSIDs.isEmpty()) {
-                                  Text(
-                                      stringResource(R.string.none),
-                                      fontStyle = FontStyle.Italic,
-                                      color = Color.Gray)
-                                }
-                              }
-                          OutlinedTextField(
-                              enabled =
-                                  !(uiState.settings.isAutoTunnelEnabled ||
-                                      uiState.settings.isAlwaysOnVpnEnabled),
-                              value = currentText,
-                              onValueChange = { currentText = it },
-                              label = { Text(stringResource(R.string.add_trusted_ssid)) },
-                              modifier =
-                                  Modifier.padding(
-                                          start = screenPadding, top = 5.dp, bottom = 10.dp)
-                                      .focusRequester(focusRequester2)
-                              ,
-                              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)
-                                  }
-                                }
-                              })
-                        }
-                      }
-                      ConfigurationToggle(
-                          stringResource(R.string.tunnel_mobile_data),
-                          enabled =
-                              !(uiState.settings.isAutoTunnelEnabled ||
-                                  uiState.settings.isAlwaysOnVpnEnabled),
-                          checked = uiState.settings.isTunnelOnMobileDataEnabled,
-                          padding = screenPadding,
-                          onCheckChanged = { viewModel.onToggleTunnelOnMobileData() })
-                      ConfigurationToggle(
-                          stringResource(id = R.string.tunnel_on_ethernet),
-                          enabled =
-                              !(uiState.settings.isAutoTunnelEnabled ||
-                                  uiState.settings.isAlwaysOnVpnEnabled),
-                          checked = uiState.settings.isTunnelOnEthernetEnabled,
-                          padding = screenPadding,
-                          onCheckChanged = { viewModel.onToggleTunnelOnEthernet() })
-                      ConfigurationToggle(
-                          stringResource(R.string.battery_saver),
-                          enabled =
-                              !(uiState.settings.isAutoTunnelEnabled ||
-                                  uiState.settings.isAlwaysOnVpnEnabled),
-                          checked = uiState.settings.isBatterySaverEnabled,
-                          padding = screenPadding,
-                          onCheckChanged = { viewModel.onToggleBatterySaver() })
-                      Row(
-                          verticalAlignment = Alignment.CenterVertically,
-                          modifier = (if(!uiState.settings.isAutoTunnelEnabled) Modifier else Modifier.focusRequester(focusRequester))
-                              .fillMaxSize().padding(top = 5.dp),
-                          horizontalArrangement = Arrangement.Center) {
-                            TextButton(
-                                enabled = !uiState.settings.isAlwaysOnVpnEnabled,
-                                onClick = {
-                                  if (uiState.settings.isTunnelOnWifiEnabled && !uiState.settings.isAutoTunnelEnabled) {
-                                      when(false) {
-                                          isBackgroundLocationGranted ->
-                                              showSnackbarMessage(Event.Error.BackgroundLocationRequired.message)
-                                          fineLocationState.status.isGranted ->
-                                              showSnackbarMessage(Event.Error.PreciseLocationRequired.message)
-                                          viewModel.isLocationEnabled(context) ->
-                                              showLocationServicesAlertDialog = true
-                                          else -> {
-                                              viewModel.toggleAutoTunnel()
-                                          }
-                                      }
-                                  } else {
-                                    viewModel.toggleAutoTunnel()
-                                  }
-                                }) {
-                                  val autoTunnelButtonText =
-                                      if (uiState.settings.isAutoTunnelEnabled) {
-                                        stringResource(R.string.disable_auto_tunnel)
-                                      } else {
-                                        stringResource(id = R.string.enable_auto_tunnel)
-                                      }
-                                  Text(autoTunnelButtonText)
-                                }
-                          }
-                    }
-              }
-          if (WgQuickBackend.hasKernelSupport()) {
-            Surface(
-                tonalElevation = 2.dp,
-                shadowElevation = 2.dp,
-                shape = RoundedCornerShape(12.dp),
-                color = MaterialTheme.colorScheme.surface,
-                modifier = Modifier.fillMaxWidth(fillMaxWidth).padding(vertical = 10.dp)) {
-                  Column(
-                      horizontalAlignment = Alignment.Start,
-                      verticalArrangement = Arrangement.Top,
-                      modifier = Modifier.padding(15.dp)) {
-                        SectionTitle(
-                            title = stringResource(id = R.string.kernel), padding = screenPadding)
-                        ConfigurationToggle(
-                            stringResource(R.string.use_kernel),
-                            enabled =
-                                !(uiState.settings.isAutoTunnelEnabled ||
-                                    uiState.settings.isAlwaysOnVpnEnabled ||
-                                    (uiState.vpnState.status == Tunnel.State.UP)),
-                            checked = uiState.settings.isKernelEnabled,
-                            padding = screenPadding,
-                            onCheckChanged = { viewModel.onToggleKernelMode().let {
-                                when(it) {
-                                    is Result.Error -> showSnackbarMessage(it.error.message)
-                                    is Result.Success -> {}
-                                }
-                            } })
-                      }
+                        openSettings()
+                        viewModel.setLocationDisclosureShown()
+                    },
+                ) {
+                    Text(stringResource(id = R.string.turn_on))
                 }
-          }
-          if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+            }
+        }
+    }
+
+    if (showAuthPrompt) {
+        AuthorizationPrompt(
+            onSuccess = {
+                showAuthPrompt = false
+                exportAllConfigs()
+            },
+            onError = { _ ->
+                showAuthPrompt = false
+                appViewModel.showSnackbarMessage(Event.Error.AuthenticationFailed.message)
+            },
+            onFailure = {
+                showAuthPrompt = false
+                appViewModel.showSnackbarMessage(Event.Error.AuthorizationFailed.message)
+            },
+        )
+    }
+
+    if (uiState.tunnels.isEmpty() && uiState.isLocationDisclosureShown) {
+        Column(
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Center,
+            modifier = Modifier.fillMaxSize(),
+        ) {
+            Text(
+                stringResource(R.string.one_tunnel_required),
+                textAlign = TextAlign.Center,
+                modifier = Modifier.padding(15.dp),
+                fontStyle = FontStyle.Italic,
+            )
+        }
+    }
+    if (uiState.isLocationDisclosureShown && uiState.tunnels.isNotEmpty()) {
+        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 =
-                    Modifier.fillMaxWidth(fillMaxWidth)
-                        .padding(vertical = 10.dp)
-                        .padding(bottom = 140.dp)) {
-                  Column(
-                      horizontalAlignment = Alignment.Start,
-                      verticalArrangement = Arrangement.Top,
-                      modifier = Modifier.padding(15.dp)) {
+                (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(id = R.string.tunnel_on_wifi),
+                        enabled =
+                        !(uiState.settings.isAutoTunnelEnabled ||
+                            uiState.settings.isAlwaysOnVpnEnabled),
+                        checked = uiState.settings.isTunnelOnWifiEnabled,
+                        padding = screenPadding,
+                        onCheckChanged = { viewModel.onToggleTunnelOnWifi() },
+                        modifier =
+                        if (uiState.settings.isAutoTunnelEnabled) Modifier
+                        else
+                            Modifier
+                                .focusRequester(focusRequester),
+                    )
+                    AnimatedVisibility(visible = uiState.settings.isTunnelOnWifiEnabled) {
+                        Column {
+                            FlowRow(
+                                modifier = Modifier
+                                    .padding(screenPadding)
+                                    .fillMaxWidth(),
+                                horizontalArrangement = Arrangement.spacedBy(5.dp),
+                            ) {
+                                uiState.settings.trustedNetworkSSIDs.forEach { ssid ->
+                                    ClickableIconButton(
+                                        onClick = {
+                                            if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+                                                focusRequester.requestFocus()
+                                                viewModel.onDeleteTrustedSSID(ssid)
+                                            }
+                                        },
+                                        onIconClick = {
+                                            if (WireGuardAutoTunnel.isRunningOnAndroidTv()) focusRequester.requestFocus()
+                                            viewModel.onDeleteTrustedSSID(ssid)
+
+                                        },
+                                        text = ssid,
+                                        icon = Icons.Filled.Close,
+                                        enabled =
+                                        !(uiState.settings.isAutoTunnelEnabled ||
+                                            uiState.settings.isAlwaysOnVpnEnabled),
+                                    )
+                                }
+                                if (uiState.settings.trustedNetworkSSIDs.isEmpty()) {
+                                    Text(
+                                        stringResource(R.string.none),
+                                        fontStyle = FontStyle.Italic,
+                                        color = Color.Gray,
+                                    )
+                                }
+                            }
+                            OutlinedTextField(
+                                enabled =
+                                !(uiState.settings.isAutoTunnelEnabled ||
+                                    uiState.settings.isAlwaysOnVpnEnabled),
+                                value = currentText,
+                                onValueChange = { currentText = it },
+                                label = { Text(stringResource(R.string.add_trusted_ssid)) },
+                                modifier =
+                                Modifier
+                                    .padding(
+                                        start = screenPadding,
+                                        top = 5.dp,
+                                        bottom = 10.dp,
+                                    ),
+                                maxLines = 1,
+                                keyboardOptions =
+                                KeyboardOptions(
+                                    capitalization = KeyboardCapitalization.None,
+                                    imeAction = ImeAction.Done,
+                                ),
+                                keyboardActions = KeyboardActions(onDone = { saveTrustedSSID() }),
+                                trailingIcon = {
+                                    if (currentText != "") {
+                                        IconButton(onClick = { saveTrustedSSID() }) {
+                                            Icon(
+                                                imageVector = Icons.Outlined.Add,
+                                                contentDescription =
+                                                if (currentText == "") {
+                                                    stringResource(
+                                                        id =
+                                                        R.string
+                                                            .trusted_ssid_empty_description,
+                                                    )
+                                                } else {
+                                                    stringResource(
+                                                        id =
+                                                        R.string
+                                                            .trusted_ssid_value_description,
+                                                    )
+                                                },
+                                                tint = MaterialTheme.colorScheme.primary,
+                                            )
+                                        }
+                                    }
+                                },
+                            )
+                        }
+                    }
+                    ConfigurationToggle(
+                        stringResource(R.string.tunnel_mobile_data),
+                        enabled =
+                        !(uiState.settings.isAutoTunnelEnabled ||
+                            uiState.settings.isAlwaysOnVpnEnabled),
+                        checked = uiState.settings.isTunnelOnMobileDataEnabled,
+                        padding = screenPadding,
+                        onCheckChanged = { viewModel.onToggleTunnelOnMobileData() },
+                    )
+                    ConfigurationToggle(
+                        stringResource(id = R.string.tunnel_on_ethernet),
+                        enabled =
+                        !(uiState.settings.isAutoTunnelEnabled ||
+                            uiState.settings.isAlwaysOnVpnEnabled),
+                        checked = uiState.settings.isTunnelOnEthernetEnabled,
+                        padding = screenPadding,
+                        onCheckChanged = { viewModel.onToggleTunnelOnEthernet() },
+                    )
+                    ConfigurationToggle(
+                        stringResource(R.string.restart_on_ping),
+                        enabled =
+                        !(uiState.settings.isAutoTunnelEnabled ||
+                            uiState.settings.isAlwaysOnVpnEnabled),
+                        checked = uiState.settings.isPingEnabled,
+                        padding = screenPadding,
+                        onCheckChanged = { viewModel.onToggleRestartOnPing() },
+                    )
+                    Row(
+                        verticalAlignment = Alignment.CenterVertically,
+                        modifier =
+                        (if (!uiState.settings.isAutoTunnelEnabled) Modifier
+                        else
+                            Modifier.focusRequester(
+                                focusRequester,
+                            ))
+                            .fillMaxSize()
+                            .padding(top = 5.dp),
+                        horizontalArrangement = Arrangement.Center,
+                    ) {
+                        TextButton(
+                            enabled = !uiState.settings.isAlwaysOnVpnEnabled,
+                            onClick = {
+                                if (
+                                    uiState.settings.isTunnelOnWifiEnabled &&
+                                    !uiState.settings.isAutoTunnelEnabled
+                                ) {
+                                    when (false) {
+                                        isBackgroundLocationGranted ->
+                                            appViewModel.showSnackbarMessage(
+                                                Event.Error.BackgroundLocationRequired.message,
+                                            )
+
+                                        fineLocationState.status.isGranted ->
+                                            appViewModel.showSnackbarMessage(
+                                                Event.Error.PreciseLocationRequired.message,
+                                            )
+
+                                        viewModel.isLocationEnabled(context) ->
+                                            showLocationServicesAlertDialog = true
+
+                                        else -> {
+                                            handleAutoTunnelToggle()
+                                        }
+                                    }
+                                } else {
+                                    handleAutoTunnelToggle()
+                                }
+                            },
+                        ) {
+                            val autoTunnelButtonText =
+                                if (uiState.settings.isAutoTunnelEnabled) {
+                                    stringResource(R.string.disable_auto_tunnel)
+                                } else {
+                                    stringResource(id = R.string.enable_auto_tunnel)
+                                }
+                            Text(autoTunnelButtonText)
+                        }
+                    }
+                }
+            }
+            if (WgQuickBackend.hasKernelSupport()) {
+                Surface(
+                    tonalElevation = 2.dp,
+                    shadowElevation = 2.dp,
+                    shape = RoundedCornerShape(12.dp),
+                    color = MaterialTheme.colorScheme.surface,
+                    modifier = Modifier
+                        .fillMaxWidth(fillMaxWidth)
+                        .padding(vertical = 10.dp),
+                ) {
+                    Column(
+                        horizontalAlignment = Alignment.Start,
+                        verticalArrangement = Arrangement.Top,
+                        modifier = Modifier.padding(15.dp),
+                    ) {
                         SectionTitle(
-                            title = stringResource(id = R.string.other), padding = screenPadding)
+                            title = stringResource(id = R.string.kernel),
+                            padding = screenPadding,
+                        )
+                        ConfigurationToggle(
+                            stringResource(R.string.use_kernel),
+                            enabled =
+                            !(uiState.settings.isAutoTunnelEnabled ||
+                                uiState.settings.isAlwaysOnVpnEnabled ||
+                                (uiState.vpnState.status == Tunnel.State.UP)),
+                            checked = uiState.settings.isKernelEnabled,
+                            padding = screenPadding,
+                            onCheckChanged = {
+                                viewModel.onToggleKernelMode().let {
+                                    when (it) {
+                                        is Result.Error -> appViewModel.showSnackbarMessage(it.error.message)
+                                        is Result.Success -> {}
+                                    }
+                                }
+                            },
+                        )
+                    }
+                }
+            }
+            Surface(
+                tonalElevation = 2.dp,
+                shadowElevation = 2.dp,
+                shape = RoundedCornerShape(12.dp),
+                color = MaterialTheme.colorScheme.surface,
+                modifier =
+                Modifier
+                    .fillMaxWidth(fillMaxWidth)
+                    .padding(vertical = 10.dp)
+                    .padding(bottom = 140.dp),
+            ) {
+                Column(
+                    horizontalAlignment = Alignment.Start,
+                    verticalArrangement = Arrangement.Top,
+                    modifier = Modifier.padding(15.dp),
+                ) {
+                    SectionTitle(
+                        title = stringResource(id = R.string.other),
+                        padding = screenPadding,
+                    )
+                    if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) {
                         ConfigurationToggle(
                             stringResource(R.string.always_on_vpn_support),
                             enabled = !uiState.settings.isAutoTunnelEnabled,
                             checked = uiState.settings.isAlwaysOnVpnEnabled,
                             padding = screenPadding,
-                            onCheckChanged = { viewModel.onToggleAlwaysOnVPN() })
+                            onCheckChanged = { viewModel.onToggleAlwaysOnVPN() },
+                        )
                         ConfigurationToggle(
                             stringResource(R.string.enabled_app_shortcuts),
                             enabled = true,
                             checked = uiState.settings.isShortcutsEnabled,
                             padding = screenPadding,
-                            onCheckChanged = { viewModel.onToggleShortcutsEnabled() })
+                            onCheckChanged = { viewModel.onToggleShortcutsEnabled() },
+                        )
+                    }
+                    ConfigurationToggle(
+                        stringResource(R.string.enable_app_lock),
+                        enabled = true,
+                        checked = pinExists.value,
+                        padding = screenPadding,
+                        onCheckChanged = {
+                            if (pinExists.value) {
+                                PinManager.clearPin()
+                                pinExists.value = PinManager.pinExists()
+                            } else {
+                                navController.navigate(Screen.Lock.route)
+                            }
+                        },
+                    )
+                    if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) {
                         Row(
                             verticalAlignment = Alignment.CenterVertically,
-                            modifier = Modifier.fillMaxSize().padding(top = 5.dp),
-                            horizontalArrangement = Arrangement.Center) {
-                              TextButton(
-                                  enabled = !didExportFiles, onClick = { showAuthPrompt = true }) {
-                                    Text(stringResource(R.string.export_configs))
-                                  }
+                            modifier = Modifier
+                                .fillMaxSize()
+                                .padding(top = 5.dp),
+                            horizontalArrangement = Arrangement.Center,
+                        ) {
+                            TextButton(
+                                enabled = !didExportFiles,
+                                onClick = { showAuthPrompt = true },
+                            ) {
+                                Text(stringResource(R.string.export_configs))
                             }
-                      }
+                        }
+                    }
                 }
-          }
-          if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
-            Spacer(modifier = Modifier.weight(.17f))
-          }
+            }
         }
-  }
+    }
 }

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

@@ -5,9 +5,9 @@ import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnState
 
 data class SettingsUiState(
-    val settings : Settings = Settings(),
-    val tunnels : List<TunnelConfig> = emptyList(),
+    val settings: Settings = Settings(),
+    val tunnels: List<TunnelConfig> = emptyList(),
     val vpnState: VpnState = VpnState(),
-    val isLocationDisclosureShown : Boolean = true,
-    val loading : Boolean = true
+    val isLocationDisclosureShown: Boolean = true,
+    val isBatteryOptimizeDisableShown: Boolean = false
 )

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

@@ -7,10 +7,9 @@ import androidx.core.location.LocationManagerCompat
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.wireguard.android.util.RootShell
-import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.data.model.Settings
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
 import com.zaneschepke.wireguardautotunnel.util.Constants
@@ -29,25 +28,34 @@ class SettingsViewModel
 @Inject
 constructor(
     private val application: Application,
-    private val tunnelConfigRepository: TunnelConfigRepository,
-    private val settingsRepository: SettingsRepository,
-    private val dataStoreManager: DataStoreManager,
+    private val appDataRepository: AppDataRepository,
+    private val serviceManager: ServiceManager,
     private val rootShell: RootShell,
-    private val vpnService: VpnService
+    vpnService: VpnService
 ) : ViewModel() {
 
-    val uiState = combine(
-        settingsRepository.getSettingsFlow(),
-        tunnelConfigRepository.getTunnelConfigsFlow(),
-        vpnService.vpnState,
-        dataStoreManager.locationDisclosureFlow,
-    ){ settings, tunnels, tunnelState, locationDisclosure ->
-        SettingsUiState(settings, tunnels, tunnelState, locationDisclosure
-            ?: false, false)
-    }.stateIn(viewModelScope,
-        SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT), SettingsUiState())
+    val uiState =
+        combine(
+            appDataRepository.settings.getSettingsFlow(),
+            appDataRepository.tunnels.getTunnelConfigsFlow(),
+            vpnService.vpnState,
+            appDataRepository.appState.generalStateFlow,
+        ) { settings, tunnels, tunnelState, generalState ->
+            SettingsUiState(
+                settings,
+                tunnels,
+                tunnelState,
+                generalState.locationDisclosureShown,
+                generalState.batteryOptimizationDisableShown,
+            )
+        }
+            .stateIn(
+                viewModelScope,
+                SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
+                SettingsUiState(),
+            )
 
-    fun onSaveTrustedSSID(ssid: String) : Result<Unit>{
+    fun onSaveTrustedSSID(ssid: String): Result<Unit> {
         val trimmed = ssid.trim()
         return if (!uiState.value.settings.trustedNetworkSSIDs.contains(trimmed)) {
             uiState.value.settings.trustedNetworkSSIDs.add(trimmed)
@@ -58,64 +66,71 @@ constructor(
         }
     }
 
-    fun setLocationDisclosureShown() = viewModelScope.launch {
-            dataStoreManager.saveToDataStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN, true)
-    }
+    fun setLocationDisclosureShown() =
+        viewModelScope.launch {
+            appDataRepository.appState.setLocationDisclosureShown(true)
+        }
+
+    fun setBatteryOptimizeDisableShown() =
+        viewModelScope.launch {
+            appDataRepository.appState.setBatteryOptimizationDisableShown(true)
+        }
 
     fun onToggleTunnelOnMobileData() {
         saveSettings(
             uiState.value.settings.copy(
-                isTunnelOnMobileDataEnabled = !uiState.value.settings.isTunnelOnMobileDataEnabled
-            )
+                isTunnelOnMobileDataEnabled = !uiState.value.settings.isTunnelOnMobileDataEnabled,
+            ),
         )
     }
 
     fun onDeleteTrustedSSID(ssid: String) {
-        saveSettings(uiState.value.settings.copy(
-            trustedNetworkSSIDs = (uiState.value.settings.trustedNetworkSSIDs - ssid).toMutableList()
-        ))
-    }
-
-    private suspend fun getDefaultTunnelOrFirst() : String {
-        return uiState.value.settings.defaultTunnel ?: tunnelConfigRepository.getAll().first().toString()
-    }
-
-    fun toggleAutoTunnel() = viewModelScope.launch {
-        val isAutoTunnelEnabled = uiState.value.settings.isAutoTunnelEnabled
-        var isAutoTunnelPaused = uiState.value.settings.isAutoTunnelPaused
-
-        if (isAutoTunnelEnabled) {
-            ServiceManager.stopWatcherService(application)
-        } else {
-            ServiceManager.startWatcherService(application)
-            isAutoTunnelPaused = false
-        }
         saveSettings(
             uiState.value.settings.copy(
-                isAutoTunnelEnabled = !isAutoTunnelEnabled,
-                isAutoTunnelPaused = isAutoTunnelPaused,
-                defaultTunnel = getDefaultTunnelOrFirst()
-            )
+                trustedNetworkSSIDs =
+                (uiState.value.settings.trustedNetworkSSIDs - ssid).toMutableList(),
+            ),
         )
     }
 
+    fun onToggleAutoTunnel() =
+        viewModelScope.launch {
+            val isAutoTunnelEnabled = uiState.value.settings.isAutoTunnelEnabled
+            var isAutoTunnelPaused = uiState.value.settings.isAutoTunnelPaused
 
-    fun onToggleAlwaysOnVPN() = viewModelScope.launch {
-        val updatedSettings = uiState.value.settings.copy(
-                isAlwaysOnVpnEnabled = !uiState.value.settings.isAlwaysOnVpnEnabled,
-                defaultTunnel = getDefaultTunnelOrFirst()
+            if (isAutoTunnelEnabled) {
+                serviceManager.stopWatcherService(application)
+            } else {
+                serviceManager.startWatcherService(application)
+                isAutoTunnelPaused = false
+            }
+            saveSettings(
+                uiState.value.settings.copy(
+                    isAutoTunnelEnabled = !isAutoTunnelEnabled,
+                    isAutoTunnelPaused = isAutoTunnelPaused,
+                ),
             )
-        saveSettings(updatedSettings)
-    }
+            WireGuardAutoTunnel.requestAutoTunnelTileServiceUpdate(application)
+        }
 
-    private fun saveSettings(settings: Settings) = viewModelScope.launch {
-        settingsRepository.save(settings)
-    }
+    fun onToggleAlwaysOnVPN() =
+        viewModelScope.launch {
+            saveSettings(
+                uiState.value.settings.copy(
+                    isAlwaysOnVpnEnabled = !uiState.value.settings.isAlwaysOnVpnEnabled,
+                ),
+            )
+        }
+
+    private fun saveSettings(settings: Settings) =
+        viewModelScope.launch { appDataRepository.settings.save(settings) }
 
     fun onToggleTunnelOnEthernet() {
-        saveSettings(uiState.value.settings.copy(
-            isTunnelOnEthernetEnabled = !uiState.value.settings.isTunnelOnEthernetEnabled
-        ))
+        saveSettings(
+            uiState.value.settings.copy(
+                isTunnelOnEthernetEnabled = !uiState.value.settings.isTunnelOnEthernetEnabled,
+            ),
+        )
     }
 
     fun isLocationEnabled(context: Context): Boolean {
@@ -126,42 +141,35 @@ constructor(
     fun onToggleShortcutsEnabled() {
         saveSettings(
             uiState.value.settings.copy(
-                isShortcutsEnabled = !uiState.value.settings.isShortcutsEnabled
-            )
-        )
-    }
-
-    fun onToggleBatterySaver() {
-        saveSettings(
-            uiState.value.settings.copy(
-                isBatterySaverEnabled = !uiState.value.settings.isBatterySaverEnabled
-            )
+                isShortcutsEnabled = !uiState.value.settings.isShortcutsEnabled,
+            ),
         )
     }
 
     private fun saveKernelMode(on: Boolean) {
         saveSettings(
             uiState.value.settings.copy(
-                isKernelEnabled = on
-            )
+                isKernelEnabled = on,
+            ),
         )
     }
 
     fun onToggleTunnelOnWifi() {
         saveSettings(
             uiState.value.settings.copy(
-                isTunnelOnWifiEnabled = !uiState.value.settings.isTunnelOnWifiEnabled
-            )
+                isTunnelOnWifiEnabled = !uiState.value.settings.isTunnelOnWifiEnabled,
+            ),
         )
     }
 
-    fun onToggleKernelMode() : Result<Unit> {
+    fun onToggleKernelMode(): Result<Unit> {
         if (!uiState.value.settings.isKernelEnabled) {
             try {
                 rootShell.start()
-                Timber.d("Root shell accepted!")
+                Timber.i("Root shell accepted!")
                 saveKernelMode(on = true)
             } catch (e: RootShell.RootShellException) {
+                Timber.e(e)
                 saveKernelMode(on = false)
                 return Result.Error(Event.Error.RootDenied)
             }
@@ -170,4 +178,12 @@ constructor(
         }
         return Result.Success(Unit)
     }
+
+    fun onToggleRestartOnPing() = viewModelScope.launch {
+        saveSettings(
+            uiState.value.settings.copy(
+                isPingEnabled = !uiState.value.settings.isPingEnabled,
+            ),
+        )
+    }
 }

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

@@ -1,14 +1,10 @@
 package com.zaneschepke.wireguardautotunnel.ui.screens.support
 
-import android.content.Intent
-import android.content.Intent.createChooser
-import android.net.Uri
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.focusable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.IntrinsicSize
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -20,10 +16,11 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.ArrowForward
+import androidx.compose.material.icons.automirrored.rounded.ArrowForward
 import androidx.compose.material.icons.rounded.Book
+import androidx.compose.material.icons.rounded.FormatListNumbered
 import androidx.compose.material.icons.rounded.Mail
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
@@ -45,184 +42,236 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import androidx.core.content.ContextCompat.startActivity
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation.NavController
 import com.zaneschepke.wireguardautotunnel.BuildConfig
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.ui.common.screen.LoadingScreen
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.Event
+import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
+import com.zaneschepke.wireguardautotunnel.ui.Screen
 
 @Composable
 fun SupportScreen(
     viewModel: SupportViewModel = hiltViewModel(),
-    padding: PaddingValues,
-    showSnackbarMessage: (String) -> Unit,
+    appViewModel: AppViewModel,
+    navController: NavController,
     focusRequester: FocusRequester
 ) {
-  val context = LocalContext.current
-  val fillMaxWidth = .85f
+    val context = LocalContext.current
+    val fillMaxWidth = .85f
 
-  val uiState by viewModel.uiState.collectAsStateWithLifecycle()
-
-  fun openWebPage(url: String) {
-      try {
-          val webpage: Uri = Uri.parse(url)
-          val intent = Intent(Intent.ACTION_VIEW, webpage)
-          context.startActivity(intent)
-      } catch (e : Exception) {
-          showSnackbarMessage(Event.Error.Exception(e).message)
-      }
-  }
-
-  fun launchEmail() {
-      try {
-          val intent =
-              Intent(Intent.ACTION_SEND).apply {
-                  type = Constants.EMAIL_MIME_TYPE
-                  putExtra(Intent.EXTRA_EMAIL, context.getString(R.string.my_email))
-                  putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.email_subject))
-              }
-          startActivity(context, createChooser(intent, context.getString(R.string.email_chooser)), null)
-      } catch (e : Exception) {
-          showSnackbarMessage(Event.Error.Exception(e).message)
-      }
-  }
-
-  if (uiState.loading) {
-    LoadingScreen()
-      return
-  }
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
     Column(
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Top,
         modifier =
-            Modifier.fillMaxSize()
-                .verticalScroll(rememberScrollState())
-                .focusable()
-                .padding(padding)) {
-          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 = 25.dp)) {
-                Column(modifier = Modifier.padding(20.dp)) {
-                  Text(
-                      stringResource(R.string.thank_you),
-                      textAlign = TextAlign.Start,
-                      fontWeight = FontWeight.Bold,
-                      modifier = Modifier.padding(bottom = 20.dp),
-                      fontSize = 16.sp)
-                  Text(
-                      stringResource(id = R.string.support_help_text),
-                      textAlign = TextAlign.Start,
-                      fontSize = 16.sp,
-                      modifier = Modifier.padding(bottom = 20.dp))
-                  TextButton(
-                      onClick = { openWebPage(context.resources.getString(R.string.docs_url)) },
-                      modifier = Modifier.padding(vertical = 5.dp).focusRequester(focusRequester)) {
-                        Row(
-                            horizontalArrangement = Arrangement.SpaceBetween,
-                            verticalAlignment = Alignment.CenterVertically,
-                            modifier = Modifier.fillMaxWidth()) {
-                              Row {
-                                Icon(Icons.Rounded.Book, stringResource(id = R.string.docs))
-                                Text(
-                                    stringResource(id = R.string.docs_description),
-                                    textAlign = TextAlign.Justify,
-                                    modifier = Modifier.padding(start = 10.dp))
-                              }
-                              Icon(Icons.Rounded.ArrowForward, stringResource(id = R.string.go))
-                            }
-                      }
-                  Divider(color = MaterialTheme.colorScheme.onBackground, thickness = 0.5.dp)
-                  TextButton(
-                      onClick = { openWebPage(context.resources.getString(R.string.discord_url)) },
-                      modifier = Modifier.padding(vertical = 5.dp)) {
-                        Row(
-                            horizontalArrangement = Arrangement.SpaceBetween,
-                            verticalAlignment = Alignment.CenterVertically,
-                            modifier = Modifier.fillMaxWidth()) {
-                              Row {
-                                Icon(
-                                    imageVector = ImageVector.vectorResource(R.drawable.discord),
-                                    stringResource(id = R.string.discord),
-                                    Modifier.size(25.dp))
-                                Text(
-                                    stringResource(id = R.string.discord_description),
-                                    textAlign = TextAlign.Justify,
-                                    modifier = Modifier.padding(start = 10.dp))
-                              }
-                              Icon(Icons.Rounded.ArrowForward, stringResource(id = R.string.go))
-                            }
-                      }
-                  Divider(color = MaterialTheme.colorScheme.onBackground, thickness = 0.5.dp)
-                  TextButton(
-                      onClick = { openWebPage(context.resources.getString(R.string.github_url)) },
-                      modifier = Modifier.padding(vertical = 5.dp)) {
-                        Row(
-                            horizontalArrangement = Arrangement.SpaceBetween,
-                            verticalAlignment = Alignment.CenterVertically,
-                            modifier = Modifier.fillMaxWidth()) {
-                              Row {
-                                Icon(
-                                    imageVector = ImageVector.vectorResource(R.drawable.github),
-                                    stringResource(id = R.string.github),
-                                    Modifier.size(25.dp))
-                                Text(
-                                    "Open an issue",
-                                    textAlign = TextAlign.Justify,
-                                    modifier = Modifier.padding(start = 10.dp))
-                              }
-                              Icon(Icons.Rounded.ArrowForward, stringResource(id = R.string.go))
-                            }
-                      }
-                  Divider(color = MaterialTheme.colorScheme.onBackground, thickness = 0.5.dp)
-                  TextButton(
-                      onClick = { launchEmail() }, modifier = Modifier.padding(vertical = 5.dp)) {
-                        Row(
-                            horizontalArrangement = Arrangement.SpaceBetween,
-                            verticalAlignment = Alignment.CenterVertically,
-                            modifier = Modifier.fillMaxWidth()) {
-                              Row {
-                                Icon(Icons.Rounded.Mail, stringResource(id = R.string.email))
-                                Text(
-                                    stringResource(id = R.string.email_description),
-                                    textAlign = TextAlign.Justify,
-                                    modifier = Modifier.padding(start = 10.dp))
-                              }
-                              Icon(Icons.Rounded.ArrowForward, stringResource(id = R.string.go))
-                            }
-                      }
+        Modifier
+            .fillMaxSize()
+            .verticalScroll(rememberScrollState())
+            .focusable(),
+    ) {
+        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 = 25.dp),
+        ) {
+            Column(modifier = Modifier.padding(20.dp)) {
+                val forwardIcon = Icons.AutoMirrored.Rounded.ArrowForward
+                Text(
+                    stringResource(R.string.thank_you),
+                    textAlign = TextAlign.Start,
+                    fontWeight = FontWeight.Bold,
+                    modifier = Modifier.padding(bottom = 20.dp),
+                    fontSize = 16.sp,
+                )
+                Text(
+                    stringResource(id = R.string.support_help_text),
+                    textAlign = TextAlign.Start,
+                    fontSize = 16.sp,
+                    modifier = Modifier.padding(bottom = 20.dp),
+                )
+                TextButton(
+                    onClick = { appViewModel.openWebPage(context.resources.getString(R.string.docs_url)) },
+                    modifier = Modifier
+                        .padding(vertical = 5.dp)
+                        .focusRequester(focusRequester),
+                ) {
+                    Row(
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                        verticalAlignment = Alignment.CenterVertically,
+                        modifier = Modifier.fillMaxWidth(),
+                    ) {
+                        Row {
+                            val icon = Icons.Rounded.Book
+                            Icon(icon, icon.name)
+                            Text(
+                                stringResource(id = R.string.docs_description),
+                                textAlign = TextAlign.Justify,
+                                modifier = Modifier.padding(start = 10.dp),
+                            )
+                        }
+                        Icon(
+                            forwardIcon,
+                            forwardIcon.name,
+                        )
+                    }
                 }
-              }
-          Spacer(modifier = Modifier.weight(1f))
-          Text(
-              stringResource(id = R.string.privacy_policy),
-              style = TextStyle(textDecoration = TextDecoration.Underline),
-              fontSize = 16.sp,
-              modifier =
-                  Modifier.clickable {
-                    openWebPage(context.resources.getString(R.string.privacy_policy_url))
-                  })
-          Row(
-              horizontalArrangement = Arrangement.spacedBy(25.dp),
-              verticalAlignment = Alignment.CenterVertically,
-              modifier = Modifier.padding(25.dp)) {
-                Text("Version: ${BuildConfig.VERSION_NAME}", modifier = Modifier.focusable())
-                Text("Mode: ${if (uiState.settings.isKernelEnabled) "Kernel" else "Userspace" }")
-              }
+                HorizontalDivider(
+                    thickness = 0.5.dp,
+                    color = MaterialTheme.colorScheme.onBackground,
+                )
+                TextButton(
+                    onClick = { appViewModel.openWebPage(context.resources.getString(R.string.discord_url)) },
+                    modifier = Modifier.padding(vertical = 5.dp),
+                ) {
+                    Row(
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                        verticalAlignment = Alignment.CenterVertically,
+                        modifier = Modifier.fillMaxWidth(),
+                    ) {
+                        Row {
+                            val icon = ImageVector.vectorResource(R.drawable.discord)
+                            Icon(
+                                icon,
+                                icon.name,
+                                Modifier.size(25.dp),
+                            )
+                            Text(
+                                stringResource(id = R.string.discord_description),
+                                textAlign = TextAlign.Justify,
+                                modifier = Modifier.padding(start = 10.dp),
+                            )
+                        }
+                        Icon(
+                            forwardIcon,
+                            forwardIcon.name,
+                        )
+                    }
+                }
+                HorizontalDivider(
+                    thickness = 0.5.dp,
+                    color = MaterialTheme.colorScheme.onBackground,
+                )
+                TextButton(
+                    onClick = { appViewModel.openWebPage(context.resources.getString(R.string.github_url)) },
+                    modifier = Modifier.padding(vertical = 5.dp),
+                ) {
+                    Row(
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                        verticalAlignment = Alignment.CenterVertically,
+                        modifier = Modifier.fillMaxWidth(),
+                    ) {
+                        Row {
+                            val icon = ImageVector.vectorResource(R.drawable.github)
+                            Icon(
+                                imageVector = icon,
+                                icon.name,
+                                Modifier.size(25.dp),
+                            )
+                            Text(
+                                stringResource(id = R.string.open_issue),
+                                textAlign = TextAlign.Justify,
+                                modifier = Modifier.padding(start = 10.dp),
+                            )
+                        }
+                        Icon(
+                            forwardIcon,
+                            forwardIcon.name,
+                        )
+                    }
+                }
+                HorizontalDivider(
+                    thickness = 0.5.dp,
+                    color = MaterialTheme.colorScheme.onBackground,
+                )
+                TextButton(
+                    onClick = { appViewModel.launchEmail() },
+                    modifier = Modifier.padding(vertical = 5.dp),
+                ) {
+                    Row(
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                        verticalAlignment = Alignment.CenterVertically,
+                        modifier = Modifier.fillMaxWidth(),
+                    ) {
+                        Row {
+                            val icon = Icons.Rounded.Mail
+                            Icon(icon, icon.name)
+                            Text(
+                                stringResource(id = R.string.email_description),
+                                textAlign = TextAlign.Justify,
+                                modifier = Modifier.padding(start = 10.dp),
+                            )
+                        }
+                        Icon(
+                            forwardIcon,
+                            forwardIcon.name,
+                        )
+                    }
+                }
+                if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+                    HorizontalDivider(
+                        thickness = 0.5.dp,
+                        color = MaterialTheme.colorScheme.onBackground,
+                    )
+                    TextButton(
+                        onClick = { navController.navigate(Screen.Support.Logs.route) },
+                        modifier = Modifier.padding(vertical = 5.dp),
+                    ) {
+                        Row(
+                            horizontalArrangement = Arrangement.SpaceBetween,
+                            verticalAlignment = Alignment.CenterVertically,
+                            modifier = Modifier.fillMaxWidth(),
+                        ) {
+                            Row {
+                                val icon = Icons.Rounded.FormatListNumbered
+                                Icon(icon, icon.name)
+                                Text(
+                                    stringResource(id = R.string.read_logs),
+                                    textAlign = TextAlign.Justify,
+                                    modifier = Modifier.padding(start = 10.dp),
+                                )
+                            }
+                            Icon(
+                                Icons.AutoMirrored.Rounded.ArrowForward,
+                                stringResource(id = R.string.go),
+                            )
+                        }
+                    }
+                }
+            }
         }
-  }
+        Spacer(modifier = Modifier.weight(1f))
+        Text(
+            stringResource(id = R.string.privacy_policy),
+            style = TextStyle(textDecoration = TextDecoration.Underline),
+            fontSize = 16.sp,
+            modifier =
+            Modifier.clickable {
+                appViewModel.openWebPage(context.resources.getString(R.string.privacy_policy_url))
+            },
+        )
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(25.dp),
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier.padding(25.dp),
+        ) {
+            Text("Version: ${BuildConfig.VERSION_NAME}", modifier = Modifier.focusable())
+            Text("Mode: ${if (uiState.settings.isKernelEnabled) "Kernel" else "Userspace"}")
+        }
+    }
+}

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

@@ -2,7 +2,4 @@ package com.zaneschepke.wireguardautotunnel.ui.screens.support
 
 import com.zaneschepke.wireguardautotunnel.data.model.Settings
 
-data class SupportUiState(
-    val settings : Settings = Settings(),
-    val loading : Boolean = true
-)
+data class SupportUiState(val settings: Settings = Settings())

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

@@ -11,15 +11,16 @@ import kotlinx.coroutines.flow.stateIn
 import javax.inject.Inject
 
 @HiltViewModel
-class SupportViewModel @Inject constructor(
-    private val settingsRepository: SettingsRepository
-) : ViewModel() {
+class SupportViewModel @Inject constructor(settingsRepository: SettingsRepository) :
+    ViewModel() {
 
-    val uiState = settingsRepository.getSettingsFlow().map {
-        SupportUiState(it, false)
-    }.stateIn(
-        viewModelScope,
-        SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
-        SupportUiState()
-    )
+    val uiState =
+        settingsRepository
+            .getSettingsFlow()
+            .map { SupportUiState(it) }
+            .stateIn(
+                viewModelScope,
+                SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
+                SupportUiState(),
+            )
 }

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

@@ -0,0 +1,110 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.support.logs
+
+import android.annotation.SuppressLint
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Save
+import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.ClipboardManager
+import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.zaneschepke.wireguardautotunnel.ui.AppViewModel
+import com.zaneschepke.wireguardautotunnel.ui.common.text.LogTypeLabel
+import kotlinx.coroutines.launch
+
+@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
+@Composable
+fun LogsScreen(appViewModel: AppViewModel) {
+
+    val logs = remember {
+        appViewModel.logs
+    }
+
+    val lazyColumnListState = rememberLazyListState()
+    val clipboardManager: ClipboardManager = LocalClipboardManager.current
+    val scope = rememberCoroutineScope()
+
+    LaunchedEffect(logs.size) {
+        scope.launch {
+            lazyColumnListState.animateScrollToItem(logs.size)
+        }
+    }
+
+    Scaffold(
+        floatingActionButton = {
+            FloatingActionButton(
+                onClick = {
+                    appViewModel.saveLogsToFile()
+                },
+                shape = RoundedCornerShape(16.dp),
+                containerColor = MaterialTheme.colorScheme.primary,
+            ) {
+                val icon = Icons.Filled.Save
+                Icon(
+                    imageVector = icon,
+                    contentDescription = icon.name,
+                    tint = MaterialTheme.colorScheme.onPrimary,
+                )
+            }
+        },
+    ) {
+        LazyColumn(
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.Top),
+            state = lazyColumnListState,
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(horizontal = 24.dp),
+        ) {
+            items(logs) {
+                Row(
+                    horizontalArrangement = Arrangement.spacedBy(5.dp, Alignment.Start),
+                    verticalAlignment = Alignment.Top,
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .clickable(
+                            interactionSource = remember { MutableInteractionSource() },
+                            indication = null,
+                            onClick = {
+                                clipboardManager.setText(annotatedString = AnnotatedString(it.toString()))
+                            },
+                        ),
+                ) {
+                    val fontSize = 10.sp
+                    Text(text = it.tag, modifier = Modifier.fillMaxSize(0.3f), fontSize = fontSize)
+                    LogTypeLabel(color = Color(it.level.color())) {
+                        Text(
+                            text = it.level.signifier,
+                            textAlign = TextAlign.Center,
+                            fontSize = fontSize,
+                        )
+                    }
+                    Text("${it.message} - ${it.time}", fontSize = fontSize)
+                }
+            }
+        }
+    }
+}

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

@@ -21,7 +21,7 @@ private val DarkColorScheme =
         primary = virdigris,
         secondary = virdigris,
         // secondary = PurpleGrey80,
-        tertiary = virdigris
+        tertiary = virdigris,
         // tertiary = Pink80
     )
 
@@ -29,7 +29,7 @@ private val LightColorScheme =
     lightColorScheme(
         primary = Purple40,
         secondary = PurpleGrey40,
-        tertiary = Pink40
+        tertiary = Pink40,
         /* Other default colors to override
         background = Color(0xFFFFFBFE),
         surface = Color(0xFFFFFBFE),
@@ -68,14 +68,14 @@ fun WireguardAutoTunnelTheme(
             WindowCompat.setDecorFitsSystemWindows(window, false)
             window.statusBarColor = Color.Transparent.toArgb()
             window.navigationBarColor = Color.Transparent.toArgb()
-            WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars = !darkTheme
-            WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightNavigationBars = !darkTheme
+            WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars =
+                !darkTheme
         }
     }
 
     MaterialTheme(
         colorScheme = colorScheme,
         typography = Typography,
-        content = content
+        content = content,
     )
 }

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

@@ -1,22 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.theme
-
-import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.ui.graphics.Color
-import com.google.accompanist.systemuicontroller.rememberSystemUiController
-
-@Composable
-fun TransparentSystemBars() {
-    val systemUiController = rememberSystemUiController()
-    val useDarkIcons = !isSystemInDarkTheme()
-
-    DisposableEffect(systemUiController, useDarkIcons) {
-        systemUiController.setSystemBarsColor(
-            color = Color.Transparent,
-            darkIcons = useDarkIcons
-        )
-
-        onDispose {}
-    }
-}

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

@@ -15,8 +15,8 @@ val Typography =
             fontWeight = FontWeight.Normal,
             fontSize = 16.sp,
             lineHeight = 24.sp,
-            letterSpacing = 0.5.sp
-        )
+            letterSpacing = 0.5.sp,
+        ),
         /* Other default text styles to override
         titleLarge = TextStyle(
             fontFamily = FontFamily.Default,

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

@@ -1,22 +1,38 @@
 package com.zaneschepke.wireguardautotunnel.util
 
 object Constants {
+
+    const val BASE_LOG_FILE_NAME = "wgtunnel-logs"
+    const val LOG_BUFFER_SIZE = 3_000L
+
     const val MANUAL_TUNNEL_CONFIG_ID = "0"
-    const val BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT = 10 * 60 * 1000L // 10 minutes
-    const val DEFAULT_WATCHER_WAKE_LOCK_TIMEOUT = 30 * 60 * 1000L // 30 minutes
-    const val VPN_STATISTIC_CHECK_INTERVAL = 1000L
-    const val VPN_CONNECTED_NOTIFICATION_DELAY = 3000L
+    const val BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT = 10 * 60 * 1_000L // 10 minutes
+    const val VPN_STATISTIC_CHECK_INTERVAL = 1_000L
+    const val VPN_CONNECTED_NOTIFICATION_DELAY = 3_000L
     const val TOGGLE_TUNNEL_DELAY = 300L
+    const val WATCHER_COLLECTION_DELAY = 1_000L
     const val CONF_FILE_EXTENSION = ".conf"
     const val ZIP_FILE_EXTENSION = ".zip"
     const val URI_CONTENT_SCHEME = "content"
-    const val URI_PACKAGE_SCHEME = "package"
     const val ALLOWED_FILE_TYPES = "*/*"
+    const val TEXT_MIME_TYPE = "text/plain"
     const val GOOGLE_TV_EXPLORER_STUB = "com.google.android.tv.frameworkpackagestubs"
     const val ANDROID_TV_EXPLORER_STUB = "com.android.tv.frameworkpackagestubs"
+    const val ALWAYS_ON_VPN_ACTION = "android.net.VpnService"
     const val EMAIL_MIME_TYPE = "message/rfc822"
     const val SYSTEM_EXEMPT_SERVICE_TYPE_ID = 1024
 
     const val SUBSCRIPTION_TIMEOUT = 5_000L
     const val FOCUS_REQUEST_DELAY = 500L
+
+    const val BACKUP_PING_HOST = "1.1.1.1"
+    const val PING_TIMEOUT = 5_000L
+    const val VPN_RESTART_DELAY = 1_000L
+    const val PING_INTERVAL = 60_000L
+    const val PING_COOLDOWN = PING_INTERVAL * 60 //one hour
+
+    const val ALLOWED_DISPLAY_NAME_LENGTH = 20
+
+    const val TUNNEL_EXTRA_KEY = "tunnelId"
+
 }

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

@@ -12,79 +12,106 @@ sealed class Event {
             override val message: String
                 get() = WireGuardAutoTunnel.instance.getString(R.string.error_none)
         }
+
         data object SsidConflict : Error() {
             override val message: String
                 get() = WireGuardAutoTunnel.instance.getString(R.string.error_ssid_exists)
         }
+
+        data class ConfigParseError(val appendedMessage: String) : Error() {
+            override val message: String =
+                WireGuardAutoTunnel.instance.getString(R.string.config_parse_error) + (
+                    if (appendedMessage != "") ": ${appendedMessage.trim()}" else "")
+        }
+
         data object RootDenied : Error() {
             override val message: String
                 get() = WireGuardAutoTunnel.instance.getString(R.string.error_root_denied)
         }
+
         data class General(val customMessage: String) : Error() {
             override val message: String
                 get() = customMessage
         }
-        data class Exception(val exception : kotlin.Exception) : Error() {
+
+        data class Exception(val exception: kotlin.Exception) : Error() {
             override val message: String
-                get() = exception.message ?: WireGuardAutoTunnel.instance.getString(R.string.unknown_error)
+                get() =
+                    exception.message
+                        ?: WireGuardAutoTunnel.instance.getString(R.string.unknown_error)
         }
+
         data object InvalidQrCode : Error() {
             override val message: String
                 get() = WireGuardAutoTunnel.instance.getString(R.string.error_invalid_code)
         }
+
         data object InvalidFileExtension : Error() {
             override val message: String
                 get() = WireGuardAutoTunnel.instance.getString(R.string.error_file_extension)
         }
+
         data object FileReadFailed : Error() {
             override val message: String
                 get() = WireGuardAutoTunnel.instance.getString(R.string.error_file_extension)
         }
+
         data object AuthenticationFailed : Error() {
             override val message: String
                 get() = WireGuardAutoTunnel.instance.getString(R.string.error_authentication_failed)
         }
+
         data object AuthorizationFailed : Error() {
             override val message: String
                 get() = WireGuardAutoTunnel.instance.getString(R.string.error_authorization_failed)
         }
+
         data object BackgroundLocationRequired : Error() {
             override val message: String
-                get() = WireGuardAutoTunnel.instance.getString(R.string.background_location_required)
+                get() =
+                    WireGuardAutoTunnel.instance.getString(R.string.background_location_required)
         }
+
         data object LocationServicesRequired : Error() {
             override val message: String
                 get() = WireGuardAutoTunnel.instance.getString(R.string.location_services_required)
         }
+
         data object PreciseLocationRequired : Error() {
             override val message: String
                 get() = WireGuardAutoTunnel.instance.getString(R.string.precise_location_required)
         }
+
         data object FileExplorerRequired : Error() {
             override val message: String
                 get() = WireGuardAutoTunnel.instance.getString(R.string.error_no_file_explorer)
         }
     }
+
     sealed class Message : Event() {
-        data object ConfigSaved: Message() {
+        data object ConfigSaved : Message() {
             override val message: String
                 get() = WireGuardAutoTunnel.instance.getString(R.string.config_changes_saved)
         }
-        data object ConfigsExported: Message() {
+
+        data object ConfigsExported : Message() {
             override val message: String
                 get() = WireGuardAutoTunnel.instance.getString(R.string.exported_configs_message)
         }
-        data object TunnelOffAction: Message() {
+
+        data object TunnelOffAction : Message() {
             override val message: String
                 get() = WireGuardAutoTunnel.instance.getString(R.string.turn_off_tunnel)
         }
-        data object TunnelOnAction: Message() {
+
+        data object TunnelOnAction : Message() {
             override val message: String
                 get() = WireGuardAutoTunnel.instance.getString(R.string.turn_on_tunnel)
         }
-        data object AutoTunnelOffAction: Message() {
+
+        data object AutoTunnelOffAction : Message() {
             override val message: String
                 get() = WireGuardAutoTunnel.instance.getString(R.string.turn_off_auto)
         }
     }
-}
+}

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

@@ -31,29 +31,35 @@ fun BroadcastReceiver.goAsync(
     }
 }
 
+fun String.truncateWithEllipsis(allowedLength: Int): String {
+    return if (this.length > allowedLength + 3) {
+        this.substring(0, allowedLength) + "***"
+    } else this
+}
+
 fun BigDecimal.toThreeDecimalPlaceString(): String {
     val df = DecimalFormat("#.###")
     return df.format(this)
 }
 
 fun <T> List<T>.update(index: Int, item: T): List<T> = toMutableList().apply { this[index] = item }
+
 fun <T> List<T>.removeAt(index: Int): List<T> = toMutableList().apply { this.removeAt(index) }
 
 typealias TunnelConfigs = List<TunnelConfig>
+
 typealias Packages = List<PackageInfo>
 
 fun Statistics.mapPeerStats(): Map<Key, PeerStats?> {
-    return this.peers().associateWith { key ->
-        (this.peer(key))
-    }
+    return this.peers().associateWith { key -> (this.peer(key)) }
 }
 
-fun PeerStats.latestHandshakeSeconds() : Long? {
+fun PeerStats.latestHandshakeSeconds(): Long? {
     return NumberUtils.getSecondsBetweenTimestampAndNow(this.latestHandshakeEpochMillis)
 }
 
-fun PeerStats.handshakeStatus() : HandshakeStatus {
-    //TODO add never connected status after duration
+fun PeerStats.handshakeStatus(): HandshakeStatus {
+    // TODO add never connected status after duration
     return this.latestHandshakeSeconds().let {
         when {
             it == null -> HandshakeStatus.NOT_STARTED
@@ -65,4 +71,3 @@ fun PeerStats.handshakeStatus() : HandshakeStatus {
         }
     }
 }
-