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. Fixed UI bug where analytics expansion could show on deactivated tunnels.
2026-07-03 14:07:49 +02:00 · 2023-12-05 01:14:19 -05:00
223 changed files with 3636 additions and 7547 deletions
@@ -1,85 +0,0 @@
-[{*.kt,*.kts}]
-indent_style = space
-insert_final_newline = true
-max_line_length = 100
-indent_size = 4
-ij_continuation_indent_size = 4
-ij_java_names_count_to_use_import_on_demand = 9999
-ij_kotlin_align_in_columns_case_branch = false
-ij_kotlin_align_multiline_binary_operation = false
-ij_kotlin_align_multiline_extends_list = false
-ij_kotlin_align_multiline_method_parentheses = false
-ij_kotlin_align_multiline_parameters = true
-ij_kotlin_align_multiline_parameters_in_calls = false
-ij_kotlin_allow_trailing_comma = true
-ij_kotlin_allow_trailing_comma_on_call_site = true
-ij_kotlin_assignment_wrap = normal
-ij_kotlin_blank_lines_after_class_header = 0
-ij_kotlin_blank_lines_around_block_when_branches = 0
-ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1
-ij_kotlin_block_comment_at_first_column = true
-ij_kotlin_call_parameters_new_line_after_left_paren = true
-ij_kotlin_call_parameters_right_paren_on_new_line = false
-ij_kotlin_call_parameters_wrap = on_every_item
-ij_kotlin_catch_on_new_line = false
-ij_kotlin_class_annotation_wrap = split_into_lines
-ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
-ij_kotlin_continuation_indent_for_chained_calls = true
-ij_kotlin_continuation_indent_for_expression_bodies = true
-ij_kotlin_continuation_indent_in_argument_lists = true
-ij_kotlin_continuation_indent_in_elvis = false
-ij_kotlin_continuation_indent_in_if_conditions = false
-ij_kotlin_continuation_indent_in_parameter_lists = false
-ij_kotlin_continuation_indent_in_supertype_lists = false
-ij_kotlin_else_on_new_line = false
-ij_kotlin_enum_constants_wrap = off
-ij_kotlin_extends_list_wrap = normal
-ij_kotlin_field_annotation_wrap = split_into_lines
-ij_kotlin_finally_on_new_line = false
-ij_kotlin_if_rparen_on_new_line = false
-ij_kotlin_import_nested_classes = false
-ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
-ij_kotlin_keep_blank_lines_before_right_brace = 2
-ij_kotlin_keep_blank_lines_in_code = 2
-ij_kotlin_keep_blank_lines_in_declarations = 2
-ij_kotlin_keep_first_column_comment = true
-ij_kotlin_keep_indents_on_empty_lines = false
-ij_kotlin_keep_line_breaks = true
-ij_kotlin_lbrace_on_next_line = false
-ij_kotlin_line_comment_add_space = false
-ij_kotlin_line_comment_at_first_column = true
-ij_kotlin_method_annotation_wrap = split_into_lines
-ij_kotlin_method_call_chain_wrap = normal
-ij_kotlin_method_parameters_new_line_after_left_paren = true
-ij_kotlin_method_parameters_right_paren_on_new_line = true
-ij_kotlin_method_parameters_wrap = on_every_item
-ij_kotlin_name_count_to_use_star_import = 9999
-ij_kotlin_name_count_to_use_star_import_for_members = 9999
-ij_kotlin_parameter_annotation_wrap = off
-ij_kotlin_space_after_comma = true
-ij_kotlin_space_after_extend_colon = true
-ij_kotlin_space_after_type_colon = true
-ij_kotlin_space_before_catch_parentheses = true
-ij_kotlin_space_before_comma = false
-ij_kotlin_space_before_extend_colon = true
-ij_kotlin_space_before_for_parentheses = true
-ij_kotlin_space_before_if_parentheses = true
-ij_kotlin_space_before_lambda_arrow = true
-ij_kotlin_space_before_type_colon = false
-ij_kotlin_space_before_when_parentheses = true
-ij_kotlin_space_before_while_parentheses = true
-ij_kotlin_spaces_around_additive_operators = true
-ij_kotlin_spaces_around_assignment_operators = true
-ij_kotlin_spaces_around_equality_operators = true
-ij_kotlin_spaces_around_function_type_arrow = true
-ij_kotlin_spaces_around_logical_operators = true
-ij_kotlin_spaces_around_multiplicative_operators = true
-ij_kotlin_spaces_around_range = false
-ij_kotlin_spaces_around_relational_operators = true
-ij_kotlin_spaces_around_unary_operator = false
-ij_kotlin_spaces_around_when_arrow = true
-ij_kotlin_variable_annotation_wrap = off
-ij_kotlin_while_on_new_line = false
-ij_kotlin_wrap_elvis_expressions = 1
-ij_kotlin_wrap_expression_body_functions = 1
-ij_kotlin_wrap_first_method_in_call_chain = false
@@ -1,2 +0,0 @@
-ko_fi: zaneschepke
-liberapay: zaneschepke
@@ -11,14 +11,12 @@ assignees: zaneschepke
 A clear and concise description of what the bug is.

 **Smartphone (please complete the following information):**
-
- Device: [e.g. Pixel 4a]
- Android Version: [e.g. Android 13]
- App Version [e.g. 3.3.3]
+ - 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 '....'
@@ -1,6 +1,6 @@
 # Support

-If you are experiencing issues with the app, the following resources are available to help you.
+If you are experiencing issues with the app, the following resources are available to help you. 

 <ol>
  <li>
@@ -1,10 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: github-actions
-    directory: /
-    schedule:
-      interval: daily
-  - package-ecosystem: gradle
-    directory: /
-    schedule:
-      interval: daily
@@ -1,31 +1,27 @@
 # name of the workflow
-name: Android CI Tag Deployment (Pre-release)
+name: Android CI Tag Deployment

 on:
-  workflow_dispatch:
  push:
    tags:
-      - '*.*.*-**'
+      - '*.*.*'

 jobs:
  build:
    name: Build Signed APK
-
+    # change to macos because of hilt issues on ubuntu in gradle 8.3
    runs-on: ubuntu-latest

    env:
+      KEY_STORE_PATH: ${{ secrets.KEY_STORE_PATH }}
      SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
      SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
-      KEY_STORE_FILE: 'android_keystore.jks'
-      KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
-      GH_USER: ${{ secrets.GH_USER }}
-      GH_TOKEN: ${{ secrets.GH_TOKEN }}

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v3
        with:
          distribution: 'temurin'
          java-version: '17'
@@ -39,16 +35,10 @@ jobs:
        id: decode_keystore
        uses: timheuer/base64-to-file@v1.2
        with:
-          fileName: ${{ env.KEY_STORE_FILE }}
-          fileDir: ${{ env.KEY_STORE_LOCATION }}
+          fileName: 'android_keystore.jks'
+          fileDir: ${{ github.workspace }}/app/keystore/
          encodedString: ${{ secrets.KEYSTORE }}

-      # create keystore path for gradle to read
-      - name: Create keystore path env var
-        run: |
-          store_path=${{ env.KEY_STORE_LOCATION }}${{ env.KEY_STORE_FILE }}
-          echo "KEY_STORE_PATH=$store_path" >> $GITHUB_ENV
-
      - name: Create service_account.json
        id: createServiceAccount
        run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
@@ -62,62 +52,36 @@ jobs:
      - name: Get apk path
        id: apk-path
        run: echo "path=$(find . -regex '^.*/build/outputs/apk/fdroid/release/.*\.apk$' -type f | head -1)" >> $GITHUB_OUTPUT
-      - name: Get version code
-        run: |
-          version_code=$(grep "VERSION_CODE" buildSrc/src/main/kotlin/Constants.kt | awk '{print $5}' | tr -d '\n')
-          echo "VERSION_CODE=$version_code" >> $GITHUB_ENV
+
      # Save the APK after the Build job is complete to publish it as a Github release in the next job
      - name: Upload APK
-        uses: actions/upload-artifact@v4.3.1
+        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@v4
+        uses: actions/download-artifact@v1
        with:
          name: wgtunnel
      - name: Create Release with Fastlane changelog notes
        id: create_release
-        uses: softprops/action-gh-release@v2
+        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/${{ env.VERSION_CODE }}.txt
+          body_path: ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/32300.txt
          tag_name: ${{ github.ref_name }}
-          name: ${{ github.ref_name }}
+          name: Release ${{ github.ref_name }}
          draft: false
-          prerelease: true
+          prerelease: false
          files: ${{ github.workspace }}/${{ steps.apk-path.outputs.path }}
-
-      - name: Install apksigner
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y apksigner
-
-      - name: Get checksum
-        id: checksum
-        run: echo "checksum=$(apksigner verify -print-certs ${{ steps.apk-path.outputs.path }} | grep -Po "(?<=SHA-256 digest:) .*")" | awk '{$1=$1};1' >> $GITHUB_OUTPUT
-
-      - name: Append checksum
-        id: append_checksum
-        uses: softprops/action-gh-release@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          body: >
-            <br /> SHA256 Checksum: <br /> ```${{ steps.checksum.outputs.checksum }}```
-          tag_name: ${{ github.ref_name }}
-          name: ${{ github.ref_name }}
-          draft: false
-          prerelease: true
-          append_body: true
-
      - name: Deploy with fastlane
        uses: ruby/setup-ruby@v1
        with:
          ruby-version: '3.2' # Not needed with a .ruby-version file
          bundler-cache: true
+
      - name: Distribute app to Beta track 🚀
        run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane beta)

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


 [![Google Play](https://img.shields.io/badge/Google_Play-414141?style=for-the-badge&logo=google-play&logoColor=white)](https://play.google.com/store/apps/details?id=com.zaneschepke.wireguardautotunnel)
+[![Fire TV](https://img.shields.io/badge/fire%20tv-fc3b2d?style=for-the-badge&logo=amazon%20fire%20tv&logoColor=white)](https://www.amazon.com/gp/product/B0CFGGL7WK)
 [![F-Droid](https://img.shields.io/static/v1?style=for-the-badge&message=F-Droid&color=1976D2&logo=F-Droid&logoColor=FFFFFF&label=)](https://f-droid.org/packages/com.zaneschepke.wireguardautotunnel/)


+</div>
+
+<div align="center">
+
+[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/N4N8NMJN2)
+
 </div>


 <div align="left">

-This is an alternative Android Application for [WireGuard](https://www.wireguard.com/) with added
-features. Built using the [wireguard-android](https://github.com/WireGuard/wireguard-android)
-library and [Jetpack Compose](https://developer.android.com/jetpack/compose), this application was
-inspired by the official [WireGuard Android](https://github.com/WireGuard/wireguard-android) app.
+This is an alternative Android Application for [WireGuard](https://www.wireguard.com/) with added features. Built using the [wireguard-android](https://github.com/WireGuard/wireguard-android) library and [Jetpack Compose](https://developer.android.com/jetpack/compose), this application was inspired by the official [WireGuard Android](https://github.com/WireGuard/wireguard-android) app.

 </div>

@@ -33,52 +37,38 @@ inspired by the official [WireGuard Android](https://github.com/WireGuard/wiregu
 ## Screenshots

 <p float="center">
-  <img label="Main" style="padding-right:25px" src="fastlane/metadata/android/en-US/images/phoneScreenshots/main_screen.png" width="200" />
-  <img label="Config" style="padding-left:25px" src="fastlane/metadata/android/en-US/images/phoneScreenshots/config_screen.png" width="200" />
-  <img label="Settings" style="padding-left:25px" src="fastlane/metadata/android/en-US/images/phoneScreenshots/settings_screen.png" width="200" />
-  <img label="Support" style="padding-left:25px" src="fastlane/metadata/android/en-US/images/phoneScreenshots/support_screen.png" width="200" />
+  <img label="Main" style="padding-right:25px" src="asset/main_screen.png" width="200" />
+  <img label="Config" style="padding-left:25px" src="asset/config_screen.png" width="200" />
+  <img label="Settings" style="padding-left:25px" src="asset/settings_screen.png" width="200" />
+  <img label="Support" style="padding-left:25px" src="asset/support_screen.png" width="200" />
 </p>

 <div align="left">

 ## Inspiration

-The original inspiration for this app came from the inconvenience of having to manually turn VPN off
-and on while on different networks. This app was created to offer a free solution to this problem.
+The original inspiration for this app came from the inconvenience of having to manually turn VPN off and on while on different networks. This app was created to offer a free solution to this problem. 

 ## Features

 * Add tunnels via .conf file, zip, manual entry, or QR code
-* Auto connect to tunnels based on Wi-Fi SSID, ethernet, or mobile data
+* Auto connect to VPN based on Wi-Fi SSID
 * Split tunneling by application with search
-* WireGuard support for kernel and userspace modes
-* Always-On VPN support
+* Always-on VPN for Android support
 * Export tunnels to zip
-* Quick tile support for tunnel toggling, auto-tunneling
-* Static shortcuts support for tunnel toggling, auto-tunneling
+* Quick tile support for VPN toggling
+* Static shortcuts support for primary tunnel for automation integration
 * Intent automation support for all tunnels
-* Automatic auto-tunneling service restart after reboot
-* Automatic tunnel restart after reboot
-* Battery preservation measures
-* Restart tunnel on ping failure (beta)
+* Optional auto connect on mobile data, ethernet
+* Automatic service restart after reboot
+* Service will stay running in background after app has been closed

-## Docs (WIP)
-
-Basic documentation of the feature and behaviors of this app can be
-found [here](https://zaneschepke.com/wgtunnel-docs/overview.html).
-
-The repository for these docs can be found [here](https://github.com/zaneschepke/wgtunnel-docs).

 ## Building
-
+    
 ```
 $ git clone https://github.com/zaneschepke/wgtunnel
 $ cd wgtunnel
-```
-
-And then build the app:
-
-```
 $ ./gradlew assembleDebug
 ```

@@ -1,5 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-Please report security issues to `support@zaneschepke.com`
@@ -4,7 +4,7 @@ plugins {
    alias(libs.plugins.android.application)
    alias(libs.plugins.kotlin.android)
    alias(libs.plugins.hilt.android)
-    alias(libs.plugins.kotlinxSerialization)
+    id("org.jetbrains.kotlin.plugin.serialization")
    alias(libs.plugins.ksp)
 }

@@ -19,74 +19,47 @@ android {
        versionCode = Constants.VERSION_CODE
        versionName = Constants.VERSION_NAME

-        ksp { arg("room.schemaLocation", "$projectDir/schemas") }
-
-        sourceSets {
-            getByName("debug").assets.srcDirs(files("$projectDir/schemas")) // Room
+        ksp {
+            arg("room.schemaLocation", "$projectDir/schemas")
        }

        resourceConfigurations.addAll(listOf("en"))

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables { useSupportLibrary = true }
+        vectorDrawables {
+            useSupportLibrary = true
+        }
    }

    signingConfigs {
        create(Constants.RELEASE) {
-            val properties =
-                Properties().apply {
-                    // created local file for signing details
-                    try {
-                        load(file("signing.properties").reader())
-                    } catch (_: Exception) {
-                        load(file("signing_template.properties").reader())
-                    }
+            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),
-                    )
+            //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"),
-        )
+        //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"
+                    val outputFileName = "${Constants.APP_NAME}-${variant.flavorName}-${variant.buildType.name}-${variant.versionName}.apk"
                    output.outputFileName = outputFileName
                }
        }
@@ -96,11 +69,13 @@ android {
            isShrinkResources = true
            proguardFiles(
                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro",
+                "proguard-rules.pro"
            )
            signingConfig = signingConfigs.getByName(Constants.RELEASE)
        }
-        debug { isDebuggable = true }
+        debug {
+            isDebuggable = true
+        }
    }
    flavorDimensions.add(Constants.TYPE)
    productFlavors {
@@ -110,8 +85,10 @@ android {
        }
        create("general") {
            dimension = Constants.TYPE
-            if (BuildHelper.isReleaseBuild(gradle) && BuildHelper.isGeneralFlavor(gradle)) {
-                //any plugins general specific
+            if (BuildHelper.isReleaseBuild(gradle) && BuildHelper.isGeneralFlavor(gradle))
+            {
+                apply(plugin = "com.google.gms.google-services")
+                apply(plugin = "com.google.firebase.crashlytics")
            }
        }
    }
@@ -120,24 +97,29 @@ android {
        targetCompatibility = JavaVersion.VERSION_17
        isCoreLibraryDesugaringEnabled = true
    }
-    kotlinOptions { jvmTarget = Constants.JVM_TARGET }
+    kotlinOptions {
+        jvmTarget = Constants.JVM_TARGET
+    }
    buildFeatures {
        compose = true
        buildConfig = true
+
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
+    }
+    packaging {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
    }
-    composeOptions { kotlinCompilerExtensionVersion = Constants.COMPOSE_COMPILER_EXTENSION_VERSION }
-    packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
 }

 val generalImplementation by configurations
-
 dependencies {
-
-    implementation(project(":logcatter"))
-
    implementation(libs.androidx.core.ktx)
    implementation(libs.androidx.lifecycle.runtime.ktx)
-    // helpers for implementing LifecycleOwner in a Service
+    // optional - helpers for implementing LifecycleOwner in a Service
    implementation(libs.androidx.lifecycle.service)
    implementation(libs.androidx.activity.compose)
    implementation(platform(libs.androidx.compose.bom))
@@ -147,25 +129,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)

-    // get tunnel lib from github packages or mavenLocal
+    //wg
    implementation(libs.tunnel)
    coreLibraryDesugaring(libs.desugar.jdk.libs)

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

-
    // compose navigation
    implementation(libs.androidx.navigation.compose)
    implementation(libs.androidx.hilt.navigation.compose)
@@ -174,36 +153,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.drawablepainter)

-    // storage
+    //room
    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)

-    // barcode scanning
+    //firebase crashlytics
+    generalImplementation(platform(libs.firebase.bom))
+    generalImplementation(libs.google.firebase.crashlytics.ktx)
+    generalImplementation(libs.google.firebase.analytics.ktx)
+
+    //barcode scanning
    implementation(libs.zxing.android.embedded)
    implementation(libs.zxing.core)

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

-    // shortcuts
+    //shortcuts
    implementation(libs.androidx.core)
    implementation(libs.androidx.core.google.shortcuts)
-}
+}
@@ -1,5 +1 @@
-dontwarn com.google.errorprone.annotations.**
-
-keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
-    <fields>;
-}
+-dontwarn com.google.errorprone.annotations.**
@@ -0,0 +1,39 @@
+{
+  "project_info": {
+    "project_number": "328300975830",
+    "project_id": "wireguard-auto-tunnel",
+    "storage_bucket": "wireguard-auto-tunnel.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:328300975830:android:82cd774598ccb7234b1b77",
+        "android_client_info": {
+          "package_name": "com.zaneschepke.wireguardautotunnel"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "328300975830-m72lc3hr69ddhdqh9ngr27rvc8o0jb2d.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBsSMY0LlckizXDnuYBy7nXWGSdl8zZedI"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "328300975830-m72lc3hr69ddhdqh9ngr27rvc8o0jb2d.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
@@ -19,8 +19,3 @@
 # 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>;
-}
-
-
@@ -1,154 +0,0 @@
-{
-  "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')"
-    ]
-  }
-}
@@ -1,161 +0,0 @@
-{
-  "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')"
-    ]
-  }
-}
@@ -1,168 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 6,
-    "identityHash": "625820076477aca948536f7bccccc7ca",
-    "entities": [
-      {
-        "tableName": "Settings",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_tunnel_enabled` INTEGER NOT NULL, `is_tunnel_on_mobile_data_enabled` INTEGER NOT NULL, `trusted_network_ssids` TEXT NOT NULL, `default_tunnel` TEXT, `is_always_on_vpn_enabled` INTEGER NOT NULL, `is_tunnel_on_ethernet_enabled` INTEGER NOT NULL, `is_shortcuts_enabled` INTEGER NOT NULL DEFAULT false, `is_battery_saver_enabled` INTEGER NOT NULL DEFAULT false, `is_tunnel_on_wifi_enabled` INTEGER NOT NULL DEFAULT false, `is_kernel_enabled` INTEGER NOT NULL DEFAULT false, `is_restore_on_boot_enabled` INTEGER NOT NULL DEFAULT false, `is_multi_tunnel_enabled` INTEGER NOT NULL DEFAULT false, `is_auto_tunnel_paused` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAutoTunnelEnabled",
-            "columnName": "is_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnMobileDataEnabled",
-            "columnName": "is_tunnel_on_mobile_data_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "trustedNetworkSSIDs",
-            "columnName": "trusted_network_ssids",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "defaultTunnel",
-            "columnName": "default_tunnel",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isAlwaysOnVpnEnabled",
-            "columnName": "is_always_on_vpn_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnEthernetEnabled",
-            "columnName": "is_tunnel_on_ethernet_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isShortcutsEnabled",
-            "columnName": "is_shortcuts_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isBatterySaverEnabled",
-            "columnName": "is_battery_saver_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isTunnelOnWifiEnabled",
-            "columnName": "is_tunnel_on_wifi_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isKernelEnabled",
-            "columnName": "is_kernel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isRestoreOnBootEnabled",
-            "columnName": "is_restore_on_boot_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isMultiTunnelEnabled",
-            "columnName": "is_multi_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isAutoTunnelPaused",
-            "columnName": "is_auto_tunnel_paused",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "TunnelConfig",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `wg_quick` TEXT NOT NULL)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "wgQuick",
-            "columnName": "wg_quick",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_TunnelConfig_name",
-            "unique": true,
-            "columnNames": [
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_TunnelConfig_name` ON `${TABLE_NAME}` (`name`)"
-          }
-        ],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '625820076477aca948536f7bccccc7ca')"
-    ]
-  }
-}
@@ -1,176 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 7,
-    "identityHash": "e65e4e7cf01f50fb03196d47b54288b1",
-    "entities": [
-      {
-        "tableName": "Settings",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_tunnel_enabled` INTEGER NOT NULL, `is_tunnel_on_mobile_data_enabled` INTEGER NOT NULL, `trusted_network_ssids` TEXT NOT NULL, `is_always_on_vpn_enabled` INTEGER NOT NULL, `is_tunnel_on_ethernet_enabled` INTEGER NOT NULL, `is_shortcuts_enabled` INTEGER NOT NULL DEFAULT false, `is_tunnel_on_wifi_enabled` INTEGER NOT NULL DEFAULT false, `is_kernel_enabled` INTEGER NOT NULL DEFAULT false, `is_restore_on_boot_enabled` INTEGER NOT NULL DEFAULT false, `is_multi_tunnel_enabled` INTEGER NOT NULL DEFAULT false, `is_auto_tunnel_paused` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAutoTunnelEnabled",
-            "columnName": "is_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnMobileDataEnabled",
-            "columnName": "is_tunnel_on_mobile_data_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "trustedNetworkSSIDs",
-            "columnName": "trusted_network_ssids",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAlwaysOnVpnEnabled",
-            "columnName": "is_always_on_vpn_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnEthernetEnabled",
-            "columnName": "is_tunnel_on_ethernet_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isShortcutsEnabled",
-            "columnName": "is_shortcuts_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isTunnelOnWifiEnabled",
-            "columnName": "is_tunnel_on_wifi_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isKernelEnabled",
-            "columnName": "is_kernel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isRestoreOnBootEnabled",
-            "columnName": "is_restore_on_boot_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isMultiTunnelEnabled",
-            "columnName": "is_multi_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isAutoTunnelPaused",
-            "columnName": "is_auto_tunnel_paused",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "TunnelConfig",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `wg_quick` TEXT NOT NULL, `tunnel_networks` TEXT NOT NULL DEFAULT '', `is_mobile_data_tunnel` INTEGER NOT NULL DEFAULT false, `is_primary_tunnel` INTEGER NOT NULL DEFAULT false)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "wgQuick",
-            "columnName": "wg_quick",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "tunnelNetworks",
-            "columnName": "tunnel_networks",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isMobileDataTunnel",
-            "columnName": "is_mobile_data_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPrimaryTunnel",
-            "columnName": "is_primary_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_TunnelConfig_name",
-            "unique": true,
-            "columnNames": [
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_TunnelConfig_name` ON `${TABLE_NAME}` (`name`)"
-          }
-        ],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'e65e4e7cf01f50fb03196d47b54288b1')"
-    ]
-  }
-}
@@ -19,4 +19,4 @@ class ExampleInstrumentedTest {
        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
        assertEquals("com.zaneschepke.wireguardautotunnel", appContext.packageName)
    }
-}
+}
@@ -1,44 +0,0 @@
-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 com.zaneschepke.wireguardautotunnel.data.Queries
-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 migrate6To7() {
-        helper.createDatabase(dbName, 6).apply {
-            // Database has schema version 1. Insert some data using SQL queries.
-            // You can't use DAO classes because they expect the latest schema.
-            execSQL(Queries.createDefaultSettings())
-            execSQL(
-                Queries.createTunnelConfig(),
-            )
-            // Prepare for the next version.
-            close()
-        }
-
-        // Re-open the database with version 2 and provide
-        // MIGRATION_1_2 as the migration process.
-        helper.runMigrationsAndValidate(dbName, 7, true)
-        // MigrationTestHelper automatically verifies the schema changes,
-        // but you need to validate that the data was migrated properly.
-    }
-}
@@ -1,81 +1,68 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools">
-
    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission
-        android:name="android.permission.READ_EXTERNAL_STORAGE"
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
        android:maxSdkVersion="32" />
    <uses-permission
        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
        android:maxSdkVersion="32"
        tools:ignore="ScopedStorage" />
-    <uses-permission
-        android:name="android.permission.ACCESS_WIFI_STATE"
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"
        android:maxSdkVersion="30"
        tools:ignore="LeanbackUsesWifi" />
    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
-    <!--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.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_REMOTE_MESSAGING"/>
    <!--foreground service permissions-->
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
    <!--start service on boot permission-->
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
    <!--android tv support-->
-    <uses-feature
-        android:name="android.software.leanback"
+    <uses-feature android:name="android.software.leanback"
        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.touchscreen"
+    <uses-feature android:name="android.hardware.touchscreen"
        android:required="false" />
    <uses-feature
        android:name="android.hardware.location.gps"
        android:required="false" />
    <uses-feature
-        android:name="android.hardware.screen.portrait"
-        android:required="false" />
-
+    android:name="android.hardware.screen.portrait"
+    android:required="false" />
    <queries>
        <intent>
            <action android:name="android.intent.action.MAIN" />
        </intent>
    </queries>
    <application
-        android:name=".WireGuardAutoTunnel"
        android:allowBackup="true"
-        android:banner="@drawable/ic_banner"
+        android:name=".WireGuardAutoTunnel"
        android:dataExtractionRules="@xml/data_extraction_rules"
-        android:enableOnBackInvokedCallback="true"
        android:fullBackupContent="@xml/backup_rules"
        android:icon="@mipmap/ic_launcher"
+        android:banner="@mipmap/ic_banner"
        android:label="@string/app_name"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
        android:theme="@style/Theme.WireguardAutoTunnel"
-        tools:targetApi="tiramisu">
+        tools:targetApi="31">
        <activity
            android:name=".ui.MainActivity"
            android:exported="true"
            android:theme="@style/Theme.WireguardAutoTunnel">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
-
                <category android:name="android.intent.category.LAUNCHER" />
                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
-
-                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
+                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES"/>
            </intent-filter>
-            <meta-data
-                android:name="android.app.shortcuts"
+            <meta-data android:name="android.app.shortcuts"
                android:resource="@xml/shortcuts" />
        </activity>
        <activity
@@ -83,94 +70,61 @@
            android:screenOrientation="fullSensor"
            android:stateNotNeeded="true"
            android:theme="@style/zxing_CaptureTheme"
-            android:windowSoftInputMode="stateAlwaysHidden"
-            tools:ignore="DiscouragedApi" />
+            android:windowSoftInputMode="stateAlwaysHidden" />
        <activity
-            android:name=".service.shortcut.ShortcutsActivity"
+            android:finishOnTaskLaunch="true"
            android:enabled="true"
            android:exported="true"
-            android:finishOnTaskLaunch="true"
-            android:theme="@android:style/Theme.NoDisplay" />
-
+            android:theme="@android:style/Theme.NoDisplay"
+            android:name=".service.shortcut.ShortcutsActivity"/>
        <service
            android:name=".service.foreground.ForegroundService"
            android:enabled="true"
-            android:exported="false"
-            android:foregroundServiceType="systemExempted"
-            tools:node="merge" />
-        <service
-            android:name=".service.tile.TunnelControlTile"
-            android:exported="true"
-            android:icon="@drawable/ic_launcher"
-            android:label="Tunnel control"
-            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
-            <meta-data
-                android:name="android.service.quicksettings.ACTIVE_TILE"
-                android:value="true" />
-            <meta-data
-                android:name="android.service.quicksettings.TOGGLEABLE_TILE"
-                android:value="true" />
-
-            <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE" />
-            </intent-filter>
+            android:foregroundServiceType="remoteMessaging"
+            android:exported="false">
        </service>
        <service
-            android:name=".service.tile.AutoTunnelControlTile"
            android:exported="true"
-            android:icon="@drawable/ic_launcher"
-            android:label="Auto-tunnel"
+            android:name=".service.tile.TunnelControlTile"
+            android:icon="@drawable/shield"
+            android:label="WG Tunnel"
            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
-            <meta-data
-                android:name="android.service.quicksettings.ACTIVE_TILE"
+            <meta-data android:name="android.service.quicksettings.ACTIVE_TILE"
                android:value="true" />
-            <meta-data
-                android:name="android.service.quicksettings.TOGGLEABLE_TILE"
+            <meta-data android:name="android.service.quicksettings.TOGGLEABLE_TILE"
                android:value="true" />
-
            <intent-filter>
                <action android:name="android.service.quicksettings.action.QS_TILE" />
            </intent-filter>
        </service>
        <service
            android:name=".service.foreground.WireGuardTunnelService"
-            android:enabled="true"
-            android:exported="false"
-            android:foregroundServiceType="systemExempted"
            android:permission="android.permission.BIND_VPN_SERVICE"
+            android:enabled="true"
            android:persistent="true"
-            tools:node="merge">
+            android:foregroundServiceType="remoteMessaging"
+            android:exported="false">
            <intent-filter>
-                <action android:name="android.net.VpnService" />
+                <action android:name="android.net.VpnService"/>
            </intent-filter>
-            <meta-data
-                android:name="android.net.VpnService.SUPPORTS_ALWAYS_ON"
+            <meta-data android:name="android.net.VpnService.SUPPORTS_ALWAYS_ON"
                android:value="true" />
        </service>
        <service
            android:name=".service.foreground.WireGuardConnectivityWatcherService"
            android:enabled="true"
-            android:exported="false"
-            android:foregroundServiceType="systemExempted"
-            android:persistent="true"
            android:stopWithTask="false"
-            tools:node="merge" />
-
-        <receiver
-            android:name=".receiver.BootReceiver"
-            android:enabled="true"
+            android:persistent="true"
+            android:foregroundServiceType="location"
+            android:permission=""
            android:exported="false">
+        </service>
+        <receiver android:enabled="true" android:name=".receiver.BootReceiver"
+            android:exported="true">
            <intent-filter>
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="android.intent.action.ACTION_BOOT_COMPLETED" />
-                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
-                <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
            </intent-filter>
        </receiver>
-        <receiver
-            android:name=".receiver.NotificationActionReceiver"
-            android:exported="false" />
+        <receiver android:exported="false" android:name=".receiver.NotificationActionReceiver"/>
    </application>
 </manifest>
@@ -0,0 +1,20 @@
+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 = 1000L
+    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"
+    const val EMAIL_MIME_TYPE = "message/rfc822"
+}
@@ -0,0 +1,31 @@
+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 java.math.BigDecimal
+import java.text.DecimalFormat
+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()
+        }
+    }
+}
+
+fun BigDecimal.toThreeDecimalPlaceString() : String {
+    val df = DecimalFormat("#.###")
+    return df.format(this)
+}
@@ -1,46 +1,46 @@
 package com.zaneschepke.wireguardautotunnel

 import android.app.Application
-import android.content.ComponentName
 import android.content.Context
 import android.content.pm.PackageManager
-import android.service.quicksettings.TileService
-import com.zaneschepke.wireguardautotunnel.service.tile.AutoTunnelControlTile
-import com.zaneschepke.wireguardautotunnel.service.tile.TunnelControlTile
-import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
+import androidx.lifecycle.ProcessLifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
+import com.zaneschepke.wireguardautotunnel.repository.model.Settings
 import dagger.hilt.android.HiltAndroidApp
+import kotlinx.coroutines.launch
 import timber.log.Timber
-import xyz.teamgravity.pin_lock_compose.PinManager
+import javax.inject.Inject

@HiltAndroidApp
 class WireGuardAutoTunnel : Application() {
+
+    @Inject
+    lateinit var settingsRepo : SettingsDoa
+
    override fun onCreate() {
        super.onCreate()
-        instance = this
-        if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree()) else Timber.plant(ReleaseTree())
-        PinManager.initialize(this)
+        if(BuildConfig.DEBUG) {
+            Timber.plant(Timber.DebugTree())
+        }
+        initSettings()
    }

+    private fun initSettings() {
+        with(ProcessLifecycleOwner.get()) {
+            lifecycleScope.launch {
+                if(settingsRepo.getAll().isEmpty()) {
+                    settingsRepo.save(Settings())
+                }
+            }
+        }
+    }
+
+
+
    companion object {
-        lateinit var instance: WireGuardAutoTunnel
-            private set
-
-        fun isRunningOnAndroidTv(): Boolean {
-            return instance.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
-        }
-
-        fun requestTunnelTileServiceStateUpdate(context: Context) {
-            TileService.requestListeningState(
-                context,
-                ComponentName(instance, TunnelControlTile::class.java),
-            )
-        }
-
-        fun requestAutoTunnelTileServiceUpdate(context: Context) {
-            TileService.requestListeningState(
-                context,
-                ComponentName(instance, AutoTunnelControlTile::class.java),
-            )
+        fun isRunningOnAndroidTv(context : Context) : Boolean {
+            return context.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
        }
    }
-}
+}
@@ -1,54 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data
-
-import androidx.room.AutoMigration
-import androidx.room.Database
-import androidx.room.DeleteColumn
-import androidx.room.RoomDatabase
-import androidx.room.TypeConverters
-import androidx.room.migration.AutoMigrationSpec
-import com.zaneschepke.wireguardautotunnel.data.model.Settings
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-
-@Database(
-    entities = [Settings::class, TunnelConfig::class],
-    version = 7,
-    autoMigrations =
-    [
-        AutoMigration(from = 1, to = 2),
-        AutoMigration(from = 2, to = 3),
-        AutoMigration(
-            from = 3,
-            to = 4,
-        ),
-        AutoMigration(
-            from = 4,
-            to = 5,
-        ),
-        AutoMigration(
-            from = 5,
-            to = 6,
-        ),
-        AutoMigration(
-            from = 6,
-            to = 7,
-            spec = RemoveLegacySettingColumnsMigration::class,
-        ),
-    ],
-    exportSchema = true,
-)
-@TypeConverters(DatabaseListConverters::class)
-abstract class AppDatabase : RoomDatabase() {
-    abstract fun settingDao(): SettingsDao
-
-    abstract fun tunnelConfigDoa(): TunnelConfigDao
-}
-
-@DeleteColumn(
-    tableName = "Settings",
-    columnName = "default_tunnel",
-)
-@DeleteColumn(
-    tableName = "Settings",
-    columnName = "is_battery_saver_enabled",
-)
-class RemoveLegacySettingColumnsMigration : AutoMigrationSpec
@@ -1,21 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data
-
-import androidx.room.RoomDatabase
-import androidx.sqlite.db.SupportSQLiteDatabase
-import timber.log.Timber
-
-class DatabaseCallback : RoomDatabase.Callback() {
-    override fun onCreate(db: SupportSQLiteDatabase) = db.run {
-        // Notice non-ui thread is here
-        beginTransaction()
-        try {
-            execSQL(Queries.createDefaultSettings())
-            Timber.i("Bootstrapping settings data")
-            setTransactionSuccessful()
-        } catch (e: Exception) {
-            Timber.e(e)
-        } finally {
-            endTransaction()
-        }
-    }
-}
@@ -1,35 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data
-
-object Queries {
-    fun createDefaultSettings(): String {
-        return """
-            INSERT INTO Settings (is_tunnel_enabled,
-                    is_tunnel_on_mobile_data_enabled,
-                    trusted_network_ssids,
-                    is_always_on_vpn_enabled,
-                    is_tunnel_on_ethernet_enabled,
-                    is_shortcuts_enabled,
-                    is_tunnel_on_wifi_enabled,
-                    is_kernel_enabled,
-                    is_restore_on_boot_enabled,
-                    is_multi_tunnel_enabled)
-                    VALUES
-                    ('false',
-                    'false',
-                    'sampleSSID1,sampleSSID2',
-                    'false',
-                    'false',
-                    'false',
-                    'false',
-                    'false',
-                    'false',
-                    'false')
-        """.trimIndent()
-    }
-
-    fun createTunnelConfig(): String {
-        return """
-            INSERT INTO TunnelConfig (name, wg_quick) VALUES ('test', 'test')
-        """.trimIndent()
-    }
-}
@@ -1,49 +0,0 @@
-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.data.model.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.util.TunnelConfigs
-import kotlinx.coroutines.flow.Flow
-
-@Dao
-interface TunnelConfigDao {
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun save(t: TunnelConfig)
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun saveAll(t: TunnelConfigs)
-
-    @Query("SELECT * FROM TunnelConfig WHERE id=:id")
-    suspend fun getById(id: Long): TunnelConfig?
-
-    @Query("SELECT * FROM TunnelConfig")
-    suspend fun getAll(): TunnelConfigs
-
-    @Delete
-    suspend fun delete(t: TunnelConfig)
-
-    @Query("SELECT COUNT('id') FROM TunnelConfig")
-    suspend fun count(): Long
-
-    @Query("SELECT * FROM TunnelConfig WHERE tunnel_networks LIKE '%' || :name || '%'")
-    suspend fun findByTunnelNetworkName(name: String): TunnelConfigs
-
-    @Query("UPDATE TunnelConfig SET is_primary_tunnel = 0 WHERE is_primary_tunnel =1")
-    fun resetPrimaryTunnel()
-
-    @Query("UPDATE TunnelConfig SET is_mobile_data_tunnel = 0 WHERE is_mobile_data_tunnel =1")
-    fun resetMobileDataTunnel()
-
-    @Query("SELECT * FROM TUNNELCONFIG WHERE is_primary_tunnel=1")
-    suspend fun findByPrimary(): TunnelConfigs
-
-    @Query("SELECT * FROM TUNNELCONFIG WHERE is_mobile_data_tunnel=1")
-    suspend fun findByMobileDataTunnel(): TunnelConfigs
-
-    @Query("SELECT * FROM tunnelconfig")
-    fun getAllFlow(): Flow<MutableList<TunnelConfig>>
-}
@@ -1,70 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.datastore
-
-import android.content.Context
-import androidx.datastore.preferences.core.Preferences
-import androidx.datastore.preferences.core.booleanPreferencesKey
-import androidx.datastore.preferences.core.edit
-import androidx.datastore.preferences.core.intPreferencesKey
-import androidx.datastore.preferences.core.stringPreferencesKey
-import androidx.datastore.preferences.preferencesDataStore
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.runBlocking
-import timber.log.Timber
-import java.io.IOException
-
-class DataStoreManager(private val context: Context) {
-    companion object {
-        val LOCATION_DISCLOSURE_SHOWN = booleanPreferencesKey("LOCATION_DISCLOSURE_SHOWN")
-        val BATTERY_OPTIMIZE_DISABLE_SHOWN = booleanPreferencesKey("BATTERY_OPTIMIZE_DISABLE_SHOWN")
-        val TUNNEL_RUNNING_FROM_MANUAL_START =
-            booleanPreferencesKey("TUNNEL_RUNNING_FROM_MANUAL_START")
-        val ACTIVE_TUNNEL = intPreferencesKey("ACTIVE_TUNNEL")
-        val CURRENT_SSID = stringPreferencesKey("CURRENT_SSID")
-    }
-
-    // preferences
-    private val preferencesKey = "preferences"
-    private val Context.dataStore by
-    preferencesDataStore(
-        name = preferencesKey,
-    )
-
-    suspend fun init() {
-        try {
-            context.dataStore.data.first()
-        } catch (e: IOException) {
-            Timber.e(e)
-        }
-    }
-
-    suspend fun <T> saveToDataStore(key: Preferences.Key<T>, value: T) {
-        try {
-            context.dataStore.edit { it[key] = value }
-        } catch (e: IOException) {
-            Timber.e(e)
-        } catch (e: Exception) {
-            Timber.e(e)
-        }
-    }
-
-
-    fun <T> getFromStoreFlow(key: Preferences.Key<T>) = context.dataStore.data.map { it[key] }
-
-    suspend fun <T> getFromStore(key: Preferences.Key<T>): T? {
-        return try {
-            context.dataStore.data.map { it[key] }.first()
-        } catch (e: IOException) {
-            Timber.e(e)
-            null
-        }
-    }
-
-
-    fun <T> getFromStoreBlocking(key: Preferences.Key<T>) = runBlocking {
-        context.dataStore.data.map { it[key] }.first()
-    }
-
-    val preferencesFlow: Flow<Preferences?> = context.dataStore.data
-}
@@ -1,14 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.model
-
-data class GeneralState(
-    val locationDisclosureShown: Boolean = LOCATION_DISCLOSURE_SHOWN_DEFAULT,
-    val batteryOptimizationDisableShown: Boolean = BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
-    val tunnelRunningFromManualStart: Boolean = TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT,
-    val activeTunnelId: Int? = null
-) {
-    companion object {
-        const val LOCATION_DISCLOSURE_SHOWN_DEFAULT = false
-        const val BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT = false
-        const val TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT = false
-    }
-}
@@ -1,53 +0,0 @@
-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") val isAutoTunnelEnabled: Boolean = false,
-    @ColumnInfo(name = "is_tunnel_on_mobile_data_enabled")
-    val isTunnelOnMobileDataEnabled: Boolean = false,
-    @ColumnInfo(name = "trusted_network_ssids")
-    val trustedNetworkSSIDs: MutableList<String> = mutableListOf(),
-    @ColumnInfo(name = "is_always_on_vpn_enabled") val isAlwaysOnVpnEnabled: Boolean = false,
-    @ColumnInfo(name = "is_tunnel_on_ethernet_enabled")
-    val isTunnelOnEthernetEnabled: Boolean = false,
-    @ColumnInfo(
-        name = "is_shortcuts_enabled",
-        defaultValue = "false",
-    )
-    val isShortcutsEnabled: Boolean = false,
-    @ColumnInfo(
-        name = "is_tunnel_on_wifi_enabled",
-        defaultValue = "false",
-    )
-    val isTunnelOnWifiEnabled: Boolean = false,
-    @ColumnInfo(
-        name = "is_kernel_enabled",
-        defaultValue = "false",
-    )
-    val isKernelEnabled: Boolean = false,
-    @ColumnInfo(
-        name = "is_restore_on_boot_enabled",
-        defaultValue = "false",
-    )
-    val isRestoreOnBootEnabled: Boolean = false,
-    @ColumnInfo(
-        name = "is_multi_tunnel_enabled",
-        defaultValue = "false",
-    )
-    val isMultiTunnelEnabled: Boolean = false,
-    @ColumnInfo(
-        name = "is_auto_tunnel_paused",
-        defaultValue = "false",
-    )
-    val isAutoTunnelPaused: Boolean = false,
-    @ColumnInfo(
-        name = "is_ping_enabled",
-        defaultValue = "false",
-    )
-    val isPingEnabled: Boolean = false,
-)
@@ -1,38 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.model
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.Index
-import androidx.room.PrimaryKey
-import com.wireguard.config.Config
-import java.io.InputStream
-
-@Entity(indices = [Index(value = ["name"], unique = true)])
-data class TunnelConfig(
-    @PrimaryKey(autoGenerate = true) val id: Int = 0,
-    @ColumnInfo(name = "name") val name: String,
-    @ColumnInfo(name = "wg_quick") val wgQuick: String,
-    @ColumnInfo(
-        name = "tunnel_networks",
-        defaultValue = "",
-    )
-    val tunnelNetworks: MutableList<String> = mutableListOf(),
-    @ColumnInfo(
-        name = "is_mobile_data_tunnel",
-        defaultValue = "false",
-    )
-    val isMobileDataTunnel: Boolean = false,
-    @ColumnInfo(
-        name = "is_primary_tunnel",
-        defaultValue = "false",
-    )
-    val isPrimaryTunnel: Boolean = false,
-) {
-    companion object {
-        fun configFromQuick(wgQuick: String): Config {
-            val inputStream: InputStream = wgQuick.byteInputStream()
-            val reader = inputStream.bufferedReader(Charsets.UTF_8)
-            return Config.parse(reader)
-        }
-    }
-}
@@ -1,14 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.repository
-
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-
-interface AppDataRepository {
-    suspend fun getPrimaryOrFirstTunnel(): TunnelConfig?
-    suspend fun getStartTunnelConfig(): TunnelConfig?
-
-    suspend fun toggleWatcherServicePause()
-
-    val settings: SettingsRepository
-    val tunnels: TunnelConfigRepository
-    val appState: AppStateRepository
-}
@@ -1,34 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.repository
-
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-import javax.inject.Inject
-
-class AppDataRoomRepository @Inject constructor(
-    override val settings: SettingsRepository,
-    override val tunnels: TunnelConfigRepository,
-    override val appState: AppStateRepository
-) : AppDataRepository {
-    override suspend fun getPrimaryOrFirstTunnel(): TunnelConfig? {
-        return tunnels.findPrimary().firstOrNull() ?: tunnels.getAll().firstOrNull()
-    }
-
-    override suspend fun getStartTunnelConfig(): TunnelConfig? {
-        return if (appState.isTunnelRunningFromManualStart()) {
-            appState.getActiveTunnelId()?.let {
-                tunnels.getById(it)
-            }
-        } else null
-    }
-
-    override suspend fun toggleWatcherServicePause() {
-        val settings = settings.getSettings()
-        if (settings.isAutoTunnelEnabled) {
-            val pauseAutoTunnel = !settings.isAutoTunnelPaused
-            this.settings.save(
-                settings.copy(
-                    isAutoTunnelPaused = pauseAutoTunnel,
-                ),
-            )
-        }
-    }
-}
@@ -1,26 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.repository
-
-import com.zaneschepke.wireguardautotunnel.data.model.GeneralState
-import kotlinx.coroutines.flow.Flow
-
-interface AppStateRepository {
-    suspend fun isLocationDisclosureShown(): Boolean
-    suspend fun setLocationDisclosureShown(shown: Boolean)
-
-    suspend fun isBatteryOptimizationDisableShown(): Boolean
-    suspend fun setBatteryOptimizationDisableShown(shown: Boolean)
-
-    suspend fun isTunnelRunningFromManualStart(): Boolean
-    suspend fun setTunnelRunningFromManualStart(id: Int)
-
-    suspend fun setManualStop()
-
-    suspend fun getActiveTunnelId(): Int?
-
-    suspend fun getCurrentSsid(): String?
-
-    suspend fun setCurrentSsid(ssid: String)
-
-    val generalStateFlow: Flow<GeneralState>
-
-}
@@ -1,81 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.repository
-
-import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
-import com.zaneschepke.wireguardautotunnel.data.model.GeneralState
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
-import timber.log.Timber
-
-class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager) :
-    AppStateRepository {
-    override suspend fun isLocationDisclosureShown(): Boolean {
-        return dataStoreManager.getFromStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN)
-            ?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT
-    }
-
-    override suspend fun setLocationDisclosureShown(shown: Boolean) {
-        dataStoreManager.saveToDataStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN, shown)
-    }
-
-    override suspend fun isBatteryOptimizationDisableShown(): Boolean {
-        return dataStoreManager.getFromStore(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN)
-            ?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT
-    }
-
-    override suspend fun setBatteryOptimizationDisableShown(shown: Boolean) {
-        dataStoreManager.saveToDataStore(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN, shown)
-    }
-
-    override suspend fun isTunnelRunningFromManualStart(): Boolean {
-        return dataStoreManager.getFromStore(DataStoreManager.TUNNEL_RUNNING_FROM_MANUAL_START)
-            ?: GeneralState.TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT
-    }
-
-    override suspend fun setTunnelRunningFromManualStart(id: Int) {
-        setTunnelRunningFromManualStart(true)
-        setActiveTunnelId(id)
-    }
-
-    override suspend fun setManualStop() {
-        setTunnelRunningFromManualStart(false)
-    }
-
-    private suspend fun setTunnelRunningFromManualStart(running: Boolean) {
-        dataStoreManager.saveToDataStore(DataStoreManager.TUNNEL_RUNNING_FROM_MANUAL_START, running)
-    }
-
-    override suspend fun getActiveTunnelId(): Int? {
-        return dataStoreManager.getFromStore(DataStoreManager.ACTIVE_TUNNEL)
-    }
-
-    private suspend fun setActiveTunnelId(id: Int) {
-        dataStoreManager.saveToDataStore(DataStoreManager.ACTIVE_TUNNEL, id)
-    }
-
-    override suspend fun getCurrentSsid(): String? {
-        return dataStoreManager.getFromStore(DataStoreManager.CURRENT_SSID)
-    }
-
-    override suspend fun setCurrentSsid(ssid: String) {
-        dataStoreManager.saveToDataStore(DataStoreManager.CURRENT_SSID, ssid)
-    }
-
-    override val generalStateFlow: Flow<GeneralState> =
-        dataStoreManager.preferencesFlow.map { prefs ->
-            prefs?.let { pref ->
-                try {
-                    GeneralState(
-                        locationDisclosureShown = pref[DataStoreManager.LOCATION_DISCLOSURE_SHOWN]
-                            ?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT,
-                        batteryOptimizationDisableShown = pref[DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN]
-                            ?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
-                        tunnelRunningFromManualStart = pref[DataStoreManager.TUNNEL_RUNNING_FROM_MANUAL_START]
-                            ?: GeneralState.TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT,
-                    )
-                } catch (e: IllegalArgumentException) {
-                    Timber.e(e)
-                    GeneralState()
-                }
-            } ?: GeneralState()
-        }
-}
@@ -1,24 +0,0 @@
-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 RoomSettingsRepository(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()
-    }
-}
@@ -1,68 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.repository
-
-import com.zaneschepke.wireguardautotunnel.data.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.util.TunnelConfigs
-import kotlinx.coroutines.flow.Flow
-
-class RoomTunnelConfigRepository(private val tunnelConfigDao: TunnelConfigDao) :
-    TunnelConfigRepository {
-    override fun getTunnelConfigsFlow(): Flow<TunnelConfigs> {
-        return tunnelConfigDao.getAllFlow()
-    }
-
-    override suspend fun getAll(): TunnelConfigs {
-        return tunnelConfigDao.getAll()
-    }
-
-    override suspend fun save(tunnelConfig: TunnelConfig) {
-        tunnelConfigDao.save(tunnelConfig)
-    }
-
-    override suspend fun updatePrimaryTunnel(tunnelConfig: TunnelConfig?) {
-        tunnelConfigDao.resetPrimaryTunnel()
-        tunnelConfig?.let {
-            save(
-                it.copy(
-                    isPrimaryTunnel = true,
-                ),
-            )
-        }
-
-    }
-
-    override suspend fun updateMobileDataTunnel(tunnelConfig: TunnelConfig?) {
-        tunnelConfigDao.resetMobileDataTunnel()
-        tunnelConfig?.let {
-            save(
-                it.copy(
-                    isMobileDataTunnel = true,
-                ),
-            )
-        }
-    }
-
-    override suspend fun delete(tunnelConfig: TunnelConfig) {
-        tunnelConfigDao.delete(tunnelConfig)
-    }
-
-    override suspend fun getById(id: Int): TunnelConfig? {
-        return tunnelConfigDao.getById(id.toLong())
-    }
-
-    override suspend fun count(): Int {
-        return tunnelConfigDao.count().toInt()
-    }
-
-    override suspend fun findByTunnelNetworksName(name: String): TunnelConfigs {
-        return tunnelConfigDao.findByTunnelNetworkName(name)
-    }
-
-    override suspend fun findByMobileDataTunnel(): TunnelConfigs {
-        return tunnelConfigDao.findByMobileDataTunnel()
-    }
-
-    override suspend fun findPrimary(): TunnelConfigs {
-        return tunnelConfigDao.findByPrimary()
-    }
-}
@@ -1,14 +0,0 @@
-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>
-}
@@ -1,30 +0,0 @@
-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 updatePrimaryTunnel(tunnelConfig: TunnelConfig?)
-
-    suspend fun updateMobileDataTunnel(tunnelConfig: TunnelConfig?)
-
-    suspend fun delete(tunnelConfig: TunnelConfig)
-
-    suspend fun getById(id: Int): TunnelConfig?
-
-    suspend fun count(): Int
-
-    suspend fun findByTunnelNetworksName(name: String): TunnelConfigs
-
-    suspend fun findByMobileDataTunnel(): TunnelConfigs
-
-    suspend fun findPrimary(): TunnelConfigs
-}
@@ -3,8 +3,7 @@ package com.zaneschepke.wireguardautotunnel.module
 import android.content.Context
 import androidx.room.Room
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.data.AppDatabase
-import com.zaneschepke.wireguardautotunnel.data.DatabaseCallback
+import com.zaneschepke.wireguardautotunnel.repository.AppDatabase
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -17,14 +16,11 @@ 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()
-            .addCallback(DatabaseCallback())
            .build()
    }
-}
+}
@@ -1,7 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.module
-
-import javax.inject.Qualifier
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class Kernel
@@ -1,73 +1,27 @@
 package com.zaneschepke.wireguardautotunnel.module

-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.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRoomRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.DataStoreAppStateRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.RoomSettingsRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.RoomTunnelConfigRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
+import com.zaneschepke.wireguardautotunnel.repository.AppDatabase
+import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
+import com.zaneschepke.wireguardautotunnel.repository.TunnelConfigDao
 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 provideSettingsDoa(appDatabase: AppDatabase): SettingsDao {
+    fun provideSettingsRepository(appDatabase: AppDatabase) : SettingsDoa {
        return appDatabase.settingDao()
    }

    @Singleton
    @Provides
-    fun provideTunnelConfigDoa(appDatabase: AppDatabase): TunnelConfigDao {
+    fun provideTunnelConfigRepository(appDatabase: AppDatabase) : TunnelConfigDao {
        return appDatabase.tunnelConfigDoa()
    }
-
-    @Singleton
-    @Provides
-    fun provideTunnelConfigRepository(tunnelConfigDao: TunnelConfigDao): TunnelConfigRepository {
-        return RoomTunnelConfigRepository(tunnelConfigDao)
-    }
-
-    @Singleton
-    @Provides
-    fun provideSettingsRepository(settingsDao: SettingsDao): SettingsRepository {
-        return RoomSettingsRepository(settingsDao)
-    }
-
-    @Singleton
-    @Provides
-    fun providePreferencesDataStore(@ApplicationContext context: Context): DataStoreManager {
-        return DataStoreManager(context)
-    }
-
-    @Provides
-    @Singleton
-    fun provideGeneralStateRepository(dataStoreManager: DataStoreManager): AppStateRepository {
-        return DataStoreAppStateRepository(dataStoreManager)
-    }
-
-    @Provides
-    @Singleton
-    fun provideAppDataRepository(
-        settingsRepository: SettingsRepository,
-        tunnelConfigRepository: TunnelConfigRepository,
-        appStateRepository: AppStateRepository
-    ): AppDataRepository {
-        return AppDataRoomRepository(settingsRepository, tunnelConfigRepository, appStateRepository)
-    }
-
-
-}
+}
@@ -15,25 +15,20 @@ 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 provideWifiService(wifiService: WifiService): NetworkService<WifiService>
+    abstract fun provideNotificationService(wireGuardNotification: WireGuardNotification) : NotificationService

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

    @Binds
    @ServiceScoped
-    abstract fun provideEthernetService(
-        ethernetService: EthernetService
-    ): NetworkService<EthernetService>
-}
+    abstract fun provideMobileDataService(mobileDataService : MobileDataService) : NetworkService<MobileDataService>
+
+    @Binds
+    @ServiceScoped
+    abstract fun provideEthernetService(ethernetService: EthernetService) : NetworkService<EthernetService>
+}
@@ -3,11 +3,6 @@ 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.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.WireGuardTunnel
 import dagger.Module
@@ -20,39 +15,16 @@ import javax.inject.Singleton
@Module
@InstallIn(SingletonComponent::class)
 class TunnelModule {
-    @Provides
-    @Singleton
-    fun provideRootShell(@ApplicationContext context: Context): RootShell {
-        return RootShell(context)
-    }

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

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

@AndroidEntryPoint
 class BootReceiver : BroadcastReceiver() {

    @Inject
-    lateinit var appDataRepository: AppDataRepository
+    lateinit var settingsRepo : SettingsDoa

-    @Inject
-    lateinit var serviceManager: ServiceManager
-
-    override fun onReceive(context: Context?, intent: Intent?) = goAsync {
-        if (Intent.ACTION_BOOT_COMPLETED != intent?.action) return@goAsync
-        context?.run {
-            val settings = appDataRepository.settings.getSettings()
-            if (settings.isAutoTunnelEnabled) {
-                Timber.i("Starting watcher service from boot")
-                serviceManager.startWatcherServiceForeground(context)
-            }
-            if (appDataRepository.appState.isTunnelRunningFromManualStart()) {
-                appDataRepository.appState.getActiveTunnelId()?.let {
-                    Timber.i("Starting tunnel that was active before reboot")
-                    serviceManager.startVpnServiceForeground(
-                        context,
-                        appDataRepository.tunnels.getById(it)?.id,
-                    )
+    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!!)
+                    }
                }
-            }
-            if (settings.isAlwaysOnVpnEnabled) {
-                Timber.i("Starting vpn service from boot AOVPN")
-                serviceManager.startVpnServiceForeground(context)
+            } finally {
+                cancel()
            }
        }
    }
-}
+}
@@ -3,34 +3,33 @@ package com.zaneschepke.wireguardautotunnel.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
+import com.zaneschepke.wireguardautotunnel.Constants
+import com.zaneschepke.wireguardautotunnel.goAsync
+import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
 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
-import timber.log.Timber
 import javax.inject.Inject

@AndroidEntryPoint
 class NotificationActionReceiver : BroadcastReceiver() {
-    @Inject
-    lateinit var settingsRepository: SettingsRepository

    @Inject
-    lateinit var serviceManager: ServiceManager
-
+    lateinit var settingsRepo : SettingsDoa
    override fun onReceive(context: Context, intent: Intent?) = goAsync {
        try {
-            //TODO fix for manual start changes when enabled
-            serviceManager.stopVpnService(context)
-            delay(Constants.TOGGLE_TUNNEL_DELAY)
-            serviceManager.startVpnServiceForeground(context)
-        } catch (e: Exception) {
-            Timber.e(e)
+            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())
+                }
+            }
        } finally {
            cancel()
        }
    }
-}
+}
@@ -0,0 +1,17 @@
+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 = 3, autoMigrations = [
+    AutoMigration(from = 1, to = 2), AutoMigration(from = 2, to = 3)
+], exportSchema = true)
+@TypeConverters(DatabaseListConverters::class)
+abstract class AppDatabase : RoomDatabase() {
+    abstract fun settingDao(): SettingsDoa
+    abstract fun tunnelConfigDoa() : TunnelConfigDao
+}
@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.data
+package com.zaneschepke.wireguardautotunnel.repository

 import androidx.room.TypeConverter
 import kotlinx.serialization.encodeToString
@@ -9,16 +9,15 @@ class DatabaseListConverters {
    fun listToString(value: MutableList<String>): String {
        return Json.encodeToString(value)
    }
-
    @TypeConverter
    fun stringToList(value: String): MutableList<String> {
-        if (value.isBlank() || 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,15 +1,16 @@
-package com.zaneschepke.wireguardautotunnel.data
+package com.zaneschepke.wireguardautotunnel.repository

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

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

@@ -22,9 +23,6 @@ interface SettingsDao {
    @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>>

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

    @Query("SELECT COUNT('id') FROM settings")
    suspend fun count(): Long
-}
+}
@@ -0,0 +1,34 @@
+package com.zaneschepke.wireguardautotunnel.repository
+
+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 kotlinx.coroutines.flow.Flow
+
+@Dao
+interface TunnelConfigDao{
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun save(t: TunnelConfig)
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun saveAll(t: List<TunnelConfig>)
+
+    @Query("SELECT * FROM TunnelConfig WHERE id=:id")
+    suspend fun getById(id: Long): TunnelConfig?
+
+    @Query("SELECT * FROM TunnelConfig")
+    suspend fun getAll(): List<TunnelConfig>
+
+    @Delete
+    suspend fun delete(t: TunnelConfig)
+
+    @Query("SELECT COUNT('id') FROM TunnelConfig")
+    suspend fun count(): Long
+
+    @Query("SELECT * FROM tunnelconfig")
+    fun getAllFlow(): Flow<MutableList<TunnelConfig>>
+}
@@ -0,0 +1,28 @@
+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,
+    @ColumnInfo(name = "is_tunnel_on_wifi_enabled", defaultValue = "false") var isTunnelOnWifiEnabled : Boolean = false,
+) {
+    fun isTunnelConfigDefault(tunnelConfig: TunnelConfig) : Boolean {
+        return if (defaultTunnel != null) {
+            val defaultConfig = TunnelConfig.from(defaultTunnel!!)
+            (tunnelConfig.id == defaultConfig.id)
+        } else {
+            false
+        }
+    }
+}
@@ -0,0 +1,35 @@
+package com.zaneschepke.wireguardautotunnel.repository.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.Index
+import androidx.room.PrimaryKey
+import com.wireguard.config.Config
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+import java.io.InputStream
+
+@Entity(indices = [Index(value = ["name"], unique = true)])
+@Serializable
+data class TunnelConfig(
+    @PrimaryKey(autoGenerate = true) val id : Int = 0,
+    @ColumnInfo(name = "name") var name : String,
+    @ColumnInfo(name = "wg_quick") var wgQuick : String,
+){
+
+    override fun toString(): String {
+        return Json.encodeToString(serializer(), this)
+    }
+
+    companion object {
+
+        fun from(string : String) : TunnelConfig {
+            return Json.decodeFromString<TunnelConfig>(string)
+        }
+        fun configFromQuick(wgQuick: String): Config {
+            val inputStream: InputStream = wgQuick.byteInputStream()
+            val reader = inputStream.bufferedReader(Charsets.UTF_8)
+            return Config.parse(reader)
+        }
+    }
+}
@@ -4,4 +4,4 @@ enum class Action {
    START,
    START_FOREGROUND,
    STOP
-}
+}
@@ -4,10 +4,11 @@ import android.content.Intent
 import android.os.Bundle
 import android.os.IBinder
 import androidx.lifecycle.LifecycleService
-import com.zaneschepke.wireguardautotunnel.util.Constants
 import timber.log.Timber

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

    override fun onBind(intent: Intent): IBinder? {
@@ -21,46 +22,45 @@ open class ForegroundService : LifecycleService() {
        Timber.d("onStartCommand executed with startId: $startId")
        if (intent != null) {
            val action = intent.action
+            Timber.d("using an intent with action $action")
            when (action) {
-                Action.START.name,
-                Action.START_FOREGROUND.name -> startService(intent.extras)
-
-                Constants.ALWAYS_ON_VPN_ACTION -> {
-                    Timber.i("Always-on VPN starting service")
+                Action.START.name, Action.START_FOREGROUND.name -> startService(intent.extras)
+                Action.STOP.name -> stopService(intent.extras)
+                "android.net.VpnService" -> {
+                    Timber.d("Always-on VPN starting service")
                    startService(intent.extras)
                }
-
                else -> Timber.d("This should never happen. No action in the received intent")
            }
        } else {
            Timber.d(
-                "with a null intent. It has been probably restarted by the system.",
+                "with a null intent. It has been probably restarted by the system."
            )
        }
        // by returning this we make sure the service is restarted if the system kills the service
        return START_STICKY
    }

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

-    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() {
+    protected open fun stopService(extras : Bundle?) {
        Timber.d("Stopping ${this.javaClass.simpleName}")
        try {
            stopForeground(STOP_FOREGROUND_REMOVE)
            stopSelf()
        } catch (e: Exception) {
-            Timber.e(e)
+            Timber.d("Service stopped without being started: ${e.message}")
        }
        isServiceStarted = false
    }
-}
+}
@@ -1,108 +1,101 @@
 package com.zaneschepke.wireguardautotunnel.service.foreground

+import android.app.ActivityManager
 import android.app.Service
 import android.content.Context
+import android.content.Context.ACTIVITY_SERVICE
 import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.R
 import timber.log.Timber

-class ServiceManager(private val appDataRepository: AppDataRepository) {
+object ServiceManager {
+    @Suppress("DEPRECATION")
+    private // Deprecated for third party Services.
+    fun <T> Context.isServiceRunning(service: Class<T>) =
+        (getSystemService(ACTIVITY_SERVICE) as ActivityManager)
+            .getRunningServices(Integer.MAX_VALUE)
+            .any { it.service.className == service.name }

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

-    suspend fun startVpnService(
-        context: Context,
-        tunnelId: Int? = null,
-        isManualStart: Boolean = false
-    ) {
-        if (isManualStart) onManualStart(tunnelId)
+    fun startVpnService(context : Context, tunnelConfig : String) {
        actionOnService(
            Action.START,
            context,
            WireGuardTunnelService::class.java,
-            tunnelId?.let { mapOf(Constants.TUNNEL_EXTRA_KEY to it) },
-        )
+            mapOf(context.getString(R.string.tunnel_extras_key) to tunnelConfig))
    }
-
-    suspend fun stopVpnService(context: Context, isManualStop: Boolean = false) {
-        if (isManualStop) onManualStop()
-        Timber.i("Stopping vpn service")
+    fun stopVpnService(context : Context) {
        actionOnService(
            Action.STOP,
            context,
-            WireGuardTunnelService::class.java,
+            WireGuardTunnelService::class.java
        )
    }

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

-    private suspend fun onManualStart(tunnelId: Int?) {
-        tunnelId?.let {
-            appDataRepository.appState.setTunnelRunningFromManualStart(it)
+    private fun startWatcherServiceForeground(context : Context, tunnelConfig : String) {
+        actionOnService(
+            Action.START, context,
+            WireGuardConnectivityWatcherService::class.java, mapOf(context.
+            getString(R.string.tunnel_extras_key) to
+                    tunnelConfig))
+    }
+
+    fun startWatcherService(context : Context, tunnelConfig : String) {
+        actionOnService(
+            Action.START, context,
+            WireGuardConnectivityWatcherService::class.java, mapOf(context.
+            getString(R.string.tunnel_extras_key) to
+                    tunnelConfig))
+    }
+
+    fun stopWatcherService(context : Context) {
+        actionOnService(
+            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)
        }
    }
-
-    suspend fun startVpnServiceForeground(
-        context: Context,
-        tunnelId: Int? = null,
-        isManualStart: Boolean = false
-    ) {
-        if (isManualStart) onManualStart(tunnelId)
-        actionOnService(
-            Action.START_FOREGROUND,
-            context,
-            WireGuardTunnelService::class.java,
-            tunnelId?.let { mapOf(Constants.TUNNEL_EXTRA_KEY to it) },
-        )
-    }
-
-    fun startWatcherServiceForeground(
-        context: Context,
-    ) {
-        actionOnService(
-            Action.START_FOREGROUND,
-            context,
-            WireGuardConnectivityWatcherService::class.java,
-        )
-    }
-
-    fun startWatcherService(context: Context) {
-        actionOnService(
-            Action.START,
-            context,
-            WireGuardConnectivityWatcherService::class.java,
-        )
-    }
-
-    fun stopWatcherService(context: Context) {
-        actionOnService(
-            Action.STOP,
-            context,
-            WireGuardConnectivityWatcherService::class.java,
-        )
-    }
-}
+}
@@ -0,0 +1,6 @@
+package com.zaneschepke.wireguardautotunnel.service.foreground
+
+enum class ServiceState {
+    STARTED,
+    STOPPED,
+}
@@ -1,84 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground
-
-import com.wireguard.android.backend.Tunnel
-import com.zaneschepke.wireguardautotunnel.data.model.Settings
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-
-data class WatcherState(
-    val isWifiConnected: Boolean = false,
-    val config: TunnelConfig? = null,
-    val vpnStatus: Tunnel.State = Tunnel.State.DOWN,
-    val isEthernetConnected: Boolean = false,
-    val isMobileDataConnected: Boolean = false,
-    val currentNetworkSSID: String = "",
-    val settings: Settings = Settings()
-) {
-
-    private fun isVpnConnected() = vpnStatus == Tunnel.State.UP
-    fun isEthernetConditionMet(): Boolean {
-        return (isEthernetConnected &&
-            settings.isTunnelOnEthernetEnabled &&
-            !isVpnConnected())
-    }
-
-    fun isMobileDataConditionMet(): Boolean {
-        return (!isEthernetConnected &&
-            settings.isTunnelOnMobileDataEnabled &&
-            !isWifiConnected &&
-            isMobileDataConnected &&
-            !isVpnConnected())
-    }
-
-    fun isTunnelNotMobileDataPreferredConditionMet(): Boolean {
-        return (!isEthernetConnected &&
-            settings.isTunnelOnMobileDataEnabled &&
-            !isWifiConnected &&
-            isMobileDataConnected &&
-            config?.isMobileDataTunnel == false && isVpnConnected())
-    }
-
-    fun isTunnelOffOnMobileDataConditionMet(): Boolean {
-        return (!isEthernetConnected &&
-            !settings.isTunnelOnMobileDataEnabled &&
-            isMobileDataConnected &&
-            !isWifiConnected &&
-            isVpnConnected())
-    }
-
-    fun isUntrustedWifiConditionMet(): Boolean {
-        return (!isEthernetConnected &&
-            isWifiConnected &&
-            !settings.trustedNetworkSSIDs.contains(currentNetworkSSID) &&
-            settings.isTunnelOnWifiEnabled
-            && !isVpnConnected())
-    }
-
-    fun isTunnelNotWifiNamePreferredMet(ssid: String): Boolean {
-        return (!isEthernetConnected &&
-            isWifiConnected &&
-            !settings.trustedNetworkSSIDs.contains(currentNetworkSSID) &&
-            settings.isTunnelOnWifiEnabled && config?.tunnelNetworks?.contains(ssid) == false && isVpnConnected())
-    }
-
-    fun isTrustedWifiConditionMet(): Boolean {
-        return (!isEthernetConnected &&
-            (isWifiConnected &&
-                settings.trustedNetworkSSIDs.contains(currentNetworkSSID)) &&
-            (isVpnConnected()))
-    }
-
-    fun isTunnelOffOnWifiConditionMet(): Boolean {
-        return (!isEthernetConnected &&
-            (isWifiConnected &&
-                !settings.isTunnelOnWifiEnabled &&
-                (isVpnConnected())))
-    }
-
-    fun isTunnelOffOnNoConnectivityMet(): Boolean {
-        return (!isEthernetConnected &&
-            !isWifiConnected &&
-            !isMobileDataConnected &&
-            (isVpnConnected()))
-    }
-}
-
@@ -1,14 +1,18 @@
 package com.zaneschepke.wireguardautotunnel.service.foreground

+import android.app.AlarmManager
+import android.app.PendingIntent
 import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import android.os.PowerManager
-import androidx.core.app.ServiceCompat
+import android.os.SystemClock
 import androidx.lifecycle.lifecycleScope
 import com.wireguard.android.backend.Tunnel
+import com.zaneschepke.wireguardautotunnel.Constants
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
+import com.zaneschepke.wireguardautotunnel.repository.model.Settings
 import com.zaneschepke.wireguardautotunnel.service.network.EthernetService
 import com.zaneschepke.wireguardautotunnel.service.network.MobileDataService
 import com.zaneschepke.wireguardautotunnel.service.network.NetworkService
@@ -16,21 +20,18 @@ 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
-import java.net.InetAddress
 import javax.inject.Inject

-
@AndroidEntryPoint
 class WireGuardConnectivityWatcherService : ForegroundService() {
+
    private val foregroundId = 122

    @Inject
@@ -43,7 +44,7 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
    lateinit var ethernetService: NetworkService<EthernetService>

    @Inject
-    lateinit var appDataRepository: AppDataRepository
+    lateinit var settingsRepo: SettingsDoa

    @Inject
    lateinit var notificationService: NotificationService
@@ -51,48 +52,47 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
    @Inject
    lateinit var vpnService: VpnService

-    @Inject
-    lateinit var serviceManager: ServiceManager
-
-    private val networkEventsFlow = MutableStateFlow(WatcherState())
+    private var isWifiConnected = false
+    private var isEthernetConnected = false
+    private var isMobileDataConnected = false
+    private var currentNetworkSSID = ""

    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

+
    override fun onCreate() {
        super.onCreate()
        lifecycleScope.launch(Dispatchers.Main) {
-            try {
-                if (appDataRepository.settings.getSettings().isAutoTunnelPaused) {
-                    launchWatcherPausedNotification()
-                } else launchWatcherNotification()
-            } catch (e: Exception) {
-                Timber.e("Failed to start watcher service, not enough permissions")
-            }
+            launchWatcherNotification()
        }
    }

-    override fun onDestroy() {
-        super.onDestroy()
-        stopService()
-    }
-
    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()
+        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()
-        } catch (e: Exception) {
-            Timber.e("Failed to launch watcher service, no permissions")
+        } else {
+            stopService(extras)
        }
    }

-    override fun stopService() {
-        super.stopService()
+    override fun stopService(extras: Bundle?) {
+        super.stopService(extras)
        wakeLock?.let {
            if (it.isHeld) {
                it.release()
@@ -102,37 +102,47 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
        stopSelf()
    }

-    private fun launchWatcherNotification(
-        description: String = getString(R.string.watcher_notification_text_active)
-    ) {
-        val notification =
-            notificationService.createNotification(
-                channelId = getString(R.string.watcher_channel_id),
-                channelName = getString(R.string.watcher_channel_name),
-                title = getString(R.string.auto_tunnel_title),
-                description = description,
-            )
-        ServiceCompat.startForeground(
-            this,
-            foregroundId,
-            notification,
-            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+    private fun launchWatcherNotification() {
+        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),
+            vibration = false
+        )
+        super.startForeground(foregroundId, notification)
+    }
+
+    //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 fun launchWatcherPausedNotification() {
-        launchWatcherNotification(getString(R.string.watcher_notification_text_paused))
-    }
-
-    private fun initWakeLock() {
+    private suspend fun initWakeLock() {
+        val isBatterySaverOn = withContext(lifecycleScope.coroutineContext) {
+            settingsRepo.getAll().firstOrNull()?.isBatterySaverEnabled ?: false
+        }
        wakeLock =
            (getSystemService(Context.POWER_SERVICE) as PowerManager).run {
                newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "$tag::lock").apply {
-                    try {
-                        Timber.i("Initiating wakelock with 10 min timeout")
-                        acquire(Constants.BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT)
-                    } finally {
-                        release()
+                    if (isBatterySaverOn) {
+                        Timber.d("Initiating wakelock with timeout")
+                        acquire(Constants.WATCHER_SERVICE_WAKE_LOCK_TIMEOUT)
+                    } else {
+                        Timber.d("Initiating wakelock with zero timeout")
+                        acquire()
                    }
                }
            }
@@ -145,161 +155,67 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
    }

    private fun startWatcherJob() {
-        watcherJob =
-            lifecycleScope.launch(Dispatchers.IO) {
-                val setting = appDataRepository.settings.getSettings()
-                launch {
-                    Timber.i("Starting wifi watcher")
-                    watchForWifiConnectivityChanges()
-                }
-                if (setting.isTunnelOnMobileDataEnabled) {
-                    launch {
-                        Timber.i("Starting mobile data watcher")
-                        watchForMobileDataConnectivityChanges()
-                    }
-                }
-                if (setting.isTunnelOnEthernetEnabled) {
-                    launch {
-                        Timber.i("Starting ethernet data watcher")
-                        watchForEthernetConnectivityChanges()
-                    }
-                }
-                launch {
-                    Timber.i("Starting vpn state watcher")
-                    watchForVpnConnectivityChanges()
-                }
-                launch {
-                    Timber.i("Starting settings watcher")
-                    watchForSettingsChanges()
-                }
-                if (setting.isPingEnabled) {
-                    launch {
-                        Timber.i("Starting ping watcher")
-                        watchForPingFailure()
-                    }
-                }
-                launch {
-                    Timber.i("Starting management watcher")
-                    manageVpn()
-                }
-
+        watcherJob = lifecycleScope.launch(Dispatchers.IO) {
+            val settings = settingsRepo.getAll()
+            if (settings.isNotEmpty()) {
+                setting = settings[0]
            }
+            launch {
+                watchForWifiConnectivityChanges()
+            }
+            if (setting.isTunnelOnMobileDataEnabled) {
+                launch {
+                    watchForMobileDataConnectivityChanges()
+                }
+            }
+            if (setting.isTunnelOnEthernetEnabled) {
+                launch {
+                    watchForEthernetConnectivityChanges()
+                }
+            }
+            launch {
+                manageVpn()
+            }
+        }
    }

    private suspend fun watchForMobileDataConnectivityChanges() {
        mobileDataService.networkStatus.collect {
            when (it) {
                is NetworkStatus.Available -> {
-                    Timber.i("Gained Mobile data connection")
-                    networkEventsFlow.value =
-                        networkEventsFlow.value.copy(
-                            isMobileDataConnected = true,
-                        )
+                    Timber.d("Gained Mobile data connection")
+                    isMobileDataConnected = true
                }

                is NetworkStatus.CapabilitiesChanged -> {
-                    networkEventsFlow.value =
-                        networkEventsFlow.value.copy(
-                            isMobileDataConnected = true,
-                        )
-                    Timber.i("Mobile data capabilities changed")
+                    isMobileDataConnected = true
+                    Timber.d("Mobile data capabilities changed")
                }

                is NetworkStatus.Unavailable -> {
-                    networkEventsFlow.value =
-                        networkEventsFlow.value.copy(
-                            isMobileDataConnected = false,
-                        )
-                    Timber.i("Lost mobile data connection")
+                    isMobileDataConnected = false
+                    Timber.d("Lost mobile data connection")
                }
            }
        }
    }

-    private suspend fun watchForPingFailure() {
-        try {
-            do {
-                if (vpnService.vpnState.value.status == Tunnel.State.UP) {
-                    val tunnelConfig = vpnService.vpnState.value.tunnelConfig
-                    tunnelConfig?.let {
-                        val config = TunnelConfig.configFromQuick(it.wgQuick)
-                        val results = config.peers.map { peer ->
-                            val host = if (peer.endpoint.isPresent &&
-                                peer.endpoint.get().resolved.isPresent)
-                                peer.endpoint.get().resolved.get().host
-                            else Constants.BACKUP_PING_HOST
-                            Timber.i("Checking reachability of: $host")
-                            val reachable = InetAddress.getByName(host)
-                                .isReachable(Constants.PING_TIMEOUT.toInt())
-                            Timber.i("Result: reachable - $reachable")
-                            reachable
-                        }
-                        if (results.contains(false)) {
-                            Timber.i("Restarting VPN for ping failure")
-                            serviceManager.stopVpnService(this)
-                            delay(Constants.VPN_RESTART_DELAY)
-                            serviceManager.startVpnServiceForeground(this)
-                            delay(Constants.PING_COOLDOWN)
-                        }
-                    }
-                }
-                delay(Constants.PING_INTERVAL)
-            } while (true)
-        } catch (e: Exception) {
-            Timber.e(e)
-        }
-    }
-
-    private suspend fun watchForSettingsChanges() {
-        appDataRepository.settings.getSettingsFlow().collect {
-            if (networkEventsFlow.value.settings.isAutoTunnelPaused != it.isAutoTunnelPaused) {
-                when (it.isAutoTunnelPaused) {
-                    true -> launchWatcherPausedNotification()
-                    false -> launchWatcherNotification()
-                }
-            }
-            networkEventsFlow.value =
-                networkEventsFlow.value.copy(
-                    settings = it,
-                )
-        }
-    }
-
-    private suspend fun watchForVpnConnectivityChanges() {
-        vpnService.vpnState.collect {
-            networkEventsFlow.value =
-                networkEventsFlow.value.copy(
-                    vpnStatus = it.status,
-                    config = it.tunnelConfig,
-                )
-        }
-    }
-
    private suspend fun watchForEthernetConnectivityChanges() {
        ethernetService.networkStatus.collect {
            when (it) {
                is NetworkStatus.Available -> {
-                    Timber.i("Gained Ethernet connection")
-                    networkEventsFlow.value =
-                        networkEventsFlow.value.copy(
-                            isEthernetConnected = true,
-                        )
+                    Timber.d("Gained Ethernet connection")
+                    isEthernetConnected = true
                }

                is NetworkStatus.CapabilitiesChanged -> {
-                    Timber.i("Ethernet capabilities changed")
-                    networkEventsFlow.value =
-                        networkEventsFlow.value.copy(
-                            isEthernetConnected = true,
-                        )
+                    Timber.d("Ethernet capabilities changed")
+                    isEthernetConnected = true
                }

                is NetworkStatus.Unavailable -> {
-                    networkEventsFlow.value =
-                        networkEventsFlow.value.copy(
-                            isEthernetConnected = false,
-                        )
-                    Timber.i("Lost Ethernet connection")
+                    isEthernetConnected = false
+                    Timber.d("Lost Ethernet connection")
                }
            }
        }
@@ -309,122 +225,58 @@ class WireGuardConnectivityWatcherService : ForegroundService() {
        wifiService.networkStatus.collect {
            when (it) {
                is NetworkStatus.Available -> {
-                    Timber.i("Gained Wi-Fi connection")
-                    networkEventsFlow.value =
-                        networkEventsFlow.value.copy(
-                            isWifiConnected = true,
-                        )
+                    Timber.d("Gained Wi-Fi connection")
+                    isWifiConnected = true
                }

                is NetworkStatus.CapabilitiesChanged -> {
-                    Timber.i("Wifi capabilities changed")
-                    networkEventsFlow.value =
-                        networkEventsFlow.value.copy(
-                            isWifiConnected = true,
-                        )
-                    val ssid = wifiService.getNetworkName(it.networkCapabilities)
-                    ssid?.let {
-                        Timber.i("Detected SSID: $ssid")
-                        appDataRepository.appState.setCurrentSsid(ssid)
-                        networkEventsFlow.value =
-                            networkEventsFlow.value.copy(
-                                currentNetworkSSID = ssid,
-                            )
-                    } ?: Timber.w("Failed to read ssid")
+                    Timber.d("Wifi capabilities changed")
+                    isWifiConnected = true
+                    currentNetworkSSID = wifiService.getNetworkName(it.networkCapabilities) ?: ""
                }

                is NetworkStatus.Unavailable -> {
-                    networkEventsFlow.value =
-                        networkEventsFlow.value.copy(
-                            isWifiConnected = false,
-                        )
-                    Timber.i("Lost Wi-Fi connection")
+                    isWifiConnected = false
+                    Timber.d("Lost Wi-Fi connection")
                }
            }
        }
    }

-    private suspend fun getMobileDataTunnel(): TunnelConfig? {
-        return appDataRepository.tunnels.findByMobileDataTunnel().firstOrNull()
-    }
-
-    private suspend fun getSsidTunnel(ssid: String): TunnelConfig? {
-        return appDataRepository.tunnels.findByTunnelNetworksName(ssid).firstOrNull()
-    }
-
    private suspend fun manageVpn() {
-        networkEventsFlow.collectLatest { watcherState ->
-            val autoTunnel = "Auto-tunnel watcher"
-            if (!watcherState.settings.isAutoTunnelPaused) {
-                //delay for rapid network state changes and then collect latest
-                delay(Constants.WATCHER_COLLECTION_DELAY)
-                when {
-                    watcherState.isEthernetConditionMet() -> {
-                        Timber.i("$autoTunnel - tunnel on on ethernet condition met")
-                        serviceManager.startVpnServiceForeground(this)
-                    }
-
-                    watcherState.isMobileDataConditionMet() -> {
-                        Timber.i("$autoTunnel - tunnel on on mobile data condition met")
-                        serviceManager.startVpnServiceForeground(this, getMobileDataTunnel()?.id)
-                    }
-
-                    watcherState.isTunnelNotMobileDataPreferredConditionMet() -> {
-                        getMobileDataTunnel()?.let {
-                            Timber.i("$autoTunnel - tunnel connected on mobile data is not preferred condition met, switching to preferred")
-                            serviceManager.startVpnServiceForeground(
-                                this,
-                                getMobileDataTunnel()?.id,
-                            )
-                        }
-                    }
-
-                    watcherState.isTunnelOffOnMobileDataConditionMet() -> {
-                        Timber.i("$autoTunnel - tunnel off on mobile data met, turning vpn off")
-                        serviceManager.stopVpnService(this)
-                    }
-
-                    watcherState.isTunnelNotWifiNamePreferredMet(watcherState.currentNetworkSSID) -> {
-                        Timber.i("$autoTunnel - tunnel on ssid not associated with current tunnel condition met")
-                        getSsidTunnel(watcherState.currentNetworkSSID)?.let {
-                            Timber.i("Found tunnel associated with this SSID, bringing tunnel up")
-                            serviceManager.startVpnServiceForeground(this, it.id)
-                        } ?: suspend {
-                            Timber.i("No tunnel associated with this SSID, using defaults")
-                            if (appDataRepository.getPrimaryOrFirstTunnel()?.name != vpnService.name) {
-                                serviceManager.startVpnServiceForeground(this)
-                            }
-                        }.invoke()
-                    }
-
-                    watcherState.isUntrustedWifiConditionMet() -> {
-                        Timber.i("$autoTunnel - tunnel on untrusted wifi condition met")
-                        serviceManager.startVpnServiceForeground(
-                            this,
-                            getSsidTunnel(watcherState.currentNetworkSSID)?.id,
-                        )
-                    }
-
-                    watcherState.isTrustedWifiConditionMet() -> {
-                        Timber.i("$autoTunnel - tunnel off on trusted wifi condition met, turning vpn off")
-                        serviceManager.stopVpnService(this)
-                    }
-
-                    watcherState.isTunnelOffOnWifiConditionMet() -> {
-                        Timber.i("$autoTunnel - tunnel off on wifi condition met, turning vpn off")
-                        serviceManager.stopVpnService(this)
-                    }
-
-                    watcherState.isTunnelOffOnNoConnectivityMet() -> {
-                        Timber.i("$autoTunnel - tunnel off on no connectivity met, turning vpn off")
-                        serviceManager.stopVpnService(this)
-                    }
-
-                    else -> {
-                        Timber.i("$autoTunnel - no condition met")
-                    }
-                }
+        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) &&
+                setting.isTunnelOnWifiEnabled &&
+                (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)
+            } else if (!isEthernetConnected && (isWifiConnected &&
+                        !setting.isTunnelOnWifiEnabled &&
+                (vpnService.getState() == Tunnel.State.UP)
+            )) {
+                ServiceManager.stopVpnService(this)
+            }
+            delay(Constants.VPN_CONNECTIVITY_CHECK_INTERVAL)
        }
    }
-}
+}
@@ -3,187 +3,163 @@ 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.wireguard.android.backend.Tunnel
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 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 appDataRepository: AppDataRepository
+    lateinit var settingsRepo: SettingsDoa

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

-    private lateinit var job: Job
+    private lateinit var job : Job

-    private var didShowConnected = false
+    private var tunnelName : String = ""

    override fun onCreate() {
        super.onCreate()
        lifecycleScope.launch(Dispatchers.Main) {
-            //TODO fix this to not launch if AOVPN
-            if (appDataRepository.tunnels.count() != 0) {
-                launchVpnNotification()
-            }
+            launchVpnStartingNotification()
        }
    }

-    override fun onDestroy() {
-        super.onDestroy()
-
-    }
-
-    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()
-        job =
-            lifecycleScope.launch(Dispatchers.IO) {
-                launch {
-                    val tunnelId = extras?.getInt(Constants.TUNNEL_EXTRA_KEY)
-                    if (vpnService.getState() == Tunnel.State.UP) {
-                        vpnService.stopTunnel()
+        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!!)
+                            tunnelName = tunnelConfig.name
+                            vpnService.startTunnel(tunnelConfig)
+                        }
                    }
-                    vpnService.startTunnel(
-                        tunnelId?.let {
-                            appDataRepository.tunnels.getById(it)
-                        },
-                    )
-                }
-                launch {
-                    handshakeNotifications()
                }
            }
-    }
-
-    //TODO improve tunnel notifications
-    private suspend fun handshakeNotifications() {
-        var tunnelName: String? = null
-        vpnService.vpnState.collect { state ->
-            state.statistics
-                ?.mapPeerStats()
-                ?.map { it.value?.handshakeStatus() }
-                .let { statuses ->
-                    when {
-                        statuses?.all { it == HandshakeStatus.HEALTHY } == true -> {
-                            if (!didShowConnected) {
-                                delay(Constants.VPN_CONNECTED_NOTIFICATION_DELAY)
-                                tunnelName = state.tunnelConfig?.name
-                                launchVpnNotification(
-                                    getString(R.string.tunnel_start_title),
-                                    "${getString(R.string.tunnel_start_text)} - $tunnelName",
-                                )
+            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
+                            }
+                        }
+                        HandshakeStatus.HEALTHY -> {
+                            if(!didShowConnected) {
+                                launchVpnConnectedNotification()
                                didShowConnected = true
                            }
                        }
-
-                        statuses?.any { it == HandshakeStatus.STALE } == true -> {}
-                        statuses?.all { it == HandshakeStatus.NOT_STARTED } ==
-                            true -> {
+                        HandshakeStatus.UNHEALTHY -> {
+                            if(!didShowFailedHandshakeNotification) {
+                                launchVpnConnectionFailedNotification(getString(R.string.lost_connection_failure_message))
+                                didShowFailedHandshakeNotification = true
+                                didShowConnected = false
+                            }
                        }
-
-                        else -> {}
                    }
                }
-            if (state.status == Tunnel.State.UP && state.tunnelConfig?.name != tunnelName) {
-                tunnelName = state.tunnelConfig?.name
-                launchVpnNotification(
-                    getString(R.string.tunnel_start_title),
-                    "${getString(R.string.tunnel_start_text)} - $tunnelName",
-                )
            }
        }
    }

-    private fun launchAlwaysOnDisabledNotification() {
-        launchVpnNotification(
-            title = this.getString(R.string.vpn_connection_failed),
-            description = this.getString(R.string.always_on_disabled),
-        )
-    }
-
-    override fun stopService() {
-        super.stopService()
+    override fun stopService(extras : Bundle?) {
+        super.stopService(extras)
        lifecycleScope.launch(Dispatchers.IO) {
            vpnService.stopTunnel()
-            didShowConnected = false
        }
        cancelJob()
        stopSelf()
    }

-    private fun launchVpnNotification(
-        title: String = getString(R.string.vpn_starting),
-        description: String = getString(R.string.attempt_connection)
-    ) {
-        val notification =
-            notificationService.createNotification(
-                channelId = getString(R.string.vpn_channel_id),
-                channelName = getString(R.string.vpn_channel_name),
-                title = title,
-                onGoing = false,
-                vibration = false,
-                showTimestamp = true,
-                description = description,
-            )
-        ServiceCompat.startForeground(
-            this,
-            foregroundId,
-            notification,
-            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+    private fun 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,
+            vibration = false,
+            showTimestamp = true,
+            description = "${getString(R.string.tunnel_start_text)} $tunnelName"
        )
+        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,
-                vibration = true,
-                showTimestamp = true,
-                description = message,
-            )
-        ServiceCompat.startForeground(
-            this,
-            foregroundId,
-            notification,
-            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+    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,
+            vibration = false,
+            showTimestamp = true,
+            description = getString(R.string.attempt_connection)
        )
+        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,
+            vibration = true,
+            showTimestamp = true,
+            description = message
+        )
+        super.startForeground(foregroundId, notification)
+    }
+
+
    private fun cancelJob() {
-        if (this::job.isInitialized) {
+        if(this::job.isInitialized) {
            job.cancel()
        }
    }
-}
+}
@@ -14,10 +14,8 @@ 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

@@ -25,70 +23,61 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
        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 fun onLost(network: Network) {
-                            trySend(NetworkStatus.Unavailable(network))
-                        }
-
-                        override fun onCapabilitiesChanged(
-                            network: Network,
-                            networkCapabilities: NetworkCapabilities
-                        ) {
-                            trySend(
-                                NetworkStatus.CapabilitiesChanged(
-                                    network,
-                                    networkCapabilities,
-                                ),
-                            )
-                        }
+        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))
                    }
-                }

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

-                        override fun onLost(network: Network) {
-                            trySend(NetworkStatus.Unavailable(network))
-                        }
-
-                        override fun onCapabilitiesChanged(
-                            network: Network,
-                            networkCapabilities: NetworkCapabilities
-                        ) {
-                            trySend(
-                                NetworkStatus.CapabilitiesChanged(
-                                    network,
-                                    networkCapabilities,
-                                ),
-                            )
-                        }
+                    override fun onCapabilitiesChanged(
+                        network: Network,
+                        networkCapabilities: NetworkCapabilities
+                    ) {
+                        trySend(NetworkStatus.CapabilitiesChanged(network, networkCapabilities))
                    }
                }
            }
-        val request =
-            NetworkRequest.Builder()
-                .addTransportType(networkCapability)
-                .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-                .addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
-                .build()
+
+            else -> {
+                object : ConnectivityManager.NetworkCallback() {
+
+                    override fun onAvailable(network: Network) {
+                        trySend(NetworkStatus.Available(network))
+                    }
+
+                    override fun onLost(network: Network) {
+                        trySend(NetworkStatus.Unavailable(network))
+                    }
+
+                    override fun onCapabilitiesChanged(
+                        network: Network,
+                        networkCapabilities: NetworkCapabilities
+                    ) {
+                        trySend(NetworkStatus.CapabilitiesChanged(network, networkCapabilities))
+                    }
+                }
+            }
+        }
+        val request = NetworkRequest.Builder()
+            .addTransportType(networkCapability)
+            .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+            .addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
+            .build()
        connectivityManager.registerNetworkCallback(request, networkStatusCallback)

-        awaitClose { connectivityManager.unregisterNetworkCallback(networkStatusCallback) }
+        awaitClose {
+            connectivityManager.unregisterNetworkCallback(networkStatusCallback)
+        }
    }

+
    override fun getNetworkName(networkCapabilities: NetworkCapabilities): String? {
        var ssid: String? = getWifiNameFromCapabilities(networkCapabilities)
        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.R) {
@@ -100,6 +89,7 @@ abstract class BaseNetworkService<T : BaseNetworkService<T>>(
        return ssid?.trim('"')
    }

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

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

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

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

 interface NetworkService<T> {
    fun getNetworkName(networkCapabilities: NetworkCapabilities): String?
-
    val networkStatus: Flow<NetworkStatus>
 }
@@ -4,10 +4,7 @@ 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()
 }
@@ -6,4 +6,5 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject

 class WifiService @Inject constructor(@ApplicationContext context: Context) :
-    BaseNetworkService<WifiService>(context, NetworkCapabilities.TRANSPORT_WIFI)
+    BaseNetworkService<WifiService>(context, NetworkCapabilities.TRANSPORT_WIFI) {
+}
@@ -12,11 +12,10 @@ interface NotificationService {
        action: PendingIntent? = null,
        actionText: String? = null,
        description: String,
-        showTimestamp: Boolean = false,
+        showTimestamp : Boolean = false,
        importance: Int = NotificationManager.IMPORTANCE_HIGH,
        vibration: Boolean = false,
        onGoing: Boolean = true,
-        lights: Boolean = true,
-        onlyAlertOnce: Boolean = true,
+        lights: Boolean = true
    ): Notification
-}
+}
@@ -7,27 +7,14 @@ 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 {
-    private val notificationManager =
-        context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+class WireGuardNotification @Inject constructor(@ApplicationContext private val context: Context) : NotificationService {

-    private val watcherBuilder: NotificationCompat.Builder =
-        NotificationCompat.Builder(
-            context,
-            context.getString(R.string.watcher_channel_id),
-        )
-    private val tunnelBuilder: NotificationCompat.Builder =
-        NotificationCompat.Builder(
-            context,
-            context.getString(R.string.vpn_channel_id),
-        )
+    private val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager

    override fun createNotification(
        channelId: String,
@@ -40,23 +27,20 @@ class WireGuardNotification @Inject constructor(@ApplicationContext private val
        importance: Int,
        vibration: Boolean,
        onGoing: Boolean,
-        lights: Boolean,
-        onlyAlertOnce: Boolean,
+        lights: Boolean
    ): Notification {
-        val channel =
-            NotificationChannel(
-                channelId,
-                channelName,
-                importance,
-            )
-                .let {
-                    it.description = title
-                    it.enableLights(lights)
-                    it.lightColor = Color.RED
-                    it.enableVibration(vibration)
-                    it.vibrationPattern = longArrayOf(100, 200, 300)
-                    it
-                }
+        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
+        }
        notificationManager.createNotificationChannel(channel)
        val pendingIntent: PendingIntent =
            Intent(context, MainActivity::class.java).let { notificationIntent ->
@@ -64,38 +48,30 @@ class WireGuardNotification @Inject constructor(@ApplicationContext private val
                    context,
                    0,
                    notificationIntent,
-                    PendingIntent.FLAG_IMMUTABLE,
+                    PendingIntent.FLAG_IMMUTABLE
                )
            }

-        val builder =
-            when (channelId) {
-                context.getString(R.string.watcher_channel_id) -> watcherBuilder
-                context.getString(R.string.vpn_channel_id) -> tunnelBuilder
-                else -> {
-                    NotificationCompat.Builder(
-                        context,
-                        channelId,
-                    )
-                }
-            }
-
+        val builder: Notification.Builder =
+            Notification.Builder(
+                context,
+                channelId
+            )
        return builder.let {
-            if (action != null && actionText != null) {
+            if(action != null && actionText != null) {
+                //TODO find a not deprecated way to do this
                it.addAction(
-                    NotificationCompat.Action.Builder(0, actionText, action).build(),
-                )
-                it.setAutoCancel(true)
+                    Notification.Action.Builder(0, actionText, action)
+                        .build())
+                    it.setAutoCancel(true)
            }
-            it.setContentTitle(title)
+                it.setContentTitle(title)
                .setContentText(description)
-                .setOnlyAlertOnce(onlyAlertOnce)
                .setContentIntent(pendingIntent)
                .setOngoing(onGoing)
-                .setPriority(NotificationCompat.PRIORITY_HIGH)
                .setShowWhen(showTimestamp)
-                .setSmallIcon(R.drawable.ic_launcher)
+                .setSmallIcon(R.mipmap.ic_launcher_foreground)
                .build()
        }
    }
-}
+}
@@ -3,64 +3,64 @@ package com.zaneschepke.wireguardautotunnel.service.shortcut
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+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.service.foreground.Action
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.foreground.WireGuardConnectivityWatcherService
 import com.zaneschepke.wireguardautotunnel.service.foreground.WireGuardTunnelService
+import com.zaneschepke.wireguardautotunnel.util.WgTunnelException
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import timber.log.Timber
 import javax.inject.Inject

@AndroidEntryPoint
 class ShortcutsActivity : ComponentActivity() {

    @Inject
-    lateinit var appDataRepository: AppDataRepository
+    lateinit var settingsRepo : SettingsDoa

    @Inject
-    lateinit var serviceManager: ServiceManager
+    lateinit var tunnelConfigRepo : TunnelConfigDao
+
+    private fun attemptWatcherServiceToggle(tunnelConfig : String) {
+        lifecycleScope.launch(Dispatchers.Main) {
+            val settings = getSettings()
+            if(settings.isAutoTunnelEnabled) {
+                ServiceManager.toggleWatcherServiceForeground(this@ShortcutsActivity, tunnelConfig)
+            }
+        }
+    }

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-        lifecycleScope.launch(Dispatchers.Main) {
-            val settings = appDataRepository.settings.getSettings()
-            if (settings.isShortcutsEnabled) {
-                when (intent.getStringExtra(CLASS_NAME_EXTRA_KEY)) {
-                    WireGuardTunnelService::class.java.simpleName -> {
+        if(intent.getStringExtra(CLASS_NAME_EXTRA_KEY)
+            .equals(WireGuardTunnelService::class.java.simpleName)) {
+            lifecycleScope.launch(Dispatchers.Main) {
+                val settings = getSettings()
+                if(settings.isShortcutsEnabled) {
+                    try {
                        val tunnelName = intent.getStringExtra(TUNNEL_NAME_EXTRA_KEY)
-                        val tunnelConfig = tunnelName?.let {
-                            appDataRepository.tunnels.getAll().firstOrNull {
-                                it.name == tunnelName
+                        val tunnelConfig = if(tunnelName != null) {
+                            tunnelConfigRepo.getAll().firstOrNull { it.name == tunnelName }
+                        } else {
+                            if(settings.defaultTunnel == null) {
+                                tunnelConfigRepo.getAll().first()
+                            } else {
+                                TunnelConfig.from(settings.defaultTunnel!!)
                            }
                        }
-                        when (intent.action) {
-                            Action.START.name -> serviceManager.startVpnServiceForeground(
-                                this@ShortcutsActivity, tunnelConfig?.id, isManualStart = true,
-                            )
-
-                            Action.STOP.name -> serviceManager.stopVpnService(
-                                this@ShortcutsActivity,
-                                isManualStop = true,
-                            )
-                        }
-                    }
-
-                    WireGuardConnectivityWatcherService::class.java.simpleName -> {
-                        when (intent.action) {
-                            Action.START.name -> appDataRepository.settings.save(
-                                settings.copy(
-                                    isAutoTunnelPaused = false,
-                                ),
-                            )
-
-                            Action.STOP.name -> appDataRepository.settings.save(
-                                settings.copy(
-                                    isAutoTunnelPaused = true,
-                                ),
-                            )
+                        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())
                        }
+                    } catch (e : Exception) {
+                        Timber.e(e.message)
                    }
                }
            }
@@ -68,8 +68,16 @@ 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"
    }
-}
+}
@@ -1,111 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.tile
-
-import android.os.Build
-import android.service.quicksettings.Tile
-import android.service.quicksettings.TileService
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.cancel
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.launch
-import timber.log.Timber
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class AutoTunnelControlTile : TileService() {
-
-    @Inject
-    lateinit var appDataRepository: AppDataRepository
-
-    @Inject
-    lateinit var serviceManager: ServiceManager
-
-    private val scope = CoroutineScope(Dispatchers.IO)
-
-    private var manualStartConfig: TunnelConfig? = null
-
-    override fun onStartListening() {
-        super.onStartListening()
-        scope.launch {
-            appDataRepository.settings.getSettingsFlow().collectLatest {
-                when (it.isAutoTunnelEnabled) {
-                    true -> {
-                        if (it.isAutoTunnelPaused) {
-                            setInactive()
-                            setTileDescription(this@AutoTunnelControlTile.getString(R.string.paused))
-                        } else {
-                            setActive()
-                            setTileDescription(this@AutoTunnelControlTile.getString(R.string.active))
-                        }
-                    }
-
-                    false -> {
-                        setTileDescription(this@AutoTunnelControlTile.getString(R.string.disabled))
-                        setUnavailable()
-                    }
-                }
-            }
-        }
-    }
-
-    override fun onTileAdded() {
-        super.onTileAdded()
-        onStartListening()
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        scope.cancel()
-    }
-
-    override fun onTileRemoved() {
-        super.onTileRemoved()
-        scope.cancel()
-    }
-
-    override fun onClick() {
-        super.onClick()
-        unlockAndRun {
-            scope.launch {
-                try {
-                    appDataRepository.toggleWatcherServicePause()
-                } catch (e: Exception) {
-                    Timber.e(e.message)
-                } finally {
-                    cancel()
-                }
-            }
-        }
-    }
-
-    private fun setActive() {
-        qsTile.state = Tile.STATE_ACTIVE
-        qsTile.updateTile()
-    }
-
-    private fun setInactive() {
-        qsTile.state = Tile.STATE_INACTIVE
-        qsTile.updateTile()
-    }
-
-    private fun setUnavailable() {
-        manualStartConfig = null
-        qsTile.state = Tile.STATE_UNAVAILABLE
-        qsTile.updateTile()
-    }
-
-    private fun setTileDescription(description: String) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            qsTile.subtitle = description
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            qsTile.stateDescription = description
-        }
-        qsTile.updateTile()
-    }
-}
@@ -4,13 +4,16 @@ import android.os.Build
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
 import com.wireguard.android.backend.Tunnel
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+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.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
@@ -20,43 +23,28 @@ import javax.inject.Inject
 class TunnelControlTile : TileService() {

    @Inject
-    lateinit var appDataRepository: AppDataRepository
+    lateinit var settingsRepo : SettingsDoa

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

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

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

-    private var manualStartConfig: TunnelConfig? = null
+    private lateinit var job : Job

    override fun onStartListening() {
-        super.onStartListening()
-        Timber.d("On start listening called")
-        scope.launch {
-            vpnService.vpnState.collect { it ->
-                when (it.status) {
-                    Tunnel.State.UP -> {
-                        setActive()
-                        it.tunnelConfig?.name?.let { name -> setTileDescription(name) }
-                    }
-
-                    Tunnel.State.DOWN -> {
-                        setInactive()
-                        val config = appDataRepository.getStartTunnelConfig()?.also { config ->
-                            manualStartConfig = config
-                        } ?: appDataRepository.getPrimaryOrFirstTunnel()
-                        config?.let {
-                            setTileDescription(it.name)
-                        } ?: setUnavailable()
-                    }
-
-                    else -> setInactive()
-                }
-            }
+        job = scope.launch {
+            updateTileState()
        }
+        super.onStartListening()
+    }
+
+    override fun onTileRemoved() {
+        super.onTileRemoved()
+        cancelJob()
    }

    override fun onDestroy() {
@@ -64,32 +52,21 @@ class TunnelControlTile : TileService() {
        scope.cancel()
    }

-    override fun onTileRemoved() {
-        super.onTileRemoved()
-        scope.cancel()
-    }
-
-    override fun onTileAdded() {
-        super.onTileAdded()
-        onStartListening()
-    }
-
    override fun onClick() {
        super.onClick()
        unlockAndRun {
            scope.launch {
                try {
-                    if (vpnService.getState() == Tunnel.State.UP) {
-                        serviceManager.stopVpnService(
-                            this@TunnelControlTile,
-                            isManualStop = true,
-                        )
-                    } else {
-                        serviceManager.startVpnServiceForeground(
-                            this@TunnelControlTile, manualStartConfig?.id, isManualStart = true,
-                        )
+                    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())
+                        }
                    }
-                } catch (e: Exception) {
+                } catch (e : Exception) {
                    Timber.e(e.message)
                } finally {
                    cancel()
@@ -98,29 +75,74 @@ class TunnelControlTile : TileService() {
        }
    }

-    private fun setActive() {
-        qsTile.state = Tile.STATE_ACTIVE
-        qsTile.updateTile()
+    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 setInactive() {
-        qsTile.state = Tile.STATE_INACTIVE
-        qsTile.updateTile()
+
+    private fun attemptWatcherServiceToggle(tunnelConfig : String) {
+        scope.launch {
+            val settings = settingsRepo.getAll()
+            if (settings.isNotEmpty()) {
+                val setting = settings.first()
+                if(setting.isAutoTunnelEnabled) {
+                    ServiceManager.toggleWatcherServiceForeground(this@TunnelControlTile, tunnelConfig)
+                }
+            }
+        }
    }

-    private fun setUnavailable() {
-        manualStartConfig = null
-        qsTile.state = Tile.STATE_UNAVAILABLE
-        qsTile.updateTile()
+    private suspend fun updateTileState() {
+        vpnService.state.collect {
+            try {
+                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()
+            } catch (e : Exception) {
+                Timber.e("Unable to update tile state")
+            }
+        }
    }

-    private fun setTileDescription(description: String) {
+    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,15 +2,13 @@ package com.zaneschepke.wireguardautotunnel.service.tunnel

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

    companion object {
-        private const val WG_TYPICAL_HANDSHAKE_INTERVAL_WHEN_HEALTHY_SEC = 180
-        const val STATUS_CHANGE_TIME_BUFFER = 30
-        const val STALE_TIME_LIMIT_SEC =
-            WG_TYPICAL_HANDSHAKE_INTERVAL_WHEN_HEALTHY_SEC + STATUS_CHANGE_TIME_BUFFER
+        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
        const val NEVER_CONNECTED_TO_UNHEALTHY_TIME_LIMIT_SEC = 30
    }
-}
+}
@@ -1,15 +1,18 @@
 package com.zaneschepke.wireguardautotunnel.service.tunnel

+import com.wireguard.android.backend.Statistics
 import com.wireguard.android.backend.Tunnel
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-import kotlinx.coroutines.flow.StateFlow
+import com.wireguard.crypto.Key
+import com.zaneschepke.wireguardautotunnel.repository.model.TunnelConfig
+import kotlinx.coroutines.flow.SharedFlow

 interface VpnService : Tunnel {
-    suspend fun startTunnel(tunnelConfig: TunnelConfig? = null): Tunnel.State
-
+    suspend fun startTunnel(tunnelConfig : TunnelConfig) : Tunnel.State
    suspend fun stopTunnel()
-
-    val vpnState: StateFlow<VpnState>
-
-    fun getState(): Tunnel.State
-}
+    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
+}
@@ -1,11 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.tunnel
-
-import com.wireguard.android.backend.Statistics
-import com.wireguard.android.backend.Tunnel
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-
-data class VpnState(
-    val status: Tunnel.State = Tunnel.State.DOWN,
-    val tunnelConfig: TunnelConfig? = null,
-    val statistics: Statistics? = null
-)
@@ -3,140 +3,140 @@ 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.State
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.module.Kernel
-import com.zaneschepke.wireguardautotunnel.module.Userspace
-import com.zaneschepke.wireguardautotunnel.util.Constants
+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 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.StateFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject

-class WireGuardTunnel
-@Inject
-constructor(
-    @Userspace private val userspaceBackend: Backend,
-    @Kernel private val kernelBackend: Backend,
-    private val appDataRepository: AppDataRepository,
-) : VpnService {
-    private val _vpnState = MutableStateFlow(VpnState())
-    override val vpnState: StateFlow<VpnState> = _vpnState.asStateFlow()
+
+class WireGuardTunnel @Inject constructor(private val backend : Backend) : 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 scope = CoroutineScope(Dispatchers.IO)

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

-    private var backend: Backend = userspaceBackend

-    private var backendIsUserspace = true
-
-    init {
-        scope.launch {
-            appDataRepository.settings.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
-                }
-            }
-        }
-    }
-
-    override suspend fun startTunnel(tunnelConfig: TunnelConfig?): State {
+    override suspend fun startTunnel(tunnelConfig: TunnelConfig) : Tunnel.State{
        return try {
-            //TODO we need better error handling here
-            val config = tunnelConfig ?: appDataRepository.getPrimaryOrFirstTunnel()
-            if (config != null) {
-                emitTunnelConfig(config)
-                val wgConfig = TunnelConfig.configFromQuick(config.wgQuick)
-                val state =
-                    backend.setState(
-                        this,
-                        State.UP,
-                        wgConfig,
-                    )
-                state
-            } else throw Exception("No tunnels")
-        } catch (e: BackendException) {
+            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}")
-            State.DOWN
+            Tunnel.State.DOWN
        }
    }

-    private fun emitTunnelState(state: State) {
-        _vpnState.tryEmit(
-            _vpnState.value.copy(
-                status = state,
-            ),
-        )
+    private suspend fun emitTunnelName(name : String) {
+        _tunnelName.emit(name)
    }

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

-    private suspend fun emitTunnelConfig(tunnelConfig: TunnelConfig?) {
-        _vpnState.emit(
-            _vpnState.value.copy(
-                tunnelConfig = tunnelConfig,
-            ),
-        )
+    override fun getName(): String {
+        return _tunnelName.value
    }

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

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

-    override fun getName(): String {
-        return _vpnState.value.tunnelConfig?.name ?: ""
-    }
-
-    override fun onStateChange(state: State) {
+    override fun onStateChange(state : Tunnel.State) {
        val tunnel = this
-        emitTunnelState(state)
-        WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate(WireGuardAutoTunnel.instance)
-        if (state == State.UP) {
-            statsJob =
-                scope.launch {
-                    while (true) {
-                        val statistics = backend.getStatistics(tunnel)
-                        emitBackendStatistics(statistics)
-                        delay(Constants.VPN_STATISTIC_CHECK_INTERVAL)
+        _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 += (1 * Constants.VPN_STATISTIC_CHECK_INTERVAL/1000).toInt()
+                            }
+                            return@forEach
+                        }
+                        if((NumberUtils.getSecondsBetweenTimestampAndNow(handshakeEpoch) ?: 0L) >= HandshakeStatus.UNHEALTHY_TIME_LIMIT_SEC) {
+                            _handshakeStatus.emit(HandshakeStatus.UNHEALTHY)
+                        } else {
+                            _handshakeStatus.emit(HandshakeStatus.HEALTHY)
+                        }
                    }
+                    _lastHandshake.emit(handshakeMap)
+                    delay(Constants.VPN_STATISTIC_CHECK_INTERVAL)
                }
-        }
-        if (state == State.DOWN) {
-            if (this::statsJob.isInitialized) {
-                statsJob.cancel()
            }
        }
+        if(state == Tunnel.State.DOWN) {
+            if(this::statsJob.isInitialized) {
+                statsJob.cancel()
+            }
+            _handshakeStatus.tryEmit(HandshakeStatus.NOT_STARTED)
+            _lastHandshake.tryEmit(emptyMap())
+        }
    }
-}
+
+
+}
@@ -1,9 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui
-
-data class AppUiState(
-    val snackbarMessage: String = "",
-    val snackbarMessageConsumed: Boolean = true,
-    val vpnPermissionAccepted: Boolean = false,
-    val notificationPermissionAccepted: Boolean = false,
-    val requestPermissions: Boolean = false
-)
@@ -1,148 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui
-
-import android.app.Application
-import android.content.ActivityNotFoundException
-import android.content.Intent
-import android.net.Uri
-import android.widget.Toast
-import androidx.compose.runtime.mutableStateListOf
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.wireguard.android.backend.GoBackend
-import com.zaneschepke.logcatter.Logcatter
-import com.zaneschepke.logcatter.model.LogMessage
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.FileUtils
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.launch
-import timber.log.Timber
-import java.time.Instant
-import javax.inject.Inject
-
-@HiltViewModel
-class AppViewModel
-@Inject
-constructor(
-    private val application: Application,
-) : ViewModel() {
-
-    val vpnIntent: Intent? = GoBackend.VpnService.prepare(WireGuardAutoTunnel.instance)
-
-    private val _appUiState = MutableStateFlow(
-        AppUiState(
-            vpnPermissionAccepted = vpnIntent == null,
-        ),
-    )
-    val appUiState = _appUiState.asStateFlow()
-
-
-    fun isRequiredPermissionGranted(): Boolean {
-        val allAccepted =
-            (_appUiState.value.vpnPermissionAccepted && _appUiState.value.vpnPermissionAccepted)
-        if (!allAccepted) requestPermissions()
-        return allAccepted
-    }
-
-    private fun requestPermissions() {
-        _appUiState.value = _appUiState.value.copy(
-            requestPermissions = true,
-        )
-    }
-
-    fun permissionsRequested() {
-        _appUiState.value = _appUiState.value.copy(
-            requestPermissions = false,
-        )
-    }
-
-    fun openWebPage(url: String) {
-        try {
-            val webpage: Uri = Uri.parse(url)
-            val intent = Intent(Intent.ACTION_VIEW, webpage).apply {
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            }
-            application.startActivity(intent)
-        } catch (e: ActivityNotFoundException) {
-            Timber.e(e)
-            showSnackbarMessage(application.getString(R.string.no_browser_detected))
-        }
-    }
-
-    fun onVpnPermissionAccepted() {
-        _appUiState.value = _appUiState.value.copy(
-            vpnPermissionAccepted = true,
-        )
-    }
-
-    fun launchEmail() {
-        try {
-            val intent =
-                Intent(Intent.ACTION_SENDTO).apply {
-                    type = Constants.EMAIL_MIME_TYPE
-                    putExtra(Intent.EXTRA_EMAIL, arrayOf(application.getString(R.string.my_email)))
-                    putExtra(Intent.EXTRA_SUBJECT, application.getString(R.string.email_subject))
-                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                }
-            application.startActivity(
-                Intent.createChooser(intent, application.getString(R.string.email_chooser)).apply {
-                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                },
-            )
-        } catch (e: ActivityNotFoundException) {
-            Timber.e(e)
-            showSnackbarMessage(application.getString(R.string.no_email_detected))
-        }
-    }
-
-    fun showSnackbarMessage(message: String) {
-        _appUiState.value = _appUiState.value.copy(
-            snackbarMessage = message,
-            snackbarMessageConsumed = false,
-        )
-    }
-
-    fun snackbarMessageConsumed() {
-        _appUiState.value = _appUiState.value.copy(
-            snackbarMessage = "",
-            snackbarMessageConsumed = true,
-        )
-    }
-
-    val logs = mutableStateListOf<LogMessage>()
-
-    fun readLogCatOutput() =
-        viewModelScope.launch(viewModelScope.coroutineContext + Dispatchers.IO) {
-            launch {
-                Logcatter.logs {
-                    logs.add(it)
-                    if (logs.size > Constants.LOG_BUFFER_SIZE) {
-                        logs.removeRange(0, (logs.size - Constants.LOG_BUFFER_SIZE).toInt())
-                    }
-                }
-            }
-        }
-
-    fun clearLogs() {
-        logs.clear()
-        Logcatter.clear()
-    }
-
-    fun saveLogsToFile() {
-        val fileName = "${Constants.BASE_LOG_FILE_NAME}-${Instant.now().epochSecond}.txt"
-        val content = logs.joinToString(separator = "\n")
-        FileUtils.saveFileToDownloads(application.applicationContext, content, fileName)
-        Toast.makeText(application, application.getString(R.string.logs_saved), Toast.LENGTH_SHORT)
-            .show()
-    }
-
-    fun setNotificationPermissionAccepted(accepted: Boolean) {
-        _appUiState.value = _appUiState.value.copy(
-            notificationPermissionAccepted = accepted,
-        )
-    }
-}
@@ -2,4 +2,4 @@ package com.zaneschepke.wireguardautotunnel.ui

 import com.journeyapps.barcodescanner.CaptureActivity

-class CaptureActivityPortrait : CaptureActivity()
+class CaptureActivityPortrait : CaptureActivity()
@@ -1,17 +1,21 @@
 package com.zaneschepke.wireguardautotunnel.ui

 import android.Manifest
+import android.content.Intent
+import android.net.Uri
 import android.os.Build
 import android.os.Bundle
-import androidx.activity.SystemBarStyle
+import android.provider.Settings
+import android.view.KeyEvent
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.foundation.focusable
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
+import androidx.compose.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.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarData
@@ -22,243 +26,209 @@ import androidx.compose.material3.SnackbarResult
 import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
-import androidx.compose.ui.focus.focusProperties
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.input.key.onKeyEvent
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
+import com.wireguard.android.backend.GoBackend
+import com.zaneschepke.wireguardautotunnel.Constants
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
+import com.zaneschepke.wireguardautotunnel.ui.common.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.main.MainScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.options.OptionsScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.pinlock.PinLockScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.SettingsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.SupportScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.support.logs.LogsScreen
+import com.zaneschepke.wireguardautotunnel.ui.theme.TransparentSystemBars
 import com.zaneschepke.wireguardautotunnel.ui.theme.WireguardAutoTunnelTheme
-import com.zaneschepke.wireguardautotunnel.util.StringValue
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import xyz.teamgravity.pin_lock_compose.PinManager
-import javax.inject.Inject
+import timber.log.Timber

@AndroidEntryPoint
 class MainActivity : AppCompatActivity() {

-    @Inject
-    lateinit var dataStoreManager: DataStoreManager
-
-    @Inject
-    lateinit var settingsRepository: SettingsRepository
-
-    @Inject
-    lateinit var serviceManager: ServiceManager
-
-    @OptIn(
-        ExperimentalPermissionsApi::class,
+    @OptIn(ExperimentalAnimationApi::class,
+        ExperimentalPermissionsApi::class
    )
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
-
-        enableEdgeToEdge(navigationBarStyle = SystemBarStyle.dark(Color.Transparent.toArgb()))
-
-        // load preferences into memory and init data
-        lifecycleScope.launch {
-            dataStoreManager.init()
-            WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate(this@MainActivity)
-            val settings = settingsRepository.getSettings()
-            if (settings.isAutoTunnelEnabled) {
-                serviceManager.startWatcherService(application.applicationContext)
-            }
-        }
        setContent {
-            val appViewModel = hiltViewModel<AppViewModel>()
-            val appUiState by appViewModel.appUiState.collectAsStateWithLifecycle()
            val navController = rememberNavController()
-            val navBackStackEntry by navController.currentBackStackEntryAsState()
+            val focusRequester = remember { FocusRequester() }

-            val notificationPermissionState =
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
-                    rememberPermissionState(Manifest.permission.POST_NOTIFICATIONS) else null
+            WireguardAutoTunnelTheme {
+                TransparentSystemBars()

-            val snackbarHostState = remember { SnackbarHostState() }
+                val snackbarHostState = remember { SnackbarHostState() }

-            val vpnActivityResultState =
-                rememberLauncherForActivityResult(
+                val notificationPermissionState =
+                    rememberPermissionState(Manifest.permission.POST_NOTIFICATIONS)
+
+                fun requestNotificationPermission() {
+                    if (!notificationPermissionState.status.isGranted && Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                        notificationPermissionState.launchPermissionRequest()
+                    }
+                }
+
+                var vpnIntent by remember { mutableStateOf(GoBackend.VpnService.prepare(this)) }
+                val vpnActivityResultState = rememberLauncherForActivityResult(
                    ActivityResultContracts.StartActivityForResult(),
                    onResult = {
                        val accepted = (it.resultCode == RESULT_OK)
                        if (accepted) {
-                            appViewModel.onVpnPermissionAccepted()
+                            vpnIntent = null
                        }
-                    },
-                )
+                    })
+                LaunchedEffect(vpnIntent) {
+                    if (vpnIntent != null) {
+                        vpnActivityResultState.launch(vpnIntent)
+                    } else requestNotificationPermission()
+                }

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

-            LaunchedEffect(appUiState.requestPermissions) {
-                if (appUiState.requestPermissions) {
-                    appViewModel.permissionsRequested()
-                    if (notificationPermissionState != null && !notificationPermissionState.status.isGranted
-                    ) {
-                        showSnackBarMessage(StringValue.StringResource(R.string.notification_permission_required))
-                        return@LaunchedEffect notificationPermissionState.launchPermissionRequest()
-                    }
-                    if (!appUiState.vpnPermissionAccepted) {
-                        return@LaunchedEffect vpnActivityResultState.launch(appViewModel.vpnIntent)
-                    }
-                }
-            }
-
-            WireguardAutoTunnelTheme {
-                LaunchedEffect(Unit) {
-                    appViewModel.setNotificationPermissionAccepted(
-                        notificationPermissionState?.status?.isGranted ?: true,
-                    )
-                    if (!WireGuardAutoTunnel.isRunningOnAndroidTv()) appViewModel.readLogCatOutput()
-                }
-
-                LaunchedEffect(appUiState.snackbarMessageConsumed) {
-                    if (!appUiState.snackbarMessageConsumed) {
-                        showSnackBarMessage(StringValue.DynamicString(appUiState.snackbarMessage))
-                        appViewModel.snackbarMessageConsumed()
-                    }
-                }
-
-                val focusRequester = remember { FocusRequester() }
-
-                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)
                            )
                        }
                    },
-                    //TODO refactor
-                    modifier = Modifier
-                        .focusable()
-                        .focusProperties {
-                            when (navBackStackEntry?.destination?.route) {
-                                Screen.Lock.route -> Unit
-                                else -> up = focusRequester
+                    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
+                                }
                            }
-                        },
-                    bottomBar = {
-                        BottomNavBar(
-                            navController,
-                            listOf(
-                                Screen.Main.navItem,
-                                Screen.Settings.navItem,
-                                Screen.Support.navItem,
-                            ),
+                        } else {
+                            false
+                        }
+                    },
+                    bottomBar = if (vpnIntent == null && notificationPermissionState.status.isGranted) {
+                        { BottomNavBar(navController, Routes.navItems) }
+                    } else {
+                        {}
+                    },
+                )
+                { padding ->
+                    if (vpnIntent != null) {
+                        PermissionRequestFailedScreen(
+                            padding = padding,
+                            onRequestAgain = { vpnActivityResultState.launch(vpnIntent) },
+                            message = getString(R.string.vpn_permission_required),
+                            getString(R.string.retry)
                        )
-                    },
-                ) { padding ->
-                    NavHost(
-                        navController,
-                        startDestination =
-                        (if (PinManager.pinExists()) Screen.Lock.route else Screen.Main.route),
-                        modifier =
-                        Modifier
-                            .padding(padding)
-                            .fillMaxSize(),
-                    ) {
-                        composable(
-                            Screen.Main.route,
-                        ) {
-                            MainScreen(
-                                focusRequester = focusRequester,
-                                appViewModel = appViewModel,
-                                navController = navController,
-                            )
-                        }
-                        composable(
-                            Screen.Settings.route,
-                        ) {
-                            SettingsScreen(
-                                appViewModel = appViewModel,
-                                navController = navController,
-                                focusRequester = focusRequester,
-                            )
-                        }
-                        composable(
-                            Screen.Support.route,
-                        ) {
-                            SupportScreen(
-                                focusRequester = focusRequester,
-                                appViewModel = appViewModel,
-                                navController = navController,
-                            )
-                        }
-                        composable(Screen.Support.Logs.route) {
-                            LogsScreen(appViewModel)
-                        }
-                        composable("${Screen.Config.route}/{id}") {
-                            val id = it.arguments?.getString("id")
-                            if (!id.isNullOrBlank()) {
-                                ConfigScreen(
-                                    navController = navController,
-                                    tunnelId = id,
-                                    appViewModel = appViewModel,
-                                    focusRequester = focusRequester,
-                                )
+                        return@Scaffold
+                    }
+                    if (!notificationPermissionState.status.isGranted) {
+                        PermissionRequestFailedScreen(
+                            padding = padding,
+                            onRequestAgain = {
+                                val intentSettings =
+                                    Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+                                intentSettings.data =
+                                    Uri.fromParts(Constants.URI_PACKAGE_SCHEME, this.packageName, null)
+                                startActivity(intentSettings)
+                            },
+                            message = getString(R.string.notification_permission_required),
+                            getString(R.string.open_settings)
+                        )
+                        return@Scaffold
+                    }
+
+                    NavHost(navController, startDestination = 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
                        }
-                        composable("${Screen.Option.route}/{id}") {
-                            val id = it.arguments?.getString("id")
-                            if (!id.isNullOrBlank()) {
-                                OptionsScreen(
-                                    navController = navController,
-                                    tunnelId = id,
-                                    appViewModel = appViewModel,
-                                    focusRequester = focusRequester,
-                                )
+                            ) {
+                            MainScreen(padding = padding, showSnackbarMessage = { message -> showSnackBarMessage(message) }, navController = navController)
+                        }
+                        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))
+                                }
                            }
-                        }
-                        composable(Screen.Lock.route) {
-                            PinLockScreen(
-                                navController = navController,
-                                appViewModel = appViewModel,
-                            )
+                        }) { 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 ->
+                            val id = it.arguments?.getString("id")
+                            if(!id.isNullOrBlank()) {
+                                ConfigScreen(navController = navController, id = id, showSnackbarMessage = { message -> showSnackBarMessage(message) }, focusRequester = focusRequester)}
                        }
                    }
                }
@@ -6,38 +6,30 @@ 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 =
+enum class Routes {
+    Main,
+    Settings,
+    Support,
+    Config;
+
+
+    companion object {
+        val navItems = listOf(
            BottomNavItem(
                name = "Tunnels",
-                route = route,
+                route = Main.name,
                icon = Icons.Rounded.Home,
-            )
-    }
-
-    data object Settings : Screen("settings") {
-        val navItem =
+            ),
            BottomNavItem(
                name = "Settings",
-                route = route,
+                route = Settings.name,
                icon = Icons.Rounded.Settings,
-            )
-    }
-
-    data object Support : Screen("support") {
-        val navItem =
+            ),
            BottomNavItem(
                name = "Support",
-                route = route,
+                route = Support.name,
                icon = Icons.Rounded.QuestionMark,
            )
-
-        data object Logs : Screen("support/logs")
+        )
    }
-
-    data object Config : Screen("config")
-    data object Lock : Screen("lock")
-
-    data object Option : Screen("option")
-}
+}
@@ -10,33 +10,24 @@ import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import com.zaneschepke.wireguardautotunnel.R

@Composable
-fun ClickableIconButton(
-    onClick: () -> Unit,
-    onIconClick: () -> Unit,
-    text: String,
-    icon: ImageVector,
-    enabled: Boolean
-) {
-    TextButton(
-        onClick = onClick,
-        enabled = enabled,
+fun ClickableIconButton(onIconClick : () -> Unit, text : String, icon : ImageVector, enabled : Boolean) {
+    TextButton(onClick = {},
+        enabled = enabled
    ) {
-        Text(text, Modifier.weight(1f, false))
+        Text(text)
        Spacer(modifier = Modifier.size(ButtonDefaults.IconSpacing))
        Icon(
            imageVector = icon,
-            contentDescription = icon.name,
-            modifier =
-            Modifier
-                .size(ButtonDefaults.IconSize)
-                .weight(1f, false)
-                .clickable {
-                    if (enabled) {
-                        onIconClick()
-                    }
-                },
+            contentDescription = stringResource(R.string.delete),
+            modifier = Modifier.size(ButtonDefaults.IconSize).clickable {
+                if(enabled) {
+                    onIconClick()
+                }
+            }
        )
    }
-}
+}
@@ -0,0 +1,35 @@
+package com.zaneschepke.wireguardautotunnel.ui.common
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Button
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import kotlinx.coroutines.launch
+
+@Composable
+fun PermissionRequestFailedScreen(padding : PaddingValues, onRequestAgain : () -> Unit, message : String, buttonText : String ) {
+    val scope = rememberCoroutineScope()
+    Column(horizontalAlignment = Alignment.CenterHorizontally,
+        verticalArrangement = Arrangement.Center,
+        modifier = Modifier
+            .fillMaxSize()
+            .padding(padding)) {
+        Text(message, textAlign = TextAlign.Center, modifier = Modifier.padding(15.dp))
+        Button(onClick = {
+            scope.launch {
+                onRequestAgain()
+            }
+        }) {
+            Text(buttonText)
+        }
+    }
+}
@@ -18,65 +18,57 @@ 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.toThreeDecimalPlaceString
 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,
-    expanded: Boolean,
-    statistics: Statistics?
-) {
+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() },
-                onLongClick = { onHold() },
-            ),
+                onClick = {
+                    onClick()
+                },
+                onLongClick = {
+                    onHold()
+                }
+            )
    ) {
        Column {
            Row(
                modifier = Modifier
                    .fillMaxWidth()
-                    .padding(horizontal = 15.dp, vertical = 5.dp),
+                    .padding(horizontal = 14.dp, vertical = 5.dp),
                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.SpaceBetween,
+                horizontalArrangement = Arrangement.SpaceBetween
            ) {
-                Row(
-                    verticalAlignment = Alignment.CenterVertically,
-                ) {
+                Row(verticalAlignment = Alignment.CenterVertically,) {
                    icon()
                    Text(text)
                }
                rowButton()
            }
-            if (expanded) {
+            if(expanded) {
                statistics?.peers()?.forEach {
                    Row(
-                        modifier =
-                        Modifier
+                        modifier = Modifier
                            .fillMaxWidth()
                            .padding(end = 10.dp, bottom = 10.dp, start = 10.dp),
                        verticalAlignment = Alignment.CenterVertically,
-                        horizontalArrangement = Arrangement.SpaceEvenly,
+                        horizontalArrangement = Arrangement.SpaceEvenly
                    ) {
-                        //TODO change these to string resources
                        val handshakeEpoch = statistics.peer(it)!!.latestHandshakeEpochMillis
                        val peerTx = statistics.peer(it)!!.txBytes
                        val peerRx = statistics.peer(it)!!.rxBytes
-                        val peerId = it.toBase64().subSequence(0, 3).toString() + "***"
-                        val handshakeSec =
-                            NumberUtils.getSecondsBetweenTimestampAndNow(handshakeEpoch)
-                        val handshake =
-                            if (handshakeSec == null) "never" else "$handshakeSec secs ago"
+                        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
@@ -89,4 +81,4 @@ fun RowListItem(
            }
        }
    }
-}
+}
@@ -25,7 +25,9 @@ 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) }
@@ -47,7 +49,7 @@ fun SearchBar(onQuery: (queryString: String) -> Unit) {
            Icon(
                imageVector = Icons.Rounded.Search,
                tint = MaterialTheme.colorScheme.onBackground,
-                contentDescription = stringResource(id = R.string.search_icon),
+                contentDescription = stringResource(id = R.string.search_icon)
            )
        },
        trailingIcon = {
@@ -56,14 +58,13 @@ fun SearchBar(onQuery: (queryString: String) -> Unit) {
                    Icon(
                        imageVector = Icons.Rounded.Clear,
                        tint = MaterialTheme.colorScheme.onBackground,
-                        contentDescription = stringResource(id = R.string.clear_icon),
+                        contentDescription = stringResource(id = R.string.clear_icon)
                    )
                }
            }
        },
        maxLines = 1,
-        colors =
-        TextFieldDefaults.colors(
+        colors = TextFieldDefaults.colors(
            focusedContainerColor = Color.Transparent,
            unfocusedContainerColor = Color.Transparent,
            disabledContainerColor = Color.Transparent,
@@ -72,9 +73,8 @@ fun SearchBar(onQuery: (queryString: String) -> Unit) {
        textStyle = MaterialTheme.typography.bodySmall,
        singleLine = true,
        keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Text),
-        modifier =
-        Modifier
+        modifier = Modifier
            .fillMaxWidth()
-            .background(color = MaterialTheme.colorScheme.background, shape = RectangleShape),
+            .background(color = MaterialTheme.colorScheme.background, shape = RectangleShape)
    )
-}
+}
@@ -10,27 +10,24 @@ 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,
-        onValueChange = { onValueChange(it) },
+        onValueChange = {
+            onValueChange(it)
+        },
        label = { Text(label) },
        maxLines = 1,
-        placeholder = { Text(hint) },
-        keyboardOptions =
-        KeyboardOptions(
+        placeholder = {
+            Text(hint)
+        },
+        keyboardOptions = KeyboardOptions(
            capitalization = KeyboardCapitalization.None,
-            imeAction = ImeAction.Done,
+            imeAction = ImeAction.Done
        ),
        keyboardActions = keyboardActions,
    )
-}
+}
@@ -9,31 +9,26 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.Dp

@Composable
-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
            .fillMaxWidth()
            .padding(padding),
        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.SpaceBetween,
+        horizontalArrangement = Arrangement.SpaceBetween
    ) {
-        Text(label, textAlign = TextAlign.Start)
+        Text(label)
        Switch(
            modifier = modifier,
            enabled = enabled,
            checked = checked,
-            onCheckedChange = { onCheckChanged() },
+            onCheckedChange = {
+                onCheckChanged()
+            }
        )
    }
-}
+}
@@ -6,33 +6,19 @@ import androidx.compose.material3.NavigationBar
 import androidx.compose.material3.NavigationBarItem
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.navigation.NavController
 import androidx.navigation.compose.currentBackStackEntryAsState
-import com.zaneschepke.wireguardautotunnel.ui.Screen

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

-    var showBottomBar by rememberSaveable { mutableStateOf(true) }
-    val navBackStackEntry by navController.currentBackStackEntryAsState()
-
-    //TODO find a better way to hide nav bar
-    showBottomBar = when (navBackStackEntry?.destination?.route) {
-        Screen.Lock.route -> false
-        else -> true
-    }
-
    NavigationBar(
-        containerColor = if (!showBottomBar) Color.Transparent else MaterialTheme.colorScheme.background,
+        containerColor = MaterialTheme.colorScheme.background,
    ) {
-        if (showBottomBar) bottomNavItems.forEach { item ->
+        bottomNavItems.forEach { item ->
            val selected = item.route == backStackEntry.value?.destination?.route

            NavigationBarItem(
@@ -49,8 +35,8 @@ fun BottomNavBar(navController: NavController, bottomNavItems: List<BottomNavIte
                        imageVector = item.icon,
                        contentDescription = "${item.name} Icon",
                    )
-                },
+                }
            )
        }
    }
-}
+}
@@ -11,79 +11,69 @@ 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) {
+        when(bio){
            BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE -> {
                onError("Biometrics not available")
                false
            }
-
            BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED -> {
                onError("Biometrics not created")
                false
            }
-
            BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE -> {
                onError("Biometric hardware not found")
                false
            }
-
            BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED -> {
                onError("Biometric security update required")
                false
            }
-
            BiometricManager.BIOMETRIC_ERROR_UNSUPPORTED -> {
                onError("Biometrics not supported")
                false
            }
-
            BiometricManager.BIOMETRIC_STATUS_UNKNOWN -> {
                onError("Biometrics status unknown")
                false
            }
-
            BiometricManager.BIOMETRIC_SUCCESS -> true
            else -> false
        }
    }
-    if (isBiometricAvailable) {
+    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)
    }
-}
+}
@@ -19,9 +19,12 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
+import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel

@Composable
@@ -30,35 +33,29 @@ fun CustomSnackBar(
    isRtl: Boolean = true,
    containerColor: Color = MaterialTheme.colorScheme.surface
 ) {
-    Snackbar(
-        containerColor = containerColor,
-        modifier =
-        Modifier
-            .fillMaxWidth(
-                if (WireGuardAutoTunnel.isRunningOnAndroidTv()) 1 / 3f else 2 / 3f,
-            )
-            .padding(bottom = 100.dp),
-        shape = RoundedCornerShape(16.dp),
-    ) {
+    val context = LocalContext.current
+    Snackbar(containerColor = containerColor,
+        modifier = Modifier.fillMaxWidth(
+            if(WireGuardAutoTunnel.isRunningOnAndroidTv(context)) 1/3f else 2/3f).padding(bottom = 100.dp),
+        shape = RoundedCornerShape(16.dp)
+        ) {
        CompositionLocalProvider(
-            LocalLayoutDirection provides if (isRtl) LayoutDirection.Rtl else LayoutDirection.Ltr,
+            LocalLayoutDirection provides
+                    if (isRtl) LayoutDirection.Rtl else LayoutDirection.Ltr
        ) {
            Row(
-                modifier = Modifier
-                    .width(IntrinsicSize.Max)
-                    .height(IntrinsicSize.Min),
+                modifier = Modifier.width(IntrinsicSize.Max).height(IntrinsicSize.Min),
                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.Start,
+                horizontalArrangement = Arrangement.Start
            ) {
-                val icon = Icons.Rounded.Info
                Icon(
-                    icon,
-                    contentDescription = icon.name,
+                    Icons.Rounded.Info,
+                    contentDescription = stringResource(R.string.info),
                    tint = Color.White,
-                    modifier = Modifier.padding(end = 10.dp),
+                    modifier = Modifier.padding(end = 10.dp)
                )
                Text(message, color = Color.White, modifier = Modifier.padding(end = 5.dp))
            }
        }
    }
-}
+}
@@ -1,26 +0,0 @@
-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() }
-    }
-}
@@ -1,25 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.text
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.dp
-
-@Composable
-fun LogTypeLabel(color: Color, content: @Composable () -> Unit) {
-    Box(
-        modifier = Modifier
-            .size(20.dp)
-            .clip(RoundedCornerShape(2.dp))
-            .background(color),
-        contentAlignment = Alignment.Center,
-    ) {
-        content()
-    }
-}
@@ -12,11 +12,11 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp

@Composable
-fun SectionTitle(title: String, padding: Dp) {
+fun SectionTitle(title : String, padding : Dp) {
    Text(
        title,
-        textAlign = TextAlign.Start,
+        textAlign = TextAlign.Center,
        style = TextStyle(fontSize = 18.sp, fontWeight = FontWeight.ExtraBold),
-        modifier = Modifier.padding(padding, bottom = 5.dp, top = 5.dp),
+        modifier = Modifier.padding(padding, bottom = 5.dp, top = 5.dp)
    )
-}
+}
@@ -3,28 +3,23 @@ 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,71 +3,30 @@ 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 {
-                    ""
-                },
-                allowedIps = peer.allowedIps.joinToString(", ").trim(),
+                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")
    }
-}
+}
@@ -1,18 +0,0 @@
-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 = ""
-)
--- a/Show More
+++ b/Show More