fix pipeline sdk target

feat: androidtv navigation, auto-tunneling pause
Improved AndroidTV navigation to be less clunky and more streamlined Added auto-tunneling pause feature to UI to allow of quick auto tunneling pauses. App shortcuts and quick tile also override auto tunneling by engaging pause for temporary override of VPN purposes. Fixed bug where auto start on reboot was not working on older devices and AndroidTV. Fixed bug where location services is prefenting some flavors of Android from using auto-tunneling. Fixed bug where location permissions were not being detected correctly on AndroidTV versions. Fixed bug where quick tile could become out of sync. Improved notifications to show proper state of auto-tunneling and vpn. Removed excessive vibration from notifications. Improved error handling. Closes #75 Closes #73 Closes #61 Closes #53 Closes #30
2026-06-02 08:33:40 +02:00 · 2023-12-31 20:35:57 -05:00 · 2023-12-31 17:59:30 -05:00 · 2023-12-21 12:22:55 -05:00 · 2023-12-20 23:17:15 -05:00 · 2023-12-09 09:45:54 -05:00
126 changed files with 5021 additions and 3514 deletions
@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG] - Problem with app"
+labels: bug
+assignees: zaneschepke
+
+---
+
+**Describe the bug**
+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]
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots (Only if necessary)**
+
+**Additional context**
+Add any other context about the problem here.
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[FEATURE] - New feature request"
+labels: enhancement
+assignees: zaneschepke
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
@@ -0,0 +1,17 @@
+# Support
+
+If you are experiencing issues with the app, the following resources are available to help you. 
+
+<ol>
+  <li>
+    See the app docs site <a href="https://zaneschepke.com/wgtunnel-docs/overview.html">here</a> (work in progress).
+  </li>
+  <li>
+    Chat with me and our community on Discord <a href="https://discord.gg/rbRRNh6H7V">here</a>, or open an issue on GitHub <a href="https://github.com/zaneschepke/wgtunnel/issues/new/choose">here</a>.
+  </li>
+  <li>
+    Send me an email <a href="mailto:zanecschepke@gmail.com">here</a>.
+  </li>
+</ol>
+
+Thank you for using WG Tunnel.
@@ -0,0 +1,87 @@
+# name of the workflow
+name: Android CI Tag Deployment
+
+on:
+  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 }}
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        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: 'android_keystore.jks'
+          fileDir: ${{ github.workspace }}/app/keystore/
+          encodedString: ${{ secrets.KEYSTORE }}
+
+      - 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
+
+      # 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
+        with:
+          name: wgtunnel
+          path: ${{ steps.apk-path.outputs.path }}
+      - name: Download APK from build
+        uses: actions/download-artifact@v1
+        with:
+          name: wgtunnel
+      - name: Create Release with Fastlane changelog notes
+        id: create_release
+        uses: softprops/action-gh-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          # fix hardcode changelog file name
+          body_path: ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/33100.txt
+          tag_name: ${{ github.ref_name }}
+          name: Release ${{ 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 Beta track 🚀
+        run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane beta)
+
@@ -69,3 +69,5 @@ lint/tmp/
 # App Specific cases
 app/release/output.json
 .idea/codeStyles/
+# where we keep our signing secrets locally
+app/signing.properties
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "fastlane"
@@ -47,18 +47,19 @@ This is an alternative Android Application for [WireGuard](https://www.wireguard

 ## Inspiration

-The inspiration for this app came from the inconvenience of constantly having to turn VPN off and on while on different networks. With there being no free solution to this problem, this app was created to meet that need.
+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
+* Add tunnels via .conf file, zip, manual entry, or QR code
 * Auto connect to VPN based on Wi-Fi SSID
 * Split tunneling by application with search
 * Always-on VPN for Android support
-* Quick tile support for vpn toggling
-* Dynamic shortcuts support for automation integration
-* Configurable Trusted Network list 
-* Optional auto connect on mobile data
+* 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

@@ -68,7 +69,7 @@ The inspiration for this app came from the inconvenience of constantly having to
 ```
 $ git clone https://github.com/zaneschepke/wgtunnel
 $ cd wgtunnel
-$ ./gradlew assembleRelease
+$ ./gradlew assembleDebug
 ```

 </span>
@@ -1,3 +1,5 @@
+import java.util.Properties
+
 plugins {
    alias(libs.plugins.android.application)
    alias(libs.plugins.kotlin.android)
@@ -7,20 +9,24 @@ plugins {
 }

 android {
-    namespace = "com.zaneschepke.wireguardautotunnel"
-    compileSdk = 34
+    namespace = Constants.APP_ID
+    compileSdk = Constants.TARGET_SDK

    defaultConfig {
-        applicationId = "com.zaneschepke.wireguardautotunnel"
-        minSdk = 26
-        targetSdk = 34
-        versionCode = 32000
-        versionName = "3.2.0"
+        applicationId = Constants.APP_ID
+        minSdk = Constants.MIN_SDK
+        targetSdk = Constants.TARGET_SDK
+        versionCode = Constants.VERSION_CODE
+        versionName = Constants.VERSION_NAME

        ksp {
            arg("room.schemaLocation", "$projectDir/schemas")
        }

+        sourceSets {
+            getByName("debug").assets.srcDirs(files("$projectDir/schemas")) // Room
+        }
+
        resourceConfigurations.addAll(listOf("en"))

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -29,7 +35,56 @@ android {
        }
    }

+    signingConfigs {
+        create(Constants.RELEASE) {
+            val properties =
+                Properties().apply {
+                    // created local file for signing details
+                    try {
+                        load(file("signing.properties").reader())
+                    } catch (_: Exception) {
+                        load(file("signing_template.properties").reader())
+                    }
+                }
+
+            // try to get secrets from env first for pipeline build, then properties file for local build
+            storeFile = file(
+                System.getenv().getOrDefault(
+                    Constants.KEY_STORE_PATH_VAR,
+                    properties.getProperty(Constants.KEY_STORE_PATH_VAR)
+                )
+            )
+            storePassword = System.getenv().getOrDefault(
+                Constants.STORE_PASS_VAR,
+                properties.getProperty(Constants.STORE_PASS_VAR)
+            )
+            keyAlias = System.getenv().getOrDefault(
+                Constants.KEY_ALIAS_VAR,
+                properties.getProperty(Constants.KEY_ALIAS_VAR)
+            )
+            keyPassword = System.getenv().getOrDefault(
+                Constants.KEY_PASS_VAR,
+                properties.getProperty(Constants.KEY_PASS_VAR)
+            )
+        }
+    }
+
    buildTypes {
+        // don't strip
+        packaging.jniLibs.keepDebugSymbols.addAll(
+            listOf("libwg-go.so", "libwg-quick.so", "libwg.so")
+        )
+
+        applicationVariants.all {
+            val variant = this
+            variant.outputs
+                .map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
+                .forEach { output ->
+                    val outputFileName =
+                        "${Constants.APP_NAME}-${variant.flavorName}-${variant.buildType.name}-${variant.versionName}.apk"
+                    output.outputFileName = outputFileName
+                }
+        }
        release {
            isDebuggable = false
            isMinifyEnabled = true
@@ -38,21 +93,21 @@ android {
                getDefaultProguardFile("proguard-android-optimize.txt"),
                "proguard-rules.pro"
            )
+            signingConfig = signingConfigs.getByName(Constants.RELEASE)
        }
        debug {
            isDebuggable = true
        }
    }
-    flavorDimensions.add("type")
+    flavorDimensions.add(Constants.TYPE)
    productFlavors {
        create("fdroid") {
-            dimension = "type"
+            dimension = Constants.TYPE
            proguardFile("fdroid-rules.pro")
        }
        create("general") {
-            dimension = "type"
-            if (BuildHelper.isReleaseBuild(gradle) && BuildHelper.isGeneralFlavor(gradle))
-            {
+            dimension = Constants.TYPE
+            if (BuildHelper.isReleaseBuild(gradle) && BuildHelper.isGeneralFlavor(gradle)) {
                apply(plugin = "com.google.gms.google-services")
                apply(plugin = "com.google.firebase.crashlytics")
            }
@@ -61,14 +116,14 @@ android {
    compileOptions {
        sourceCompatibility = JavaVersion.VERSION_17
        targetCompatibility = JavaVersion.VERSION_17
+        isCoreLibraryDesugaringEnabled = true
    }
    kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = Constants.JVM_TARGET
    }
    buildFeatures {
        compose = true
        buildConfig = true
-
    }
    composeOptions {
        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
@@ -94,19 +149,22 @@ dependencies {
    implementation(libs.androidx.material3)
    implementation(libs.androidx.appcompat)

-    //test
+    // test
    testImplementation(libs.junit)
+    testImplementation(libs.androidx.junit)
    androidTestImplementation(libs.androidx.junit)
    androidTestImplementation(libs.androidx.espresso.core)
    androidTestImplementation(platform(libs.androidx.compose.bom))
    androidTestImplementation(libs.androidx.compose.ui.test)
+    androidTestImplementation(libs.androidx.room.testing)
    debugImplementation(libs.androidx.compose.ui.tooling)
    debugImplementation(libs.androidx.compose.manifest)

-    //wg
+    // wg
    implementation(libs.tunnel)
+    coreLibraryDesugaring(libs.desugar.jdk.libs)

-    //logging
+    // logging
    implementation(libs.timber)

    // compose navigation
@@ -117,42 +175,41 @@ dependencies {
    implementation(libs.hilt.android)
    ksp(libs.hilt.android.compiler)

-    //accompanist
+    // accompanist
    implementation(libs.accompanist.systemuicontroller)
    implementation(libs.accompanist.permissions)
    implementation(libs.accompanist.flowlayout)
-    implementation(libs.accompanist.navigation.animation)
    implementation(libs.accompanist.drawablepainter)

-    //room
+    // storage
    implementation(libs.androidx.room.runtime)
    ksp(libs.androidx.room.compiler)
    implementation(libs.androidx.room.ktx)
+    implementation(libs.androidx.datastore.preferences)

-    //lifecycle
+    // lifecycle
    implementation(libs.lifecycle.runtime.compose)
    implementation(libs.androidx.lifecycle.runtime.ktx)
    implementation(libs.androidx.lifecycle.process)

-
-    //icons
+    // icons
    implementation(libs.material.icons.extended)
-    //serialization
+    // serialization
    implementation(libs.kotlinx.serialization.json)

-    //firebase crashlytics
+    // firebase crashlytics
    generalImplementation(platform(libs.firebase.bom))
    generalImplementation(libs.google.firebase.crashlytics.ktx)
    generalImplementation(libs.google.firebase.analytics.ktx)

-    //barcode scanning
+    // barcode scanning
    implementation(libs.zxing.android.embedded)
    implementation(libs.zxing.core)

-    //bio
+    // bio
    implementation(libs.androidx.biometric.ktx)

-    //shortcuts
+    // shortcuts
    implementation(libs.androidx.core)
    implementation(libs.androidx.core.google.shortcuts)
-}
+}
@@ -1 +1,5 @@
-dontwarn com.google.errorprone.annotations.**
+-dontwarn com.google.errorprone.annotations.**
+
+-keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
+    <fields>;
+}
@@ -19,3 +19,8 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+-keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
+    <fields>;
+}
+
+
@@ -0,0 +1,133 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 3,
+    "identityHash": "6b30daba29bb95f8ddc4d26206329d4f",
+    "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)",
+        "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"
+          }
+        ],
+        "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, '6b30daba29bb95f8ddc4d26206329d4f')"
+    ]
+  }
+}
@@ -0,0 +1,154 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 4,
+    "identityHash": "aee55639422df8dadfe74c3bad204477",
+    "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)",
+        "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"
+          }
+        ],
+        "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, 'aee55639422df8dadfe74c3bad204477')"
+    ]
+  }
+}
@@ -0,0 +1,161 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 5,
+    "identityHash": "bc15003a44746e18b9c260ec49737089",
+    "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)",
+        "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"
+          }
+        ],
+        "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, 'bc15003a44746e18b9c260ec49737089')"
+    ]
+  }
+}
@@ -0,0 +1,4 @@
+SIGNING_STORE_PASSWORD=
+SIGNING_KEY_ALIAS=
+SIGNING_KEY_PASSWORD=
+KEY_STORE_PATH=/
@@ -19,4 +19,4 @@ class ExampleInstrumentedTest {
        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
        assertEquals("com.zaneschepke.wireguardautotunnel", appContext.packageName)
    }
-}
+}
@@ -0,0 +1,69 @@
+package com.zaneschepke.wireguardautotunnel
+
+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 org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.io.IOException
+
+@RunWith(AndroidJUnit4::class)
+class MigrationTest {
+    private val dbName = "migration-test"
+
+    @get:Rule
+    val helper: MigrationTestHelper = MigrationTestHelper(
+        InstrumentationRegistry.getInstrumentation(),
+        AppDatabase::class.java
+    )
+
+    @Test
+    @Throws(IOException::class)
+    fun migrate4To5() {
+        helper.createDatabase(dbName, 4).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(
+                "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')"
+            )
+            // Prepare for the next version.
+            close()
+        }
+
+        // Re-open the database with version 2 and provide
+        // MIGRATION_1_2 as the migration process.
+        helper.runMigrationsAndValidate(dbName, 5, true)
+        // MigrationTestHelper automatically verifies the schema changes,
+        // but you need to validate that the data was migrated properly.
+    }
+}
@@ -17,8 +17,11 @@
    <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.FOREGROUND_SERVICE_LOCATION"/>
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_REMOTE_MESSAGING"/>
+    <!--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"/>
+
    <!--foreground service permissions-->
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
    <uses-permission android:name="android.permission.WAKE_LOCK" />
@@ -42,6 +45,7 @@
    </queries>
    <application
        android:allowBackup="true"
+        android:enableOnBackInvokedCallback="true"
        android:name=".WireGuardAutoTunnel"
        android:dataExtractionRules="@xml/data_extraction_rules"
        android:fullBackupContent="@xml/backup_rules"
@@ -51,7 +55,7 @@
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
        android:theme="@style/Theme.WireguardAutoTunnel"
-        tools:targetApi="31">
+        tools:targetApi="tiramisu">
        <activity
            android:name=".ui.MainActivity"
            android:exported="true"
@@ -80,7 +84,8 @@
        <service
            android:name=".service.foreground.ForegroundService"
            android:enabled="true"
-            android:foregroundServiceType="remoteMessaging"
+            android:foregroundServiceType="systemExempted|specialUse"
+            tools:node="merge"
            android:exported="false">
        </service>
        <service
@@ -102,7 +107,8 @@
            android:permission="android.permission.BIND_VPN_SERVICE"
            android:enabled="true"
            android:persistent="true"
-            android:foregroundServiceType="remoteMessaging"
+            android:foregroundServiceType="systemExempted|specialUse"
+            tools:node="merge"
            android:exported="false">
            <intent-filter>
                <action android:name="android.net.VpnService"/>
@@ -115,14 +121,18 @@
            android:enabled="true"
            android:stopWithTask="false"
            android:persistent="true"
-            android:foregroundServiceType="location"
-            android:permission=""
+            android:foregroundServiceType="systemExempted|specialUse"
+            tools:node="merge"
            android:exported="false">
        </service>
        <receiver android:enabled="true" android:name=".receiver.BootReceiver"
-            android:exported="true">
+            android:exported="false">
            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <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"/>
@@ -1,19 +0,0 @@
-package com.zaneschepke.wireguardautotunnel
-
-object Constants {
-    const val MANUAL_TUNNEL_CONFIG_ID = "0"
-    const val WATCHER_SERVICE_WAKE_LOCK_TIMEOUT = 10*60*1000L /*10 minute*/
-    const val VPN_CONNECTIVITY_CHECK_INTERVAL = 3000L
-    const val VPN_STATISTIC_CHECK_INTERVAL = 10000L
-    const val TOGGLE_TUNNEL_DELAY = 500L
-    const val FADE_IN_ANIMATION_DURATION = 1000
-    const val SLIDE_IN_ANIMATION_DURATION = 500
-    const val SLIDE_IN_TRANSITION_OFFSET = 1000
-    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 GOOGLE_TV_EXPLORER_STUB = "com.google.android.tv.frameworkpackagestubs"
-    const val ANDROID_TV_EXPLORER_STUB = "com.android.tv.frameworkpackagestubs"
-}
@@ -1,24 +0,0 @@
-package com.zaneschepke.wireguardautotunnel
-
-import android.content.BroadcastReceiver
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import kotlin.coroutines.CoroutineContext
-import kotlin.coroutines.EmptyCoroutineContext
-
-fun BroadcastReceiver.goAsync(
-    context: CoroutineContext = EmptyCoroutineContext,
-    block: suspend CoroutineScope.() -> Unit
-) {
-    val pendingResult = goAsync()
-    @OptIn(DelicateCoroutinesApi::class) // Must run globally; there's no teardown callback.
-    GlobalScope.launch(context) {
-        try {
-            block()
-        } finally {
-            pendingResult.finish()
-        }
-    }
-}
@@ -1,46 +1,64 @@
 package com.zaneschepke.wireguardautotunnel

 import android.app.Application
-import android.content.Context
+import android.content.ComponentName
 import android.content.pm.PackageManager
+import android.service.quicksettings.TileService
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
-import com.zaneschepke.wireguardautotunnel.repository.model.Settings
+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.TunnelControlTile
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.launch
 import timber.log.Timber
+import java.io.IOException
 import javax.inject.Inject

@HiltAndroidApp
 class WireGuardAutoTunnel : Application() {
+    @Inject
+    lateinit var settingsRepository: SettingsRepository

    @Inject
-    lateinit var settingsRepo : SettingsDoa
+    lateinit var dataStoreManager: DataStoreManager

    override fun onCreate() {
        super.onCreate()
-        if(BuildConfig.DEBUG) {
-            Timber.plant(Timber.DebugTree())
-        }
+        instance = this
+        if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree())
        initSettings()
-    }
-
-    private fun initSettings() {
        with(ProcessLifecycleOwner.get()) {
            lifecycleScope.launch {
-                if(settingsRepo.getAll().isEmpty()) {
-                    settingsRepo.save(Settings())
+                try {
+                    // load preferences into memory
+                    dataStoreManager.init()
+                    requestTileServiceStateUpdate()
+                } catch (e: IOException) {
+                    Timber.e("Failed to load preferences")
                }
            }
        }
    }

-
-
-    companion object {
-        fun isRunningOnAndroidTv(context : Context) : Boolean {
-            return context.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
+    private fun initSettings() {
+        with(ProcessLifecycleOwner.get()) {
+            lifecycleScope.launch {
+                if (settingsRepository.getAll().isEmpty()) {
+                    settingsRepository.save(Settings())
+                }
+            }
        }
    }
-}
+
+    companion object {
+        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))
+        }
+    }
+}
@@ -0,0 +1,29 @@
+package com.zaneschepke.wireguardautotunnel.data
+
+import androidx.room.AutoMigration
+import androidx.room.Database
+import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
+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(
+            from = 3,
+            to = 4
+        ),AutoMigration(
+            from = 4,
+            to = 5
+        )
+    ],
+    exportSchema = true
+)
+@TypeConverters(DatabaseListConverters::class)
+abstract class AppDatabase : RoomDatabase() {
+    abstract fun settingDao(): SettingsDao
+
+    abstract fun tunnelConfigDoa(): TunnelConfigDao
+}
@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.repository
+package com.zaneschepke.wireguardautotunnel.data

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

 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import com.zaneschepke.wireguardautotunnel.repository.model.Settings
+import com.zaneschepke.wireguardautotunnel.data.model.Settings
 import kotlinx.coroutines.flow.Flow

@Dao
-interface SettingsDoa {
-
+interface SettingsDao {
    @Insert(onConflict = OnConflictStrategy.REPLACE)
    suspend fun save(t: Settings)

@@ -23,6 +22,9 @@ interface SettingsDoa {
    @Query("SELECT * FROM settings")
    suspend fun getAll(): List<Settings>

+    @Query("SELECT * FROM settings LIMIT 1")
+    fun getSettingsFlow(): Flow<Settings>
+
    @Query("SELECT * FROM settings")
    fun getAllFlow(): Flow<MutableList<Settings>>

@@ -31,4 +33,4 @@ interface SettingsDoa {

    @Query("SELECT COUNT('id') FROM settings")
    suspend fun count(): Long
-}
+}
@@ -1,16 +1,15 @@
-package com.zaneschepke.wireguardautotunnel.repository
+package com.zaneschepke.wireguardautotunnel.data

 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import com.zaneschepke.wireguardautotunnel.repository.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 import kotlinx.coroutines.flow.Flow

@Dao
-interface TunnelConfigDao{
-
+interface TunnelConfigDao {
    @Insert(onConflict = OnConflictStrategy.REPLACE)
    suspend fun save(t: TunnelConfig)

@@ -31,4 +30,4 @@ interface TunnelConfigDao{

    @Query("SELECT * FROM tunnelconfig")
    fun getAllFlow(): Flow<MutableList<TunnelConfig>>
-}
+}
@@ -0,0 +1,39 @@
+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.preferencesDataStore
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+
+class DataStoreManager(private val context: Context) {
+    companion object {
+        val LOCATION_DISCLOSURE_SHOWN = booleanPreferencesKey("LOCATION_DISCLOSURE_SHOWN")
+    }
+
+    // preferences
+    private val preferencesKey = "preferences"
+    private val Context.dataStore by preferencesDataStore(
+        name = preferencesKey
+    )
+
+    suspend fun init() {
+        context.dataStore.data.first()
+    }
+
+    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> 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]
+    }
+}
@@ -0,0 +1,53 @@
+package com.zaneschepke.wireguardautotunnel.data.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+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_shortcuts_enabled",
+        defaultValue = "false"
+    ) var isShortcutsEnabled: Boolean = false,
+    @ColumnInfo(
+        name = "is_battery_saver_enabled",
+        defaultValue = "false"
+    ) var isBatterySaverEnabled: Boolean = false,
+    @ColumnInfo(
+        name = "is_tunnel_on_wifi_enabled",
+        defaultValue = "false"
+    ) var isTunnelOnWifiEnabled: Boolean = false,
+    @ColumnInfo(
+        name = "is_kernel_enabled",
+        defaultValue = "false"
+    ) var isKernelEnabled: Boolean = false,
+    @ColumnInfo(
+    name = "is_restore_on_boot_enabled",
+    defaultValue = "false"
+    ) var isRestoreOnBootEnabled: Boolean = false,
+    @ColumnInfo(
+    name = "is_multi_tunnel_enabled",
+    defaultValue = "false"
+    ) var 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
+        }
+    }
+}
@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.repository.model
+package com.zaneschepke.wireguardautotunnel.data.model

 import androidx.room.ColumnInfo
 import androidx.room.Entity
@@ -12,24 +12,23 @@ 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,
-){
-
+    @PrimaryKey(autoGenerate = true) val id: Int = 0,
+    @ColumnInfo(name = "name") var name: String,
+    @ColumnInfo(name = "wg_quick") var wgQuick: String
+) {
    override fun toString(): String {
        return Json.encodeToString(serializer(), this)
    }

    companion object {
-
-        fun from(string : String) : TunnelConfig {
+        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)
            return Config.parse(reader)
        }
    }
-}
+}
@@ -0,0 +1,12 @@
+package com.zaneschepke.wireguardautotunnel.data.repository
+
+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 getSettings() : Settings
+    suspend fun getAll() : List<Settings>
+}
@@ -0,0 +1,24 @@
+package com.zaneschepke.wireguardautotunnel.data.repository
+
+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 {
+
+    override suspend fun save(settings: Settings) {
+        settingsDoa.save(settings)
+    }
+
+    override fun getSettingsFlow(): Flow<Settings> {
+        return settingsDoa.getSettingsFlow()
+    }
+
+    override suspend fun getSettings(): Settings {
+        return settingsDoa.getAll().firstOrNull() ?: Settings()
+    }
+
+    override suspend fun getAll(): List<Settings> {
+        return settingsDoa.getAll()
+    }
+}
@@ -0,0 +1,14 @@
+package com.zaneschepke.wireguardautotunnel.data.repository
+
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.util.TunnelConfigs
+import kotlinx.coroutines.flow.Flow
+
+interface TunnelConfigRepository {
+
+    fun getTunnelConfigsFlow() : Flow<TunnelConfigs>
+    suspend fun getAll() : TunnelConfigs
+    suspend fun save(tunnelConfig: TunnelConfig)
+    suspend fun delete(tunnelConfig: TunnelConfig)
+    suspend fun count() : Int
+}
@@ -0,0 +1,28 @@
+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()
+    }
+}
@@ -3,7 +3,7 @@ package com.zaneschepke.wireguardautotunnel.module
 import android.content.Context
 import androidx.room.Room
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.repository.AppDatabase
+import com.zaneschepke.wireguardautotunnel.data.AppDatabase
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -16,11 +16,15 @@ 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))
+            AppDatabase::class.java,
+            context.getString(R.string.db_name)
+        )
            .fallbackToDestructiveMigration()
            .build()
    }
-}
+}
@@ -0,0 +1,7 @@
+package com.zaneschepke.wireguardautotunnel.module
+
+import javax.inject.Qualifier
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class Kernel
@@ -1,27 +1,51 @@
 package com.zaneschepke.wireguardautotunnel.module

-import com.zaneschepke.wireguardautotunnel.repository.AppDatabase
-import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
-import com.zaneschepke.wireguardautotunnel.repository.TunnelConfigDao
+import android.content.Context
+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.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
+import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton

@Module
@InstallIn(SingletonComponent::class)
 class RepositoryModule {
-
    @Singleton
    @Provides
-    fun provideSettingsRepository(appDatabase: AppDatabase) : SettingsDoa {
+    fun provideSettingsDoa(appDatabase: AppDatabase): SettingsDao {
        return appDatabase.settingDao()
    }

    @Singleton
    @Provides
-    fun provideTunnelConfigRepository(appDatabase: AppDatabase) : TunnelConfigDao {
+    fun provideTunnelConfigDoa(appDatabase: AppDatabase): TunnelConfigDao {
        return appDatabase.tunnelConfigDoa()
    }
-}
+
+    @Singleton
+    @Provides
+    fun provideTunnelConfigRepository(tunnelConfigDao: TunnelConfigDao): TunnelConfigRepository {
+        return TunnelConfigRepositoryImpl(tunnelConfigDao)
+    }
+
+    @Singleton
+    @Provides
+    fun provideSettingsRepository(settingsDao: SettingsDao): SettingsRepository {
+        return SettingsRepositoryImpl(settingsDao)
+    }
+
+    @Singleton
+    @Provides
+    fun providePreferencesDataStore(@ApplicationContext context: Context): DataStoreManager {
+        return DataStoreManager(context)
+    }
+}
@@ -15,20 +15,19 @@ import dagger.hilt.android.scopes.ServiceScoped
@Module
@InstallIn(ServiceComponent::class)
 abstract class ServiceModule {
+    @Binds
+    @ServiceScoped
+    abstract fun provideNotificationService(wireGuardNotification: WireGuardNotification): NotificationService

    @Binds
    @ServiceScoped
-    abstract fun provideNotificationService(wireGuardNotification: WireGuardNotification) : NotificationService
+    abstract fun provideWifiService(wifiService: WifiService): NetworkService<WifiService>

    @Binds
    @ServiceScoped
-    abstract fun provideWifiService(wifiService: WifiService) : NetworkService<WifiService>
+    abstract fun provideMobileDataService(mobileDataService: MobileDataService): NetworkService<MobileDataService>

    @Binds
    @ServiceScoped
-    abstract fun provideMobileDataService(mobileDataService : MobileDataService) : NetworkService<MobileDataService>
-
-    @Binds
-    @ServiceScoped
-    abstract fun provideEthernetService(ethernetService: EthernetService) : NetworkService<EthernetService>
-}
+    abstract fun provideEthernetService(ethernetService: EthernetService): NetworkService<EthernetService>
+}
@@ -3,6 +3,10 @@ package com.zaneschepke.wireguardautotunnel.module
 import android.content.Context
 import com.wireguard.android.backend.Backend
 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.service.tunnel.VpnService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.WireGuardTunnel
 import dagger.Module
@@ -15,16 +19,40 @@ import javax.inject.Singleton
@Module
@InstallIn(SingletonComponent::class)
 class TunnelModule {
+    @Provides
+    @Singleton
+    fun provideRootShell(
+        @ApplicationContext context: Context
+    ): RootShell {
+        return RootShell(context)
+    }

    @Provides
    @Singleton
-    fun provideBackend(@ApplicationContext context : Context) : Backend {
+    @Userspace
+    fun provideUserspaceBackend(
+        @ApplicationContext context: Context
+    ): Backend {
        return GoBackend(context)
    }

    @Provides
    @Singleton
-    fun provideVpnService(backend: Backend) : VpnService {
-        return WireGuardTunnel(backend)
+    @Kernel
+    fun provideKernelBackend(
+        @ApplicationContext context: Context,
+        rootShell: RootShell
+    ): Backend {
+        return WgQuickBackend(context, rootShell, ToolsInstaller(context, rootShell))
    }
-}
+
+    @Provides
+    @Singleton
+    fun provideVpnService(
+        @Userspace userspaceBackend: Backend,
+        @Kernel kernelBackend: Backend,
+        settingsRepository : SettingsRepository
+    ): VpnService {
+        return WireGuardTunnel(userspaceBackend, kernelBackend, settingsRepository)
+    }
+}
@@ -0,0 +1,7 @@
+package com.zaneschepke.wireguardautotunnel.module
+
+import javax.inject.Qualifier
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class Userspace
@@ -3,32 +3,23 @@ package com.zaneschepke.wireguardautotunnel.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.goAsync
-import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
+import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
+import com.zaneschepke.wireguardautotunnel.util.goAsync
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.cancel
 import javax.inject.Inject

+
@AndroidEntryPoint
 class BootReceiver : BroadcastReceiver() {

    @Inject
-    lateinit var settingsRepo : SettingsDoa
-
-    override fun onReceive(context: Context, intent: Intent) = goAsync {
-        if (intent.action == Intent.ACTION_BOOT_COMPLETED) {
-            try {
-                val settings = settingsRepo.getAll()
-                if (settings.isNotEmpty()) {
-                    val setting = settings.first()
-                    if (setting.isAutoTunnelEnabled && setting.defaultTunnel != null) {
-                        ServiceManager.startWatcherService(context, setting.defaultTunnel!!)
-                    }
-                }
-            } finally {
-                cancel()
-            }
+    lateinit var settingsRepository: SettingsRepository
+    override fun onReceive(context: Context?, intent: Intent?) = goAsync {
+        if (Intent.ACTION_BOOT_COMPLETED != intent?.action) return@goAsync
+        if(settingsRepository.getSettings().isAutoTunnelEnabled) {
+            ServiceManager.startWatcherServiceForeground(context!!)
        }
    }
-}
+
+}
@@ -3,10 +3,10 @@ package com.zaneschepke.wireguardautotunnel.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.Constants
-import com.zaneschepke.wireguardautotunnel.goAsync
-import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
+import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.goAsync
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
@@ -14,22 +14,22 @@ import javax.inject.Inject

@AndroidEntryPoint
 class NotificationActionReceiver : BroadcastReceiver() {
-
    @Inject
-    lateinit var settingsRepo : SettingsDoa
-    override fun onReceive(context: Context, intent: Intent?) = goAsync {
+    lateinit var settingsRepository: SettingsRepository
+
+    override fun onReceive(
+        context: Context,
+        intent: Intent?
+    ) = goAsync {
        try {
-            val settings = settingsRepo.getAll()
-            if (settings.isNotEmpty()) {
-                val setting = settings.first()
-                if (setting.defaultTunnel != null) {
-                    ServiceManager.stopVpnService(context)
-                    delay(Constants.TOGGLE_TUNNEL_DELAY)
-                    ServiceManager.startVpnService(context, setting.defaultTunnel.toString())
-                }
+            val settings = settingsRepository.getSettings()
+            if (settings.defaultTunnel != null) {
+                ServiceManager.stopVpnService(context)
+                delay(Constants.TOGGLE_TUNNEL_DELAY)
+                ServiceManager.startVpnService(context, settings.defaultTunnel.toString())
            }
        } finally {
            cancel()
        }
    }
-}
+}
@@ -1,17 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.repository
-
-import androidx.room.AutoMigration
-import androidx.room.Database
-import androidx.room.RoomDatabase
-import androidx.room.TypeConverters
-import com.zaneschepke.wireguardautotunnel.repository.model.Settings
-import com.zaneschepke.wireguardautotunnel.repository.model.TunnelConfig
-
-@Database(entities = [Settings::class, TunnelConfig::class], version = 2, autoMigrations = [
-    AutoMigration(from = 1, to = 2)
-], exportSchema = true)
-@TypeConverters(DatabaseListConverters::class)
-abstract class AppDatabase : RoomDatabase() {
-    abstract fun settingDao(): SettingsDoa
-    abstract fun tunnelConfigDoa() : TunnelConfigDao
-}
@@ -1,27 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.repository.model
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-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_shortcuts_enabled", defaultValue = "false") var isShortcutsEnabled : Boolean = false,
-    @ColumnInfo(name = "is_battery_saver_enabled", defaultValue = "false") var isBatterySaverEnabled : Boolean = false,
-) {
-    fun isTunnelConfigDefault(tunnelConfig: TunnelConfig) : Boolean {
-        return if (defaultTunnel != null) {
-            val defaultConfig = TunnelConfig.from(defaultTunnel!!)
-            (tunnelConfig.id == defaultConfig.id)
-        } else {
-            false
-        }
-    }
-}
@@ -4,4 +4,4 @@ enum class Action {
    START,
    START_FOREGROUND,
    STOP
-}
+}
@@ -6,9 +6,7 @@ import android.os.IBinder
 import androidx.lifecycle.LifecycleService
 import timber.log.Timber

-
 open class ForegroundService : LifecycleService() {
-
    private var isServiceStarted = false

    override fun onBind(intent: Intent): IBinder? {
@@ -17,7 +15,11 @@ 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) {
@@ -41,19 +43,18 @@ open class ForegroundService : LifecycleService() {
        return START_STICKY
    }

-
    override fun onDestroy() {
        super.onDestroy()
        Timber.d("The service has been destroyed")
    }

-    protected open fun startService(extras : Bundle?) {
+    protected open fun startService(extras: Bundle?) {
        if (isServiceStarted) return
        Timber.d("Starting ${this.javaClass.simpleName}")
        isServiceStarted = true
    }

-    protected open fun stopService(extras : Bundle?) {
+    protected open fun stopService(extras: Bundle?) {
        Timber.d("Stopping ${this.javaClass.simpleName}")
        try {
            stopForeground(STOP_FOREGROUND_REMOVE)
@@ -63,4 +64,4 @@ open class ForegroundService : LifecycleService() {
        }
        isServiceStarted = false
    }
-}
+}
@@ -16,44 +16,60 @@ object ServiceManager {
            .getRunningServices(Integer.MAX_VALUE)
            .any { it.service.className == service.name }

-    fun <T : Service> getServiceState(context: Context, cls : Class<T>): ServiceState {
+    fun <T : Service> getServiceState(
+        context: Context,
+        cls: Class<T>
+    ): ServiceState {
        val isServiceRunning = context.isServiceRunning(cls)
-        return if(isServiceRunning) ServiceState.STARTED else ServiceState.STOPPED
+        return if (isServiceRunning) ServiceState.STARTED else ServiceState.STOPPED
    }

-    private fun <T : Service> actionOnService(action: Action, context: Context, cls : Class<T>, extras : Map<String,String>? = null) {
+    private fun <T : Service> actionOnService(
+        action: Action,
+        context: Context,
+        cls: Class<T>,
+        extras: Map<String, String>? = 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)
+        val intent =
+            Intent(context, cls).also {
+                it.action = action.name
+                extras?.forEach { (k, v) ->
+                    it.putExtra(k, v)
+                }
            }
-        }
        intent.component?.javaClass
        try {
-            when(action) {
+            when (action) {
                Action.START_FOREGROUND -> {
                    context.startForegroundService(intent)
                }
+
                Action.START -> {
                    context.startService(intent)
                }
+
                Action.STOP -> context.startService(intent)
            }
-        } catch (e : Exception) {
+        } catch (e: Exception) {
            Timber.e(e.message)
        }
    }

-    fun startVpnService(context : Context, tunnelConfig : String) {
+    fun startVpnService(
+        context: Context,
+        tunnelConfig: String
+    ) {
        actionOnService(
            Action.START,
            context,
            WireGuardTunnelService::class.java,
-            mapOf(context.getString(R.string.tunnel_extras_key) to tunnelConfig))
+            mapOf(context.getString(R.string.tunnel_extras_key) to tunnelConfig)
+        )
    }
-    fun stopVpnService(context : Context) {
+
+    fun stopVpnService(context: Context) {
        actionOnService(
            Action.STOP,
            context,
@@ -61,41 +77,43 @@ object ServiceManager {
        )
    }

-    fun startVpnServiceForeground(context : Context, tunnelConfig : String) {
+    fun startVpnServiceForeground(
+        context: Context,
+        tunnelConfig: String
+    ) {
        actionOnService(
            Action.START_FOREGROUND,
            context,
            WireGuardTunnelService::class.java,
-            mapOf(context.getString(R.string.tunnel_extras_key) to tunnelConfig))
+            mapOf(context.getString(R.string.tunnel_extras_key) to tunnelConfig)
+        )
    }

-    private fun startWatcherServiceForeground(context : Context, tunnelConfig : String) {
+    fun startWatcherServiceForeground(
+        context: Context,
+    ) {
        actionOnService(
-            Action.START, context,
-            WireGuardConnectivityWatcherService::class.java, mapOf(context.
-            getString(R.string.tunnel_extras_key) to
-                    tunnelConfig))
+            Action.START_FOREGROUND,
+            context,
+            WireGuardConnectivityWatcherService::class.java
+        )
    }

-    fun startWatcherService(context : Context, tunnelConfig : String) {
+    fun startWatcherService(
+        context: Context
+    ) {
        actionOnService(
-            Action.START, context,
-            WireGuardConnectivityWatcherService::class.java, mapOf(context.
-            getString(R.string.tunnel_extras_key) to
-                    tunnelConfig))
+            Action.START,
+            context,
+            WireGuardConnectivityWatcherService::class.java
+        )
    }

-    fun stopWatcherService(context : Context) {
+    fun stopWatcherService(context: Context) {
        actionOnService(
-            Action.STOP, context,
-            WireGuardConnectivityWatcherService::class.java)
+            Action.STOP,
+            context,
+            WireGuardConnectivityWatcherService::class.java
+        )
    }
-
-    fun toggleWatcherServiceForeground(context: Context, tunnelConfig : String) {
-        when(getServiceState( context,
-            WireGuardConnectivityWatcherService::class.java,)) {
-            ServiceState.STARTED -> stopWatcherService(context)
-            ServiceState.STOPPED -> startWatcherServiceForeground(context, tunnelConfig)
-        }
-    }
-}
+}
@@ -3,4 +3,4 @@ package com.zaneschepke.wireguardautotunnel.service.foreground
 enum class ServiceState {
    STARTED,
    STOPPED,
-}
+}
@@ -7,12 +7,12 @@ 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.Constants
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
-import com.zaneschepke.wireguardautotunnel.repository.model.Settings
+import com.zaneschepke.wireguardautotunnel.data.model.Settings
+import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
 import com.zaneschepke.wireguardautotunnel.service.network.EthernetService
 import com.zaneschepke.wireguardautotunnel.service.network.MobileDataService
 import com.zaneschepke.wireguardautotunnel.service.network.NetworkService
@@ -20,10 +20,13 @@ import com.zaneschepke.wireguardautotunnel.service.network.NetworkStatus
 import com.zaneschepke.wireguardautotunnel.service.network.WifiService
 import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
+import com.zaneschepke.wireguardautotunnel.util.Constants
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 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
@@ -31,245 +34,334 @@ 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 settingsRepo: SettingsDoa
+  @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()
+  )

-    private var isWifiConnected = false
-    private var isEthernetConnected = false
-    private var isMobileDataConnected = false
-    private var currentNetworkSSID = ""
+  private lateinit var watcherJob: Job

-    private lateinit var watcherJob: Job
-    private lateinit var setting: Settings
-    private lateinit var tunnelConfig: String
+  private var wakeLock: PowerManager.WakeLock? = null
+  private val tag = this.javaClass.name

-    private var wakeLock: PowerManager.WakeLock? = null
-    private val tag = this.javaClass.name
-
-
-    override fun onCreate() {
-        super.onCreate()
-        lifecycleScope.launch(Dispatchers.Main) {
-            launchWatcherNotification()
-        }
+  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")
+      }
    }
+  }

-    override fun startService(extras: Bundle?) {
-        super.startService(extras)
-        launchWatcherNotification()
-        val tunnelId = extras?.getString(getString(R.string.tunnel_extras_key))
-        if (tunnelId != null) {
-            this.tunnelConfig = tunnelId
-        }
-        // we need this lock so our service gets not affected by Doze Mode
-        lifecycleScope.launch {
-            initWakeLock()
-        }
-        cancelWatcherJob()
-        if (this::tunnelConfig.isInitialized) {
-            startWatcherJob()
-        } else {
-            stopService(extras)
-        }
+  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()
-            }
-        }
-        cancelWatcherJob()
-        stopSelf()
+  override fun stopService(extras: Bundle?) {
+    super.stopService(extras)
+    wakeLock?.let {
+      if (it.isHeld) {
+        it.release()
+      }
    }
+    cancelWatcherJob()
+    stopSelf()
+  }

-    private fun launchWatcherNotification() {
-        val notification = notificationService.createNotification(
+  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),
-            description = getString(R.string.watcher_notification_text)
-        )
-        super.startForeground(foregroundId, notification)
+            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))
    }

-    //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
-        )
-    }
+  // 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) {
-            settingsRepo.getAll().firstOrNull()?.isBatterySaverEnabled ?: false
+  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.WATCHER_SERVICE_WAKE_LOCK_TIMEOUT)
-                    } else {
-                        Timber.d("Initiating wakelock with zero timeout")
-                        acquire()
-                    }
-                }
+    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 cancelWatcherJob() {
-        if (this::watcherJob.isInitialized) {
-            watcherJob.cancel()
+          }
        }
-    }
+  }

-    private fun startWatcherJob() {
-        watcherJob = lifecycleScope.launch(Dispatchers.IO) {
-            val settings = settingsRepo.getAll()
-            if (settings.isNotEmpty()) {
-                setting = settings[0]
+  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 {
-                watchForWifiConnectivityChanges()
+                Timber.d("Starting settings watcher")
+                watchForSettingsChanges()
            }
-            if (setting.isTunnelOnMobileDataEnabled) {
-                launch {
-                    watchForMobileDataConnectivityChanges()
+          launch {
+            Timber.d("Starting management watcher")
+            manageVpn()
+          }
+        }
+  }
+
+  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 suspend fun watchForSettingsChanges() {
+        settingsRepository.getSettingsFlow().collect {
+            if(networkEventsFlow.value.settings.isAutoTunnelPaused != it.isAutoTunnelPaused) {
+                when(it.isAutoTunnelPaused) {
+                    true -> launchWatcherPausedNotification()
+                    false -> launchWatcherNotification()
                }
            }
-            if (setting.isTunnelOnEthernetEnabled) {
-                launch {
-                    watchForEthernetConnectivityChanges()
-                }
-            }
-            launch {
-                manageVpn()
+            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
+                )
+                Tunnel.State.UP -> networkEventsFlow.value = networkEventsFlow.value.copy(
+                    isVpnConnected = true
+                )
+                else -> {}
            }
        }
    }

-    private suspend fun watchForMobileDataConnectivityChanges() {
-        mobileDataService.networkStatus.collect {
-            when (it) {
-                is NetworkStatus.Available -> {
-                    Timber.d("Gained Mobile data connection")
-                    isMobileDataConnected = true
-                }
+  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")
+        }
+      }
+    }
+  }

-                is NetworkStatus.CapabilitiesChanged -> {
-                    isMobileDataConnected = true
-                    Timber.d("Mobile data capabilities changed")
-                }
+  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.Unavailable -> {
-                    isMobileDataConnected = false
-                    Timber.d("Lost mobile data connection")
+    //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")
                }
            }
        }
    }
-
-    private suspend fun watchForEthernetConnectivityChanges() {
-        ethernetService.networkStatus.collect {
-            when (it) {
-                is NetworkStatus.Available -> {
-                    Timber.d("Gained Ethernet connection")
-                    isEthernetConnected = true
-                }
-
-                is NetworkStatus.CapabilitiesChanged -> {
-                    Timber.d("Ethernet capabilities changed")
-                    isEthernetConnected = true
-                }
-
-                is NetworkStatus.Unavailable -> {
-                    isEthernetConnected = false
-                    Timber.d("Lost Ethernet connection")
-                }
-            }
-        }
-    }
-
-    private suspend fun watchForWifiConnectivityChanges() {
-        wifiService.networkStatus.collect {
-            when (it) {
-                is NetworkStatus.Available -> {
-                    Timber.d("Gained Wi-Fi connection")
-                    isWifiConnected = true
-                }
-
-                is NetworkStatus.CapabilitiesChanged -> {
-                    Timber.d("Wifi capabilities changed")
-                    isWifiConnected = true
-                    currentNetworkSSID = wifiService.getNetworkName(it.networkCapabilities) ?: ""
-                }
-
-                is NetworkStatus.Unavailable -> {
-                    isWifiConnected = false
-                    Timber.d("Lost Wi-Fi connection")
-                }
-            }
-        }
-    }
-
-    private suspend fun manageVpn() {
-        while (true) {
-            if (isEthernetConnected && setting.isTunnelOnEthernetEnabled && vpnService.getState() == Tunnel.State.DOWN) {
-                ServiceManager.startVpnService(this, tunnelConfig)
-            }
-            if (!isEthernetConnected && setting.isTunnelOnMobileDataEnabled &&
-                !isWifiConnected &&
-                isMobileDataConnected
-                && vpnService.getState() == Tunnel.State.DOWN
-            ) {
-                ServiceManager.startVpnService(this, tunnelConfig)
-            } else if (!isEthernetConnected && !setting.isTunnelOnMobileDataEnabled &&
-                !isWifiConnected &&
-                vpnService.getState() == Tunnel.State.UP
-            ) {
-                ServiceManager.stopVpnService(this)
-            } else if (!isEthernetConnected && isWifiConnected &&
-                !setting.trustedNetworkSSIDs.contains(currentNetworkSSID) &&
-                (vpnService.getState() != Tunnel.State.UP)
-            ) {
-                ServiceManager.startVpnService(this, tunnelConfig)
-            } else if (!isEthernetConnected && (isWifiConnected &&
-                        setting.trustedNetworkSSIDs.contains(currentNetworkSSID)) &&
-                (vpnService.getState() == Tunnel.State.UP)
-            ) {
-                ServiceManager.stopVpnService(this)
-            }
-            delay(Constants.VPN_CONNECTIVITY_CHECK_INTERVAL)
-        }
-    }
-}
+  }
+}
@@ -3,160 +3,179 @@ package com.zaneschepke.wireguardautotunnel.service.foreground
 import android.app.PendingIntent
 import android.content.Intent
 import android.os.Bundle
+import androidx.core.app.ServiceCompat
 import androidx.lifecycle.lifecycleScope
 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.receiver.NotificationActionReceiver
-import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
-import com.zaneschepke.wireguardautotunnel.repository.model.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.HandshakeStatus
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.handshakeStatus
+import com.zaneschepke.wireguardautotunnel.util.mapPeerStats
 import dagger.hilt.android.AndroidEntryPoint
 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
 class WireGuardTunnelService : ForegroundService() {
-
    private val foregroundId = 123

    @Inject
-    lateinit var vpnService : VpnService
+    lateinit var vpnService: VpnService

    @Inject
-    lateinit var settingsRepo: SettingsDoa
+    lateinit var settingsRepository: SettingsRepository

    @Inject
-    lateinit var notificationService : NotificationService
+    lateinit var tunnelConfigRepository: TunnelConfigRepository

-    private lateinit var job : Job
+    @Inject
+    lateinit var notificationService: NotificationService

-    private var tunnelName : String = ""
+    private lateinit var job: Job
+
+    private var tunnelName: String = ""
+    private var didShowConnected = false

    override fun onCreate() {
        super.onCreate()
        lifecycleScope.launch(Dispatchers.Main) {
-            launchVpnStartingNotification()
+            if(tunnelConfigRepository.getAll().isNotEmpty()) {
+                launchVpnNotification()
+            }
        }
    }

-    override fun startService(extras : Bundle?) {
+    override fun startService(extras: Bundle?) {
        super.startService(extras)
-        launchVpnStartingNotification()
-        val tunnelConfigString = extras?.getString(getString(R.string.tunnel_extras_key))
        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) {
-            launch {
-                if(tunnelConfigString != null) {
-                    try {
-                        val tunnelConfig = TunnelConfig.from(tunnelConfigString)
-                        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")
-                    val settings = settingsRepo.getAll()
-                    if(settings.isNotEmpty()) {
-                        val setting = settings[0]
-                        if(setting.defaultTunnel != null && setting.isAlwaysOnVpnEnabled) {
-                            val tunnelConfig = TunnelConfig.from(setting.defaultTunnel!!)
+                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)
+                            }
+
                        }
                    }
                }
-            }
-            launch {
-                var didShowConnected = false
-                var didShowFailedHandshakeNotification = false
-                vpnService.handshakeStatus.collect {
-                    when(it) {
-                        HandshakeStatus.NOT_STARTED -> {
-                        }
-                        HandshakeStatus.NEVER_CONNECTED -> {
-                            if(!didShowFailedHandshakeNotification) {
-                                launchVpnConnectionFailedNotification(getString(R.string.initial_connection_failure_message))
-                                didShowFailedHandshakeNotification = true
-                                didShowConnected = false
+                //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 -> {}
+                                }
                            }
-                        }
-                        HandshakeStatus.HEALTHY -> {
-                            if(!didShowConnected) {
-                                launchVpnConnectedNotification()
-                                didShowConnected = true
-                            }
-                        }
-                        HandshakeStatus.UNHEALTHY -> {
-                            if(!didShowFailedHandshakeNotification) {
-                                launchVpnConnectionFailedNotification(getString(R.string.lost_connection_failure_message))
-                                didShowFailedHandshakeNotification = true
-                                didShowConnected = false
-                            }
-                        }
                    }
                }
            }
-        }
    }

-    override fun stopService(extras : Bundle?) {
+    override fun stopService(extras: Bundle?) {
        super.stopService(extras)
        lifecycleScope.launch(Dispatchers.IO) {
            vpnService.stopTunnel()
+            didShowConnected = false
        }
        cancelJob()
        stopSelf()
    }

-    private fun launchVpnConnectedNotification() {
-        val notification = notificationService.createNotification(
-            channelId = getString(R.string.vpn_channel_id),
-            channelName = getString(R.string.vpn_channel_name),
-            title = getString(R.string.tunnel_start_title),
-            onGoing = false,
-            showTimestamp = true,
-            description = "${getString(R.string.tunnel_start_text)} $tunnelName"
+    private fun launchVpnNotification(title : String = getString(R.string.vpn_starting),description : String = getString(R.string.attempt_connection)) {
+        val notification =
+            notificationService.createNotification(
+                channelId = getString(R.string.vpn_channel_id),
+                channelName = getString(R.string.vpn_channel_name),
+                title = title,
+                onGoing = false,
+                vibration = false,
+                showTimestamp = true,
+                description = description
+            )
+        ServiceCompat.startForeground(
+            this,
+            foregroundId,
+            notification,
+            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID
        )
-        super.startForeground(foregroundId, notification)
    }

-    private fun launchVpnStartingNotification() {
-        val notification = notificationService.createNotification(
-            channelId = getString(R.string.vpn_channel_id),
-            channelName = getString(R.string.vpn_channel_name),
-            title = getString(R.string.vpn_starting),
-            onGoing = false,
-            showTimestamp = true,
-            description = getString(R.string.attempt_connection)
+    private fun launchVpnConnectionFailedNotification(message: String) {
+        val notification =
+            notificationService.createNotification(
+                channelId = getString(R.string.vpn_channel_id),
+                channelName = getString(R.string.vpn_channel_name),
+                action =
+                PendingIntent.getBroadcast(
+                    this,
+                    0,
+                    Intent(this, NotificationActionReceiver::class.java),
+                    PendingIntent.FLAG_IMMUTABLE
+                ),
+                actionText = getString(R.string.restart),
+                title = getString(R.string.vpn_connection_failed),
+                onGoing = false,
+                vibration = true,
+                showTimestamp = true,
+                description = message
+            )
+        ServiceCompat.startForeground(
+            this,
+            foregroundId,
+            notification,
+            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID
        )
-        super.startForeground(foregroundId, notification)
    }

-    private fun launchVpnConnectionFailedNotification(message : String) {
-        val notification = notificationService.createNotification(
-            channelId = getString(R.string.vpn_channel_id),
-            channelName = getString(R.string.vpn_channel_name),
-            action = PendingIntent.getBroadcast(this,0,
-                Intent(this, NotificationActionReceiver::class.java),PendingIntent.FLAG_IMMUTABLE),
-            actionText = getString(R.string.restart),
-            title = getString(R.string.vpn_connection_failed),
-            onGoing = false,
-            showTimestamp = true,
-            description = message
-        )
-        super.startForeground(foregroundId, notification)
-    }
-
-
    private fun cancelJob() {
-        if(this::job.isInitialized) {
+        if (this::job.isInitialized) {
            job.cancel()
        }
    }
-}
+}
@@ -14,69 +14,82 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.map

-
-abstract class BaseNetworkService<T : BaseNetworkService<T>>(val context: Context, networkCapability : Int) : NetworkService<T> {
+abstract class BaseNetworkService<T : BaseNetworkService<T>>(
+    val context: Context,
+    networkCapability: Int
+) : NetworkService<T> {
    private val connectivityManager =
        context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager

    private val wifiManager =
        context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager

-    override val networkStatus = callbackFlow {
-        val networkStatusCallback = when (Build.VERSION.SDK_INT) {
-            in Build.VERSION_CODES.S..Int.MAX_VALUE -> {
-                object : ConnectivityManager.NetworkCallback(
-                    FLAG_INCLUDE_LOCATION_INFO
-                ) {
-                    override fun onAvailable(network: Network) {
-                        trySend(NetworkStatus.Available(network))
+    override val networkStatus =
+        callbackFlow {
+            val networkStatusCallback =
+                when (Build.VERSION.SDK_INT) {
+                    in Build.VERSION_CODES.S..Int.MAX_VALUE -> {
+                        object : ConnectivityManager.NetworkCallback(
+                            FLAG_INCLUDE_LOCATION_INFO
+                        ) {
+                            override fun onAvailable(network: Network) {
+                                trySend(NetworkStatus.Available(network))
+                            }
+
+                            override fun onLost(network: Network) {
+                                trySend(NetworkStatus.Unavailable(network))
+                            }
+
+                            override fun onCapabilitiesChanged(
+                                network: Network,
+                                networkCapabilities: NetworkCapabilities
+                            ) {
+                                trySend(
+                                    NetworkStatus.CapabilitiesChanged(
+                                        network,
+                                        networkCapabilities
+                                    )
+                                )
+                            }
+                        }
                    }

-                    override fun onLost(network: Network) {
-                        trySend(NetworkStatus.Unavailable(network))
-                    }
+                    else -> {
+                        object : ConnectivityManager.NetworkCallback() {
+                            override fun onAvailable(network: Network) {
+                                trySend(NetworkStatus.Available(network))
+                            }

-                    override fun onCapabilitiesChanged(
-                        network: Network,
-                        networkCapabilities: NetworkCapabilities
-                    ) {
-                        trySend(NetworkStatus.CapabilitiesChanged(network, networkCapabilities))
+                            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)

-            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))
-                    }
-                }
+            awaitClose {
+                connectivityManager.unregisterNetworkCallback(networkStatusCallback)
            }
        }
-        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)
@@ -89,7 +102,6 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(val context: Contex
        return ssid?.trim('"')
    }

-
    companion object {
        private fun getWifiNameFromCapabilities(networkCapabilities: NetworkCapabilities): String? {
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
@@ -105,13 +117,20 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(val context: Contex
 }

 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(status.network, status.networkCapabilities)
+    crossinline onUnavailable: suspend (network: Network) -> Result,
+    crossinline onAvailable: suspend (network: Network) -> Result,
+    crossinline onCapabilitiesChanged: suspend (
+        network: Network,
+        networkCapabilities: NetworkCapabilities
+    ) -> Result
+): Flow<Result> =
+    map { status ->
+        when (status) {
+            is NetworkStatus.Unavailable -> onUnavailable(status.network)
+            is NetworkStatus.Available -> onAvailable(status.network)
+            is NetworkStatus.CapabilitiesChanged -> onCapabilitiesChanged(
+                status.network,
+                status.networkCapabilities
+            )
+        }
    }
-}
@@ -5,6 +5,9 @@ import android.net.NetworkCapabilities
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject

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

-class MobileDataService @Inject constructor(@ApplicationContext context: Context) :
-    BaseNetworkService<MobileDataService>(context, NetworkCapabilities.TRANSPORT_CELLULAR) {
-}
+class MobileDataService
+@Inject
+constructor(
+    @ApplicationContext context: Context
+) :
+    BaseNetworkService<MobileDataService>(context, NetworkCapabilities.TRANSPORT_CELLULAR)
@@ -4,7 +4,7 @@ import android.net.NetworkCapabilities
 import kotlinx.coroutines.flow.Flow

 interface NetworkService<T> {
-    fun getNetworkName(networkCapabilities: NetworkCapabilities) : String?
-    val networkStatus : Flow<NetworkStatus>
+    fun getNetworkName(networkCapabilities: NetworkCapabilities): String?

-}
+    val networkStatus: Flow<NetworkStatus>
+}
@@ -4,7 +4,10 @@ import android.net.Network
 import android.net.NetworkCapabilities

 sealed class NetworkStatus {
-    class Available(val network : Network) : NetworkStatus()
-    class Unavailable(val network : Network) : NetworkStatus()
-    class CapabilitiesChanged(val network : Network, val networkCapabilities : NetworkCapabilities) : NetworkStatus()
+    class Available(val network: Network) : NetworkStatus()
+
+    class Unavailable(val network: Network) : NetworkStatus()
+
+    class CapabilitiesChanged(val network: Network, val networkCapabilities: NetworkCapabilities) :
+        NetworkStatus()
 }
@@ -5,6 +5,9 @@ import android.net.NetworkCapabilities
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject

-class WifiService @Inject constructor(@ApplicationContext context: Context) :
-    BaseNetworkService<WifiService>(context, NetworkCapabilities.TRANSPORT_WIFI) {
-}
+class WifiService
+@Inject
+constructor(
+    @ApplicationContext context: Context
+) :
+    BaseNetworkService<WifiService>(context, NetworkCapabilities.TRANSPORT_WIFI)
@@ -3,6 +3,7 @@ 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(
@@ -12,10 +13,11 @@ interface NotificationService {
        action: PendingIntent? = null,
        actionText: String? = null,
        description: String,
-        showTimestamp : Boolean = false,
+        showTimestamp: Boolean = false,
        importance: Int = NotificationManager.IMPORTANCE_HIGH,
-        vibration: Boolean = true,
+        vibration: Boolean = false,
        onGoing: Boolean = true,
-        lights: Boolean = true
+        lights: Boolean = true,
+        onlyAlertOnce: Boolean = true,
    ): Notification
-}
+}
@@ -7,14 +7,29 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.graphics.Color
+import androidx.core.app.NotificationCompat
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.MainActivity
 import 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 notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+    private val watcherBuilder: NotificationCompat.Builder =
+        NotificationCompat.Builder(
+            context,
+            context.getString(R.string.watcher_channel_id)
+        )
+    private val tunnelBuilder: NotificationCompat.Builder = NotificationCompat.Builder(
+        context,
+        context.getString(R.string.vpn_channel_id)
+    )

    override fun createNotification(
        channelId: String,
@@ -27,20 +42,22 @@ class WireGuardNotification @Inject constructor(@ApplicationContext private val
        importance: Int,
        vibration: Boolean,
        onGoing: Boolean,
-        lights: Boolean
+        lights: Boolean,
+        onlyAlertOnce: Boolean,
    ): Notification {
-        val channel = NotificationChannel(
-            channelId,
-            channelName,
-            importance
-        ).let {
-            it.description = title
-            it.enableLights(lights)
-            it.lightColor = Color.RED
-            it.enableVibration(vibration)
-            it.vibrationPattern = longArrayOf(100, 200, 300, 400, 500, 400, 300, 200, 400)
-            it
-        }
+        val channel =
+            NotificationChannel(
+                channelId,
+                channelName,
+                importance
+            ).let {
+                it.description = title
+                it.enableLights(lights)
+                it.lightColor = Color.RED
+                it.enableVibration(vibration)
+                it.vibrationPattern = longArrayOf(100,200,300)
+                it
+            }
        notificationManager.createNotificationChannel(channel)
        val pendingIntent: PendingIntent =
            Intent(context, MainActivity::class.java).let { notificationIntent ->
@@ -52,26 +69,34 @@ class WireGuardNotification @Inject constructor(@ApplicationContext private val
                )
            }

-        val builder: Notification.Builder =
-            Notification.Builder(
-                context,
-                channelId
-            )
-        return builder.let {
-            if(action != null && actionText != null) {
-                //TODO find a not deprecated way to do this
-                it.addAction(
-                    Notification.Action.Builder(0, actionText, action)
-                        .build())
-                    it.setAutoCancel(true)
+        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
+                )
            }
-                it.setContentTitle(title)
+        }
+
+        return builder.let {
+            if (action != null && actionText != null) {
+                it.addAction(
+                    NotificationCompat.Action.Builder(0, actionText, action)
+                        .build()
+                )
+                it.setAutoCancel(true)
+            }
+            it.setContentTitle(title)
                .setContentText(description)
+                .setOnlyAlertOnce(onlyAlertOnce)
                .setContentIntent(pendingIntent)
                .setOngoing(onGoing)
+                .setPriority(NotificationCompat.PRIORITY_HIGH)
                .setShowWhen(showTimestamp)
                .setSmallIcon(R.mipmap.ic_launcher_foreground)
                .build()
        }
    }
-}
+}
@@ -1,66 +1,75 @@
 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.repository.SettingsDoa
-import com.zaneschepke.wireguardautotunnel.repository.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.repository.model.Settings
-import com.zaneschepke.wireguardautotunnel.repository.model.TunnelConfig
+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.service.foreground.Action
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.foreground.WireGuardTunnelService
-import com.zaneschepke.wireguardautotunnel.util.WgTunnelException
 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 settingsRepo : SettingsDoa
+    lateinit var tunnelConfigRepository: TunnelConfigRepository

-    @Inject
-    lateinit var tunnelConfigRepo : TunnelConfigDao
-
-    private fun attemptWatcherServiceToggle(tunnelConfig : String) {
-        lifecycleScope.launch(Dispatchers.Main) {
-            val settings = getSettings()
-            if(settings.isAutoTunnelEnabled) {
-                ServiceManager.toggleWatcherServiceForeground(this@ShortcutsActivity, tunnelConfig)
+    private suspend fun toggleWatcherServicePause() {
+            val settings = settingsRepository.getSettings()
+            if (settings.isAutoTunnelEnabled) {
+                val pauseAutoTunnel = !settings.isAutoTunnelPaused
+                settingsRepository.save(settings.copy(
+                    isAutoTunnelPaused = pauseAutoTunnel
+                ))
            }
        }
-    }

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        if(intent.getStringExtra(CLASS_NAME_EXTRA_KEY)
-            .equals(WireGuardTunnelService::class.java.simpleName)) {
+        setContentView(View(this))
+        if (intent.getStringExtra(CLASS_NAME_EXTRA_KEY)
+                .equals(WireGuardTunnelService::class.java.simpleName)
+        ) {
            lifecycleScope.launch(Dispatchers.Main) {
-                val settings = getSettings()
-                if(settings.isShortcutsEnabled) {
+                val settings = settingsRepository.getSettings()
+                if (settings.isShortcutsEnabled) {
                    try {
                        val tunnelName = intent.getStringExtra(TUNNEL_NAME_EXTRA_KEY)
-                        val tunnelConfig = if(tunnelName != null) {
-                            tunnelConfigRepo.getAll().firstOrNull { it.name == tunnelName }
-                        } else {
-                            if(settings.defaultTunnel == null) {
-                                tunnelConfigRepo.getAll().first()
+                        val tunnelConfig =
+                            if (tunnelName != null) {
+                                tunnelConfigRepository.getAll().firstOrNull { it.name == tunnelName }
                            } else {
-                                TunnelConfig.from(settings.defaultTunnel!!)
+                                if (settings.defaultTunnel == null) {
+                                    tunnelConfigRepository.getAll().first()
+                                } else {
+                                    TunnelConfig.from(settings.defaultTunnel!!)
+                                }
                            }
-                        }
                        tunnelConfig ?: return@launch
-                        attemptWatcherServiceToggle(tunnelConfig.toString())
-                        when(intent.action){
-                            Action.STOP.name -> ServiceManager.stopVpnService(this@ShortcutsActivity)
-                            Action.START.name -> ServiceManager.startVpnService(this@ShortcutsActivity, tunnelConfig.toString())
+                        toggleWatcherServicePause()
+                        when (intent.action) {
+                            Action.STOP.name -> ServiceManager.stopVpnService(
+                                this@ShortcutsActivity
+                            )
+                            Action.START.name -> ServiceManager.startVpnService(
+                                this@ShortcutsActivity,
+                                tunnelConfig.toString()
+                            )
                        }
-                    } catch (e : Exception) {
+                    } catch (e: Exception) {
                        Timber.e(e.message)
+                        finish()
                    }
                }
            }
@@ -68,16 +77,8 @@ class ShortcutsActivity : ComponentActivity() {
        finish()
    }

-    private suspend fun getSettings() : Settings {
-        val settings = settingsRepo.getAll()
-        return if (settings.isNotEmpty()) {
-            settings.first()
-        } else {
-            throw WgTunnelException("Settings empty")
-        }
-    }
    companion object {
        const val TUNNEL_NAME_EXTRA_KEY = "tunnelName"
        const val CLASS_NAME_EXTRA_KEY = "className"
    }
-}
+}
@@ -4,51 +4,67 @@ import android.os.Build
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
 import com.wireguard.android.backend.Tunnel
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
-import com.zaneschepke.wireguardautotunnel.repository.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.repository.model.TunnelConfig
+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.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject

@AndroidEntryPoint
-class TunnelControlTile : TileService() {
+class TunnelControlTile() : TileService() {

    @Inject
-    lateinit var settingsRepo : SettingsDoa
+    lateinit var tunnelConfigRepository: TunnelConfigRepository

    @Inject
-    lateinit var configRepo : TunnelConfigDao
+    lateinit var settingsRepository: SettingsRepository

    @Inject
-    lateinit var vpnService : VpnService
+    lateinit var vpnService: VpnService

-    private val scope = CoroutineScope(Dispatchers.Main)
+    private val scope = CoroutineScope(Dispatchers.IO)

-    private lateinit var job : Job
+    private var tunnelName : String? = null

    override fun onStartListening() {
-        job = scope.launch {
-            updateTileState()
-        }
        super.onStartListening()
+        Timber.d("On start listening called")
+        scope.launch {
+            vpnService.vpnState.collect {
+                when(it.status) {
+                    Tunnel.State.UP -> setActive()
+                    Tunnel.State.DOWN -> setInactive()
+                    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()
    }

    override fun onTileRemoved() {
        super.onTileRemoved()
-        cancelJob()
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
        scope.cancel()
    }

@@ -57,16 +73,17 @@ class TunnelControlTile : TileService() {
        unlockAndRun {
            scope.launch {
                try {
-                    val tunnel = determineTileTunnel()
-                    if(tunnel != null) {
-                        attemptWatcherServiceToggle(tunnel.toString())
-                        if(vpnService.getState() == Tunnel.State.UP) {
-                            ServiceManager.stopVpnService(this@TunnelControlTile)
-                        } else {
-                            ServiceManager.startVpnServiceForeground(this@TunnelControlTile, tunnel.toString())
-                        }
+                    val tunnelConfig = tunnelConfigRepository.getAll().first { it.name == tunnelName }
+                    toggleWatcherServicePause()
+                    if (vpnService.getState() == Tunnel.State.UP) {
+                        ServiceManager.stopVpnService(this@TunnelControlTile)
+                    } else {
+                        ServiceManager.startVpnServiceForeground(
+                            this@TunnelControlTile,
+                            tunnelConfig.toString()
+                        )
                    }
-                } catch (e : Exception) {
+                } catch (e: Exception) {
                    Timber.e(e.message)
                } finally {
                    cancel()
@@ -75,70 +92,40 @@ class TunnelControlTile : TileService() {
        }
    }

-    private suspend fun determineTileTunnel() : TunnelConfig? {
-        var tunnelConfig : TunnelConfig? = null
-        val settings = settingsRepo.getAll()
-        if (settings.isNotEmpty()) {
-            val setting = settings.first()
-            tunnelConfig = if (setting.defaultTunnel != null) {
-                TunnelConfig.from(setting.defaultTunnel!!)
-            } else {
-                val configs = configRepo.getAll()
-                val config  = if(configs.isNotEmpty()) {
-                    configs.first()
-                } else {
-                    null
-                }
-                config
-            }
-        }
-        return tunnelConfig
-    }
-
-
-    private fun attemptWatcherServiceToggle(tunnelConfig : String) {
+    private fun toggleWatcherServicePause() {
        scope.launch {
-            val settings = settingsRepo.getAll()
-            if (settings.isNotEmpty()) {
-                val setting = settings.first()
-                if(setting.isAutoTunnelEnabled) {
-                    ServiceManager.toggleWatcherServiceForeground(this@TunnelControlTile, tunnelConfig)
-                }
+            val settings = settingsRepository.getSettings()
+            if (settings.isAutoTunnelEnabled) {
+                val pauseAutoTunnel = !settings.isAutoTunnelPaused
+                settingsRepository.save(settings.copy(
+                    isAutoTunnelPaused = pauseAutoTunnel
+                ))
            }
        }
    }

-    private suspend fun updateTileState() {
-        vpnService.state.collect {
-            when(it) {
-                Tunnel.State.UP -> {
-                    qsTile.state = Tile.STATE_ACTIVE
-                }
-                Tunnel.State.DOWN -> {
-                    qsTile.state = Tile.STATE_INACTIVE
-                }
-                else -> {
-                    qsTile.state = Tile.STATE_UNAVAILABLE
-                }
-            }
-            val config = determineTileTunnel()
-            setTileDescription(config?.name ?: this.resources.getString(R.string.no_tunnel_available))
-            qsTile.updateTile()
-        }
+    private fun setActive() {
+        qsTile.state = Tile.STATE_ACTIVE
+        qsTile.updateTile()
    }

-    private fun setTileDescription(description : String) {
+    private fun setInactive() {
+        qsTile.state = Tile.STATE_INACTIVE
+        qsTile.updateTile()
+    }
+
+    private fun setUnavailable() {
+        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()
    }
-
-    private fun cancelJob() {
-        if(this::job.isInitialized) {
-            job.cancel()
-        }
-    }
-}
+}
@@ -2,13 +2,15 @@ package com.zaneschepke.wireguardautotunnel.service.tunnel

 enum class HandshakeStatus {
    HEALTHY,
-    UNHEALTHY,
-    NEVER_CONNECTED,
-    NOT_STARTED;
+    STALE,
+    UNKNOWN,
+    NOT_STARTED
+    ;

    companion object {
-        private const val WG_TYPICAL_HANDSHAKE_INTERVAL_WHEN_HEALTHY_SEC = 120
-        const val UNHEALTHY_TIME_LIMIT_SEC = WG_TYPICAL_HANDSHAKE_INTERVAL_WHEN_HEALTHY_SEC + 60
+        private const val WG_TYPICAL_HANDSHAKE_INTERVAL_WHEN_HEALTHY_SEC = 180
+        const val STATUS_CHANGE_TIME_BUFFER = 30
+        const val STALE_TIME_LIMIT_SEC = WG_TYPICAL_HANDSHAKE_INTERVAL_WHEN_HEALTHY_SEC + STATUS_CHANGE_TIME_BUFFER
        const val NEVER_CONNECTED_TO_UNHEALTHY_TIME_LIMIT_SEC = 30
    }
-}
+}
@@ -1,18 +1,15 @@
 package com.zaneschepke.wireguardautotunnel.service.tunnel

-import com.wireguard.android.backend.Statistics
 import com.wireguard.android.backend.Tunnel
-import com.wireguard.crypto.Key
-import com.zaneschepke.wireguardautotunnel.repository.model.TunnelConfig
-import kotlinx.coroutines.flow.SharedFlow
+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): Tunnel.State
+
    suspend fun stopTunnel()
-    val state : SharedFlow<Tunnel.State>
-    val tunnelName : SharedFlow<String>
-    val statistics : SharedFlow<Statistics>
-    val lastHandshake : SharedFlow<Map<Key,Long>>
-    val handshakeStatus : SharedFlow<HandshakeStatus>
-    fun getState() : Tunnel.State
-}
+
+    val vpnState: StateFlow<VpnState>
+
+    fun getState(): Tunnel.State
+}
@@ -0,0 +1,10 @@
+package com.zaneschepke.wireguardautotunnel.service.tunnel
+
+import com.wireguard.android.backend.Statistics
+import com.wireguard.android.backend.Tunnel
+
+data class VpnState(
+    val status : Tunnel.State = Tunnel.State.DOWN,
+    val name : String = "",
+    val statistics : Statistics? = null
+)
@@ -3,141 +3,147 @@ package com.zaneschepke.wireguardautotunnel.service.tunnel
 import com.wireguard.android.backend.Backend
 import com.wireguard.android.backend.BackendException
 import com.wireguard.android.backend.Statistics
-import com.wireguard.android.backend.Tunnel
-import com.wireguard.crypto.Key
-import com.zaneschepke.wireguardautotunnel.Constants
-import com.zaneschepke.wireguardautotunnel.repository.model.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.util.NumberUtils
+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.module.Kernel
+import com.zaneschepke.wireguardautotunnel.module.Userspace
+import com.zaneschepke.wireguardautotunnel.util.Constants
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject

-
-class WireGuardTunnel @Inject constructor(private val backend : Backend,
+class WireGuardTunnel
+@Inject
+constructor(
+    @Userspace private val userspaceBackend: Backend,
+    @Kernel private val kernelBackend: Backend,
+    private val settingsRepository: SettingsRepository
 ) : VpnService {
-
-    private val _tunnelName = MutableStateFlow("")
-    override val tunnelName get() = _tunnelName.asStateFlow()
-
-    private val _state = MutableSharedFlow<Tunnel.State>(
-        onBufferOverflow = BufferOverflow.DROP_OLDEST,
-        replay = 1)
-
-    private val _handshakeStatus = MutableSharedFlow<HandshakeStatus>(replay = 1,
-        onBufferOverflow = BufferOverflow.DROP_OLDEST)
-    override val state get() = _state.asSharedFlow()
-
-    private val _statistics = MutableSharedFlow<Statistics>(replay = 1)
-    override val statistics get() = _statistics.asSharedFlow()
-
-    private val _lastHandshake = MutableSharedFlow<Map<Key, Long>>(replay = 1)
-    override val lastHandshake get() = _lastHandshake.asSharedFlow()
-
-    override val handshakeStatus: SharedFlow<HandshakeStatus>
-        get() = _handshakeStatus.asSharedFlow()
+    private val _vpnState = MutableStateFlow(VpnState())
+    override val vpnState: StateFlow<VpnState> = _vpnState.asStateFlow()

    private val scope = CoroutineScope(Dispatchers.IO)

-    private lateinit var statsJob : Job
+    private lateinit var statsJob: Job

+    private var config: Config? = null

-    override suspend fun startTunnel(tunnelConfig: TunnelConfig) : Tunnel.State{
-        return try {
-            stopTunnelOnConfigChange(tunnelConfig)
-            emitTunnelName(tunnelConfig.name)
-            val config = TunnelConfig.configFromQuick(tunnelConfig.wgQuick)
-            val state = backend.setState(
-                this, Tunnel.State.UP, config)
-            _state.emit(state)
-            state
-        } catch (e : Exception) {
-            Timber.e("Failed to start tunnel with error: ${e.message}")
-            Tunnel.State.DOWN
+    private var backend: Backend = userspaceBackend
+
+    private var backendIsUserspace = true
+
+    init {
+        scope.launch {
+            settingsRepository.getSettingsFlow().collect {
+                if (it.isKernelEnabled && backendIsUserspace) {
+                    Timber.d("Setting kernel backend")
+                    backend = kernelBackend
+                    backendIsUserspace = false
+                } else if (!it.isKernelEnabled && !backendIsUserspace) {
+                    Timber.d("Setting userspace backend")
+                    backend = userspaceBackend
+                    backendIsUserspace = true
+                }
+            }
        }
    }

-    private suspend fun emitTunnelName(name : String) {
-        _tunnelName.emit(name)
+    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) {
+            Timber.e("Failed to start tunnel with error: ${e.message}")
+            State.DOWN
+        }
+    }
+
+    private fun emitTunnelState(state: State) {
+        _vpnState.tryEmit(
+            _vpnState.value.copy(
+                status = state
+            )
+        )
+    }
+
+    private fun emitBackendStatistics(statistics: Statistics) {
+        _vpnState.tryEmit(
+            _vpnState.value.copy(
+                statistics = statistics
+            )
+        )
+    }
+
+    private suspend fun emitTunnelName(name: String) {
+        _vpnState.emit(
+            _vpnState.value.copy(
+                name = name
+            )
+        )
    }

    private suspend fun stopTunnelOnConfigChange(tunnelConfig: TunnelConfig) {
-        if(getState() == Tunnel.State.UP && _tunnelName.value != tunnelConfig.name) {
+        if (getState() == State.UP && _vpnState.value.name != tunnelConfig.name) {
            stopTunnel()
        }
    }

    override fun getName(): String {
-        return _tunnelName.value
+        return _vpnState.value.name
    }

    override suspend fun stopTunnel() {
        try {
-            if(getState() == Tunnel.State.UP) {
-                val state = backend.setState(this, Tunnel.State.DOWN, null)
-                _state.emit(state)
+            if (getState() == State.UP) {
+                val state = backend.setState(this, State.DOWN, null)
+                emitTunnelState(state)
            }
-        } catch (e : BackendException) {
+        } catch (e: BackendException) {
            Timber.e("Failed to stop tunnel with error: ${e.message}")
        }
    }

-    override fun getState(): Tunnel.State {
+    override fun getState(): State {
        return backend.getState(this)
    }

-    override fun onStateChange(state : Tunnel.State) {
+    override fun onStateChange(state: State) {
        val tunnel = this
-        _state.tryEmit(state)
-        if(state == Tunnel.State.UP) {
-            statsJob = scope.launch {
-                val handshakeMap = HashMap<Key, Long>()
-                var neverHadHandshakeCounter = 0
-                while (true) {
-                    val statistics = backend.getStatistics(tunnel)
-                    _statistics.emit(statistics)
-                    statistics.peers().forEach {
-                        val handshakeEpoch = statistics.peer(it)?.latestHandshakeEpochMillis ?: 0L
-                        handshakeMap[it] = handshakeEpoch
-                        if(handshakeEpoch == 0L) {
-                            if(neverHadHandshakeCounter >= HandshakeStatus.NEVER_CONNECTED_TO_UNHEALTHY_TIME_LIMIT_SEC) {
-                                _handshakeStatus.emit(HandshakeStatus.NEVER_CONNECTED)
-                            } else {
-                                _handshakeStatus.emit(HandshakeStatus.NOT_STARTED)
-                            }
-                            if(neverHadHandshakeCounter <= HandshakeStatus.NEVER_CONNECTED_TO_UNHEALTHY_TIME_LIMIT_SEC) {
-                                neverHadHandshakeCounter += 10
-                            }
-                            return@forEach
-                        }
-                        if(NumberUtils.getSecondsBetweenTimestampAndNow(handshakeEpoch) >= HandshakeStatus.UNHEALTHY_TIME_LIMIT_SEC) {
-                            _handshakeStatus.emit(HandshakeStatus.UNHEALTHY)
-                        } else {
-                            _handshakeStatus.emit(HandshakeStatus.HEALTHY)
-                        }
+        emitTunnelState(state)
+        WireGuardAutoTunnel.requestTileServiceStateUpdate()
+        if (state == State.UP) {
+            statsJob =
+                scope.launch {
+                    while (true) {
+                        val statistics = backend.getStatistics(tunnel)
+                        emitBackendStatistics(statistics)
+                        delay(Constants.VPN_STATISTIC_CHECK_INTERVAL)
                    }
-                    _lastHandshake.emit(handshakeMap)
-                    delay(Constants.VPN_STATISTIC_CHECK_INTERVAL)
                }
-            }
        }
-        if(state == Tunnel.State.DOWN) {
-            if(this::statsJob.isInitialized) {
+        if (state == State.DOWN) {
+            if (this::statsJob.isInitialized) {
                statsJob.cancel()
            }
-            _handshakeStatus.tryEmit(HandshakeStatus.NOT_STARTED)
-            _lastHandshake.tryEmit(emptyMap())
        }
    }
-
-
-}
+}
@@ -0,0 +1,13 @@
+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() {
+
+}
@@ -2,4 +2,4 @@ package com.zaneschepke.wireguardautotunnel.ui

 import com.journeyapps.barcodescanner.CaptureActivity

-class CaptureActivityPortrait : CaptureActivity()
+class CaptureActivityPortrait : CaptureActivity()
@@ -6,16 +6,11 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
-import android.view.KeyEvent
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.animation.ExitTransition
-import androidx.compose.animation.ExperimentalAnimationApi
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.slideInHorizontally
+import androidx.compose.foundation.focusable
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarData
@@ -31,44 +26,43 @@ 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.input.key.onKeyEvent
+import androidx.compose.ui.focus.focusProperties
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.lifecycleScope
-import com.google.accompanist.navigation.animation.AnimatedNavHost
-import com.google.accompanist.navigation.animation.composable
-import com.google.accompanist.navigation.animation.rememberAnimatedNavController
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+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.Constants
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.ui.common.PermissionRequestFailedScreen
 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.detail.DetailScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.MainScreen
 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.theme.WireguardAutoTunnelTheme
+import com.zaneschepke.wireguardautotunnel.util.Constants
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import timber.log.Timber

@AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
-
-    @OptIn(ExperimentalAnimationApi::class,
+    @OptIn(
        ExperimentalPermissionsApi::class
    )
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        setContent {
-            val navController = rememberAnimatedNavController()
-            val focusRequester = remember { FocusRequester() }
+//            val activityViewModel = hiltViewModel<ActivityViewModel>()
+
+            val navController = rememberNavController()
+            val focusRequester = remember { FocusRequester()}

            WireguardAutoTunnelTheme {
                TransparentSystemBars()
@@ -85,68 +79,62 @@ class MainActivity : AppCompatActivity() {
                }

                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
+                val vpnActivityResultState =
+                    rememberLauncherForActivityResult(
+                        ActivityResultContracts.StartActivityForResult(),
+                        onResult = {
+                            val accepted = (it.resultCode == RESULT_OK)
+                            if (accepted) {
+                                vpnIntent = null
+                            }
                        }
-                    })
+                    )
                LaunchedEffect(vpnIntent) {
                    if (vpnIntent != null) {
                        vpnActivityResultState.launch(vpnIntent)
-                    } else requestNotificationPermission()
+                    } else {
+                        requestNotificationPermission()
+                    }
                }

-                fun showSnackBarMessage(message : String) {
+                fun showSnackBarMessage(message: String) {
                    lifecycleScope.launch(Dispatchers.Main) {
                        val result = snackbarHostState.showSnackbar(
-                            message = message,
-                            actionLabel = applicationContext.getString(R.string.okay),
-                            duration = SnackbarDuration.Short,
-                        )
+                                message = message,
+                                actionLabel = applicationContext.getString(R.string.okay),
+                                duration = SnackbarDuration.Short
+                            )
                        when (result) {
-                            SnackbarResult.ActionPerformed -> { snackbarHostState.currentSnackbarData?.dismiss() }
-                            SnackbarResult.Dismissed -> { snackbarHostState.currentSnackbarData?.dismiss() }
+                            SnackbarResult.ActionPerformed, SnackbarResult.Dismissed -> {
+                                snackbarHostState.currentSnackbarData?.dismiss()
+                            }
                        }
                    }
                }

-                Scaffold(snackbarHost = {
+                Scaffold(
+                    snackbarHost = {
                        SnackbarHost(snackbarHostState) { snackbarData: SnackbarData ->
                            CustomSnackBar(
                                snackbarData.visuals.message,
                                isRtl = false,
-                                containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)
+                                containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(
+                                    2.dp
+                                )
                            )
                        }
                    },
-                    modifier = Modifier.onKeyEvent {
-                        if (it.nativeKeyEvent.action == KeyEvent.ACTION_UP) {
-                            when (it.nativeKeyEvent.keyCode) {
-                                KeyEvent.KEYCODE_DPAD_UP -> {
-                                    try {
-                                        focusRequester.requestFocus()
-                                    } catch(e : IllegalStateException) {
-                                        Timber.e("No D-Pad focus request modifier added to element on screen")
-                                    }
-                                    false
-                                } else -> {
-                                   false
-                                }
-                            }
-                        } else {
-                            false
-                        }
-                    },
-                    bottomBar = if (vpnIntent == null && notificationPermissionState.status.isGranted) {
-                        { BottomNavBar(navController, Routes.navItems) }
+                    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 {
                        {}
-                    },
-                )
-                { padding ->
+                    }
+                ) { padding ->
                    if (vpnIntent != null) {
                        PermissionRequestFailedScreen(
                            padding = padding,
@@ -163,7 +151,11 @@ class MainActivity : AppCompatActivity() {
                                val intentSettings =
                                    Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
                                intentSettings.data =
-                                    Uri.fromParts(Constants.URI_PACKAGE_SCHEME, this.packageName, null)
+                                    Uri.fromParts(
+                                        Constants.URI_PACKAGE_SCHEME,
+                                        this.packageName,
+                                        null
+                                    )
                                startActivity(intentSettings)
                            },
                            message = getString(R.string.notification_permission_required),
@@ -171,72 +163,39 @@ class MainActivity : AppCompatActivity() {
                        )
                        return@Scaffold
                    }
-
-                    AnimatedNavHost(navController, startDestination = Routes.Main.name) {
-                        composable(Routes.Main.name, enterTransition = {
-                            when (initialState.destination.route) {
-                                Routes.Settings.name, Routes.Support.name ->
-                                    slideInHorizontally(
-                                        initialOffsetX = { -Constants.SLIDE_IN_TRANSITION_OFFSET },
-                                        animationSpec = tween(Constants.SLIDE_IN_ANIMATION_DURATION)
-                                    )
-
-                                else -> {
-                                    fadeIn(animationSpec = tween(Constants.FADE_IN_ANIMATION_DURATION))
-                                }
-                            }
-                        }, exitTransition = {
-                            ExitTransition.None
+                    NavHost(navController, startDestination = Screen.Main.route) {
+                        composable(
+                            Screen.Main.route,
+                        ) {
+                            MainScreen(padding = padding, focusRequester = focusRequester, showSnackbarMessage = { message ->
+                                showSnackBarMessage(message)
+                            }, navController = navController)
                        }
-                            ) {
-                            MainScreen(padding = padding, showSnackbarMessage = { message -> showSnackBarMessage(message) }, navController = navController)
+                        composable(Screen.Settings.route,
+                        ) {
+                            SettingsScreen(padding = padding, showSnackbarMessage = { message ->
+                                showSnackBarMessage(message)
+                            }, focusRequester = focusRequester)
                        }
-                        composable(Routes.Settings.name, enterTransition = {
-                            when (initialState.destination.route) {
-                                Routes.Main.name ->
-                                    slideInHorizontally(
-                                        initialOffsetX = { Constants.SLIDE_IN_TRANSITION_OFFSET },
-                                        animationSpec = tween(Constants.SLIDE_IN_ANIMATION_DURATION)
-                                    )
-
-                                Routes.Support.name -> {
-                                    slideInHorizontally(
-                                        initialOffsetX = { -Constants.SLIDE_IN_TRANSITION_OFFSET },
-                                        animationSpec = tween(Constants.SLIDE_IN_ANIMATION_DURATION)
-                                    )
-                                }
-
-                                else -> {
-                                    fadeIn(animationSpec = tween(Constants.FADE_IN_ANIMATION_DURATION))
-                                }
-                            }
-                        }) { SettingsScreen(padding = padding, showSnackbarMessage = { message -> showSnackBarMessage(message) }, focusRequester = focusRequester) }
-                        composable(Routes.Support.name, enterTransition = {
-                            when (initialState.destination.route) {
-                                Routes.Settings.name, Routes.Main.name ->
-                                    slideInHorizontally(
-                                        initialOffsetX = { Constants.SLIDE_IN_ANIMATION_DURATION },
-                                        animationSpec = tween(Constants.SLIDE_IN_ANIMATION_DURATION)
-                                    )
-
-                                else -> {
-                                    fadeIn(animationSpec = tween(Constants.FADE_IN_ANIMATION_DURATION))
-                                }
-                            }
-                        }) { SupportScreen(padding = padding, focusRequester) }
-                        composable("${Routes.Config.name}/{id}", enterTransition = {
-                            fadeIn(animationSpec = tween(Constants.FADE_IN_ANIMATION_DURATION))
-                        }) { it ->
+                        composable(Screen.Support.route,
+                        ) {
+                            SupportScreen(padding = padding, focusRequester = focusRequester,
+                                showSnackbarMessage = { message ->
+                                    showSnackBarMessage(message)
+                                })
+                        }
+                        composable("${Screen.Config.route}/{id}") {
                            val id = it.arguments?.getString("id")
-                            if(!id.isNullOrBlank()) {
-                                ConfigScreen(navController = navController, id = id, showSnackbarMessage = { message -> showSnackBarMessage(message) }, focusRequester = focusRequester)}
-                            }
-                        composable("${Routes.Detail.name}/{id}", enterTransition = {
-                            fadeIn(animationSpec = tween(Constants.FADE_IN_ANIMATION_DURATION))
-                        }) {
-                            val id = it.arguments?.getString("id")
-                            if(!id.isNullOrBlank()) {
-                                DetailScreen(padding = padding, focusRequester = focusRequester, id = id)
+                            if (!id.isNullOrBlank()) {
+                                //https://dagger.dev/hilt/view-model#assisted-injection
+                                ConfigScreen(
+                                    navController = navController,
+                                    id = id,
+                                    showSnackbarMessage = { message ->
+                                        showSnackBarMessage(message)
+                                    },
+                                    focusRequester = focusRequester
+                                )
                            }
                        }
                    }
@@ -1,36 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui
-
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.Home
-import androidx.compose.material.icons.rounded.QuestionMark
-import androidx.compose.material.icons.rounded.Settings
-import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavItem
-
-enum class Routes {
-    Main,
-    Settings,
-    Support,
-    Config,
-    Detail;
-
-
-    companion object {
-        val navItems = listOf(
-            BottomNavItem(
-                name = "Tunnels",
-                route = Main.name,
-                icon = Icons.Rounded.Home,
-            ),
-            BottomNavItem(
-                name = "Settings",
-                route = Settings.name,
-                icon = Icons.Rounded.Settings,
-            ),
-            BottomNavItem(
-                name = "Support",
-                route = Support.name,
-                icon = Icons.Rounded.QuestionMark,
-            )
-        )
-    }
-}
@@ -0,0 +1,33 @@
+package com.zaneschepke.wireguardautotunnel.ui
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Home
+import androidx.compose.material.icons.rounded.QuestionMark
+import androidx.compose.material.icons.rounded.Settings
+import com.zaneschepke.wireguardautotunnel.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
+        )
+    }
+    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")
+
+}
@@ -14,20 +14,28 @@ import androidx.compose.ui.res.stringResource
 import com.zaneschepke.wireguardautotunnel.R

@Composable
-fun ClickableIconButton(onIconClick : () -> Unit, text : String, icon : ImageVector, enabled : Boolean) {
-    TextButton(onClick = {},
+fun ClickableIconButton(
+    onClick: () -> Unit,
+    onIconClick: () -> Unit,
+    text: String,
+    icon: ImageVector,
+    enabled: Boolean
+) {
+    TextButton(
+        onClick = onClick,
        enabled = enabled
    ) {
-        Text(text)
+        Text(text, Modifier.weight(1f, false))
        Spacer(modifier = Modifier.size(ButtonDefaults.IconSpacing))
        Icon(
            imageVector = icon,
            contentDescription = stringResource(R.string.delete),
-            modifier = Modifier.size(ButtonDefaults.IconSize).clickable {
-                if(enabled) {
+            modifier =
+            Modifier.size(ButtonDefaults.IconSize).weight(1f, false).clickable {
+                if (enabled) {
                    onIconClick()
                }
            }
        )
    }
-}
+}
@@ -16,13 +16,21 @@ import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.launch

@Composable
-fun PermissionRequestFailedScreen(padding : PaddingValues, onRequestAgain : () -> Unit, message : String, buttonText : String ) {
+fun PermissionRequestFailedScreen(
+    padding: PaddingValues,
+    onRequestAgain: () -> Unit,
+    message: String,
+    buttonText: String
+) {
    val scope = rememberCoroutineScope()
-    Column(horizontalAlignment = Alignment.CenterHorizontally,
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
        verticalArrangement = Arrangement.Center,
-        modifier = Modifier
+        modifier =
+        Modifier
            .fillMaxSize()
-            .padding(padding)) {
+            .padding(padding)
+    ) {
        Text(message, textAlign = TextAlign.Center, modifier = Modifier.padding(15.dp))
        Button(onClick = {
            scope.launch {
@@ -32,4 +40,4 @@ fun PermissionRequestFailedScreen(padding : PaddingValues, onRequestAgain : () -
            Text(buttonText)
        }
    }
-}
+}
@@ -1,23 +1,42 @@
 package com.zaneschepke.wireguardautotunnel.ui.common

+import androidx.compose.animation.animateContentSize
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.wireguard.android.backend.Statistics
+import com.zaneschepke.wireguardautotunnel.util.NumberUtils
+import com.zaneschepke.wireguardautotunnel.util.toThreeDecimalPlaceString

@OptIn(ExperimentalFoundationApi::class)
@Composable
-fun RowListItem(icon : @Composable() () -> Unit, text : String, onHold : () -> Unit, onClick: () -> Unit, rowButton : @Composable() () -> Unit ) {
+fun RowListItem(
+    icon: @Composable () -> Unit,
+    text: String,
+    onHold: () -> Unit,
+    onClick: () -> Unit,
+    rowButton: @Composable () -> Unit,
+    expanded: Boolean,
+    statistics: Statistics?
+) {
    Box(
-        modifier = Modifier
+        modifier =
+        Modifier
+            .animateContentSize()
+            .clip(RoundedCornerShape(30.dp))
            .combinedClickable(
                onClick = {
                    onClick()
@@ -27,19 +46,52 @@ fun RowListItem(icon : @Composable() () -> Unit, text : String, onHold : () -> U
                }
            )
    ) {
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .padding(14.dp),
-            verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.SpaceBetween
-        ) {
-            Row(verticalAlignment = Alignment.CenterVertically,) {
-                icon()
-                Text(text)
+        Column {
+            Row(
+                modifier =
+                Modifier
+                    .fillMaxWidth()
+                    .padding(horizontal = 15.dp, vertical = 5.dp),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.SpaceBetween
+            ) {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    modifier = Modifier.fillMaxWidth(.60f)
+                ) {
+                    icon()
+                    Text(text)
+                }
+                rowButton()
+            }
+            if (expanded) {
+                statistics?.peers()?.forEach {
+                    Row(
+                        modifier =
+                        Modifier
+                            .fillMaxWidth()
+                            .padding(end = 10.dp, bottom = 10.dp, start = 10.dp),
+                        verticalAlignment = Alignment.CenterVertically,
+                        horizontalArrangement = Arrangement.SpaceEvenly
+                    ) {
+                        val handshakeEpoch = statistics.peer(it)!!.latestHandshakeEpochMillis
+                        val peerTx = statistics.peer(it)!!.txBytes
+                        val peerRx = statistics.peer(it)!!.rxBytes
+                        val peerId = it.toBase64().subSequence(0, 3).toString() + "***"
+                        val handshakeSec =
+                            NumberUtils.getSecondsBetweenTimestampAndNow(handshakeEpoch)
+                        val handshake =
+                            if (handshakeSec == null) "never" else "$handshakeSec secs ago"
+                        val peerTxMB = NumberUtils.bytesToMB(peerTx).toThreeDecimalPlaceString()
+                        val peerRxMB = NumberUtils.bytesToMB(peerRx).toThreeDecimalPlaceString()
+                        val fontSize = 9.sp
+                        Text("peer: $peerId", fontSize = fontSize)
+                        Text("handshake: $handshake", fontSize = fontSize)
+                        Text("tx: $peerTxMB MB", fontSize = fontSize)
+                        Text("rx: $peerRxMB MB", fontSize = fontSize)
+                    }
+                }
            }
-
-            rowButton()
        }
    }
-}
+}
@@ -25,9 +25,7 @@ import androidx.compose.ui.text.input.KeyboardType
 import com.zaneschepke.wireguardautotunnel.R

@Composable
-fun SearchBar(
-    onQuery : (queryString : String) -> Unit
-) {
+fun SearchBar(onQuery: (queryString: String) -> Unit) {
    // Immediately update and keep track of query from text field changes.
    var query: String by rememberSaveable { mutableStateOf("") }
    var showClearIcon by rememberSaveable { mutableStateOf(false) }
@@ -64,17 +62,19 @@ fun SearchBar(
            }
        },
        maxLines = 1,
-        colors = TextFieldDefaults.colors(
+        colors =
+        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,
        singleLine = true,
        keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Text),
-        modifier = Modifier
+        modifier =
+        Modifier
            .fillMaxWidth()
            .background(color = MaterialTheme.colorScheme.background, shape = RectangleShape)
    )
-}
+}
@@ -10,9 +10,15 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardCapitalization

@Composable
-fun
-        ConfigurationTextBox(value : String, hint : String, onValueChange : (String) -> Unit, keyboardActions : KeyboardActions, label : String, modifier: Modifier) {
-   OutlinedTextField(
+fun ConfigurationTextBox(
+    value: String,
+    hint: String,
+    onValueChange: (String) -> Unit,
+    keyboardActions: KeyboardActions,
+    label: String,
+    modifier: Modifier
+) {
+    OutlinedTextField(
        modifier = modifier,
        value = value,
        singleLine = true,
@@ -24,10 +30,11 @@ fun
        placeholder = {
            Text(hint)
        },
-        keyboardOptions = KeyboardOptions(
+        keyboardOptions =
+        KeyboardOptions(
            capitalization = KeyboardCapitalization.None,
            imeAction = ImeAction.Done
        ),
-        keyboardActions = keyboardActions,
+        keyboardActions = keyboardActions
    )
-}
+}
@@ -12,10 +12,17 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.Dp

@Composable
-fun ConfigurationToggle(label : String, enabled : Boolean, checked : Boolean, padding : Dp,
-                        onCheckChanged : () -> Unit, modifier : Modifier = Modifier) {
+fun ConfigurationToggle(
+    label: String,
+    enabled: Boolean,
+    checked: Boolean,
+    padding: Dp,
+    onCheckChanged: () -> Unit,
+    modifier: Modifier = Modifier
+) {
    Row(
-        modifier = Modifier
+        modifier =
+        Modifier
            .fillMaxWidth()
            .padding(padding),
        verticalAlignment = Alignment.CenterVertically,
@@ -31,4 +38,4 @@ fun ConfigurationToggle(label : String, enabled : Boolean, checked : Boolean, pa
            }
        )
    }
-}
+}
@@ -11,12 +11,14 @@ import androidx.navigation.NavController
 import androidx.navigation.compose.currentBackStackEntryAsState

@Composable
-fun BottomNavBar(navController : NavController, bottomNavItems : List<BottomNavItem>) {
-
+fun BottomNavBar(
+    navController: NavController,
+    bottomNavItems: List<BottomNavItem>
+) {
    val backStackEntry = navController.currentBackStackEntryAsState()

    NavigationBar(
-        containerColor = MaterialTheme.colorScheme.background,
+        containerColor = MaterialTheme.colorScheme.background
    ) {
        bottomNavItems.forEach { item ->
            val selected = item.route == backStackEntry.value?.destination?.route
@@ -27,16 +29,16 @@ fun BottomNavBar(navController : NavController, bottomNavItems : List<BottomNavI
                label = {
                    Text(
                        text = item.name,
-                        fontWeight = FontWeight.SemiBold,
+                        fontWeight = FontWeight.SemiBold
                    )
                },
                icon = {
                    Icon(
                        imageVector = item.icon,
-                        contentDescription = "${item.name} Icon",
+                        contentDescription = "${item.name} Icon"
                    )
                }
            )
        }
    }
-}
+}
@@ -11,69 +11,87 @@ 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
+    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
            }
-            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) {
+    if (isBiometricAvailable) {
        val executor = remember { ContextCompat.getMainExecutor(context) }

-        val promptInfo = BiometricPrompt.PromptInfo.Builder()
-            .setAllowedAuthenticators(BIOMETRIC_WEAK or DEVICE_CREDENTIAL)
-            .setTitle("Biometric Authentication")
-            .setSubtitle("Log in using your biometric credential")
-            .build()
+        val promptInfo =
+            BiometricPrompt.PromptInfo.Builder()
+                .setAllowedAuthenticators(BIOMETRIC_WEAK or DEVICE_CREDENTIAL)
+                .setTitle("Biometric Authentication")
+                .setSubtitle("Log in using your biometric credential")
+                .build()

-        val biometricPrompt = BiometricPrompt(
-            context as FragmentActivity,
-            executor,
-            object : BiometricPrompt.AuthenticationCallback() {
-                override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
-                    super.onAuthenticationError(errorCode, errString)
-                    onFailure()
-                }
+        val biometricPrompt =
+            BiometricPrompt(
+                context as FragmentActivity,
+                executor,
+                object : BiometricPrompt.AuthenticationCallback() {
+                    override fun onAuthenticationError(
+                        errorCode: Int,
+                        errString: CharSequence
+                    ) {
+                        super.onAuthenticationError(errorCode, errString)
+                        onFailure()
+                    }

-                override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
-                    super.onAuthenticationSucceeded(result)
-                    onSuccess()
-                }
+                    override fun onAuthenticationSucceeded(
+                        result: BiometricPrompt.AuthenticationResult
+                    ) {
+                        super.onAuthenticationSucceeded(result)
+                        onSuccess()
+                    }

-                override fun onAuthenticationFailed() {
-                    super.onAuthenticationFailed()
-                    onFailure()
+                    override fun onAuthenticationFailed() {
+                        super.onAuthenticationFailed()
+                        onFailure()
+                    }
                }
-            }
-        )
+            )
        biometricPrompt.authenticate(promptInfo)
    }
-}
+}
@@ -34,11 +34,14 @@ fun CustomSnackBar(
    containerColor: Color = MaterialTheme.colorScheme.surface
 ) {
    val context = LocalContext.current
-    Snackbar(containerColor = containerColor,
-        modifier = Modifier.fillMaxWidth(
-            if(WireGuardAutoTunnel.isRunningOnAndroidTv(context)) 1/3f else 2/3f).padding(bottom = 100.dp),
+    Snackbar(
+        containerColor = containerColor,
+        modifier =
+        Modifier.fillMaxWidth(
+            if (WireGuardAutoTunnel.isRunningOnAndroidTv()) 1 / 3f else 2 / 3f
+        ).padding(bottom = 100.dp),
        shape = RoundedCornerShape(16.dp)
-        ) {
+    ) {
        CompositionLocalProvider(
            LocalLayoutDirection provides
                    if (isRtl) LayoutDirection.Rtl else LayoutDirection.Ltr
@@ -58,4 +61,4 @@ fun CustomSnackBar(
            }
        }
    }
-}
+}
@@ -0,0 +1,22 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.screen
+
+import androidx.compose.foundation.focusable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+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() }
+    }
+}
@@ -12,11 +12,14 @@ 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,
        style = TextStyle(fontSize = 18.sp, fontWeight = FontWeight.ExtraBold),
        modifier = Modifier.padding(padding, bottom = 5.dp, top = 5.dp)
    )
-}
+}
@@ -3,23 +3,28 @@ package com.zaneschepke.wireguardautotunnel.ui.models
 import com.wireguard.config.Interface

 data class InterfaceProxy(
-    var privateKey : String = "",
-    var publicKey : String = "",
-    var addresses : String = "",
-    var dnsServers : String = "",
-    var listenPort : String = "",
-    var mtu : String = "",
-){
+    var privateKey: String = "",
+    var publicKey: String = "",
+    var addresses: String = "",
+    var dnsServers: String = "",
+    var listenPort: String = "",
+    var mtu: String = ""
+) {
    companion object {
-        fun from(i : Interface) : InterfaceProxy {
+        fun from(i: Interface): InterfaceProxy {
            return InterfaceProxy(
                publicKey = i.keyPair.publicKey.toBase64().trim(),
                privateKey = i.keyPair.privateKey.toBase64().trim(),
                addresses = i.addresses.joinToString(", ").trim(),
                dnsServers = i.dnsServers.joinToString(", ").replace("/", "").trim(),
-                listenPort = if(i.listenPort.isPresent) i.listenPort.get().toString().trim() else "",
-                mtu = if(i.mtu.isPresent) i.mtu.get().toString().trim() else ""
+                listenPort = if (i.listenPort.isPresent) {
+                    i.listenPort.get().toString()
+                    .trim()
+                } else {
+                    ""
+                },
+                mtu = if (i.mtu.isPresent) i.mtu.get().toString().trim() else ""
            )
        }
    }
-}
+}
@@ -3,30 +3,47 @@ package com.zaneschepke.wireguardautotunnel.ui.models
 import com.wireguard.config.Peer

 data class PeerProxy(
-    var publicKey : String = "",
-    var preSharedKey : String = "",
-    var persistentKeepalive : String = "",
-    var endpoint : String = "",
+    var publicKey: String = "",
+    var preSharedKey: String = "",
+    var persistentKeepalive: String = "",
+    var endpoint: String = "",
    var allowedIps: String = IPV4_WILDCARD.joinToString(", ").trim()
-){
+) {
    companion object {
-        fun from(peer : Peer) : PeerProxy {
+        fun from(peer: Peer): PeerProxy {
            return PeerProxy(
                publicKey = peer.publicKey.toBase64(),
-                preSharedKey = if(peer.preSharedKey.isPresent) peer.preSharedKey.get().toBase64().trim() else "",
-                persistentKeepalive = if(peer.persistentKeepalive.isPresent) peer.persistentKeepalive.get().toString().trim() else "",
-                endpoint = if(peer.endpoint.isPresent) peer.endpoint.get().toString().trim() else "",
+                preSharedKey = if (peer.preSharedKey.isPresent) {
+                    peer.preSharedKey.get().toBase64()
+                    .trim()
+                } else {
+                    ""
+                },
+                persistentKeepalive = if (peer.persistentKeepalive.isPresent) {
+                    peer.persistentKeepalive.get()
+                    .toString().trim()
+                } else {
+                    ""
+                },
+                endpoint = if (peer.endpoint.isPresent) {
+                    peer.endpoint.get().toString()
+                    .trim()
+                } else {
+                    ""
+                },
                allowedIps = peer.allowedIps.joinToString(", ").trim()
            )
        }
-        val IPV4_PUBLIC_NETWORKS = setOf(
-            "0.0.0.0/5", "8.0.0.0/7", "11.0.0.0/8", "12.0.0.0/6", "16.0.0.0/4", "32.0.0.0/3",
-            "64.0.0.0/2", "128.0.0.0/3", "160.0.0.0/5", "168.0.0.0/6", "172.0.0.0/12",
-            "172.32.0.0/11", "172.64.0.0/10", "172.128.0.0/9", "173.0.0.0/8", "174.0.0.0/7",
-            "176.0.0.0/4", "192.0.0.0/9", "192.128.0.0/11", "192.160.0.0/13", "192.169.0.0/16",
-            "192.170.0.0/15", "192.172.0.0/14", "192.176.0.0/12", "192.192.0.0/10",
-            "193.0.0.0/8", "194.0.0.0/7", "196.0.0.0/6", "200.0.0.0/5", "208.0.0.0/4"
-        )
+
+        val IPV4_PUBLIC_NETWORKS =
+            setOf(
+                "0.0.0.0/5", "8.0.0.0/7", "11.0.0.0/8", "12.0.0.0/6", "16.0.0.0/4", "32.0.0.0/3",
+                "64.0.0.0/2", "128.0.0.0/3", "160.0.0.0/5", "168.0.0.0/6", "172.0.0.0/12",
+                "172.32.0.0/11", "172.64.0.0/10", "172.128.0.0/9", "173.0.0.0/8", "174.0.0.0/7",
+                "176.0.0.0/4", "192.0.0.0/9", "192.128.0.0/11", "192.160.0.0/13", "192.169.0.0/16",
+                "192.170.0.0/15", "192.172.0.0/14", "192.176.0.0/12", "192.192.0.0/10",
+                "193.0.0.0/8", "194.0.0.0/7", "196.0.0.0/6", "200.0.0.0/5", "208.0.0.0/4"
+            )
        val IPV4_WILDCARD = setOf("0.0.0.0/0")
    }
-}
+}
@@ -49,7 +49,6 @@ 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.ExperimentalComposeUiApi
@@ -65,7 +64,6 @@ import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.input.KeyboardCapitalization
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.unit.dp
@@ -73,22 +71,24 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import com.google.accompanist.drawablepainter.DrawablePainter
-import com.zaneschepke.wireguardautotunnel.Constants
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.ui.Routes
+import com.zaneschepke.wireguardautotunnel.ui.Screen
 import com.zaneschepke.wireguardautotunnel.ui.common.SearchBar
 import com.zaneschepke.wireguardautotunnel.ui.common.config.ConfigurationTextBox
 import com.zaneschepke.wireguardautotunnel.ui.common.prompt.AuthorizationPrompt
+import com.zaneschepke.wireguardautotunnel.ui.common.screen.LoadingScreen
 import com.zaneschepke.wireguardautotunnel.ui.common.text.SectionTitle
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import timber.log.Timber
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.Event
+import com.zaneschepke.wireguardautotunnel.util.Result
+import kotlinx.coroutines.delay

@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
-@OptIn(ExperimentalComposeUiApi::class, ExperimentalMaterial3Api::class,
-    ExperimentalFoundationApi::class
-)
+@OptIn(
+    ExperimentalComposeUiApi::class,
+    ExperimentalMaterial3Api::class,
+    ExperimentalFoundationApi::class)
@Composable
 fun ConfigScreen(
    viewModel: ConfigViewModel = hiltViewModel(),
@@ -97,566 +97,454 @@ fun ConfigScreen(
    showSnackbarMessage: (String) -> Unit,
    id: 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 scope = rememberCoroutineScope()
-    val clipboardManager: ClipboardManager = LocalClipboardManager.current
-    val keyboardController = LocalSoftwareKeyboardController.current
-
-
-    val tunnel by viewModel.tunnel.collectAsStateWithLifecycle(null)
-    val tunnelName = viewModel.tunnelName.collectAsStateWithLifecycle()
-    val packages by viewModel.packages.collectAsStateWithLifecycle()
-    val checkedPackages by viewModel.checkedPackages.collectAsStateWithLifecycle()
-    val include by viewModel.include.collectAsStateWithLifecycle()
-    val isAllApplicationsEnabled by viewModel.isAllApplicationsEnabled.collectAsStateWithLifecycle()
-    val proxyPeers by viewModel.proxyPeers.collectAsStateWithLifecycle()
-    val proxyInterface by viewModel.interfaceProxy.collectAsStateWithLifecycle()
-    var showApplicationsDialog by remember { mutableStateOf(false) }
-    var showAuthPrompt by remember { mutableStateOf(false) }
-    var isAuthenticated by remember { mutableStateOf(false) }
-    val baseTextBoxModifier = Modifier.onFocusChanged {
-        if(WireGuardAutoTunnel.isRunningOnAndroidTv(context)) {
-            keyboardController?.hide()
-        }
-    }
-
-    val keyboardActions = KeyboardActions(
-        onDone = {
-            keyboardController?.hide()
-        }
-    )
-
-    val keyboardOptions = KeyboardOptions(
-        capitalization = KeyboardCapitalization.None,
-        imeAction = ImeAction.Done
-    )
-
-    val fillMaxHeight = .85f
-    val fillMaxWidth = .85f
-    val screenPadding = 5.dp
+  val uiState by viewModel.uiState.collectAsStateWithLifecycle()

    LaunchedEffect(Unit) {
-        scope.launch(Dispatchers.IO) {
-            try {
-                viewModel.onScreenLoad(id)
-            } catch (e : Exception) {
-                showSnackbarMessage(e.message!!)
-                navController.navigate(Routes.Main.name)
-            }
+        viewModel.init(id)
+    }
+
+  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")
        }
-    }
+  }

-    val applicationButtonText = {
-        "Tunneling apps: " +
-                if (isAllApplicationsEnabled) "all"
-                else "${checkedPackages.size} " + (if (include) "included" else "excluded")
+  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(showAuthPrompt) {
-        AuthorizationPrompt(onSuccess = {
-            showAuthPrompt = false
-            isAuthenticated = true },
-            onError = { error ->
-                showSnackbarMessage(error)
-                showAuthPrompt = false
-                      },
-            onFailure = {
-                showAuthPrompt = false
-                showSnackbarMessage(context.getString(R.string.authentication_failed))
-            })
-    }
-
-    if (showApplicationsDialog) {
-        val sortedPackages = remember(packages) {
-            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 (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 = isAllApplicationsEnabled,
-                            onCheckedChange = {
-                                viewModel.onAllApplicationsChange(it)
-                            }
-                        )
+  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) })
+                          }
                    }
-                    if (!isAllApplicationsEnabled) {
+                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(
-                            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 = include,
-                                    onCheckedChange = {
-                                        viewModel.onIncludeChange(!include)
+                            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.exclude))
-                                Checkbox(
-                                    checked = !include,
-                                    onCheckedChange = {
-                                        viewModel.onIncludeChange(!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(
+                      }
+                    }
+              }
+              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 {
+                    if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+                      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)
+                    }
+                    is Result.Error -> showSnackbarMessage(it.error.message)
+                  }
+                }
+              },
+              containerColor = fobColor,
+              shape = RoundedCornerShape(16.dp)) {
+                Icon(
+                    imageVector = Icons.Rounded.Save,
+                    contentDescription = stringResource(id = R.string.save_changes),
+                    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
-                                .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 {
-                                            Icon(
-                                                Icons.Rounded.Android,
-                                                stringResource(id = R.string.edit),
-                                                modifier = Modifier.size(
-                                                    50.dp,
-                                                    50.dp
-                                                )
-                                            )
+                            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)
                                        }
-                                        Text(
-                                            viewModel.getPackageLabel(pack),
-                                            modifier = Modifier.padding(5.dp)
-                                        )
+                                  },
+                                  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)
+                                    },
+                                    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())
                                    }
-                                    Checkbox(
-                                        modifier = Modifier.fillMaxSize(),
-                                        checked = (checkedPackages.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))
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-
-    if (tunnel != null) {
-        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 {
-                        if(WireGuardAutoTunnel.isRunningOnAndroidTv(context)) {
-                            fobColor = if (it.isFocused) hoverColor else secondaryColor }
-                    },
-                    onClick = {
-                        scope.launch {
-                            try {
-                                viewModel.onSaveAllChanges()
-                                navController.navigate(Routes.Main.name)
-                                showSnackbarMessage(context.resources.getString(R.string.config_changes_saved))
-                            } catch (e : Exception) {
-                                Timber.e(e.message)
-                                showSnackbarMessage(e.message!!)
-                            }
-                        }
-                    },
-                    containerColor = fobColor,
-                    shape = RoundedCornerShape(16.dp),
-                ) {
-                    Icon(
-                        imageVector = Icons.Rounded.Save,
-                        contentDescription = stringResource(id = R.string.save_changes),
-                        tint = Color.DarkGray,
-                    )
-                }
-            }) {
-            Column {
-                Column(
-                    horizontalAlignment = Alignment.CenterHorizontally,
-                    verticalArrangement = Arrangement.Top,
-                    modifier = Modifier
-                        .verticalScroll(rememberScrollState())
-                        .weight(1f, true)
-                        .fillMaxSize()
-                ) {
+                      }
+                  uiState.proxyPeers.forEachIndexed { index, peer ->
                    Surface(
                        tonalElevation = 2.dp,
                        shadowElevation = 2.dp,
                        shape = RoundedCornerShape(12.dp),
                        color = MaterialTheme.colorScheme.surface,
-                        modifier = (if (WireGuardAutoTunnel.isRunningOnAndroidTv(context))
-                            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 = tunnelName.value,
-                                onValueChange = { value ->
-                                    viewModel.onTunnelNameChange(value)
-                                },
-                                keyboardActions = keyboardActions,
-                                label = stringResource(R.string.name),
-                                hint = stringResource(R.string.tunnel_name).lowercase(),
-                                modifier = baseTextBoxModifier.fillMaxWidth().focusRequester(focusRequester)
-                            )
-                            OutlinedTextField(
-                                modifier = baseTextBoxModifier.fillMaxWidth().clickable {
-                                    showAuthPrompt = true
-                                },
-                                value = proxyInterface.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 = baseTextBoxModifier.fillMaxWidth().focusRequester(FocusRequester.Default),
-                                value = proxyInterface.publicKey,
-                                enabled = false,
-                                onValueChange = {},
-                                trailingIcon = {
-                                    IconButton(
-                                        modifier = Modifier.focusRequester(FocusRequester.Default),
-                                        onClick = {
-                                            clipboardManager.setText(AnnotatedString(proxyInterface.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 = proxyInterface.addresses,
-                                    onValueChange = { value ->
-                                        viewModel.onAddressesChanged(value)
-                                    },
-                                    keyboardActions = keyboardActions,
-                                    label = stringResource(R.string.addresses),
-                                    hint = stringResource(R.string.comma_separated_list),
-                                    modifier = baseTextBoxModifier
-                                        .fillMaxWidth(3 / 5f)
-                                        .padding(end = 5.dp)
-                                )
-                                ConfigurationTextBox(
-                                    value = proxyInterface.listenPort,
-                                    onValueChange = { value -> viewModel.onListenPortChanged(value) },
-                                    keyboardActions =  keyboardActions,
-                                    label = stringResource(R.string.listen_port),
-                                    hint = stringResource(R.string.random),
-                                    modifier = baseTextBoxModifier.width(IntrinsicSize.Min)
-                                )
-                            }
-                            Row(modifier = Modifier.fillMaxWidth()) {
-                                ConfigurationTextBox(
-                                    value = proxyInterface.dnsServers,
-                                    onValueChange = { value -> viewModel.onDnsServersChanged(value) },
-                                    keyboardActions = keyboardActions,
-                                    label = stringResource(R.string.dns_servers),
-                                    hint = stringResource(R.string.comma_separated_list),
-                                    modifier = baseTextBoxModifier
-                                        .fillMaxWidth(3 / 5f)
-                                        .padding(end = 5.dp)
-                                )
-                                ConfigurationTextBox(
-                                    value = proxyInterface.mtu,
-                                    onValueChange = { value -> viewModel.onMtuChanged(value) },
-                                    keyboardActions = keyboardActions,
-                                    label = stringResource(R.string.mtu),
-                                    hint = stringResource(R.string.auto),
-                                    modifier = baseTextBoxModifier.width(IntrinsicSize.Min)
-                                )
-                            }
-                            Row(
-                                verticalAlignment = Alignment.CenterVertically,
-                                modifier = Modifier
-                                    .fillMaxSize()
-                                    .padding(top = 5.dp),
-                                horizontalArrangement = Arrangement.Center
-                            ) {
-                                TextButton(
-                                    onClick = {
-                                        showApplicationsDialog = true
-                                    }) {
-                                    Text(applicationButtonText())
-                                }
-                            }
-                        }
-                    }
-                    proxyPeers.forEachIndexed { index, peer ->
-                        Surface(
-                            tonalElevation = 2.dp,
-                            shadowElevation = 2.dp,
-                            shape = RoundedCornerShape(12.dp),
-                            color = MaterialTheme.colorScheme.surface,
-                            modifier = (if (WireGuardAutoTunnel.isRunningOnAndroidTv(context))
-                                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)
-                            ) {
+                        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)
-                                        }
-                                    ) {
+                                    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
-                                        )
+                                      viewModel.onPeerPublicKeyChange(index, value)
                                    },
                                    keyboardActions = keyboardActions,
                                    label = stringResource(R.string.public_key),
                                    hint = stringResource(R.string.base64_key),
-                                    modifier = baseTextBoxModifier.fillMaxWidth()
-                                )
+                                    modifier = Modifier.fillMaxWidth())
                                ConfigurationTextBox(
                                    value = peer.preSharedKey,
                                    onValueChange = { value ->
-                                        viewModel.onPreSharedKeyChange(
-                                            index,
-                                            value
-                                        )
+                                      viewModel.onPreSharedKeyChange(index, value)
                                    },
                                    keyboardActions = keyboardActions,
                                    label = stringResource(R.string.preshared_key),
                                    hint = stringResource(R.string.optional),
-                                    modifier = baseTextBoxModifier.fillMaxWidth()
-                                )
+                                    modifier = Modifier.fillMaxWidth())
                                OutlinedTextField(
-                                    modifier = baseTextBoxModifier.fillMaxWidth(),
+                                    modifier = Modifier.fillMaxWidth(),
                                    value = peer.persistentKeepalive,
                                    enabled = true,
                                    onValueChange = { value ->
-                                        viewModel.onPersistentKeepaliveChanged(index, value)
+                                      viewModel.onPersistentKeepaliveChanged(index, value)
+                                    },
+                                    trailingIcon = {
+                                      Text(
+                                          stringResource(R.string.seconds),
+                                          modifier = Modifier.padding(end = 10.dp))
                                    },
-                                    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)) },
+                                    placeholder = {
+                                      Text(stringResource(R.string.optional_no_recommend))
+                                    },
                                    keyboardOptions = keyboardOptions,
-                                    keyboardActions = keyboardActions
-                                )
+                                    keyboardActions = keyboardActions)
                                ConfigurationTextBox(
                                    value = peer.endpoint,
                                    onValueChange = { value ->
-                                        viewModel.onEndpointChange(
-                                            index,
-                                            value
-                                        )
+                                      viewModel.onEndpointChange(index, value)
                                    },
                                    keyboardActions = keyboardActions,
                                    label = stringResource(R.string.endpoint),
                                    hint = stringResource(R.string.endpoint).lowercase(),
-                                    modifier = baseTextBoxModifier.fillMaxWidth()
-                                )
+                                    modifier = Modifier.fillMaxWidth())
                                OutlinedTextField(
-                                    modifier = baseTextBoxModifier.fillMaxWidth(),
+                                    modifier = Modifier.fillMaxWidth(),
                                    value = peer.allowedIps,
                                    enabled = true,
                                    onValueChange = { value ->
-                                        viewModel.onAllowedIpsChange(
-                                            index,
-                                            value
-                                        )
+                                      viewModel.onAllowedIpsChange(index, value)
                                    },
                                    label = { Text(stringResource(R.string.allowed_ips)) },
                                    singleLine = true,
-                                    placeholder = { Text(stringResource(R.string.comma_separated_list)) },
+                                    placeholder = {
+                                      Text(stringResource(R.string.comma_separated_list))
+                                    },
                                    keyboardOptions = keyboardOptions,
-                                    keyboardActions = keyboardActions
-                                )
-                            }
+                                    keyboardActions = keyboardActions)
+                              }
                        }
-                    }
-                    Row(
-                        horizontalArrangement = Arrangement.SpaceEvenly,
-                        verticalAlignment = Alignment.CenterVertically,
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .padding(bottom = 140.dp)
-                    ) {
-
+                  }
+                  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()
-                                }) {
+                            horizontalArrangement = Arrangement.Center) {
+                              TextButton(onClick = { viewModel.addEmptyPeer() }) {
                                Text(stringResource(R.string.add_peer))
+                              }
                            }
-                        }
-                    }
-                }
-                if(WireGuardAutoTunnel.isRunningOnAndroidTv(context)) {
-                    Spacer(modifier = Modifier.weight(.17f))
+                      }
                }
+            if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+              Spacer(modifier = Modifier.weight(.17f))
            }
+          }
        }
-    }
-}
+}
@@ -0,0 +1,18 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.config
+
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.ui.models.InterfaceProxy
+import com.zaneschepke.wireguardautotunnel.ui.models.PeerProxy
+import com.zaneschepke.wireguardautotunnel.util.Packages
+
+data class ConfigUiState(
+    val proxyPeers: List<PeerProxy> = arrayListOf(PeerProxy()),
+    val interfaceProxy: InterfaceProxy = InterfaceProxy(),
+    val packages: Packages = emptyList(),
+    val checkedPackageNames: List<String> = emptyList(),
+    val include: Boolean = true,
+    val isAllApplicationsEnabled : Boolean = false,
+    val loading: Boolean = true,
+    val tunnel: TunnelConfig? = null,
+    val tunnelName: String = ""
+)
@@ -5,8 +5,6 @@ import android.app.Application
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.os.Build
-import androidx.compose.runtime.mutableStateListOf
-import androidx.compose.runtime.toMutableStateList
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.wireguard.config.Config
@@ -14,382 +12,301 @@ import com.wireguard.config.Interface
 import com.wireguard.config.Peer
 import com.wireguard.crypto.Key
 import com.wireguard.crypto.KeyPair
-import com.zaneschepke.wireguardautotunnel.Constants
-import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
-import com.zaneschepke.wireguardautotunnel.repository.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.repository.model.TunnelConfig
+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.ui.models.InterfaceProxy
 import com.zaneschepke.wireguardautotunnel.ui.models.PeerProxy
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.Event
 import com.zaneschepke.wireguardautotunnel.util.NumberUtils
-import com.zaneschepke.wireguardautotunnel.util.WgTunnelException
+import com.zaneschepke.wireguardautotunnel.util.Result
+import com.zaneschepke.wireguardautotunnel.util.removeAt
+import com.zaneschepke.wireguardautotunnel.util.update
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import javax.inject.Inject

@HiltViewModel
-class ConfigViewModel @Inject constructor(private val application : Application,
-                                          private val tunnelRepo : TunnelConfigDao,
-                                          private val settingsRepo : SettingsDoa
+class ConfigViewModel
+@Inject
+constructor(
+    private val application: Application,
+    private val tunnelConfigRepository: TunnelConfigRepository,
+    private val settingsRepository: SettingsRepository,
 ) : ViewModel() {

-    private val _tunnel = MutableStateFlow<TunnelConfig?>(null)
-    private val _tunnelName = MutableStateFlow("")
-    val tunnelName get() = _tunnelName.asStateFlow()
-    val tunnel get() = _tunnel.asStateFlow()
+  private val packageManager = application.packageManager

-    private var _proxyPeers = MutableStateFlow(mutableStateListOf<PeerProxy>())
-    val proxyPeers get() = _proxyPeers.asStateFlow()
+  private val _uiState = MutableStateFlow(ConfigUiState())
+  val uiState = _uiState.asStateFlow()

-    private var _interface = MutableStateFlow(InterfaceProxy())
-    val interfaceProxy = _interface.asStateFlow()
-
-    private val _packages = MutableStateFlow(emptyList<PackageInfo>())
-    val packages get() = _packages.asStateFlow()
-    private val packageManager = application.packageManager
-
-    private val _checkedPackages = MutableStateFlow(mutableStateListOf<String>())
-    val checkedPackages get() = _checkedPackages.asStateFlow()
-    private val _include = MutableStateFlow(true)
-    val include get() = _include.asStateFlow()
-
-    private val _isAllApplicationsEnabled = MutableStateFlow(false)
-    val isAllApplicationsEnabled get() = _isAllApplicationsEnabled.asStateFlow()
-    private val _isDefaultTunnel = MutableStateFlow(false)
-    val isDefaultTunnel = _isDefaultTunnel.asStateFlow()
-
-    private lateinit var tunnelConfig: TunnelConfig
-
-    suspend fun onScreenLoad(id : String) {
-        if(id != Constants.MANUAL_TUNNEL_CONFIG_ID) {
-            tunnelConfig = getTunnelConfigById(id) ?: throw WgTunnelException("Config not found")
-            emitScreenData()
-        } else {
-            emitEmptyScreenData()
-        }
-    }
-
-    private fun emitEmptyScreenData() {
-        tunnelConfig = TunnelConfig(name = NumberUtils.generateRandomTunnelName(), wgQuick = "")
-        viewModelScope.launch {
-            emitTunnelConfig()
-            emitPeerProxy(PeerProxy())
-            emitInterfaceProxy(InterfaceProxy())
-            emitTunnelConfigName()
-            emitDefaultTunnelStatus()
-            emitQueriedPackages("")
-            emitTunnelAllApplicationsEnabled()
-        }
-    }
-
-
-    private suspend fun emitScreenData() {
-        emitTunnelConfig()
-        emitPeersFromConfig()
-        emitInterfaceFromConfig()
-        emitTunnelConfigName()
-        emitDefaultTunnelStatus()
-        emitQueriedPackages("")
-        emitCurrentPackageConfigurations()
-    }
-
-    private suspend fun emitDefaultTunnelStatus() {
-        val settings = settingsRepo.getAll()
-        if(settings.isNotEmpty()) {
-            _isDefaultTunnel.value = settings.first().isTunnelConfigDefault(tunnelConfig)
-        }
-    }
-
-    private fun emitInterfaceFromConfig() {
-        val config = TunnelConfig.configFromQuick(tunnelConfig.wgQuick)
-        _interface.value = InterfaceProxy.from(config.`interface`)
-    }
-
-    private fun emitPeersFromConfig() {
-        val config = TunnelConfig.configFromQuick(tunnelConfig.wgQuick)
-        config.peers.forEach{
-            _proxyPeers.value.add(PeerProxy.from(it))
-        }
-    }
-
-    private fun emitPeerProxy(peerProxy: PeerProxy) {
-        _proxyPeers.value.add(peerProxy)
-    }
-
-    private fun emitInterfaceProxy(interfaceProxy: InterfaceProxy) {
-        _interface.value = interfaceProxy
-    }
-
-    private suspend fun getTunnelConfigById(id : String) : TunnelConfig? {
-        return try {
-            tunnelRepo.getById(id.toLong())
-        } catch (_ : Exception) {
-            null
-        }
-    }
-
-    private suspend fun emitTunnelConfig() {
-        _tunnel.emit(tunnelConfig)
-    }
-
-    private  suspend fun emitTunnelConfigName() {
-        _tunnelName.emit(tunnelConfig.name)
-    }
-
-    fun onTunnelNameChange(name : String) {
-        _tunnelName.value = name
-    }
-
-    fun onIncludeChange(include : Boolean) {
-        _include.value = include
-    }
-    fun onAddCheckedPackage(packageName : String) {
-        _checkedPackages.value.add(packageName)
-    }
-
-    fun onAllApplicationsChange(isAllApplicationsEnabled : Boolean) {
-        _isAllApplicationsEnabled.value = isAllApplicationsEnabled
-    }
-
-    fun onRemoveCheckedPackage(packageName : String) {
-        _checkedPackages.value.remove(packageName)
-    }
-
-    private suspend fun emitSplitTunnelConfiguration(config : Config) {
-        val excludedApps = config.`interface`.excludedApplications
-        val includedApps = config.`interface`.includedApplications
-        if (excludedApps.isNotEmpty() || includedApps.isNotEmpty()) {
-            emitTunnelAllApplicationsDisabled()
-            determineAppInclusionState(excludedApps, includedApps)
-        } else {
-            emitTunnelAllApplicationsEnabled()
-        }
-    }
-
-    private suspend fun determineAppInclusionState(excludedApps : Set<String>, includedApps : Set<String>) {
-        if (excludedApps.isEmpty()) {
-            emitIncludedAppsExist()
-            emitCheckedApps(includedApps)
-        } else {
-            emitExcludedAppsExist()
-            emitCheckedApps(excludedApps)
-        }
-    }
-
-    private suspend fun emitIncludedAppsExist() {
-        _include.emit(true)
-    }
-
-    private suspend fun emitExcludedAppsExist() {
-        _include.emit(false)
-    }
-
-    private suspend fun emitCheckedApps(apps : Set<String>) {
-        _checkedPackages.emit(apps.toMutableStateList())
-    }
-
-    private suspend fun emitTunnelAllApplicationsEnabled() {
-        _isAllApplicationsEnabled.emit(true)
-    }
-
-    private suspend fun emitTunnelAllApplicationsDisabled() {
-        _isAllApplicationsEnabled.emit(false)
-    }
-
-    private fun emitCurrentPackageConfigurations() {
-        viewModelScope.launch(Dispatchers.IO) {
-            val config = TunnelConfig.configFromQuick(tunnelConfig.wgQuick)
-            emitSplitTunnelConfiguration(config)
-        }
-    }
-
-    fun emitQueriedPackages(query : String) {
-        viewModelScope.launch(Dispatchers.IO) {
-            val packages = getAllInternetCapablePackages().filter {
-                getPackageLabel(it).lowercase().contains(query.lowercase())
+    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
+                    } else {
+                        isAllApplicationsEnabled = true
+                        emptySet()
+                    }
+                ConfigUiState(
+                    proxyPeers,
+                    proxyInterface,
+                    packages,
+                    checkedPackages.toList(),
+                    include,
+                    isAllApplicationsEnabled,
+                    false,
+                    tunnelConfig,
+                    tunnelConfig.name)
+            } else {
+                ConfigUiState(loading = false, packages = packages)
            }
-            _packages.emit(packages)
-        }
-    }
-
-    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 {
-            packageManager.getPackagesHoldingPermissions(permissions, 0)
+            ConfigUiState(loading = false, packages = packages)
        }
+        _uiState.value = state
    }
+  fun onTunnelNameChange(name: String) {
+    _uiState.value = _uiState.value.copy(tunnelName = name)
+  }

-    private fun isAllApplicationsEnabled() : Boolean {
-        return _isAllApplicationsEnabled.value
-    }
+  fun onIncludeChange(include: Boolean) {
+    _uiState.value = _uiState.value.copy(include = include)
+  }

-    private fun isIncludeApplicationsEnabled() : Boolean {
-        return _include.value
-    }
+  fun onAddCheckedPackage(packageName: String) {
+    _uiState.value =
+        _uiState.value.copy(checkedPackageNames = _uiState.value.checkedPackageNames + packageName)
+  }

-    private suspend fun saveConfig(tunnelConfig: TunnelConfig) {
-        tunnelRepo.save(tunnelConfig)
+  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 suspend fun updateTunnelConfig(tunnelConfig: TunnelConfig?) {
-        if(tunnelConfig != null) {
-            saveConfig(tunnelConfig)
-            updateSettingsDefaultTunnel(tunnelConfig)
+  }
+
+  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 {
+      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 suspend fun updateSettingsDefaultTunnel(tunnelConfig: TunnelConfig) {
-        val settings = settingsRepo.getAll()
-        if(settings.isNotEmpty()) {
-            val setting = settings[0]
-            if(setting.defaultTunnel != null) {
-                if(tunnelConfig.id == TunnelConfig.from(setting.defaultTunnel!!).id) {
-                    settingsRepo.save(setting.copy(
-                        defaultTunnel = tunnelConfig.toString()
-                    ))
-                }
-            }
+  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 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())
+    }
+    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 onPeerPublicKeyChange(index: Int, value: String) {
+    _uiState.value =
+        _uiState.value.copy(
+            proxyPeers =
+                _uiState.value.proxyPeers.update(
+                    index, _uiState.value.proxyPeers[index].copy(publicKey = value)))
+  }
+
+  fun onPreSharedKeyChange(index: Int, value: String) {
+    _uiState.value =
+        _uiState.value.copy(
+            proxyPeers =
+                _uiState.value.proxyPeers.update(
+                    index, _uiState.value.proxyPeers[index].copy(preSharedKey = value)))
+  }
+
+  fun onEndpointChange(index: Int, value: String) {
+    _uiState.value =
+        _uiState.value.copy(
+            proxyPeers =
+                _uiState.value.proxyPeers.update(
+                    index, _uiState.value.proxyPeers[index].copy(endpoint = value)))
+  }
+
+  fun onAllowedIpsChange(index: Int, value: String) {
+    _uiState.value =
+        _uiState.value.copy(
+            proxyPeers =
+                _uiState.value.proxyPeers.update(
+                    index, _uiState.value.proxyPeers[index].copy(allowedIps = value)))
+  }
+
+  fun onPersistentKeepaliveChanged(index: Int, value: String) {
+    _uiState.value =
+        _uiState.value.copy(
+            proxyPeers =
+                _uiState.value.proxyPeers.update(
+                    index, _uiState.value.proxyPeers[index].copy(persistentKeepalive = value)))
+  }
+
+  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 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("")
+    }
+  }
+
+  fun emitQueriedPackages(query: String) {
+    val packages =
+        getAllInternetCapablePackages().filter {
+          getPackageLabel(it).lowercase().contains(query.lowercase())
        }
-    }
-
-    fun buildPeerListFromProxyPeers() : List<Peer> {
-        return _proxyPeers.value.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()
-        }
-    }
-
-    fun buildInterfaceListFromProxyInterface() : Interface {
-        val builder = Interface.Builder()
-        builder.parsePrivateKey(_interface.value.privateKey.trim())
-        builder.parseAddresses(_interface.value.addresses.trim())
-        builder.parseDnsServers(_interface.value.dnsServers.trim())
-        if(_interface.value.mtu.isNotEmpty()) builder.parseMtu(_interface.value.mtu.trim())
-        if(_interface.value.listenPort.isNotEmpty()) builder.parseListenPort(_interface.value.listenPort.trim())
-        if(isAllApplicationsEnabled()) _checkedPackages.value.clear()
-        if(_include.value) builder.includeApplications(_checkedPackages.value)
-        if(!_include.value) builder.excludeApplications(_checkedPackages.value)
-        return builder.build()
-    }
-
-
-
-    suspend fun onSaveAllChanges() {
-        try {
-            val peerList = buildPeerListFromProxyPeers()
-            val wgInterface = buildInterfaceListFromProxyInterface()
-            val config = Config.Builder().addPeers(peerList).setInterface(wgInterface).build()
-            val tunnelConfig = _tunnel.value?.copy(
-                name = _tunnelName.value,
-                wgQuick = config.toWgQuickString()
-            )
-            updateTunnelConfig(tunnelConfig)
-        } catch (e : Exception) {
-            throw WgTunnelException("Error: ${e.cause?.message?.lowercase() ?: "unknown error occurred"}")
-        }
-    }
-
-    fun onPeerPublicKeyChange(index: Int, publicKey: String) {
-        _proxyPeers.value[index] = _proxyPeers.value[index].copy(
-            publicKey = publicKey
-        )
-    }
-
-    fun onPreSharedKeyChange(index: Int, value: String) {
-        _proxyPeers.value[index] = _proxyPeers.value[index].copy(
-            preSharedKey = value
-        )
-    }
-
-    fun onEndpointChange(index: Int, value: String) {
-        _proxyPeers.value[index] = _proxyPeers.value[index].copy(
-            endpoint = value
-        )
-    }
-
-    fun onAllowedIpsChange(index: Int, value: String) {
-        _proxyPeers.value[index] = _proxyPeers.value[index].copy(
-            allowedIps = value
-        )
-    }
-
-    fun onPersistentKeepaliveChanged(index : Int, value : String) {
-        _proxyPeers.value[index] = _proxyPeers.value[index].copy(
-            persistentKeepalive = value
-        )
-    }
-
-    fun onDeletePeer(index: Int) {
-        proxyPeers.value.removeAt(index)
-    }
-
-    fun addEmptyPeer() {
-        _proxyPeers.value.add(PeerProxy())
-    }
-
-    fun generateKeyPair() {
-        val keyPair = KeyPair()
-        _interface.value = _interface.value.copy(
-            privateKey = keyPair.privateKey.toBase64(),
-            publicKey = keyPair.publicKey.toBase64()
-        )
-    }
-
-    fun onAddressesChanged(value: String) {
-        _interface.value = _interface.value.copy(
-            addresses = value
-        )
-    }
-
-    fun onListenPortChanged(value: String) {
-        _interface.value = _interface.value.copy(
-            listenPort = value
-        )
-    }
-
-    fun onDnsServersChanged(value: String) {
-        _interface.value = _interface.value.copy(
-            dnsServers = value
-        )
-    }
-
-    fun onMtuChanged(value: String) {
-        _interface.value = _interface.value.copy(
-            mtu = value
-        )
-    }
-
-    private fun onInterfacePublicKeyChange(value : String) {
-        _interface.value = _interface.value.copy(
-            publicKey = value
-        )
-    }
-
-    fun onPrivateKeyChange(value: String) {
-        _interface.value = _interface.value.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)
+  }
+}
@@ -1,161 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.detail
-
-import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.focusGroup
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-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.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-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.platform.ClipboardManager
-import androidx.compose.ui.platform.LocalClipboardManager
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.util.NumberUtils
-import java.time.Duration
-import java.time.Instant
-
-@OptIn(ExperimentalFoundationApi::class)
-@Composable
-fun DetailScreen(
-    viewModel: DetailViewModel = hiltViewModel(),
-    focusRequester: FocusRequester,
-    padding: PaddingValues,
-    id : String
-) {
-
-    val context = LocalContext.current
-    val clipboardManager: ClipboardManager = LocalClipboardManager.current
-    val tunnelStats by viewModel.tunnelStats.collectAsStateWithLifecycle(null)
-    val tunnel by viewModel.tunnel.collectAsStateWithLifecycle(null)
-    val tunnelName by viewModel.tunnelName.collectAsStateWithLifecycle()
-    val lastHandshake by viewModel.lastHandshake.collectAsStateWithLifecycle(emptyMap())
-
-
-    LaunchedEffect(Unit) {
-        viewModel.emitConfig(id)
-    }
-
-    if(null != tunnel) {
-        val interfaceKey = tunnel?.`interface`?.keyPair?.publicKey?.toBase64().toString()
-        val addresses = tunnel?.`interface`?.addresses!!.joinToString()
-        val dnsServers = tunnel?.`interface`?.dnsServers!!.joinToString()
-        val optionalMtu = tunnel?.`interface`?.mtu
-        val mtu = if(optionalMtu?.isPresent == true) optionalMtu.get().toString() else stringResource(
-            id = R.string.none
-        )
-        Column(
-            horizontalAlignment = Alignment.Start,
-            verticalArrangement = Arrangement.Top,
-            modifier = Modifier
-                .fillMaxWidth()
-                .fillMaxHeight(if(WireGuardAutoTunnel.isRunningOnAndroidTv(context)) 4/5f else 1f)
-                .verticalScroll(rememberScrollState())
-                .focusRequester(focusRequester)
-                .padding(padding)
-        ) {
-            Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(horizontal = 20.dp, vertical = 7.dp).focusGroup(),
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.SpaceBetween
-            ) {
-                Column(modifier = Modifier.weight(1f, true)) {
-                    Text(stringResource(R.string.config_interface), fontWeight = FontWeight.Bold, fontSize = 20.sp)
-                    Text(stringResource(R.string.name), fontStyle = FontStyle.Italic)
-                    Text(text = tunnelName,  modifier = Modifier.clickable {
-                        clipboardManager.setText(AnnotatedString(tunnelName))
-                    })
-                    Text(stringResource(R.string.public_key), fontStyle = FontStyle.Italic)
-                    Text(text = interfaceKey,  modifier = Modifier.clickable {
-                        clipboardManager.setText(AnnotatedString(interfaceKey))
-                    })
-                    Text(stringResource(R.string.addresses), fontStyle = FontStyle.Italic)
-                    Text(text = addresses,  modifier = Modifier.clickable {
-                        clipboardManager.setText(AnnotatedString(addresses))
-                    })
-                    Text(stringResource(R.string.dns_servers), fontStyle = FontStyle.Italic)
-                    Text(text = dnsServers,  modifier = Modifier.clickable {
-                        clipboardManager.setText(AnnotatedString(dnsServers))
-                    })
-                    Text(stringResource(R.string.mtu), fontStyle = FontStyle.Italic)
-                    Text(text = mtu,  modifier = Modifier.clickable {
-                        clipboardManager.setText(AnnotatedString(mtu))
-                    })
-                    Box(modifier = Modifier.padding(10.dp))
-                    tunnel?.peers?.forEach{
-                        val peerKey = it.publicKey.toBase64()
-                        val allowedIps = it.allowedIps.joinToString()
-                        val endpoint = if(it.endpoint.isPresent) it.endpoint.get().toString() else stringResource(
-                            id = R.string.none
-                        )
-                        Text(stringResource(R.string.peer), fontWeight = FontWeight.Bold, fontSize = 20.sp)
-                        Text(stringResource(R.string.public_key), fontStyle = FontStyle.Italic)
-                        Text(text = peerKey,  modifier = Modifier.clickable {
-                            clipboardManager.setText(AnnotatedString(peerKey))
-                        })
-                        Text(stringResource(id = R.string.allowed_ips), fontStyle = FontStyle.Italic)
-                        Text(text = allowedIps,  modifier = Modifier.clickable {
-                            clipboardManager.setText(AnnotatedString(allowedIps))
-                        })
-                        Text(stringResource(R.string.endpoint), fontStyle = FontStyle.Italic)
-                        Text(text = endpoint,  modifier = Modifier.clickable {
-                            clipboardManager.setText(AnnotatedString(endpoint))
-                        })
-                        if (tunnelStats != null) {
-                            val totalRx = tunnelStats?.totalRx() ?: 0
-                            val totalTx = tunnelStats?.totalTx() ?: 0
-                            if((totalRx + totalTx != 0L))  {
-                                val rxKB = NumberUtils.bytesToKB(tunnelStats!!.totalRx())
-                                val txKB = NumberUtils.bytesToKB(tunnelStats!!.totalTx())
-                                Text(stringResource(R.string.transfer), fontStyle = FontStyle.Italic)
-                                val transfer = "rx: ${NumberUtils.formatDecimalTwoPlaces(rxKB)} KB tx: ${NumberUtils.formatDecimalTwoPlaces(txKB)} KB"
-                                Text(transfer, modifier = Modifier.clickable {
-                                    clipboardManager.setText(AnnotatedString(transfer))})
-                                Text(stringResource(R.string.last_handshake), fontStyle = FontStyle.Italic)
-                                val handshakeEpoch = lastHandshake[it.publicKey]
-                                if(handshakeEpoch != null) {
-                                    if(handshakeEpoch == 0L) {
-                                        Text(stringResource(id = R.string.never), modifier = Modifier.clickable {
-                                            clipboardManager.setText(AnnotatedString(context.getString(R.string.never)))
-                                        })
-                                    } else {
-                                        val time = Instant.ofEpochMilli(handshakeEpoch)
-                                        val duration = "${Duration.between(time, Instant.now()).seconds} seconds ago"
-                                        Text(duration, modifier = Modifier.clickable {
-                                            clipboardManager.setText(AnnotatedString(duration))
-                                        })
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
@@ -1,46 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.screens.detail
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.wireguard.config.Config
-import com.zaneschepke.wireguardautotunnel.repository.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.repository.model.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
-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 javax.inject.Inject
-
-@HiltViewModel
-class DetailViewModel @Inject constructor(private val tunnelRepo : TunnelConfigDao, private val vpnService : VpnService
-) : ViewModel() {
-
-    private val _tunnel = MutableStateFlow<Config?>(null)
-    val tunnel get() = _tunnel.asStateFlow()
-
-    private val _tunnelName = MutableStateFlow("")
-    val tunnelName = _tunnelName.asStateFlow()
-    val tunnelStats get() = vpnService.statistics
-    val lastHandshake get() = vpnService.lastHandshake
-
-    private suspend fun getTunnelConfigById(id: String): TunnelConfig? {
-        return try {
-            tunnelRepo.getById(id.toLong())
-        } catch (e: Exception) {
-            Timber.e(e.message)
-            null
-        }
-    }
-    fun emitConfig(id: String) {
-        viewModelScope.launch(Dispatchers.IO) {
-            val tunnelConfig = getTunnelConfigById(id)
-            if(tunnelConfig != null) {
-                _tunnelName.emit(tunnelConfig.name)
-                _tunnel.emit(TunnelConfig.configFromQuick(tunnelConfig.wgQuick))
-            }
-        }
-    }
-}
@@ -8,27 +8,36 @@ import android.os.Build
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
 import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.focusable
+import androidx.compose.foundation.gestures.ScrollableDefaults
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.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
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.overscroll
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Create
 import androidx.compose.material.icons.filled.FileOpen
 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.Delete
 import androidx.compose.material.icons.rounded.Edit
@@ -42,14 +51,18 @@ import androidx.compose.material3.FloatingActionButton
 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
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -61,13 +74,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.hapticfeedback.HapticFeedbackType
-import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
-import androidx.compose.ui.input.nestedscroll.NestedScrollSource
-import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.res.stringResource
@@ -79,416 +89,474 @@ import androidx.navigation.NavController
 import com.journeyapps.barcodescanner.ScanContract
 import com.journeyapps.barcodescanner.ScanOptions
 import com.wireguard.android.backend.Tunnel
-import com.zaneschepke.wireguardautotunnel.Constants
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.repository.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.service.tunnel.HandshakeStatus
 import com.zaneschepke.wireguardautotunnel.ui.CaptureActivityPortrait
-import com.zaneschepke.wireguardautotunnel.ui.Routes
+import com.zaneschepke.wireguardautotunnel.ui.Screen
 import com.zaneschepke.wireguardautotunnel.ui.common.RowListItem
-import com.zaneschepke.wireguardautotunnel.ui.theme.brickRed
+import com.zaneschepke.wireguardautotunnel.ui.common.screen.LoadingScreen
+import com.zaneschepke.wireguardautotunnel.ui.theme.corn
 import com.zaneschepke.wireguardautotunnel.ui.theme.mint
-import com.zaneschepke.wireguardautotunnel.util.WgTunnelException
+import com.zaneschepke.wireguardautotunnel.util.Constants
+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 kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch

@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
@Composable
 fun MainScreen(
    viewModel: MainViewModel = hiltViewModel(),
    padding: PaddingValues,
+    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) }
-    val tunnels by viewModel.tunnels.collectAsStateWithLifecycle(mutableListOf())
-    val handshakeStatus by viewModel.handshakeStatus.collectAsStateWithLifecycle(HandshakeStatus.NOT_STARTED)
-    var selectedTunnel by remember { mutableStateOf<TunnelConfig?>(null) }
-    val state by viewModel.state.collectAsStateWithLifecycle(Tunnel.State.DOWN)
-    val tunnelName by viewModel.tunnelName.collectAsStateWithLifecycle("")
-    val settings by viewModel.settings.collectAsStateWithLifecycle()
+  var showPrimaryChangeAlertDialog by remember { mutableStateOf(false) }
+  var selectedTunnel by remember { mutableStateOf<TunnelConfig?>(null) }
+  val uiState by viewModel.uiState.collectAsStateWithLifecycle()

-    // Nested scroll for control FAB
-    val nestedScrollConnection = remember {
-        object : NestedScrollConnection {
-            override fun onPreScroll(available: Offset, source: NestedScrollSource): Offset {
-                // Hide FAB
-                if (available.y < -1) {
-                    isVisible.value = false
-                }
-                // Show FAB
-                if (available.y > 1) {
-                    isVisible.value = true
-                }
-                return Offset.Zero
-            }
-        }
+  LaunchedEffect(uiState.loading) {
+    if (!uiState.loading && WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+      delay(Constants.FOCUS_REQUEST_DELAY)
+      focusRequester.requestFocus()
    }
+  }

-    val tunnelFileImportResultLauncher = rememberLauncherForActivityResult(object : ActivityResultContracts.GetContent() {
-        override fun createIntent(context: Context, input: String): Intent {
-            val intent = super.createIntent(context, input)
+  if (uiState.loading) {
+    LoadingScreen()
+    return
+  }

-            /* 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)
-                }) {
-                throw WgTunnelException(context.getString(R.string.no_file_explorer))
-            }
-            return intent
-        }
-    }) { data ->
-        if (data == null) return@rememberLauncherForActivityResult
-        scope.launch(Dispatchers.IO) {
-            try {
-                viewModel.onTunnelFileSelected(data)
-            } catch (e : WgTunnelException) {
-                showSnackbarMessage(e.message)
-            }
-        }
-    }
+  val tunnelFileImportResultLauncher =
+      rememberLauncherForActivityResult(
+          object : ActivityResultContracts.GetContent() {
+            override fun createIntent(context: Context, input: String): Intent {
+              val intent = super.createIntent(context, input)

-    val scanLauncher = rememberLauncherForActivityResult(
-        contract = ScanContract(),
-        onResult = {
+              /* 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 ->
+            if (data == null) return@rememberLauncherForActivityResult
            scope.launch {
-                try {
-                    viewModel.onTunnelQrResult(it.contents)
-                } catch (e: WgTunnelException) {
-                    showSnackbarMessage(e.message)
+              viewModel.onTunnelFileSelected(data).let {
+                when (it) {
+                  is Result.Error -> 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)
+                  }
+                }
+              }
+            }
+          })

-    if(showPrimaryChangeAlertDialog) {
-        AlertDialog(
-            onDismissRequest = {
-               showPrimaryChangeAlertDialog = false
-            },
-            confirmButton = {
-                TextButton(onClick = {
-                    scope.launch {
-                        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)) }
-        )
-    }
-
-    fun onTunnelToggle(checked : Boolean , tunnel : TunnelConfig) {
-        try {
-            if (checked) viewModel.onTunnelStart(tunnel) else viewModel.onTunnelStop()
-        } catch (e : Exception) {
-            showSnackbarMessage(e.message!!)
-        }
-    }
-
-    Scaffold(
-        modifier = Modifier.pointerInput(Unit) {
-            detectTapGestures(onTap = {
+  AnimatedVisibility(showPrimaryChangeAlertDialog) {
+    AlertDialog(
+        onDismissRequest = { showPrimaryChangeAlertDialog = false },
+        confirmButton = {
+          TextButton(
+              onClick = {
+                viewModel.onDefaultTunnelChange(selectedTunnel)
+                showPrimaryChangeAlertDialog = false
                selectedTunnel = null
-            })
+              }) {
+                Text(text = stringResource(R.string.okay))
+              }
        },
-        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 = Modifier.padding(bottom = 90.dp).onFocusChanged {
-                        if(WireGuardAutoTunnel.isRunningOnAndroidTv(context)) {
-                            fobColor = if (it.isFocused) hoverColor else secondaryColor }
+        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)) })
+  }
+
+  fun onTunnelToggle(checked: Boolean, tunnel: TunnelConfig) {
+    if (checked) viewModel.onTunnelStart(tunnel) else viewModel.onTunnelStop()
+  }
+
+  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))
                        }
-                    ,
-                    onClick = {
-                        showBottomSheet = true
-                    },
-                    containerColor = fobColor,
-                    shape = RoundedCornerShape(16.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")
+                        }
+                      }
+                },
+            )
+      },
+      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 {
+                            if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+                              fobColor = if (it.isFocused) hoverColor else secondaryColor
+                            }
+                          },
+                  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)
+                  }
            }
-        }
-    ) {
-        if (tunnels.isEmpty()) {
-            Column(
-                horizontalAlignment = Alignment.CenterHorizontally,
-                verticalArrangement = Arrangement.Center,
-                modifier = Modifier
-                    .fillMaxSize()
-                    .padding(padding)
-            ) {
+      }) { innerPadding ->
+        AnimatedVisibility(uiState.tunnels.isEmpty(), exit = fadeOut(), enter = fadeIn()) {
+          Column(
+              horizontalAlignment = Alignment.CenterHorizontally,
+              verticalArrangement = Arrangement.Center,
+              modifier = Modifier.fillMaxSize().padding(padding)) {
                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
-                            try {
-                                tunnelFileImportResultLauncher.launch(Constants.ALLOWED_FILE_TYPES)
-                            } catch (e : Exception) {
-                                showSnackbarMessage(e.message!!)
+                    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)
-                    )
-                }
-                if(!WireGuardAutoTunnel.isRunningOnAndroidTv(context)) {
-                    Divider()
-                    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)
-                            }
-                        }
-                        .padding(10.dp)
-                    ) {
+                            .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 {
+                                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)
+                                }
+                              }
+                              .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()
                Row(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .clickable {
-                            showBottomSheet = false
-                            navController.navigate("${Routes.Config.name}/${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 =
+                        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))
+                    }
+              }
        }
-        Column(
+
+        LazyColumn(
            horizontalAlignment = Alignment.Start,
            verticalArrangement = Arrangement.Top,
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(padding)
-        ) {
-            LazyColumn(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .nestedScroll(nestedScrollConnection),
-            ) {
-                items(tunnels, key = { tunnel -> tunnel.id }) { tunnel ->
-                   val leadingIconColor = (if (tunnelName == tunnel.name) when (handshakeStatus) {
-                        HandshakeStatus.HEALTHY -> mint
-                        HandshakeStatus.UNHEALTHY -> brickRed
-                        HandshakeStatus.NOT_STARTED -> Color.Gray
-                        HandshakeStatus.NEVER_CONNECTED -> brickRed
-                    } else {Color.Gray})
-                    val focusRequester = remember { FocusRequester() }
-                    RowListItem(icon = {
-                        if (settings.isTunnelConfigDefault(tunnel))
+            modifier =
+                Modifier.fillMaxWidth().fillMaxHeight(.90f).overscroll(ScrollableDefaults.overscrollEffect()).padding(innerPadding),
+            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) }
+                    RowListItem(
+                        icon = {
+                          if (uiState.settings.isTunnelConfigDefault(tunnel)) {
                            Icon(
-                                Icons.Rounded.Star, stringResource(R.string.status),
+                                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)
-                        )
-                    },
+                                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))
+                          }
+                        },
                        text = tunnel.name,
                        onHold = {
-                            if (state == Tunnel.State.UP && tunnel.name == tunnelName) {
-                                showSnackbarMessage(context.resources.getString(R.string.turn_off_tunnel))
-                                return@RowListItem
-                            }
-                            haptic.performHapticFeedback(HapticFeedbackType.LongPress)
-                            selectedTunnel = tunnel
+                          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(context)) {
-                                navController.navigate("${Routes.Detail.name}/${tunnel.id}")
-                            } else {
-                                selectedTunnel = tunnel
-                                focusRequester.requestFocus()
+                          if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+                            if (uiState.vpnState.status == Tunnel.State.UP &&
+                                (uiState.vpnState.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(context)) {
-                                Row {
-                                    if(!settings.isTunnelConfigDefault(tunnel)) {
-                                        IconButton(onClick = {
-                                            if(settings.isAutoTunnelEnabled) {
-                                                showSnackbarMessage(context.resources.getString(R.string.turn_off_auto))
-                                            } else showPrimaryChangeAlertDialog = true
-                                        }) {
-                                            Icon(Icons.Rounded.Star, stringResource(id = R.string.set_primary))
-                                        }
-                                    }
-                                    IconButton(onClick = {
-                                        navController.navigate("${Routes.Config.name}/${selectedTunnel?.id}")
+                          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.Edit, stringResource(id = R.string.edit))
+                                      Icon(
+                                          Icons.Rounded.Star,
+                                          stringResource(id = R.string.set_primary))
                                    }
-                                    IconButton(
-                                        modifier = Modifier.focusable(),
-                                        onClick = { viewModel.onDelete(tunnel) }) {
-                                        Icon(
-                                            Icons.Rounded.Delete,
-                                            stringResource(id = R.string.delete)
-                                        )
-                                    }
-                                }
-                            } else {
-                                if (WireGuardAutoTunnel.isRunningOnAndroidTv(context)) {
-                                    Row {
-                                        if(!settings.isTunnelConfigDefault(tunnel)) {
-                                            IconButton(onClick = {
-                                                if(settings.isAutoTunnelEnabled) {
-                                                    showSnackbarMessage(context.resources.getString(R.string.turn_off_auto))
-                                                } else showPrimaryChangeAlertDialog = true
-                                            }) {
-                                                Icon(Icons.Rounded.Star, stringResource(id = R.string.set_primary))
-                                            }
-                                        }
-                                        IconButton(
-                                            modifier = Modifier.focusRequester(focusRequester),
-                                            onClick = {
-                                                navController.navigate("${Routes.Detail.name}/${tunnel.id}")
-                                            }) {
-                                            Icon(Icons.Rounded.Info, stringResource(R.string.info))
-                                        }
-                                        IconButton(onClick = {
-                                            if (state == Tunnel.State.UP && tunnel.name == tunnelName)
-                                                showSnackbarMessage(
-                                                    context.resources.getString(
-                                                        R.string.turn_off_tunnel
-                                                    )
-                                                )
-                                            else {
-                                                navController.navigate("${Routes.Config.name}/${tunnel.id}")
-                                            }
-                                        }) {
-                                            Icon(
-                                                Icons.Rounded.Edit,
-                                                stringResource(id = R.string.edit)
-                                            )
-                                        }
-                                        IconButton(onClick = {
-                                            if (state == Tunnel.State.UP && tunnel.name == tunnelName)
-                                                showSnackbarMessage(
-                                                    context.resources.getString(
-                                                        R.string.turn_off_tunnel
-                                                    )
-                                                )
-                                            else {
-                                                viewModel.onDelete(tunnel)
-                                            }
-                                        }) {
-                                            Icon(
-                                                Icons.Rounded.Delete,
-                                                stringResource(id = R.string.delete)
-                                            )
-                                        }
-                                        Switch(
-                                            modifier = Modifier.focusRequester(focusRequester),
-                                            checked = (state == Tunnel.State.UP && tunnel.name == tunnelName),
-                                            onCheckedChange = { checked ->
-                                                onTunnelToggle(checked, tunnel)
-                                            }
-                                        )
-                                    }
-                                } else {
-                                    Switch(
-                                        checked = (state == Tunnel.State.UP && tunnel.name == tunnelName),
-                                        onCheckedChange = { checked ->
-                                            onTunnelToggle(checked, tunnel)
-                                        }
-                                    )
-                                }
+                              }
+                              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))
+                                  }
                            }
+                          } else {
+                            val checked by remember {
+                              derivedStateOf {
+                                (uiState.vpnState.status == Tunnel.State.UP &&
+                                    tunnel.name == uiState.vpnState.name)
+                              }
+                            }
+                            if (!checked) expanded.value = false
+
+                            @Composable
+                            fun TunnelSwitch() =
+                                Switch(
+                                    modifier = Modifier.focusRequester(focusRequester),
+                                    checked = checked,
+                                    onCheckedChange = { checked ->
+                                      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
+                                        }
+                                      }) {
+                                        Icon(
+                                            Icons.Rounded.Star,
+                                            stringResource(id = R.string.set_primary))
+                                      }
+                                }
+                                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()
+                            }
+                          }
                        })
-                }
+                  }
            }
-        }
-    }
+      }
 }
@@ -0,0 +1,12 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.main
+
+import com.zaneschepke.wireguardautotunnel.data.model.Settings
+import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnState
+import com.zaneschepke.wireguardautotunnel.util.TunnelConfigs
+
+data class MainUiState(
+    val settings : Settings = Settings(),
+    val tunnels : TunnelConfigs = emptyList(),
+    val vpnState: VpnState = VpnState(),
+    val loading : Boolean = true
+)
@@ -8,251 +8,254 @@ import android.provider.OpenableColumns
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.wireguard.config.Config
-import com.zaneschepke.wireguardautotunnel.Constants
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
-import com.zaneschepke.wireguardautotunnel.repository.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.repository.model.Settings
-import com.zaneschepke.wireguardautotunnel.repository.model.TunnelConfig
+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.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.WgTunnelException
+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.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.io.InputStream
 import java.util.zip.ZipInputStream
 import javax.inject.Inject

-
@HiltViewModel
-class MainViewModel @Inject constructor(
+class MainViewModel
+@Inject
+constructor(
    private val application: Application,
-    private val tunnelRepo: TunnelConfigDao,
-    private val settingsRepo: SettingsDoa,
+    private val tunnelConfigRepository: TunnelConfigRepository,
+    private val settingsRepository: SettingsRepository,
    private val vpnService: VpnService
 ) : ViewModel() {

-    val tunnels get() = tunnelRepo.getAllFlow()
-    val state get() = vpnService.state
+  val uiState =
+      combine(
+              settingsRepository.getSettingsFlow(),
+              tunnelConfigRepository.getTunnelConfigsFlow(),
+              vpnService.vpnState,
+          ) { settings, tunnels, vpnState ->
+            validateWatcherServiceState(settings)
+            MainUiState(settings, tunnels, vpnState, false)
+          }
+          .stateIn(
+              viewModelScope,
+              SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
+              MainUiState())

-    val handshakeStatus get() = vpnService.handshakeStatus
-    val tunnelName get() = vpnService.tunnelName
-    private val _settings = MutableStateFlow(Settings())
-    val settings get() = _settings.asStateFlow()
-
-    init {
-        viewModelScope.launch(Dispatchers.IO) {
-            settingsRepo.getAllFlow().filter { it.isNotEmpty() }.collect {
-                val settings = it.first()
-                validateWatcherServiceState(settings)
-                _settings.emit(settings)
-            }
-        }
+  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 validateWatcherServiceState(settings: Settings) {
-        val watcherState = ServiceManager.getServiceState(
-            application.applicationContext,
-            WireGuardConnectivityWatcherService::class.java
-        )
-        if (settings.isAutoTunnelEnabled && watcherState == ServiceState.STOPPED && settings.defaultTunnel != null) {
-            ServiceManager.startWatcherService(
-                application.applicationContext,
-                settings.defaultTunnel!!
-            )
-        }
+    private fun stopWatcherService() = viewModelScope.launch(Dispatchers.IO) {
+        ServiceManager.stopWatcherService(application.applicationContext)
    }
-
-
-    fun onDelete(tunnel: TunnelConfig) {
-        viewModelScope.launch {
-            if (tunnelRepo.count() == 1L) {
-                ServiceManager.stopWatcherService(application.applicationContext)
-                val settings = settingsRepo.getAll()
-                if (settings.isNotEmpty()) {
-                    val setting = settings[0]
-                    setting.defaultTunnel = null
-                    setting.isAutoTunnelEnabled = false
-                    setting.isAlwaysOnVpnEnabled = false
-                    settingsRepo.save(setting)
-                }
-            }
-            tunnelRepo.delete(tunnel)
-        }
+  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 {
-            stopActiveTunnel()
-            startTunnel(tunnelConfig)
-        }
-    }
+  fun onTunnelStart(tunnelConfig: TunnelConfig) = viewModelScope.launch(Dispatchers.IO) {
+        stopActiveTunnel().await()
+        startTunnel(tunnelConfig)
+  }

-    private fun startTunnel(tunnelConfig: TunnelConfig) {
-        ServiceManager.startVpnService(application.applicationContext, tunnelConfig.toString())
-    }
+  private fun startTunnel(tunnelConfig: TunnelConfig) = viewModelScope.launch(Dispatchers.IO) {
+      ServiceManager.startVpnService(application.applicationContext, tunnelConfig.toString())
+  }

-    private suspend fun stopActiveTunnel() {
+  private fun stopActiveTunnel() =
+      viewModelScope.async(Dispatchers.IO) {
        if (ServiceManager.getServiceState(
-                application.applicationContext,
-                WireGuardTunnelService::class.java,
-            ) == ServiceState.STARTED
-        ) {
-            onTunnelStop()
-            delay(Constants.TOGGLE_TUNNEL_DELAY)
+            application.applicationContext, WireGuardTunnelService::class.java) ==
+            ServiceState.STARTED) {
+          onTunnelStop()
+          delay(Constants.TOGGLE_TUNNEL_DELAY)
        }
-    }
+      }

-    fun onTunnelStop() {
-        ServiceManager.stopVpnService(application.applicationContext)
-    }
+  fun onTunnelStop() = viewModelScope.launch(Dispatchers.IO) {
+    ServiceManager.stopVpnService(application.applicationContext)
+  }

-    private fun validateConfigString(config: String) {
-        TunnelConfig.configFromQuick(config)
-    }
+  private fun validateConfigString(config: String) {
+    TunnelConfig.configFromQuick(config)
+  }

-    suspend fun onTunnelQrResult(result: String) {
-        try {
-            validateConfigString(result)
-            val tunnelConfig =
-                TunnelConfig(name = NumberUtils.generateRandomTunnelName(), wgQuick = result)
-            addTunnel(tunnelConfig)
-        } catch (e : Exception) {
-            throw WgTunnelException(e)
-        }
-    }
-
-    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)
-            ?: throw WgTunnelException(application.getString(R.string.stream_failed))
-    }
-
-    suspend fun onTunnelFileSelected(uri: Uri) {
-        try {
-            val fileName = getFileName(application.applicationContext, uri)
-            val fileExtension = getFileExtensionFromFileName(fileName)
-            when(fileExtension){
-                Constants.CONF_FILE_EXTENSION -> saveTunnelFromConfUri(fileName, uri)
-                Constants.ZIP_FILE_EXTENSION -> saveTunnelsFromZipUri(uri)
-                else -> throw WgTunnelException(application.getString(R.string.file_extension_message))
-            }
+  suspend fun onTunnelQrResult(result: String) : Result<Unit> {
+        return try {
+          validateConfigString(result)
+          val tunnelConfig =
+              TunnelConfig(name = NumberUtils.generateRandomTunnelName(), wgQuick = result)
+          addTunnel(tunnelConfig)
+            Result.Success(Unit)
        } catch (e: Exception) {
-            throw WgTunnelException(e)
+            Result.Error(Event.Error.InvalidQrCode)
        }
-    }
+      }

-    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 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)
+  }
+
+  suspend fun onTunnelFileSelected(uri: Uri) : Result<Unit> {
+        try {
+            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.ZIP_FILE_EXTENSION -> saveTunnelsFromZipUri(uri)
+                    else -> return Result.Error(Event.Error.InvalidFileExtension)
                }
+                return Result.Success(Unit)
+          } else {
+             return Result.Error(Event.Error.InvalidFileExtension)
            }
-        }
-    }
-
-    private suspend fun saveTunnelFromConfUri(name : String, uri: Uri) {
-        val stream = getInputStreamFromUri(uri)
-        saveTunnelConfigFromStream(stream, name)
-    }
-
-    private suspend fun addTunnel(tunnelConfig: TunnelConfig) {
-        saveTunnel(tunnelConfig)
-    }
-
-    private suspend fun saveTunnel(tunnelConfig: TunnelConfig) {
-        tunnelRepo.save(tunnelConfig)
-    }
-
-    private fun getFileNameByCursor(context: Context, uri: Uri): String {
-        val cursor = context.contentResolver.query(uri, null, null, null, null)
-        if (cursor != null) {
-            cursor.use {
-                return getDisplayNameByCursor(it)
-            }
-        } else {
-            throw WgTunnelException("Failed to initialize cursor")
-        }
-    }
-
-    private fun getDisplayNameColumnIndex(cursor: Cursor): Int {
-        val columnIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
-        if (columnIndex == -1) {
-            throw WgTunnelException("Cursor out of bounds")
-        }
-        return columnIndex
-    }
-
-    private fun getDisplayNameByCursor(cursor: Cursor): String {
-        if (cursor.moveToFirst()) {
-            val index = getDisplayNameColumnIndex(cursor)
-            return cursor.getString(index)
-        } else {
-            throw WgTunnelException("Cursor failed to move to first")
-        }
-    }
-
-    private fun validateUriContentScheme(uri: Uri) {
-        if (uri.scheme != Constants.URI_CONTENT_SCHEME) {
-            throw WgTunnelException(application.getString(R.string.file_extension_message))
-        }
-    }
-
-
-    private fun getFileName(context: Context, uri: Uri): String {
-        validateUriContentScheme(uri)
-        return try {
-            getFileNameByCursor(context, uri)
-        } catch (_: Exception) {
-            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) {
-            ""
+            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))
    }

-    suspend fun onDefaultTunnelChange(selectedTunnel: TunnelConfig?) {
-        if (selectedTunnel != null) {
-            _settings.emit(
-                _settings.value.copy(
-                    defaultTunnel = selectedTunnel.toString()
-                )
-            )
-            settingsRepo.save(_settings.value)
-        }
+    fun resumeAutoTunneling() = viewModelScope.launch {
+        settingsRepository.save(uiState.value.settings.copy(isAutoTunnelPaused = false))
    }
-}
+
+  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)
+    }
+      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()
+    }
+  }
+}
@@ -4,7 +4,8 @@ import android.Manifest
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
-import android.provider.Settings
+import android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS
+import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
@@ -29,6 +30,7 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.outlined.Add
 import androidx.compose.material.icons.rounded.LocationOff
+import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -37,21 +39,20 @@ import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.ExperimentalComposeUiApi
 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.focus.onFocusChanged
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalFocusManager
-import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.input.ImeAction
@@ -64,382 +65,444 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
+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.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.StorageUtil
+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 java.io.File

@OptIn(
    ExperimentalPermissionsApi::class,
-    ExperimentalLayoutApi::class, ExperimentalComposeUiApi::class
-)
+    ExperimentalLayoutApi::class)
@Composable
 fun SettingsScreen(
    viewModel: SettingsViewModel = hiltViewModel(),
    padding: PaddingValues,
    showSnackbarMessage: (String) -> Unit,
-    focusRequester: FocusRequester,
+    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 keyboardController = LocalSoftwareKeyboardController.current
-    val interactionSource = remember { MutableInteractionSource() }
+  val uiState by viewModel.uiState.collectAsStateWithLifecycle()

-    val settings by viewModel.settings.collectAsStateWithLifecycle()
-    val trustedSSIDs by viewModel.trustedSSIDs.collectAsStateWithLifecycle()
-    val tunnels by viewModel.tunnels.collectAsStateWithLifecycle(mutableListOf())
-    val fineLocationState = rememberPermissionState(Manifest.permission.ACCESS_FINE_LOCATION)
-    var currentText by remember { mutableStateOf("") }
-    val scrollState = rememberScrollState()
-    var didShowLocationDisclaimer by remember { mutableStateOf(false) }
-    var isBackgroundLocationGranted by remember { mutableStateOf(true) }
-    var showAuthPrompt by remember { mutableStateOf(false) }
-    var didExportFiles by remember { mutableStateOf(false) }
+  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() }

-    val screenPadding = 5.dp
-    val fillMaxWidth = .85f
+  val screenPadding = 5.dp
+  val fillMaxWidth = .85f

-    fun exportAllConfigs() {
-        try {
-            val files = tunnels.map { File(context.cacheDir, "${it.name}.conf") }
-            files.forEachIndexed { index, file ->
-                file.outputStream().use {
-                    it.write(tunnels[index].wgQuick.toByteArray())
-                }
-            }
-            StorageUtil.saveFilesToZip(context, files)
-            didExportFiles = true
-            showSnackbarMessage(context.getString(R.string.exported_configs_message))
-        } catch (e : Exception) {
-            showSnackbarMessage(e.message!!)
-        }
+  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()) {
-            scope.launch {
-                try {
-                    viewModel.onSaveTrustedSSID(currentText)
-                    currentText = ""
-                } catch (e : Exception) {
-                    showSnackbarMessage(e.message ?: context.getString(R.string.unknown_error))
-                }
-            }
-        }
+  fun saveTrustedSSID() {
+    if (currentText.isNotEmpty()) {
+      viewModel.onSaveTrustedSSID(currentText).let {
+          when(it) {
+              is Result.Success -> currentText = ""
+              is Result.Error -> showSnackbarMessage(it.error.message)
+          }
+      }
    }
+  }

-    fun isAllAutoTunnelPermissionsEnabled() : Boolean {
-        return(isBackgroundLocationGranted && fineLocationState.status.isGranted && !viewModel.isLocationServicesNeeded())
+  fun openSettings() {
+    scope.launch {
+      val intentSettings = Intent(ACTION_APPLICATION_DETAILS_SETTINGS)
+      intentSettings.data = Uri.fromParts("package", context.packageName, null)
+      context.startActivity(intentSettings)
    }
+  }

-    fun openSettings() {
-        scope.launch {
-            val intentSettings =
-                Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-            intentSettings.data =
-                Uri.fromParts("package", context.packageName, null)
-            context.startActivity(intentSettings)
-        }
-    }
-
-    if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-        val backgroundLocationState =
-            rememberPermissionState(Manifest.permission.ACCESS_BACKGROUND_LOCATION)
-        if(!backgroundLocationState.status.isGranted) {
-            isBackgroundLocationGranted = false
-            if(!didShowLocationDisclaimer) {
-                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(context)) Modifier
-                            .fillMaxWidth()
-                            .padding(10.dp) else Modifier
-                            .fillMaxWidth()
-                            .padding(30.dp),
-                        verticalAlignment = Alignment.CenterVertically,
-                        horizontalArrangement = Arrangement.SpaceEvenly
-                    ) {
-                        TextButton(onClick = {
-                            didShowLocationDisclaimer = true
-                        }) {
-                            Text(stringResource(id = R.string.no_thanks))
-                        }
-                        TextButton(modifier = Modifier.focusRequester(focusRequester), onClick = {
-                            openSettings()
-                        }) {
-                            Text(stringResource(id = R.string.turn_on))
-                        }
-                    }
-                }
-                return
-            }
+  fun checkFineLocationGranted() {
+    isBackgroundLocationGranted =
+        if (!fineLocationState.status.isGranted) {
+          false
        } else {
-            isBackgroundLocationGranted = true
+          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(
+            onDismissRequest = { showLocationServicesAlertDialog = false },
+            confirmButton = {
+                TextButton(
+                    onClick = {
+                        showLocationServicesAlertDialog = false
+                        viewModel.toggleAutoTunnel()
+                    }) {
+                    Text(text = stringResource(R.string.okay))
+                }
+            },
+            dismissButton = {
+                TextButton(onClick = { showLocationServicesAlertDialog = false }) {
+                    Text(text = stringResource(R.string.cancel))
+                }
+            },
+            title = { Text(text = stringResource(R.string.location_services_not_detected)) },
+            text = { Text(text = stringResource(R.string.location_services_missing_message)) })
    }

-    if(showAuthPrompt) {
-        AuthorizationPrompt(onSuccess = {
-            showAuthPrompt = false
-            exportAllConfigs() },
-            onError = { error ->
-                showSnackbarMessage(error)
-                showAuthPrompt = false
-                },
-            onFailure = {
-                showAuthPrompt = false
-                showSnackbarMessage(context.getString(R.string.authentication_failed))
-            })
-    }
-
-    if (tunnels.isEmpty()) {
-        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
-            )
-        }
-        return
-    }
-
+  if (!uiState.isLocationDisclosureShown) {
    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(context))
-                Modifier
-                    .height(IntrinsicSize.Min)
-                    .fillMaxWidth(fillMaxWidth)
-            else Modifier.fillMaxWidth(fillMaxWidth)).padding(top = 60.dp, bottom = 25.dp)
-        ) {
-            Column(
-                horizontalAlignment = Alignment.Start,
-                verticalArrangement = Arrangement.Top,
-                modifier = Modifier.padding(15.dp)
-            ) {
-                SectionTitle(title = stringResource(id = R.string.auto_tunneling), padding = screenPadding)
-                Text(
-                    stringResource(R.string.trusted_ssid),
-                    textAlign = TextAlign.Center,
-                    modifier = Modifier.padding(screenPadding, bottom = 5.dp, top = 5.dp)
-                )
-                FlowRow(
-                    modifier = Modifier.padding(screenPadding),
-                    horizontalArrangement = Arrangement.spacedBy(8.dp),
-                    verticalArrangement = Arrangement.SpaceEvenly
-                ) {
-                    trustedSSIDs.forEach { ssid ->
-                        ClickableIconButton(
-                            onIconClick = {
-                                scope.launch {
-                                    viewModel.onDeleteTrustedSSID(ssid)
-                                }
-                            },
-                            text = ssid,
-                            icon = Icons.Filled.Close,
-                            enabled = !(settings.isAutoTunnelEnabled || settings.isAlwaysOnVpnEnabled)
-                        )
-                    }
-                    if(trustedSSIDs.isEmpty()) {
-                        Text(stringResource(R.string.none), fontStyle = FontStyle.Italic, color = Color.Gray)
-                    }
+        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) {
+                TextButton(onClick = { viewModel.setLocationDisclosureShown() }) {
+                  Text(stringResource(id = R.string.no_thanks))
                }
-                OutlinedTextField(
-                    enabled = !(settings.isAutoTunnelEnabled || settings.isAlwaysOnVpnEnabled),
-                    value = currentText,
-                    onValueChange = { currentText = it },
-                    label = { Text(stringResource(R.string.add_trusted_ssid)) },
-                    modifier = Modifier.padding(start = screenPadding, top = 5.dp).focusRequester(focusRequester).onFocusChanged {
-                        if(WireGuardAutoTunnel.isRunningOnAndroidTv(context)) {
-                            keyboardController?.hide()
-                        }
-                    },
-                    maxLines = 1,
-                    keyboardOptions = KeyboardOptions(
-                        capitalization = KeyboardCapitalization.None,
-                        imeAction = ImeAction.Done
-                    ),
-                    keyboardActions = KeyboardActions(
-                        onDone = {
-                            saveTrustedSSID()
-                        }
-                    ),
-                    trailingIcon = {
-                        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 = if (currentText == "") Color.Transparent else MaterialTheme.colorScheme.primary
-                            )
-                        }
-                    },
-                )
-                ConfigurationToggle(stringResource(R.string.tunnel_mobile_data),
-                    enabled = !(settings.isAutoTunnelEnabled || settings.isAlwaysOnVpnEnabled),
-                    checked = settings.isTunnelOnMobileDataEnabled,
-                    padding = screenPadding,
-                    onCheckChanged = {
-                        scope.launch {
-                            viewModel.onToggleTunnelOnMobileData()
-                        }
+                TextButton(
+                    modifier = Modifier.focusRequester(focusRequester),
+                    onClick = {
+                      openSettings()
+                      viewModel.setLocationDisclosureShown()
+                    }) {
+                      Text(stringResource(id = R.string.turn_on))
                    }
-                )
-                ConfigurationToggle(stringResource(id = R.string.tunnel_on_ethernet),
-                    enabled = !(settings.isAutoTunnelEnabled || settings.isAlwaysOnVpnEnabled),
-                    checked = settings.isTunnelOnEthernetEnabled,
-                    padding = screenPadding,
-                    onCheckChanged = {
-                        scope.launch {
-                            viewModel.onToggleTunnelOnEthernet()
-                        }
-                    }
-                )
-                ConfigurationToggle(
-                    stringResource(R.string.battery_saver),
-                    enabled = !(settings.isAutoTunnelEnabled || settings.isAlwaysOnVpnEnabled),
-                    checked = settings.isBatterySaverEnabled,
-                    padding = screenPadding,
-                    onCheckChanged = {
-                        scope.launch {
-                            viewModel.onToggleBatterySaver()
-                        }
-                    }
-                )
-                ConfigurationToggle(stringResource(R.string.enable_auto_tunnel),
-                    enabled = !settings.isAlwaysOnVpnEnabled,
-                    checked = settings.isAutoTunnelEnabled,
-                    padding = screenPadding,
-                    onCheckChanged = {
-                        if(!isAllAutoTunnelPermissionsEnabled()) {
-                            val message = if(viewModel.isLocationServicesNeeded()){
-                                context.getString(R.string.location_services_required)
-                            } else if(!isBackgroundLocationGranted){
-                                context.getString(R.string.background_location_required)
-                            } else {
-                                context.getString(R.string.precise_location_required)
-                            }
-                            showSnackbarMessage(message)
-                        } else scope.launch {
-                            viewModel.toggleAutoTunnel()
-                        }
-                    }
-                )
-            }
-
+              }
        }
-        if(!WireGuardAutoTunnel.isRunningOnAndroidTv(context)) {
+  }
+
+  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)
-                    .height(IntrinsicSize.Min)
-                    .padding(bottom = 180.dp)
-            ) {
-                Column(
-                    horizontalAlignment = Alignment.Start,
-                    verticalArrangement = Arrangement.Top,
-                    modifier = Modifier.padding(15.dp)
-                ) {
-                    SectionTitle(title = stringResource(id = R.string.other), padding = screenPadding)
-                    ConfigurationToggle(stringResource(R.string.always_on_vpn_support),
-                        enabled = !settings.isAutoTunnelEnabled,
-                        checked = settings.isAlwaysOnVpnEnabled,
-                        padding = screenPadding,
-                        onCheckChanged = {
-                            scope.launch {
-                                viewModel.onToggleAlwaysOnVPN()
-                            }
-                        }
-                    )
-                    ConfigurationToggle(stringResource(R.string.enabled_app_shortcuts),
-                        enabled = true,
-                        checked = settings.isShortcutsEnabled,
-                        padding = screenPadding,
-                        onCheckChanged = {
-                            scope.launch {
-                                viewModel.onToggleShortcutsEnabled()
-                            }
-                        }
-                    )
-                    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.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 -> {}
+                                }
+                            } })
+                      }
                }
-            }
-        }
-        if(WireGuardAutoTunnel.isRunningOnAndroidTv(context)) {
+          }
+          if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) {
+            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)
+                        ConfigurationToggle(
+                            stringResource(R.string.always_on_vpn_support),
+                            enabled = !uiState.settings.isAutoTunnelEnabled,
+                            checked = uiState.settings.isAlwaysOnVpnEnabled,
+                            padding = screenPadding,
+                            onCheckChanged = { viewModel.onToggleAlwaysOnVPN() })
+                        ConfigurationToggle(
+                            stringResource(R.string.enabled_app_shortcuts),
+                            enabled = true,
+                            checked = uiState.settings.isShortcutsEnabled,
+                            padding = screenPadding,
+                            onCheckChanged = { viewModel.onToggleShortcutsEnabled() })
+                        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))
+                                  }
+                            }
+                      }
+                }
+          }
+          if (WireGuardAutoTunnel.isRunningOnAndroidTv()) {
            Spacer(modifier = Modifier.weight(.17f))
+          }
        }
-    }
+  }
 }
-
-
@@ -0,0 +1,13 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.settings
+
+import com.zaneschepke.wireguardautotunnel.data.model.Settings
+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 vpnState: VpnState = VpnState(),
+    val isLocationDisclosureShown : Boolean = true,
+    val loading : Boolean = true
+)
@@ -3,138 +3,171 @@ package com.zaneschepke.wireguardautotunnel.ui.screens.settings
 import android.app.Application
 import android.content.Context
 import android.location.LocationManager
-import android.os.Build
+import androidx.core.location.LocationManagerCompat
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
-import com.zaneschepke.wireguardautotunnel.repository.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.repository.model.Settings
-import com.zaneschepke.wireguardautotunnel.repository.model.TunnelConfig
+import com.wireguard.android.util.RootShell
+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.data.repository.TunnelConfigRepository
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.util.WgTunnelException
+import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
+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.async
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
+import timber.log.Timber
 import javax.inject.Inject

-
@HiltViewModel
-class SettingsViewModel @Inject constructor(private val application : Application,
-                                            private val tunnelRepo : TunnelConfigDao, private val settingsRepo : SettingsDoa
+class SettingsViewModel
+@Inject
+constructor(
+    private val application: Application,
+    private val tunnelConfigRepository: TunnelConfigRepository,
+    private val settingsRepository: SettingsRepository,
+    private val dataStoreManager: DataStoreManager,
+    private val rootShell: RootShell,
+    private val vpnService: VpnService
 ) : ViewModel() {

-    private val _trustedSSIDs = MutableStateFlow(emptyList<String>())
-    val trustedSSIDs = _trustedSSIDs.asStateFlow()
-    private val _settings = MutableStateFlow(Settings())
-    val settings get() = _settings.asStateFlow()
-    val tunnels get() = tunnelRepo.getAllFlow()
-    init {
-        isLocationServicesEnabled()
-        viewModelScope.launch(Dispatchers.IO) {
-            settingsRepo.getAllFlow().filter { it.isNotEmpty() }.collect {
-                val settings = it.first()
-                _settings.emit(settings)
-                _trustedSSIDs.emit(settings.trustedNetworkSSIDs.toList())
-            }
-        }
-    }
+    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())

-    suspend fun onSaveTrustedSSID(ssid: String) {
+    fun onSaveTrustedSSID(ssid: String) : Result<Unit>{
        val trimmed = ssid.trim()
-        if (!_settings.value.trustedNetworkSSIDs.contains(trimmed)) {
-            _settings.value.trustedNetworkSSIDs.add(trimmed)
-            settingsRepo.save(_settings.value)
+        return if (!uiState.value.settings.trustedNetworkSSIDs.contains(trimmed)) {
+            uiState.value.settings.trustedNetworkSSIDs.add(trimmed)
+            saveSettings(uiState.value.settings)
+            Result.Success(Unit)
        } else {
-            throw WgTunnelException("SSID already exists.")
+            Result.Error(Event.Error.SsidConflict)
        }
    }

-    suspend fun onToggleTunnelOnMobileData() {
-        settingsRepo.save(_settings.value.copy(
-            isTunnelOnMobileDataEnabled = !_settings.value.isTunnelOnMobileDataEnabled
+    fun setLocationDisclosureShown() = viewModelScope.launch {
+            dataStoreManager.saveToDataStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN, true)
+    }
+
+    fun onToggleTunnelOnMobileData() {
+        saveSettings(
+            uiState.value.settings.copy(
+                isTunnelOnMobileDataEnabled = !uiState.value.settings.isTunnelOnMobileDataEnabled
+            )
+        )
+    }
+
+    fun onDeleteTrustedSSID(ssid: String) {
+        saveSettings(uiState.value.settings.copy(
+            trustedNetworkSSIDs = (uiState.value.settings.trustedNetworkSSIDs - ssid).toMutableList()
        ))
    }

-    suspend fun onDeleteTrustedSSID(ssid: String) {
-        _settings.value.trustedNetworkSSIDs.remove(ssid)
-        settingsRepo.save(_settings.value)
+    private suspend fun getDefaultTunnelOrFirst() : String {
+        return uiState.value.settings.defaultTunnel ?: tunnelConfigRepository.getAll().first().toString()
    }

-    private fun emitFirstTunnelAsDefault() = viewModelScope.async {
-        _settings.emit(_settings.value.copy(defaultTunnel = getFirstTunnelConfig().toString()))
-    }
+    fun toggleAutoTunnel() = viewModelScope.launch {
+        val isAutoTunnelEnabled = uiState.value.settings.isAutoTunnelEnabled
+        var isAutoTunnelPaused = uiState.value.settings.isAutoTunnelPaused

-    suspend fun toggleAutoTunnel() {
-        if(_settings.value.isAutoTunnelEnabled) {
+        if (isAutoTunnelEnabled) {
            ServiceManager.stopWatcherService(application)
        } else {
-            if(_settings.value.defaultTunnel == null) {
-                emitFirstTunnelAsDefault().await()
-            }
-            val defaultTunnel = _settings.value.defaultTunnel
-            ServiceManager.startWatcherService(application, defaultTunnel!!)
+            ServiceManager.startWatcherService(application)
+            isAutoTunnelPaused = false
        }
-        settingsRepo.save(_settings.value.copy(
-            isAutoTunnelEnabled = !_settings.value.isAutoTunnelEnabled
-        ))
+        saveSettings(
+            uiState.value.settings.copy(
+                isAutoTunnelEnabled = !isAutoTunnelEnabled,
+                isAutoTunnelPaused = isAutoTunnelPaused,
+                defaultTunnel = getDefaultTunnelOrFirst()
+            )
+        )
    }

-    private suspend fun getFirstTunnelConfig() : TunnelConfig {
-        return tunnelRepo.getAll().first()
-    }

-    suspend fun onToggleAlwaysOnVPN() {
-        if(_settings.value.defaultTunnel == null) {
-            emitFirstTunnelAsDefault().await()
-        }
-        val updatedSettings = _settings.value.copy(isAlwaysOnVpnEnabled = !_settings.value.isAlwaysOnVpnEnabled)
-        emitSettings(updatedSettings)
+    fun onToggleAlwaysOnVPN() = viewModelScope.launch {
+        val updatedSettings = uiState.value.settings.copy(
+                isAlwaysOnVpnEnabled = !uiState.value.settings.isAlwaysOnVpnEnabled,
+                defaultTunnel = getDefaultTunnelOrFirst()
+            )
        saveSettings(updatedSettings)
    }

-    private suspend fun emitSettings(settings: Settings) {
-        _settings.emit(
-            settings
+    private fun saveSettings(settings: Settings) = viewModelScope.launch {
+        settingsRepository.save(settings)
+    }
+
+    fun onToggleTunnelOnEthernet() {
+        saveSettings(uiState.value.settings.copy(
+            isTunnelOnEthernetEnabled = !uiState.value.settings.isTunnelOnEthernetEnabled
+        ))
+    }
+
+    fun isLocationEnabled(context: Context): Boolean {
+        val locationManager = context.getSystemService(Context.LOCATION_SERVICE) as LocationManager
+        return LocationManagerCompat.isLocationEnabled(locationManager)
+    }
+
+    fun onToggleShortcutsEnabled() {
+        saveSettings(
+            uiState.value.settings.copy(
+                isShortcutsEnabled = !uiState.value.settings.isShortcutsEnabled
+            )
        )
    }

-    private suspend fun saveSettings(settings: Settings) {
-        settingsRepo.save(settings)
+    fun onToggleBatterySaver() {
+        saveSettings(
+            uiState.value.settings.copy(
+                isBatterySaverEnabled = !uiState.value.settings.isBatterySaverEnabled
+            )
+        )
    }

-    suspend fun onToggleTunnelOnEthernet() {
-        if(_settings.value.defaultTunnel == null) {
-            emitFirstTunnelAsDefault().await()
+    private fun saveKernelMode(on: Boolean) {
+        saveSettings(
+            uiState.value.settings.copy(
+                isKernelEnabled = on
+            )
+        )
+    }
+
+    fun onToggleTunnelOnWifi() {
+        saveSettings(
+            uiState.value.settings.copy(
+                isTunnelOnWifiEnabled = !uiState.value.settings.isTunnelOnWifiEnabled
+            )
+        )
+    }
+
+    fun onToggleKernelMode() : Result<Unit> {
+        if (!uiState.value.settings.isKernelEnabled) {
+            try {
+                rootShell.start()
+                Timber.d("Root shell accepted!")
+                saveKernelMode(on = true)
+            } catch (e: RootShell.RootShellException) {
+                saveKernelMode(on = false)
+                return Result.Error(Event.Error.RootDenied)
+            }
+        } else {
+            saveKernelMode(on = false)
        }
-        _settings.emit(
-            _settings.value.copy(isTunnelOnEthernetEnabled = !_settings.value.isTunnelOnEthernetEnabled)
-        )
-        settingsRepo.save(_settings.value)
+        return Result.Success(Unit)
    }
-
-    private fun isLocationServicesEnabled() : Boolean {
-        val locationManager =
-            application.getSystemService(Context.LOCATION_SERVICE) as LocationManager
-        return locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER)
-    }
-
-    fun isLocationServicesNeeded() : Boolean {
-        return(!isLocationServicesEnabled() && Build.VERSION.SDK_INT > Build.VERSION_CODES.P)
-    }
-
-    suspend fun onToggleShortcutsEnabled() {
-        settingsRepo.save(_settings.value.copy(
-            isShortcutsEnabled = !_settings.value.isShortcutsEnabled
-        ))
-    }
-
-    suspend fun onToggleBatterySaver() {
-        settingsRepo.save(_settings.value.copy(
-            isBatterySaverEnabled = !_settings.value.isBatterySaverEnabled
-        ))
-    }
-}
+}
@@ -1,23 +1,36 @@
 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
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.ArrowForward
+import androidx.compose.material.icons.rounded.Book
+import androidx.compose.material.icons.rounded.Mail
+import androidx.compose.material3.Divider
 import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
@@ -27,54 +40,189 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
 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 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

@Composable
-fun SupportScreen(padding : PaddingValues, focusRequester: FocusRequester) {
+fun SupportScreen(
+    viewModel: SupportViewModel = hiltViewModel(),
+    padding: PaddingValues,
+    showSnackbarMessage: (String) -> Unit,
+    focusRequester: FocusRequester
+) {
+  val context = LocalContext.current
+  val fillMaxWidth = .85f

-    val context = LocalContext.current
+  val uiState by viewModel.uiState.collectAsStateWithLifecycle()

-    fun openWebPage(url: String) {
-        val webpage: Uri = Uri.parse(url)
-        val intent = Intent(Intent.ACTION_VIEW, webpage)
-        context.startActivity(intent)
-    }
+  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)
+      }
+  }

-        Column(horizontalAlignment = Alignment.CenterHorizontally,
-            verticalArrangement = Arrangement.Top,
-            modifier = Modifier
-                .fillMaxSize()
+  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
+  }
+
+    Column(
+        horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Top,
+        modifier =
+            Modifier.fillMaxSize()
                .verticalScroll(rememberScrollState())
                .focusable()
                .padding(padding)) {
-            Text(stringResource(R.string.support_text), textAlign = TextAlign.Center, modifier = Modifier.padding(30.dp), fontSize = 15.sp)
-            Row(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .padding(14.dp),
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.SpaceEvenly
-            ) {
-                IconButton(onClick = {
-                    openWebPage(context.resources.getString(R.string.discord_url))
-                }) {
-                    Icon(imageVector = ImageVector.vectorResource(R.drawable.discord), "Discord")
+          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))
+                            }
+                      }
                }
-                IconButton(modifier = Modifier.focusRequester(focusRequester),onClick = {
-                    openWebPage(context.resources.getString(R.string.github_url))
-                }) {
-                    Icon(imageVector = ImageVector.vectorResource(R.drawable.github), "Github")
-                }
-            }
-            Spacer(modifier = Modifier.weight(1f))
-            Text(stringResource(id = R.string.privacy_policy), style = TextStyle(textDecoration = TextDecoration.Underline),
-                modifier = Modifier.clickable {
-                openWebPage(context.resources.getString(R.string.privacy_policy_url))
-            })
-            Text("App version: ${com.zaneschepke.wireguardautotunnel.BuildConfig.VERSION_NAME}", Modifier.padding(25.dp))
+              }
+          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" }")
+              }
        }
-    }
+  }
@@ -0,0 +1,8 @@
+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
+)
@@ -0,0 +1,25 @@
+package com.zaneschepke.wireguardautotunnel.ui.screens.support
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import javax.inject.Inject
+
+@HiltViewModel
+class SupportViewModel @Inject constructor(
+    private val settingsRepository: SettingsRepository
+) : ViewModel() {
+
+    val uiState = settingsRepository.getSettingsFlow().map {
+        SupportUiState(it, false)
+    }.stateIn(
+        viewModelScope,
+        SharingStarted.WhileSubscribed(Constants.SUBSCRIPTION_TIMEOUT),
+        SupportUiState()
+    )
+}
@@ -11,7 +11,8 @@ val Purple40 = Color(0xFF6650a4)
 val PurpleGrey40 = Color(0xFF625b71)
 val Pink40 = Color(0xFFFFFFFF)

-//status colors
+// status colors
 val brickRed = Color(0xFFCE4257)
+val corn = Color(0xFFFBEC5D)
 val pinkRed = Color(0xFFEF476F)
 val mint = Color(0xFF52B788)
@@ -15,51 +15,52 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalView
 import androidx.core.view.WindowCompat

-private val DarkColorScheme = darkColorScheme(
-    //primary = Purple80,
-    primary = virdigris,
-    secondary = virdigris,
-   // secondary = PurpleGrey80,
-    tertiary = virdigris
-    //tertiary = Pink80
-)
+private val DarkColorScheme =
+    darkColorScheme(
+        // primary = Purple80,
+        primary = virdigris,
+        secondary = virdigris,
+        // secondary = PurpleGrey80,
+        tertiary = virdigris
+        // tertiary = Pink80
+    )

-private val LightColorScheme = lightColorScheme(
-    primary = Purple40,
-    secondary = PurpleGrey40,
-    tertiary = Pink40
-
-    /* Other default colors to override
-    background = Color(0xFFFFFBFE),
-    surface = Color(0xFFFFFBFE),
-    onPrimary = Color.White,
-    onSecondary = Color.White,
-    onTertiary = Color.White,
-    onBackground = Color(0xFF1C1B1F),
-    onSurface = Color(0xFF1C1B1F),
-    */
-)
+private val LightColorScheme =
+    lightColorScheme(
+        primary = Purple40,
+        secondary = PurpleGrey40,
+        tertiary = Pink40
+        /* Other default colors to override
+        background = Color(0xFFFFFBFE),
+        surface = Color(0xFFFFFBFE),
+        onPrimary = Color.White,
+        onSecondary = Color.White,
+        onTertiary = Color.White,
+        onBackground = Color(0xFF1C1B1F),
+        onSurface = Color(0xFF1C1B1F),
+         */
+    )

@Composable
 fun WireguardAutoTunnelTheme(
-    //force dark theme
-    darkTheme : Boolean = true,
-    //darkTheme: Boolean = isSystemInDarkTheme(),
+    // force dark theme
+    darkTheme: Boolean = true,
+    // darkTheme: Boolean = isSystemInDarkTheme(),
    // Dynamic color is available on Android 12+
-    //turning off dynamic color for now
+    // turning off dynamic color for now
    dynamicColor: Boolean = false,
    content: @Composable () -> Unit
 ) {
+    val colorScheme =
+        when {
+            dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
+                val context = LocalContext.current
+                if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+            }

-    val colorScheme = when {
-        dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
-            val context = LocalContext.current
-            if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
+            darkTheme -> DarkColorScheme
+            else -> LightColorScheme
        }
-
-        darkTheme -> DarkColorScheme
-        else -> LightColorScheme
-    }
    val view = LocalView.current
    if (!view.isInEditMode) {
        SideEffect {
@@ -77,4 +78,4 @@ fun WireguardAutoTunnelTheme(
        typography = Typography,
        content = content
    )
-}
+}
@@ -19,4 +19,4 @@ fun TransparentSystemBars() {

        onDispose {}
    }
-}
+}
@@ -7,28 +7,30 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp

 // Set of Material typography styles to start with
-val Typography = Typography(
-    bodyLarge = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 16.sp,
-        lineHeight = 24.sp,
-        letterSpacing = 0.5.sp
+val Typography =
+    Typography(
+        bodyLarge =
+        TextStyle(
+            fontFamily = FontFamily.Default,
+            fontWeight = FontWeight.Normal,
+            fontSize = 16.sp,
+            lineHeight = 24.sp,
+            letterSpacing = 0.5.sp
+        )
+        /* Other default text styles to override
+        titleLarge = TextStyle(
+            fontFamily = FontFamily.Default,
+            fontWeight = FontWeight.Normal,
+            fontSize = 22.sp,
+            lineHeight = 28.sp,
+            letterSpacing = 0.sp
+        ),
+        labelSmall = TextStyle(
+            fontFamily = FontFamily.Default,
+            fontWeight = FontWeight.Medium,
+            fontSize = 11.sp,
+            lineHeight = 16.sp,
+            letterSpacing = 0.5.sp
+        )
+         */
    )
-    /* Other default text styles to override
-    titleLarge = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 22.sp,
-        lineHeight = 28.sp,
-        letterSpacing = 0.sp
-    ),
-    labelSmall = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Medium,
-        fontSize = 11.sp,
-        lineHeight = 16.sp,
-        letterSpacing = 0.5.sp
-    )
-    */
-)
@@ -0,0 +1,22 @@
+package com.zaneschepke.wireguardautotunnel.util
+
+object Constants {
+    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 TOGGLE_TUNNEL_DELAY = 300L
+    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 GOOGLE_TV_EXPLORER_STUB = "com.google.android.tv.frameworkpackagestubs"
+    const val ANDROID_TV_EXPLORER_STUB = "com.android.tv.frameworkpackagestubs"
+    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
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zane Schepke	dd16bd977f	fix pipeline sdk target	2023-12-31 20:35:57 -05:00
Zane Schepke	aeb4a13389	feat: androidtv navigation, auto-tunneling pause Improved AndroidTV navigation to be less clunky and more streamlined Added auto-tunneling pause feature to UI to allow of quick auto tunneling pauses. App shortcuts and quick tile also override auto tunneling by engaging pause for temporary override of VPN purposes. Fixed bug where auto start on reboot was not working on older devices and AndroidTV. Fixed bug where location services is prefenting some flavors of Android from using auto-tunneling. Fixed bug where location permissions were not being detected correctly on AndroidTV versions. Fixed bug where quick tile could become out of sync. Improved notifications to show proper state of auto-tunneling and vpn. Removed excessive vibration from notifications. Improved error handling. Closes #75 Closes #73 Closes #61 Closes #53 Closes #30	2023-12-31 17:59:30 -05:00
Zane Schepke	f0ec661223	fix: android 14 foreground permissions Closes #71	2023-12-21 12:22:55 -05:00
Zane Schepke	ffa7a207fb	feat: add basic kernel support Added basic kernel support to allow users to switch between userspace and kernel wireguard Improved location disclosure flow to only show once once per app install Fix airplane mode bug Improve database migration testing Fix auto-tunneling permission bug. Lint Closes #67 Closes #43	2023-12-20 23:17:15 -05:00
Zane Schepke	515e91d191	fix: airplane mode bug	2023-12-09 09:45:54 -05:00
Zane Schepke	16e65aec9f	feat: mobile data only auto-tunneling Added support for configuring auto-tunneling to only tunnel on mobile data with no location permissions necessary. Improved UI on support screen and updated support resource links. Changed UI on setting screen to hide trusted wifi networks configuration when not in use. Changed verbiage on settings screen to make auto-tunneling configuration more intuitive. Fixed UI bug where analytics expansion could show on deactivated tunnels. Closes #55 Closes #56	2023-12-05 01:19:00 -05:00
Zane Schepke	ff87bee3b4	docs: add support.md	2023-11-29 18:13:29 -05:00
Zane Schepke	9739d35eda	chore: update descriptions	2023-11-23 23:48:23 -05:00
Zane Schepke	11ad494fbb	feat: add statistics to main screen Removed Details screen and moved tunnel statistics to be shown on expansion of a tunnel config row Fixes bug where not scanning a QR code could cause app to crash when navigating back from camera view Remove vibrations from notifications Improve navigation of settings screen on AndroidTV	2023-11-23 21:04:26 -05:00
Zane Schepke	90b006acc5	change: build pipeline to fastlane deploy	2023-11-10 18:32:35 -05:00
Zane Schepke	eb7b39c379	fix: build warnings and deprecations	2023-11-08 23:43:46 -05:00
Zane Schepke	0a17593310	add: properties to template	2023-11-08 22:26:36 -05:00
Zane Schepke	c0e58125dd	add: build and release CI Add build and release pipeline for app Fixes bug where location permission screen was not appearing on < Android 9 Bump versions	2023-11-08 22:11:52 -05:00
Zane Schepke	3791261f91	add: build and release CI Add build and release pipeline for app Fixes bug where location permission screen was not appearing on < Android 9 Bump versions	2023-11-08 21:58:17 -05:00
Zane Schepke	d1e61be3ae	Update issue templates	2023-11-04 11:45:00 -04:00
Zane Schepke	afd4fb127f	Update issue templates	2023-11-04 11:41:25 -04:00