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.

.editorconfig

@@ -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

.github/CODE_OF_CONDUCT.md

@@ -1,22 +0,0 @@
-# Contributor Code of Conduct
-
-## Pledge
-
-We as individuals involved in this project, pledge to participate in this
-community in a respectful, constructive, and civil manner as we work towards a common goal
-of delivering free, open source, and value adding software for all.
-
-## Standard
-
-The standard for this community is the Golden Rule.
-
-> “Do unto others as you would have them do unto you.”
-
-## Scope
-
-This Code of Conduct applies to all spaces related to WG Tunnel.
-
-## Incidents or Concerns
-
-For any incidents or concerns, reach out to Zane at
-<support@zaneschepke.com>.

.github/FUNDING.yml

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -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. iPhone6]
-- Device: [e.g. Pixel 4a]
+ - Android Version: [e.g. iOS8.1]
-- Android Version: [e.g. Android 13]
+ - App Version [e.g. 22]
-- App Version [e.g. 3.3.3]
 
 **To Reproduce**
 Steps to reproduce the behavior:
-
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'

.github/SUPPORT.md

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

.github/dependabot.yml

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

.github/workflows/android.yml

@@ -1,30 +1,27 @@
-name: Android CI Tag Deployment (Pre-release)
+# name of the workflow
+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'
@@ -38,16 +35,10 @@ jobs:
         id: decode_keystore
         uses: timheuer/base64-to-file@v1.2
         with:
-          fileName: ${{ env.KEY_STORE_FILE }}
+          fileName: 'android_keystore.jks'
-          fileDir: ${{ env.KEY_STORE_LOCATION }}
+          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
@@ -61,64 +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.3
+        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:) .*" | tr -d "[:blank:]")" >> $GITHUB_OUTPUT
-
-      - name: Append checksum
-        id: append_checksum
-        uses: softprops/action-gh-release@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          body: |
-            
-            SHA256 fingerprint:
-            ```${{ steps.checksum.outputs.checksum }}```
-          tag_name: ${{ github.ref_name }}
-          name: ${{ github.ref_name }}
-          draft: false
-          prerelease: true
-          append_body: true
-
       - name: Deploy with fastlane
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.2' # Not needed with a .ruby-version file
           bundler-cache: true
+
       - name: Distribute app to Beta track 🚀
         run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane beta)
 

.github/workflows/issue-workflow.yml

@@ -1,20 +0,0 @@
-name: Issue Updates Workflow
-
-on:
-  issues:
-    types: [ opened, closed, reopened ]
-
-
-jobs:
-
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Send Telegram Message
-        run: |
-          msg_text='${{ github.actor }} updated an issue:
-            status: ${{ github.event.issue.state }} - #${{ github.event.issue.number }} ${{ github.event.issue.title }}
-            https://github.com/zaneschepke/wgtunnel/issues/${{ github.event.issue.number }}'
-          curl -s -X POST 'https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage' \
-          -d "chat_id=${{ secrets.TELEGRAM_TO }}&text=${msg_text}&message_thread_id=${{ secrets.TELEGRAM_TOPIC }}"

.github/workflows/publish-workflow.yml

@@ -1,21 +0,0 @@
-name: Release Updates Workflow
-
-on:
-  release:
-    types: [ published ]
-
-
-jobs:
-
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Send Telegram Message
-        run: |
-          msg_text='${{ github.actor }} published a new release:
-            Release: ${{ github.event.release.tag_name }}
-            ${{ github.event.release.body }}
-            https://github.com/zaneschepke/wgtunnel/releases/tag/${{ github.event.release.tag_name }}'
-          curl -s -X POST 'https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage' \
-          -d "chat_id=${{ secrets.TELEGRAM_TO }}&text=${msg_text}&message_thread_id=${{ secrets.TELEGRAM_TOPIC }}"

.github/workflows/release.yml

@@ -1,131 +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.3
-        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:) .*" | tr -d "[:blank:]")" >> $GITHUB_OUTPUT
-
-      - name: Append checksum
-        id: append_checksum
-        uses: softprops/action-gh-release@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          body: |
-            
-            SHA256 fingerprint:
-            ```${{ steps.checksum.outputs.checksum }}```
-          tag_name: ${{ github.ref_name }}
-          name: ${{ github.ref_name }}
-          draft: false
-          prerelease: 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)
-

README.md

@@ -4,9 +4,8 @@ WG Tunnel
 
 <div align="center">
 
-[![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/rbRRNh6H7V)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-[![X Community](https://img.shields.io/badge/X-000000?style=for-the-badge&logo=x&logoColor=white)](https://twitter.com/i/communities/1780655267685736818)
+[![Discord Chat](https://img.shields.io/discord/1108285024631001111.svg)](https://discord.gg/rbRRNh6H7V)
-[![Telegram](https://img.shields.io/badge/Telegram-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)](https://t.me/wgtunnel)
 
 </div>
 
@@ -14,19 +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/)
+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.
-and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) with added
-features. Built using the [wireguard-android](https://github.com/WireGuard/wireguard-android)
-library and [Jetpack Compose](https://developer.android.com/jetpack/compose), this application was
-inspired by the official [WireGuard Android](https://github.com/WireGuard/wireguard-android) app.
 
 </div>
 
@@ -35,70 +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="Main" style="padding-right:25px" src="asset/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="Config" style="padding-left:25px" src="asset/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="Settings" style="padding-left:25px" src="asset/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="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
+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. 
-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 for Android support
-* Amnezia support for userspace mode for DPI/censorship protection
+* Export tunnels to zip
-* Always-On VPN support
+* Quick tile support for VPN toggling
-* Export Amnezia and WireGuard tunnels to zip
+* Static shortcuts support for primary tunnel for automation integration
-* Quick tile support for tunnel toggling, auto-tunneling
-* Static shortcuts support for tunnel toggling, auto-tunneling
 * Intent automation support for all tunnels
-* Automatic auto-tunneling service restart after reboot
+* Optional auto connect on mobile data, ethernet
-* Automatic tunnel restart after reboot
+* Automatic service restart after reboot
-* Battery preservation measures
+* Service will stay running in background after app has been closed
-* Restart tunnel on ping failure (beta)
 
-## Docs
-
-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).
-
-## Contributing
-
-Any contributions in the form of feedback, issues, code, or translations are welcome and much
-appreciated!
-
-Please read
-the [code of conduct](https://github.com/zaneschepke/wgtunnel?tab=coc-ov-file#contributor-code-of-conduct)
-before contributing.
-
-## Translation
-
-This app is using [Weblate](https://weblate.org) to assist with translations.
-
-Help translate WG Tunnel into your language
-at [Hosted Weblate](https://hosted.weblate.org/engage/wg-tunnel/).\
-[![Translation status](https://hosted.weblate.org/widgets/wg-tunnel/-/multi-auto.svg)](https://hosted.weblate.org/engage/wg-tunnel/)
 
 ## Building
-
+    
 ```
 $ git clone https://github.com/zaneschepke/wgtunnel
 $ cd wgtunnel
-```
-
-And then build the app:
-
-```
 $ ./gradlew assembleDebug
 ```
 

SECURITY.md

@@ -1,5 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-Please report security issues to `support@zaneschepke.com`

app/build.gradle.kts

@@ -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)
 }
 
@@ -12,10 +12,6 @@ android {
     namespace = Constants.APP_ID
     compileSdk = Constants.TARGET_SDK
 
-    androidResources {
-        generateLocaleConfig = true
-    }
-
     defaultConfig {
         applicationId = Constants.APP_ID
         minSdk = Constants.MIN_SDK
@@ -23,72 +19,47 @@ android {
         versionCode = Constants.VERSION_CODE
         versionName = Constants.VERSION_NAME
 
-        ksp { arg("room.schemaLocation", "$projectDir/schemas") }
+        ksp {
-
+            arg("room.schemaLocation", "$projectDir/schemas")
-        sourceSets {
-            getByName("debug").assets.srcDirs(files("$projectDir/schemas")) // Room
         }
 
+        resourceConfigurations.addAll(listOf("en"))
+
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables { useSupportLibrary = true }
+        vectorDrawables {
+            useSupportLibrary = true
+        }
     }
 
     signingConfigs {
         create(Constants.RELEASE) {
-            val properties =
+            val properties = Properties().apply {
-                Properties().apply {
+                //created local file for signing details
-                    // created local file for signing details
+                try {
-                    try {
+                    load(file("signing.properties").reader())
-                        load(file("signing.properties").reader())
+                } catch (_ : Exception) {
-                    } catch (_: Exception) {
+                    load(file("signing_template.properties").reader())
-                        load(file("signing_template.properties").reader())
-                    }
                 }
+            }
 
-            // try to get secrets from env first for pipeline build, then properties file for local
+            //try to get secrets from env first for pipeline build, then properties file for local build
-            // build
+            storeFile = file(System.getenv().getOrDefault(Constants.KEY_STORE_PATH_VAR, properties.getProperty(Constants.KEY_STORE_PATH_VAR)))
-            storeFile =
+            storePassword = System.getenv().getOrDefault(Constants.STORE_PASS_VAR, properties.getProperty(Constants.STORE_PASS_VAR))
-                file(
+            keyAlias = System.getenv().getOrDefault(Constants.KEY_ALIAS_VAR, properties.getProperty(Constants.KEY_ALIAS_VAR))
-                    System.getenv()
+            keyPassword = System.getenv().getOrDefault(Constants.KEY_PASS_VAR, properties.getProperty(Constants.KEY_PASS_VAR))
-                        .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
+        //don't strip
-        packaging.jniLibs.keepDebugSymbols.addAll(
+        packaging.jniLibs.keepDebugSymbols.addAll(listOf("libwg-go.so", "libwg-quick.so", "libwg.so"))
-            listOf("libwg-go.so", "libwg-quick.so", "libwg.so"),
-        )
 
         applicationVariants.all {
             val variant = this
             variant.outputs
                 .map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
                 .forEach { output ->
-                    val outputFileName =
+                    val outputFileName = "${Constants.APP_NAME}-${variant.flavorName}-${variant.buildType.name}-${variant.versionName}.apk"
-                        "${Constants.APP_NAME}-${variant.flavorName}-${variant.buildType.name}-${variant.versionName}.apk"
                     output.outputFileName = outputFileName
                 }
         }
@@ -98,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 {
@@ -112,8 +85,10 @@ android {
         }
         create("general") {
             dimension = Constants.TYPE
-            if (BuildHelper.isReleaseBuild(gradle) && BuildHelper.isGeneralFlavor(gradle)) {
+            if (BuildHelper.isReleaseBuild(gradle) && BuildHelper.isGeneralFlavor(gradle))
-                //any plugins general specific
+            {
+                apply(plugin = "com.google.gms.google-services")
+                apply(plugin = "com.google.firebase.crashlytics")
             }
         }
     }
@@ -122,25 +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)
-
+    // optional - helpers for implementing LifecycleOwner in a Service
-    // helpers for implementing LifecycleOwner in a Service
     implementation(libs.androidx.lifecycle.service)
     implementation(libs.androidx.activity.compose)
     implementation(platform(libs.androidx.compose.bom))
@@ -150,65 +129,65 @@ 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)
-    implementation(libs.amneziawg.android)
     coreLibraryDesugaring(libs.desugar.jdk.libs)
 
-    // logging
+    //logging
     implementation(libs.timber)
 
-
     // compose navigation
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.hilt.navigation.compose)
 
-    implementation(libs.zaneschepke.multifab)
-
     // hilt
     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)
-}
+}

app/fdroid-rules.pro

@@ -1,5 +1 @@
--dontwarn com.google.errorprone.annotations.**
+-dontwarn com.google.errorprone.annotations.**
-
--keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
-    <fields>;
-}

app/google-services.json

@@ -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"
+}

app/proguard-rules.pro

@@ -19,6 +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>;
-}

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

@@ -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')"
-    ]
-  }
-}

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

@@ -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')"
-    ]
-  }
-}

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

@@ -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')"
-    ]
-  }
-}

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

@@ -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')"
-    ]
-  }
-}

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

@@ -1,190 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 8,
-    "identityHash": "b4d4a7c489f6b2f0d3aa4fa6f37b4935",
-    "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, `is_amnezia_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"
-          },
-          {
-            "fieldPath": "isAmneziaEnabled",
-            "columnName": "is_amnezia_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, `am_quick` TEXT NOT NULL DEFAULT '')",
-        "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"
-          },
-          {
-            "fieldPath": "amQuick",
-            "columnName": "am_quick",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          }
-        ],
-        "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, 'b4d4a7c489f6b2f0d3aa4fa6f37b4935')"
-    ]
-  }
-}

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

@@ -19,4 +19,4 @@ class ExampleInstrumentedTest {
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         assertEquals("com.zaneschepke.wireguardautotunnel", appContext.packageName)
     }
-}
+}

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

@@ -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.
-    }
-}

app/src/main/AndroidManifest.xml

@@ -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
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
-        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
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"
-        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_COARSE_LOCATION"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_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.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
-    <!--foreground service exempt android 14-->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION"/>
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_REMOTE_MESSAGING"/>
-    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
-
     <!--foreground service permissions-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     <!--start service on boot permission-->
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <!--android tv support-->
-    <uses-feature
+    <uses-feature android:name="android.software.leanback"
-        android:name="android.software.leanback"
         android:required="false" />
-    <uses-feature
+    <uses-feature android:name="android.hardware.touchscreen"
-        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:name="android.hardware.screen.portrait"
-        android:required="false" />
+    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
+            <meta-data android:name="android.app.shortcuts"
-                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"
+            android:windowSoftInputMode="stateAlwaysHidden" />
-            tools:ignore="DiscouragedApi" />
         <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="remoteMessaging"
-            android:foregroundServiceType="systemExempted"
+            android:exported="false">
-            tools:node="merge" />
-        <service
-            android:name=".service.tile.TunnelControlTile"
-            android:exported="true"
-            android:icon="@drawable/ic_launcher"
-            android:label="Tunnel control"
-            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
-            <meta-data
-                android:name="android.service.quicksettings.ACTIVE_TILE"
-                android:value="true" />
-            <meta-data
-                android:name="android.service.quicksettings.TOGGLEABLE_TILE"
-                android:value="true" />
-
-            <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE" />
-            </intent-filter>
         </service>
         <service
-            android:name=".service.tile.AutoTunnelControlTile"
             android:exported="true"
-            android:icon="@drawable/ic_launcher"
+            android:name=".service.tile.TunnelControlTile"
-            android:label="Auto-tunnel"
+            android:icon="@drawable/shield"
+            android:label="WG Tunnel"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
-            <meta-data
+            <meta-data android:name="android.service.quicksettings.ACTIVE_TILE"
-                android:name="android.service.quicksettings.ACTIVE_TILE"
                 android:value="true" />
-            <meta-data
+            <meta-data android:name="android.service.quicksettings.TOGGLEABLE_TILE"
-                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
+            <meta-data android:name="android.net.VpnService.SUPPORTS_ALWAYS_ON"
-                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" />
+            android:persistent="true"
-
+            android:foregroundServiceType="location"
-        <receiver
+            android:permission=""
-            android:name=".receiver.BootReceiver"
-            android:enabled="true"
             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.BOOT_COMPLETED" />
-                <action android:name="android.intent.action.ACTION_BOOT_COMPLETED" />
-                <action android:name="android.intent.action.QUICKBOOT_POWERON" />
-                <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
             </intent-filter>
         </receiver>
-        <receiver
+        <receiver android:exported="false" android:name=".receiver.NotificationActionReceiver"/>
-            android:name=".receiver.NotificationActionReceiver"
-            android:exported="false" />
     </application>
 </manifest>

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

@@ -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"
+}

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

@@ -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)
+}

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

@@ -1,80 +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.os.StrictMode
+import androidx.lifecycle.ProcessLifecycleOwner
-import android.os.StrictMode.ThreadPolicy
+import androidx.lifecycle.lifecycleScope
-import android.service.quicksettings.TileService
+import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
-import com.zaneschepke.logcatter.LocalLogCollector
+import com.zaneschepke.wireguardautotunnel.repository.model.Settings
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.service.tile.AutoTunnelControlTile
-import com.zaneschepke.wireguardautotunnel.service.tile.TunnelControlTile
-import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
 import dagger.hilt.android.HiltAndroidApp
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
 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 localLogCollector: LocalLogCollector
+    lateinit var settingsRepo : SettingsDoa
-
-    @Inject
-    @ApplicationScope
-    lateinit var applicationScope: CoroutineScope
-
-    @Inject
-    @IoDispatcher
-    lateinit var ioDispatcher: CoroutineDispatcher
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
+        if(BuildConfig.DEBUG) {
-        if (BuildConfig.DEBUG) {
             Timber.plant(Timber.DebugTree())
-            StrictMode.setThreadPolicy(
+        }
-                ThreadPolicy.Builder()
+        initSettings()
-                    .detectDiskReads()
+    }
-                    .detectDiskWrites()
+
-                    .detectNetwork()
+    private fun initSettings() {
-                    .penaltyLog()
+        with(ProcessLifecycleOwner.get()) {
-                    .build(),
+            lifecycleScope.launch {
-            )
+                if(settingsRepo.getAll().isEmpty()) {
-        } else Timber.plant(ReleaseTree())
+                    settingsRepo.save(Settings())
-        applicationScope.launch(ioDispatcher) {
+                }
-            PinManager.initialize(this@WireGuardAutoTunnel)
+            }
-            if (!isRunningOnAndroidTv()) localLogCollector.start()
         }
     }
 
+
+
     companion object {
-
+        fun isRunningOnAndroidTv(context : Context) : Boolean {
-        lateinit var instance: WireGuardAutoTunnel
+            return context.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
-            private set
-
-        fun isRunningOnAndroidTv(): Boolean {
-            return instance.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
-        }
-
-        fun requestTunnelTileServiceStateUpdate() {
-            TileService.requestListeningState(
-                instance,
-                ComponentName(instance, TunnelControlTile::class.java),
-            )
-        }
-
-        fun requestAutoTunnelTileServiceUpdate() {
-            TileService.requestListeningState(
-                instance,
-                ComponentName(instance, AutoTunnelControlTile::class.java),
-            )
         }
     }
-}
+}

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

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

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

@@ -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()
-        }
-    }
-}

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

@@ -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()
-    }
-}

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

@@ -1,52 +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.domain.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 WHERE name=:name")
-    suspend fun getByName(name: String): 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")
-    suspend fun resetPrimaryTunnel()
-
-    @Query("UPDATE TunnelConfig SET is_mobile_data_tunnel = 0 WHERE is_mobile_data_tunnel =1")
-    suspend fun resetMobileDataTunnel()
-
-    @Query("SELECT * FROM TUNNELCONFIG WHERE is_primary_tunnel=1")
-    suspend fun findByPrimary(): TunnelConfigs
-
-    @Query("SELECT * FROM TUNNELCONFIG WHERE is_mobile_data_tunnel=1")
-    suspend fun findByMobileDataTunnel(): TunnelConfigs
-
-    @Query("SELECT * FROM tunnelconfig")
-    fun getAllFlow(): Flow<MutableList<TunnelConfig>>
-}

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

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

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

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

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

@@ -1,58 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.domain
-
-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,
-    @ColumnInfo(
-        name = "is_amnezia_enabled",
-        defaultValue = "false",
-    )
-    val isAmneziaEnabled: Boolean = false,
-)

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

@@ -1,53 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.domain
-
-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,
-    @ColumnInfo(
-        name = "am_quick",
-        defaultValue = "",
-    )
-    val amQuick: String = AM_QUICK_DEFAULT,
-) {
-    companion object {
-        fun configFromWgQuick(wgQuick: String): Config {
-            val inputStream: InputStream = wgQuick.byteInputStream()
-            return inputStream.bufferedReader(Charsets.UTF_8).use {
-                Config.parse(it)
-            }
-        }
-
-        fun configFromAmQuick(amQuick: String): org.amnezia.awg.config.Config {
-            val inputStream: InputStream = amQuick.byteInputStream()
-            return inputStream.bufferedReader(Charsets.UTF_8).use {
-                org.amnezia.awg.config.Config.parse(it)
-            }
-        }
-
-        const val AM_QUICK_DEFAULT = ""
-    }
-}

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

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

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

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

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

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

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

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

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

@@ -1,24 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.repository
-
-import com.zaneschepke.wireguardautotunnel.data.SettingsDao
-import com.zaneschepke.wireguardautotunnel.data.domain.Settings
-import kotlinx.coroutines.flow.Flow
-
-class RoomSettingsRepository(private val settingsDoa: SettingsDao) : SettingsRepository {
-
-    override suspend fun save(settings: Settings) {
-        settingsDoa.save(settings)
-    }
-
-    override 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()
-    }
-}

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

@@ -1,72 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.repository
-
-import com.zaneschepke.wireguardautotunnel.data.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.data.domain.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 findByTunnelName(name: String): TunnelConfig? {
-        return tunnelConfigDao.getByName(name)
-    }
-
-    override suspend fun findByTunnelNetworksName(name: String): TunnelConfigs {
-        return tunnelConfigDao.findByTunnelNetworkName(name)
-    }
-
-    override suspend fun findByMobileDataTunnel(): TunnelConfigs {
-        return tunnelConfigDao.findByMobileDataTunnel()
-    }
-
-    override suspend fun findPrimary(): TunnelConfigs {
-        return tunnelConfigDao.findByPrimary()
-    }
-}

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

@@ -1,14 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.repository
-
-import com.zaneschepke.wireguardautotunnel.data.domain.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>
-}

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

@@ -1,32 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.repository
-
-import com.zaneschepke.wireguardautotunnel.data.domain.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 findByTunnelName(name: String): TunnelConfig?
-
-    suspend fun findByTunnelNetworksName(name: String): TunnelConfigs
-
-    suspend fun findByMobileDataTunnel(): TunnelConfigs
-
-    suspend fun findPrimary(): TunnelConfigs
-}

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,26 @@
+package com.zaneschepke.wireguardautotunnel.module
+
+import android.content.Context
+import androidx.room.Room
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.repository.AppDatabase
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+class DatabaseModule {
+    @Provides
+    @Singleton
+    fun provideDatabase(@ApplicationContext context : Context) : AppDatabase {
+        return Room.databaseBuilder(
+            context,
+            AppDatabase::class.java, context.getString(R.string.db_name))
+            .fallbackToDestructiveMigration()
+            .build()
+    }
+}

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

@@ -1,93 +1,27 @@
 package com.zaneschepke.wireguardautotunnel.module
 
-import android.content.Context
+import com.zaneschepke.wireguardautotunnel.repository.AppDatabase
-import androidx.room.Room
+import com.zaneschepke.wireguardautotunnel.repository.SettingsDoa
-import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.repository.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.data.AppDatabase
-import com.zaneschepke.wireguardautotunnel.data.DatabaseCallback
-import com.zaneschepke.wireguardautotunnel.data.SettingsDao
-import com.zaneschepke.wireguardautotunnel.data.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
-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 dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
-import kotlinx.coroutines.CoroutineDispatcher
 import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 class RepositoryModule {
-    @Provides
-    @Singleton
-    fun provideDatabase(@ApplicationContext context: Context): AppDatabase {
-        return Room.databaseBuilder(
-            context,
-            AppDatabase::class.java,
-            context.getString(R.string.db_name),
-        )
-            .fallbackToDestructiveMigration()
-            .addCallback(DatabaseCallback())
-            .build()
-    }
 
     @Singleton
     @Provides
-    fun 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,
-        @IoDispatcher ioDispatcher: CoroutineDispatcher
-    ): DataStoreManager {
-        return DataStoreManager(context, ioDispatcher)
-    }
-
-    @Provides
-    @Singleton
-    fun provideGeneralStateRepository(dataStoreManager: DataStoreManager): AppStateRepository {
-        return DataStoreAppStateRepository(dataStoreManager)
-    }
-
-    @Provides
-    @Singleton
-    fun provideAppDataRepository(
-        settingsRepository: SettingsRepository,
-        tunnelConfigRepository: TunnelConfigRepository,
-        appStateRepository: AppStateRepository
-    ): AppDataRepository {
-        return AppDataRoomRepository(settingsRepository, tunnelConfigRepository, appStateRepository)
-    }
-
-
-}

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

@@ -15,25 +15,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(
+    abstract fun provideWifiService(wifiService: WifiService) : NetworkService<WifiService>
-        mobileDataService: MobileDataService
-    ): NetworkService<MobileDataService>
 
     @Binds
     @ServiceScoped
-    abstract fun provideEthernetService(
+    abstract fun provideMobileDataService(mobileDataService : MobileDataService) : NetworkService<MobileDataService>
-        ethernetService: EthernetService
+
-    ): NetworkService<EthernetService>
+    @Binds
-}
+    @ServiceScoped
+    abstract fun provideEthernetService(ethernetService: EthernetService) : NetworkService<EthernetService>
+}

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

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

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

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

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

@@ -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
+    override fun onReceive(context: Context, intent: Intent) = goAsync {
-    lateinit var serviceManager: ServiceManager
+        if (intent.action == Intent.ACTION_BOOT_COMPLETED) {
-
+            try {
-    override fun onReceive(context: Context?, intent: Intent?) = goAsync {
+                val settings = settingsRepo.getAll()
-        if (Intent.ACTION_BOOT_COMPLETED != intent?.action) return@goAsync
+                if (settings.isNotEmpty()) {
-        context?.run {
+                    val setting = settings.first()
-            val settings = appDataRepository.settings.getSettings()
+                    if (setting.isAutoTunnelEnabled && setting.defaultTunnel != null) {
-            if (settings.isAutoTunnelEnabled) {
+                        ServiceManager.startWatcherService(context, setting.defaultTunnel!!)
-                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,
-                    )
                 }
-            }
+            } finally {
-            if (settings.isAlwaysOnVpnEnabled) {
+                cancel()
-                Timber.i("Starting vpn service from boot AOVPN")
-                serviceManager.startVpnServiceForeground(context)
             }
         }
     }
-}
+}

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

@@ -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
+            val settings = settingsRepo.getAll()
-            serviceManager.stopVpnServiceForeground(context)
+            if (settings.isNotEmpty()) {
-            delay(Constants.TOGGLE_TUNNEL_DELAY)
+                val setting = settings.first()
-            serviceManager.startVpnServiceForeground(context)
+                if (setting.defaultTunnel != null) {
-        } catch (e: Exception) {
+                    ServiceManager.stopVpnService(context)
-            Timber.e(e)
+                    delay(Constants.TOGGLE_TUNNEL_DELAY)
+                    ServiceManager.startVpnService(context, setting.defaultTunnel.toString())
+                }
+            }
         } finally {
             cancel()
         }
     }
-}
+}

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

@@ -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
+}

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

@@ -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)
         }
     }
-}
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/repository/SettingsDoa.kt

@@ -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.domain.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
-}
+}

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

@@ -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>>
+}

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

@@ -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
+        }
+    }
+}

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

@@ -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)
+        }
+    }
+}

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

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

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

@@ -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,36 +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.name, Action.START_FOREGROUND.name -> startService(intent.extras)
-                Action.START_FOREGROUND.name -> startService(intent.extras)
+                Action.STOP.name -> stopService(intent.extras)
-
+                "android.net.VpnService" -> {
-                Action.STOP.name, Action.STOP_FOREGROUND.name -> stopService()
+                    Timber.d("Always-on VPN starting service")
-                Constants.ALWAYS_ON_VPN_ACTION -> {
-                    Timber.i("Always-on VPN starting service")
                     startService(intent.extras)
                 }
-
                 else -> Timber.d("This should never happen. No action in the received intent")
             }
         } else {
             Timber.d(
-                "with a null intent. It has been probably restarted by the system.",
+                "with a null intent. It has been probably restarted by the system."
             )
         }
+        // by returning this we make sure the service is restarted if the system kills the service
         return START_STICKY
     }
 
-    protected open fun startService(extras: Bundle?) {
+
+    override fun onDestroy() {
+        super.onDestroy()
+        Timber.d("The service has been destroyed")
+    }
+
+    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}")
-        stopForeground(STOP_FOREGROUND_REMOVE)
+        try {
-        stopSelf()
+            stopForeground(STOP_FOREGROUND_REMOVE)
+            stopSelf()
+        } catch (e: Exception) {
+            Timber.d("Service stopped without being started: ${e.message}")
+        }
         isServiceStarted = false
     }
-}
+}

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

@@ -1,132 +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.R
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.withContext
 import timber.log.Timber
 
-class ServiceManager(
+object ServiceManager {
-    private val appDataRepository: AppDataRepository,
+    @Suppress("DEPRECATION")
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher
+    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(
+    fun <T : Service> getServiceState(context: Context, cls : Class<T>): ServiceState {
-        action: Action,
+        val isServiceRunning = context.isServiceRunning(cls)
-        context: Context,
+        return if(isServiceRunning) ServiceState.STARTED else ServiceState.STOPPED
-        cls: Class<T>,
+    }
-        extras: Map<String, Int>? = null
+
-    ) {
+    private fun <T : Service> actionOnService(action: Action, context: Context, cls : Class<T>, extras : Map<String,String>? = null) {
-        val intent =
+        if (getServiceState(context, cls) == ServiceState.STOPPED && action == Action.STOP) return
-            Intent(context, cls).also {
+        if (getServiceState(context, cls) == ServiceState.STARTED && action == Action.START) return
-                it.action = action.name
+        val intent = Intent(context, cls).also {
-                extras?.forEach { (k, v) -> it.putExtra(k, v) }
+            it.action = action.name
+            extras?.forEach {(k, v) ->
+                it.putExtra(k, v)
             }
+        }
         intent.component?.javaClass
         try {
-            when (action) {
+            when(action) {
-                Action.START_FOREGROUND, Action.STOP_FOREGROUND -> context.startForegroundService(
+                Action.START_FOREGROUND -> {
-                    intent,
+                    context.startForegroundService(intent)
-                )
+                }
-
+                Action.START -> {
-                Action.START, Action.STOP -> context.startService(intent)
+                    context.startService(intent)
+                }
+                Action.STOP -> context.startService(intent)
             }
-        } catch (e: Exception) {
+        } catch (e : Exception) {
             Timber.e(e.message)
         }
     }
 
-    suspend fun startVpnService(
+    fun startVpnService(context : Context, tunnelConfig : String) {
-        context: Context,
-        tunnelId: Int? = null,
-        isManualStart: Boolean = false
-    ) {
-        if (isManualStart) onManualStart(tunnelId)
         actionOnService(
             Action.START,
             context,
             WireGuardTunnelService::class.java,
-            tunnelId?.let { mapOf(Constants.TUNNEL_EXTRA_KEY to it) },
+            mapOf(context.getString(R.string.tunnel_extras_key) to tunnelConfig))
-        )
     }
-
+    fun stopVpnService(context : Context) {
-    suspend fun stopVpnServiceForeground(context: Context, isManualStop: Boolean = false) {
-        withContext(ioDispatcher) {
-            if (isManualStop) onManualStop()
-            Timber.i("Stopping vpn service")
-            actionOnService(
-                Action.STOP_FOREGROUND,
-                context,
-                WireGuardTunnelService::class.java,
-            )
-        }
-    }
-
-    suspend fun stopVpnService(context: Context, isManualStop: Boolean = false) {
-        withContext(ioDispatcher) {
-            if (isManualStop) onManualStop()
-            Timber.i("Stopping vpn service")
-            actionOnService(
-                Action.STOP,
-                context,
-                WireGuardTunnelService::class.java,
-            )
-        }
-    }
-
-    private suspend fun onManualStop() {
-        appDataRepository.appState.setManualStop()
-    }
-
-    private suspend fun onManualStart(tunnelId: Int?) {
-        tunnelId?.let {
-            appDataRepository.appState.setTunnelRunningFromManualStart(it)
-        }
-    }
-
-    suspend fun startVpnServiceForeground(
-        context: Context,
-        tunnelId: Int? = null,
-        isManualStart: Boolean = false
-    ) {
-        withContext(ioDispatcher) {
-            if (isManualStart) onManualStart(tunnelId)
-            actionOnService(
-                Action.START_FOREGROUND,
-                context,
-                WireGuardTunnelService::class.java,
-                tunnelId?.let { mapOf(Constants.TUNNEL_EXTRA_KEY to it) },
-            )
-        }
-    }
-
-    fun startWatcherServiceForeground(
-        context: Context,
-    ) {
-        actionOnService(
-            Action.START_FOREGROUND,
-            context,
-            WireGuardConnectivityWatcherService::class.java,
-        )
-    }
-
-    fun startWatcherService(context: Context) {
-        actionOnService(
-            Action.START,
-            context,
-            WireGuardConnectivityWatcherService::class.java,
-        )
-    }
-
-    fun stopWatcherService(context: Context) {
         actionOnService(
             Action.STOP,
             context,
-            WireGuardConnectivityWatcherService::class.java,
+            WireGuardTunnelService::class.java
         )
     }
-}
+
+    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 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)
+        }
+    }
+}

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

@@ -0,0 +1,6 @@
+package com.zaneschepke.wireguardautotunnel.service.foreground
+
+enum class ServiceState {
+    STARTED,
+    STOPPED,
+}

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

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

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

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

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

@@ -3,199 +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.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.module.MainImmediateDispatcher
 import com.zaneschepke.wireguardautotunnel.receiver.NotificationActionReceiver
+import com.zaneschepke.wireguardautotunnel.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.TunnelState
 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.CancellationException
+import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class WireGuardTunnelService : ForegroundService() {
+
     private val foregroundId = 123
 
     @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
 
-    @Inject
+    private lateinit var job : Job
-    @MainImmediateDispatcher
-    lateinit var mainImmediateDispatcher: CoroutineDispatcher
 
-    @Inject
+    private var tunnelName : String = ""
-    @IoDispatcher
-    lateinit var ioDispatcher: CoroutineDispatcher
-
-    private var job: Job? = null
-
-    private var didShowConnected = false
 
     override fun onCreate() {
         super.onCreate()
-        lifecycleScope.launch(mainImmediateDispatcher) {
+        lifecycleScope.launch(Dispatchers.Main) {
-            //TODO fix this to not launch if AOVPN
+            launchVpnStartingNotification()
-            if (appDataRepository.tunnels.count() != 0) {
-                launchVpnNotification()
-            }
         }
     }
 
-    override fun startService(extras: Bundle?) {
+    override fun startService(extras : Bundle?) {
         super.startService(extras)
+        launchVpnStartingNotification()
+        val tunnelConfigString = extras?.getString(getString(R.string.tunnel_extras_key))
         cancelJob()
-        job =
+        job = lifecycleScope.launch(Dispatchers.IO) {
-            lifecycleScope.launch {
+            launch {
-                launch {
+                if(tunnelConfigString != null) {
-                    val tunnelId = extras?.getInt(Constants.TUNNEL_EXTRA_KEY)
+                    try {
-                    if (vpnService.getState() == TunnelState.UP) {
+                        val tunnelConfig = TunnelConfig.from(tunnelConfigString)
-                        vpnService.stopTunnel()
+                        tunnelName = tunnelConfig.name
+                        vpnService.startTunnel(tunnelConfig)
+                    } catch (e : Exception) {
+                        Timber.e("Problem starting tunnel: ${e.message}")
+                        stopService(extras)
                     }
-                    vpnService.startTunnel(
+                } else {
-                        tunnelId?.let {
+                    Timber.d("Tunnel config null, starting default tunnel")
-                            appDataRepository.tunnels.getById(it)
+                    val settings = settingsRepo.getAll()
-                        },
+                    if(settings.isNotEmpty()) {
-                    )
+                        val setting = settings[0]
-                }
+                        if(setting.defaultTunnel != null && setting.isAlwaysOnVpnEnabled) {
-                launch {
+                            val tunnelConfig = TunnelConfig.from(setting.defaultTunnel!!)
-                    handshakeNotifications()
+                            tunnelName = tunnelConfig.name
-                }
+                            vpnService.startTunnel(tunnelConfig)
-            }
+                        }
-    }
+                    }
-
+                }
-    //TODO improve tunnel notifications
+            }
-    private suspend fun handshakeNotifications() {
+            launch {
-        withContext(ioDispatcher) {
+                var didShowConnected = false
-            var tunnelName: String? = null
+                var didShowFailedHandshakeNotification = false
-            vpnService.vpnState.collect { state ->
+                vpnService.handshakeStatus.collect {
-                state.statistics
+                    when(it) {
-                    ?.mapPeerStats()
+                        HandshakeStatus.NOT_STARTED -> {
-                    ?.map { it.value?.handshakeStatus() }
+                        }
-                    .let { statuses ->
+                        HandshakeStatus.NEVER_CONNECTED -> {
-                        when {
+                            if(!didShowFailedHandshakeNotification) {
-                            statuses?.all { it == HandshakeStatus.HEALTHY } == true -> {
+                                launchVpnConnectionFailedNotification(getString(R.string.initial_connection_failure_message))
-                                if (!didShowConnected) {
+                                didShowFailedHandshakeNotification = true
-                                    delay(Constants.VPN_CONNECTED_NOTIFICATION_DELAY)
+                                didShowConnected = false
-                                    tunnelName = state.tunnelConfig?.name
+                            }
-                                    launchVpnNotification(
+                        }
-                                        getString(R.string.tunnel_start_title),
+                        HandshakeStatus.HEALTHY -> {
-                                        "${getString(R.string.tunnel_start_text)} - $tunnelName",
+                            if(!didShowConnected) {
-                                    )
+                                launchVpnConnectedNotification()
-                                    didShowConnected = true
+                                didShowConnected = true
-                                }
+                            }
-                            }
+                        }
-
+                        HandshakeStatus.UNHEALTHY -> {
-                            statuses?.any { it == HandshakeStatus.STALE } == true -> {}
+                            if(!didShowFailedHandshakeNotification) {
-                            statuses?.all { it == HandshakeStatus.NOT_STARTED } ==
+                                launchVpnConnectionFailedNotification(getString(R.string.lost_connection_failure_message))
-                                true -> {
+                                didShowFailedHandshakeNotification = true
-                            }
+                                didShowConnected = false
-
+                            }
-                            else -> {}
                         }
                     }
-                if (state.status == TunnelState.UP && state.tunnelConfig?.name != tunnelName) {
-                    tunnelName = state.tunnelConfig?.name
-                    launchVpnNotification(
-                        getString(R.string.tunnel_start_title),
-                        "${getString(R.string.tunnel_start_text)} - $tunnelName",
-                    )
                 }
             }
         }
     }
 
-    private fun launchAlwaysOnDisabledNotification() {
+    override fun stopService(extras : Bundle?) {
-        launchVpnNotification(
+        super.stopService(extras)
-            title = this.getString(R.string.vpn_connection_failed),
+        lifecycleScope.launch(Dispatchers.IO) {
-            description = this.getString(R.string.always_on_disabled),
-        )
-    }
-
-    override fun stopService() {
-        super.stopService()
-        lifecycleScope.launch {
             vpnService.stopTunnel()
-            didShowConnected = false
         }
         cancelJob()
         stopSelf()
     }
 
-    private fun launchVpnNotification(
+    private fun launchVpnConnectedNotification() {
-        title: String = getString(R.string.vpn_starting),
+        val notification = notificationService.createNotification(
-        description: String = getString(R.string.attempt_connection)
+            channelId = getString(R.string.vpn_channel_id),
-    ) {
+            channelName = getString(R.string.vpn_channel_name),
-        val notification =
+            title = getString(R.string.tunnel_start_title),
-            notificationService.createNotification(
+            onGoing = false,
-                channelId = getString(R.string.vpn_channel_id),
+            vibration = false,
-                channelName = getString(R.string.vpn_channel_name),
+            showTimestamp = true,
-                title = title,
+            description = "${getString(R.string.tunnel_start_text)} $tunnelName"
-                onGoing = false,
-                vibration = false,
-                showTimestamp = true,
-                description = description,
-            )
-        ServiceCompat.startForeground(
-            this,
-            foregroundId,
-            notification,
-            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
         )
+        super.startForeground(foregroundId, notification)
     }
 
-    private fun launchVpnConnectionFailedNotification(message: String) {
+    private fun launchVpnStartingNotification() {
-        val notification =
+        val notification = notificationService.createNotification(
-            notificationService.createNotification(
+            channelId = getString(R.string.vpn_channel_id),
-                channelId = getString(R.string.vpn_channel_id),
+            channelName = getString(R.string.vpn_channel_name),
-                channelName = getString(R.string.vpn_channel_name),
+            title = getString(R.string.vpn_starting),
-                action =
+            onGoing = false,
-                PendingIntent.getBroadcast(
+            vibration = false,
-                    this,
+            showTimestamp = true,
-                    0,
+            description = getString(R.string.attempt_connection)
-                    Intent(this, NotificationActionReceiver::class.java),
-                    PendingIntent.FLAG_IMMUTABLE,
-                ),
-                actionText = getString(R.string.restart),
-                title = getString(R.string.vpn_connection_failed),
-                onGoing = false,
-                vibration = true,
-                showTimestamp = true,
-                description = message,
-            )
-        ServiceCompat.startForeground(
-            this,
-            foregroundId,
-            notification,
-            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
         )
+        super.startForeground(foregroundId, notification)
     }
 
+    private fun launchVpnConnectionFailedNotification(message : String) {
+        val notification = notificationService.createNotification(
+            channelId = getString(R.string.vpn_channel_id),
+            channelName = getString(R.string.vpn_channel_name),
+            action = PendingIntent.getBroadcast(this,0,
+                Intent(this, NotificationActionReceiver::class.java),PendingIntent.FLAG_IMMUTABLE),
+            actionText = getString(R.string.restart),
+            title = getString(R.string.vpn_connection_failed),
+            onGoing = false,
+            vibration = true,
+            showTimestamp = true,
+            description = message
+        )
+        super.startForeground(foregroundId, notification)
+    }
+
+
     private fun cancelJob() {
-        try {
+        if(this::job.isInitialized) {
-            job?.cancel()
+            job.cancel()
-        } catch (e: CancellationException) {
-            Timber.i("Tunnel job cancelled")
         }
     }
-}
+}

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

@@ -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,
+abstract class BaseNetworkService<T : BaseNetworkService<T>>(val context: Context, networkCapability : Int) : NetworkService<T> {
-    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 =
+        val networkStatusCallback = when (Build.VERSION.SDK_INT) {
-            when (Build.VERSION.SDK_INT) {
+            in Build.VERSION_CODES.S..Int.MAX_VALUE -> {
-                in Build.VERSION_CODES.S..Int.MAX_VALUE -> {
+                object : ConnectivityManager.NetworkCallback(
-                    object :
+                    FLAG_INCLUDE_LOCATION_INFO
-                        ConnectivityManager.NetworkCallback(
+                ) {
-                            FLAG_INCLUDE_LOCATION_INFO,
+                    override fun onAvailable(network: Network) {
-                        ) {
+                        trySend(NetworkStatus.Available(network))
-                        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,
-                                ),
-                            )
-                        }
                     }
-                }
 
-                else -> {
+                    override fun onLost(network: Network) {
-                    object : ConnectivityManager.NetworkCallback() {
+                        trySend(NetworkStatus.Unavailable(network))
-                        override fun onAvailable(network: Network) {
+                    }
-                            trySend(NetworkStatus.Available(network))
-                        }
 
-                        override fun onLost(network: Network) {
+                    override fun onCapabilitiesChanged(
-                            trySend(NetworkStatus.Unavailable(network))
+                        network: Network,
-                        }
+                        networkCapabilities: NetworkCapabilities
-
+                    ) {
-                        override fun onCapabilitiesChanged(
+                        trySend(NetworkStatus.CapabilitiesChanged(network, networkCapabilities))
-                            network: Network,
-                            networkCapabilities: NetworkCapabilities
-                        ) {
-                            trySend(
-                                NetworkStatus.CapabilitiesChanged(
-                                    network,
-                                    networkCapabilities,
-                                ),
-                            )
-                        }
                     }
                 }
             }
-        val request =
+
-            NetworkRequest.Builder()
+            else -> {
-                .addTransportType(networkCapability)
+                object : ConnectivityManager.NetworkCallback() {
-                .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+
-                .addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
+                    override fun onAvailable(network: Network) {
-                .build()
+                        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 onUnavailable: suspend (network : Network) -> Result,
-    crossinline onAvailable: suspend (network: Network) -> Result,
+    crossinline onAvailable: suspend (network : Network) -> Result,
-    crossinline onCapabilitiesChanged:
+    crossinline onCapabilitiesChanged: suspend (network : Network, networkCapabilities : NetworkCapabilities) -> Result,
-    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 ->
+        is NetworkStatus.CapabilitiesChanged -> onCapabilitiesChanged(status.network, status.networkCapabilities)
-            onCapabilitiesChanged(
-                status.network,
-                status.networkCapabilities,
-            )
     }
-}
+}

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

@@ -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) {
+}

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

@@ -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) {
+}

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

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

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

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

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

@@ -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) {
+}

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

@@ -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,
+        lights: Boolean = true
-        onlyAlertOnce: Boolean = true,
     ): Notification
-}
+}

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

@@ -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) :
+class WireGuardNotification @Inject constructor(@ApplicationContext private val context: Context) : NotificationService {
-    NotificationService {
-    private val notificationManager =
-        context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-    private val watcherBuilder: NotificationCompat.Builder =
+    private val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        NotificationCompat.Builder(
-            context,
-            context.getString(R.string.watcher_channel_id),
-        )
-    private val tunnelBuilder: NotificationCompat.Builder =
-        NotificationCompat.Builder(
-            context,
-            context.getString(R.string.vpn_channel_id),
-        )
 
     override fun createNotification(
         channelId: String,
@@ -40,23 +27,20 @@ class WireGuardNotification @Inject constructor(@ApplicationContext private val
         importance: Int,
         vibration: Boolean,
         onGoing: Boolean,
-        lights: Boolean,
+        lights: Boolean
-        onlyAlertOnce: Boolean,
     ): Notification {
-        val channel =
+        val channel = NotificationChannel(
-            NotificationChannel(
+            channelId,
-                channelId,
+            channelName,
-                channelName,
+            importance
-                importance,
+        ).let {
-            )
+            it.description = title
-                .let {
+            it.enableLights(lights)
-                    it.description = title
+            it.lightColor = Color.RED
-                    it.enableLights(lights)
+            it.enableVibration(vibration)
-                    it.lightColor = Color.RED
+            it.vibrationPattern = longArrayOf(100, 200, 300, 400, 500, 400, 300, 200, 400)
-                    it.enableVibration(vibration)
+            it
-                    it.vibrationPattern = longArrayOf(100, 200, 300)
+        }
-                    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 =
+        val builder: Notification.Builder =
-            when (channelId) {
+            Notification.Builder(
-                context.getString(R.string.watcher_channel_id) -> watcherBuilder
+                context,
-                context.getString(R.string.vpn_channel_id) -> tunnelBuilder
+                channelId
-                else -> {
+            )
-                    NotificationCompat.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(),
+                    Notification.Action.Builder(0, actionText, action)
-                )
+                        .build())
-                it.setAutoCancel(true)
+                    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()
         }
     }
-}
+}

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

@@ -2,69 +2,65 @@ package com.zaneschepke.wireguardautotunnel.service.shortcut
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
+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.CoroutineScope
+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
 
-    @Inject
+    private fun attemptWatcherServiceToggle(tunnelConfig : String) {
-    @ApplicationScope
+        lifecycleScope.launch(Dispatchers.Main) {
-    lateinit var applicationScope: CoroutineScope
+            val settings = getSettings()
+            if(settings.isAutoTunnelEnabled) {
+                ServiceManager.toggleWatcherServiceForeground(this@ShortcutsActivity, tunnelConfig)
+            }
+        }
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        applicationScope.launch {
+        if(intent.getStringExtra(CLASS_NAME_EXTRA_KEY)
-            val settings = appDataRepository.settings.getSettings()
+            .equals(WireGuardTunnelService::class.java.simpleName)) {
-            if (settings.isShortcutsEnabled) {
+            lifecycleScope.launch(Dispatchers.Main) {
-                when (intent.getStringExtra(CLASS_NAME_EXTRA_KEY)) {
+                val settings = getSettings()
-                    WireGuardTunnelService::class.java.simpleName -> {
+                if(settings.isShortcutsEnabled) {
+                    try {
                         val tunnelName = intent.getStringExtra(TUNNEL_NAME_EXTRA_KEY)
-                        val tunnelConfig = tunnelName?.let {
+                        val tunnelConfig = if(tunnelName != null) {
-                            appDataRepository.tunnels.getAll().firstOrNull {
+                            tunnelConfigRepo.getAll().firstOrNull { it.name == tunnelName }
-                                it.name == tunnelName
+                        } else {
+                            if(settings.defaultTunnel == null) {
+                                tunnelConfigRepo.getAll().first()
+                            } else {
+                                TunnelConfig.from(settings.defaultTunnel!!)
                             }
                         }
-                        when (intent.action) {
+                        tunnelConfig ?: return@launch
-                            Action.START.name -> serviceManager.startVpnServiceForeground(
+                        attemptWatcherServiceToggle(tunnelConfig.toString())
-                                this@ShortcutsActivity, tunnelConfig?.id, isManualStart = true,
+                        when(intent.action){
-                            )
+                            Action.STOP.name -> ServiceManager.stopVpnService(this@ShortcutsActivity)
-
+                            Action.START.name -> ServiceManager.startVpnService(this@ShortcutsActivity, tunnelConfig.toString())
-                            Action.STOP.name -> serviceManager.stopVpnServiceForeground(
-                                this@ShortcutsActivity,
-                                isManualStop = true,
-                            )
-                        }
-                    }
-
-                    WireGuardConnectivityWatcherService::class.java.simpleName -> {
-                        when (intent.action) {
-                            Action.START.name -> appDataRepository.settings.save(
-                                settings.copy(
-                                    isAutoTunnelPaused = false,
-                                ),
-                            )
-
-                            Action.STOP.name -> appDataRepository.settings.save(
-                                settings.copy(
-                                    isAutoTunnelPaused = true,
-                                ),
-                            )
                         }
+                    } catch (e : Exception) {
+                        Timber.e(e.message)
                     }
                 }
             }
@@ -72,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"
     }
-}
+}

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

@@ -1,101 +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.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.cancel
-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
-
-    @Inject
-    @ApplicationScope
-    lateinit var applicationScope: CoroutineScope
-
-    private var manualStartConfig: TunnelConfig? = null
-
-    override fun onStartListening() {
-        super.onStartListening()
-        applicationScope.launch {
-            val settings = appDataRepository.settings.getSettings()
-            when (settings.isAutoTunnelEnabled) {
-                true -> {
-                    if (settings.isAutoTunnelPaused) {
-                        setInactive()
-                        setTileDescription(this@AutoTunnelControlTile.getString(R.string.paused))
-                    } else {
-                        setActive()
-                        setTileDescription(this@AutoTunnelControlTile.getString(R.string.active))
-                    }
-                }
-
-                false -> {
-                    setTileDescription(this@AutoTunnelControlTile.getString(R.string.disabled))
-                    setUnavailable()
-                }
-            }
-        }
-    }
-
-    override fun onTileAdded() {
-        super.onTileAdded()
-        onStartListening()
-    }
-
-    override fun onClick() {
-        super.onClick()
-        unlockAndRun {
-            applicationScope.launch {
-                try {
-                    appDataRepository.toggleWatcherServicePause()
-                } catch (e: Exception) {
-                    Timber.e(e.message)
-                } finally {
-                    cancel()
-                }
-            }
-        }
-    }
-
-    private fun setActive() {
-        qsTile.state = Tile.STATE_ACTIVE
-        qsTile.updateTile()
-    }
-
-    private fun setInactive() {
-        qsTile.state = Tile.STATE_INACTIVE
-        qsTile.updateTile()
-    }
-
-    private fun setUnavailable() {
-        manualStartConfig = null
-        qsTile.state = Tile.STATE_UNAVAILABLE
-        qsTile.updateTile()
-    }
-
-    private fun setTileDescription(description: String) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-            qsTile.subtitle = description
-        }
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            qsTile.stateDescription = description
-        }
-        qsTile.updateTile()
-    }
-}

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

@@ -3,14 +3,16 @@ package com.zaneschepke.wireguardautotunnel.service.tile
 import android.os.Build
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.wireguard.android.backend.Tunnel
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
+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.TunnelState
 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
@@ -21,71 +23,50 @@ 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
 
-    @Inject
+    private val scope = CoroutineScope(Dispatchers.Main)
-    @ApplicationScope
-    lateinit var applicationScope: CoroutineScope
 
-    private var manualStartConfig: TunnelConfig? = null
+    private lateinit var job : Job
-
-    private var job: Job? = null;
 
     override fun onStartListening() {
-        super.onStartListening()
+        job = scope.launch {
-        Timber.d("On start listening called")
+            updateTileState()
-        //TODO Fix this
-        if (job == null || job?.isCancelled == true) job = applicationScope.launch {
-            vpnService.vpnState.collect { it ->
-                when (it.status) {
-                    TunnelState.UP -> {
-                        setActive()
-                        it.tunnelConfig?.name?.let { name -> setTileDescription(name) }
-                    }
-
-                    TunnelState.DOWN -> {
-                        setInactive()
-                        val config = appDataRepository.getStartTunnelConfig()?.also { config ->
-                            manualStartConfig = config
-                        } ?: appDataRepository.getPrimaryOrFirstTunnel()
-                        config?.let {
-                            setTileDescription(it.name)
-                        } ?: setUnavailable()
-                    }
-
-                    else -> setInactive()
-                }
-            }
         }
+        super.onStartListening()
     }
 
-    override fun onTileAdded() {
+    override fun onTileRemoved() {
-        super.onTileAdded()
+        super.onTileRemoved()
-        onStartListening()
+        cancelJob()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        scope.cancel()
     }
 
     override fun onClick() {
         super.onClick()
         unlockAndRun {
-            applicationScope.launch {
+            scope.launch {
                 try {
-                    if (vpnService.getState() == TunnelState.UP) {
+                    val tunnel = determineTileTunnel()
-                        serviceManager.stopVpnServiceForeground(
+                    if(tunnel != null) {
-                            this@TunnelControlTile,
+                        attemptWatcherServiceToggle(tunnel.toString())
-                            isManualStop = true,
+                        if(vpnService.getState() == Tunnel.State.UP) {
-                        )
+                            ServiceManager.stopVpnService(this@TunnelControlTile)
-                    } else {
+                        } else {
-                        serviceManager.startVpnServiceForeground(
+                            ServiceManager.startVpnServiceForeground(this@TunnelControlTile, tunnel.toString())
-                            this@TunnelControlTile, manualStartConfig?.id, isManualStart = true,
+                        }
-                        )
                     }
-                } catch (e: Exception) {
+                } catch (e : Exception) {
                     Timber.e(e.message)
                 } finally {
                     cancel()
@@ -94,29 +75,74 @@ class TunnelControlTile : TileService() {
         }
     }
 
-    private fun setActive() {
+    private suspend fun determineTileTunnel() : TunnelConfig? {
-        qsTile.state = Tile.STATE_ACTIVE
+        var tunnelConfig : TunnelConfig? = null
-        qsTile.updateTile()
+        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
+    private fun attemptWatcherServiceToggle(tunnelConfig : String) {
-        qsTile.updateTile()
+        scope.launch {
+            val settings = settingsRepo.getAll()
+            if (settings.isNotEmpty()) {
+                val setting = settings.first()
+                if(setting.isAutoTunnelEnabled) {
+                    ServiceManager.toggleWatcherServiceForeground(this@TunnelControlTile, tunnelConfig)
+                }
+            }
+        }
     }
 
-    private fun setUnavailable() {
+    private suspend fun updateTileState() {
-        manualStartConfig = null
+        vpnService.state.collect {
-        qsTile.state = Tile.STATE_UNAVAILABLE
+            try {
-        qsTile.updateTile()
+                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()
+        }
+    }
+}

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

@@ -2,15 +2,13 @@ package com.zaneschepke.wireguardautotunnel.service.tunnel
 
 enum class HandshakeStatus {
     HEALTHY,
-    STALE,
+    UNHEALTHY,
-    UNKNOWN,
+    NEVER_CONNECTED,
     NOT_STARTED;
 
     companion object {
-        private const val WG_TYPICAL_HANDSHAKE_INTERVAL_WHEN_HEALTHY_SEC = 180
+        private const val WG_TYPICAL_HANDSHAKE_INTERVAL_WHEN_HEALTHY_SEC = 120
-        const val STATUS_CHANGE_TIME_BUFFER = 30
+        const val UNHEALTHY_TIME_LIMIT_SEC = WG_TYPICAL_HANDSHAKE_INTERVAL_WHEN_HEALTHY_SEC + 60
-        const val STALE_TIME_LIMIT_SEC =
-            WG_TYPICAL_HANDSHAKE_INTERVAL_WHEN_HEALTHY_SEC + STATUS_CHANGE_TIME_BUFFER
         const val NEVER_CONNECTED_TO_UNHEALTHY_TIME_LIMIT_SEC = 30
     }
-}
+}

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

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

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

@@ -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.domain.TunnelConfig
+import com.wireguard.crypto.Key
-import kotlinx.coroutines.flow.StateFlow
+import com.zaneschepke.wireguardautotunnel.repository.model.TunnelConfig
-
+import kotlinx.coroutines.flow.SharedFlow
-interface VpnService : Tunnel, org.amnezia.awg.backend.Tunnel {
-    suspend fun startTunnel(tunnelConfig: TunnelConfig? = null): TunnelState
 
+interface VpnService : Tunnel {
+    suspend fun startTunnel(tunnelConfig : TunnelConfig) : Tunnel.State
     suspend fun stopTunnel()
-
+    val state : SharedFlow<Tunnel.State>
-    val vpnState: StateFlow<VpnState>
+    val tunnelName : SharedFlow<String>
-
+    val statistics : SharedFlow<Statistics>
-    fun getState(): TunnelState
+    val lastHandshake : SharedFlow<Map<Key,Long>>
-}
+    val handshakeStatus : SharedFlow<HandshakeStatus>
+    fun getState() : Tunnel.State
+}

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

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

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

@@ -2,200 +2,141 @@ package com.zaneschepke.wireguardautotunnel.service.tunnel
 
 import com.wireguard.android.backend.Backend
 import com.wireguard.android.backend.BackendException
-import com.wireguard.android.backend.Tunnel.State
+import com.wireguard.android.backend.Statistics
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.wireguard.android.backend.Tunnel
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.wireguard.crypto.Key
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.Constants
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.repository.model.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.util.NumberUtils
-import com.zaneschepke.wireguardautotunnel.module.Kernel
-import com.zaneschepke.wireguardautotunnel.module.Userspace
-import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.AmneziaStatistics
-import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStatistics
-import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.WireGuardStatistics
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.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 kotlinx.coroutines.withContext
-import org.amnezia.awg.backend.Tunnel
 import timber.log.Timber
 import javax.inject.Inject
 
-class WireGuardTunnel
+
-@Inject
+class WireGuardTunnel @Inject constructor(private val backend : Backend) : VpnService {
-constructor(
+
-    private val userspaceAmneziaBackend: org.amnezia.awg.backend.Backend,
+    private val _tunnelName = MutableStateFlow("")
-    @Userspace private val userspaceBackend: Backend,
+    override val tunnelName get() = _tunnelName.asStateFlow()
-    @Kernel private val kernelBackend: Backend,
+
-    private val appDataRepository: AppDataRepository,
+    private val _state = MutableSharedFlow<Tunnel.State>(
-    @ApplicationScope private val applicationScope: CoroutineScope,
+        onBufferOverflow = BufferOverflow.DROP_OLDEST,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher
+        replay = 1)
-) : VpnService {
+
-    private val _vpnState = MutableStateFlow(VpnState())
+    private val _handshakeStatus = MutableSharedFlow<HandshakeStatus>(replay = 1,
-    override val vpnState: StateFlow<VpnState> = _vpnState.asStateFlow()
+        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 var statsJob: Job? = null
+    override suspend fun startTunnel(tunnelConfig: TunnelConfig) : Tunnel.State{
-
+        return try {
-    private var backend: Backend = userspaceBackend
+            stopTunnelOnConfigChange(tunnelConfig)
-
+            emitTunnelName(tunnelConfig.name)
-    private var backendIsWgUserspace = true
+            val config = TunnelConfig.configFromQuick(tunnelConfig.wgQuick)
-
-    private var backendIsAmneziaUserspace = false
-
-    init {
-        applicationScope.launch(ioDispatcher) {
-            appDataRepository.settings.getSettingsFlow().collect {
-                if (it.isKernelEnabled && (backendIsWgUserspace || backendIsAmneziaUserspace)) {
-                    Timber.i("Setting kernel backend")
-                    backend = kernelBackend
-                    backendIsWgUserspace = false
-                    backendIsAmneziaUserspace = false
-                } else if (!it.isKernelEnabled && !it.isAmneziaEnabled && !backendIsWgUserspace) {
-                    Timber.i("Setting WireGuard userspace backend")
-                    backend = userspaceBackend
-                    backendIsWgUserspace = true
-                    backendIsAmneziaUserspace = false
-                } else if (it.isAmneziaEnabled && !backendIsAmneziaUserspace) {
-                    Timber.i("Setting Amnezia userspace backend")
-                    backendIsAmneziaUserspace = true
-                    backendIsWgUserspace = false
-                }
-            }
-        }
-    }
-
-    private fun setState(tunnelConfig: TunnelConfig?, tunnelState: TunnelState): TunnelState {
-        return if (backendIsAmneziaUserspace) {
-            Timber.i("Using Amnezia backend")
-            val config = tunnelConfig?.let {
-                if (it.amQuick != "") TunnelConfig.configFromAmQuick(it.amQuick) else {
-                    Timber.w("Using backwards compatible wg config, amnezia specific config not found.")
-                    TunnelConfig.configFromAmQuick(it.wgQuick)
-                }
-            }
-            val state = userspaceAmneziaBackend.setState(this, tunnelState.toAmState(), config)
-            TunnelState.from(state)
-        } else {
-            Timber.i("Using Wg backend")
-            val wgConfig = tunnelConfig?.let { TunnelConfig.configFromWgQuick(it.wgQuick) }
             val state = backend.setState(
-                this,
+                this, Tunnel.State.UP, config)
-                tunnelState.toWgState(),
+            _state.emit(state)
-                wgConfig,
+            state
-            )
+        } catch (e : Exception) {
-            TunnelState.from(state)
+            Timber.e("Failed to start tunnel with error: ${e.message}")
+            Tunnel.State.DOWN
         }
     }
 
-    override suspend fun startTunnel(tunnelConfig: TunnelConfig?): TunnelState {
+    private suspend fun emitTunnelName(name : String) {
-        return withContext(ioDispatcher) {
+        _tunnelName.emit(name)
-            try {
+    }
-                //TODO we need better error handling here
+
-                val config = tunnelConfig ?: appDataRepository.getPrimaryOrFirstTunnel()
+    private suspend fun stopTunnelOnConfigChange(tunnelConfig: TunnelConfig) {
-                if (config != null) {
+        if(getState() == Tunnel.State.UP && _tunnelName.value != tunnelConfig.name) {
-                    emitTunnelConfig(config)
+            stopTunnel()
-                    setState(config, TunnelState.UP)
-                } else throw Exception("No tunnels")
-            } catch (e: BackendException) {
-                Timber.e("Failed to start tunnel with error: ${e.message}")
-                TunnelState.from(State.DOWN)
-            }
         }
     }
 
-    private fun emitTunnelState(state: TunnelState) {
-        _vpnState.tryEmit(
-            _vpnState.value.copy(
-                status = state,
-            ),
-        )
-    }
-
-    private fun emitBackendStatistics(statistics: TunnelStatistics) {
-        _vpnState.tryEmit(
-            _vpnState.value.copy(
-                statistics = statistics,
-            ),
-        )
-    }
-
-    private suspend fun emitTunnelConfig(tunnelConfig: TunnelConfig?) {
-        _vpnState.emit(
-            _vpnState.value.copy(
-                tunnelConfig = tunnelConfig,
-            ),
-        )
-    }
-
-    private fun resetVpnState() {
-        _vpnState.tryEmit(VpnState())
-    }
-
-    override suspend fun stopTunnel() {
-        withContext(ioDispatcher) {
-            try {
-                if (getState() == TunnelState.UP) {
-                    val state = setState(null, TunnelState.DOWN)
-                    resetVpnState()
-                    emitTunnelState(state)
-                }
-            } catch (e: BackendException) {
-                Timber.e("Failed to stop wireguard tunnel with error: ${e.message}")
-            } catch (e: org.amnezia.awg.backend.BackendException) {
-                Timber.e("Failed to stop amnezia tunnel with error: ${e.message}")
-            }
-        }
-    }
-
-    override fun getState(): TunnelState {
-        return if (backendIsAmneziaUserspace) TunnelState.from(userspaceAmneziaBackend.getState(this))
-        else TunnelState.from(backend.getState(this))
-    }
-
     override fun getName(): String {
-        return _vpnState.value.tunnelConfig?.name ?: ""
+        return _tunnelName.value
     }
 
-
+    override suspend fun stopTunnel() {
-    override fun onStateChange(newState: Tunnel.State) {
+        try {
-        handleStateChange(TunnelState.from(newState))
+            if(getState() == Tunnel.State.UP) {
-    }
+                val state = backend.setState(this, Tunnel.State.DOWN, null)
-
+                _state.emit(state)
-    private fun handleStateChange(state: TunnelState) {
+            }
-        emitTunnelState(state)
+        } catch (e : BackendException) {
-        WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate()
+            Timber.e("Failed to stop tunnel with error: ${e.message}")
-        if (state == TunnelState.UP) {
-            statsJob = startTunnelStatisticsJob()
         }
-        if (state == TunnelState.DOWN) {
+    }
-            try {
+
-                statsJob?.cancel()
+    override fun getState(): Tunnel.State {
-            } catch (e: CancellationException) {
+        return backend.getState(this)
-                Timber.i("Stats job cancelled")
+    }
+
+    override fun onStateChange(state : Tunnel.State) {
+        val tunnel = this
+        _state.tryEmit(state)
+        if(state == Tunnel.State.UP) {
+            statsJob = scope.launch {
+                val handshakeMap = HashMap<Key, Long>()
+                var neverHadHandshakeCounter = 0
+                while (true) {
+                    val statistics = backend.getStatistics(tunnel)
+                    _statistics.emit(statistics)
+                    statistics.peers().forEach {
+                        val handshakeEpoch = statistics.peer(it)?.latestHandshakeEpochMillis ?: 0L
+                        handshakeMap[it] = handshakeEpoch
+                        if(handshakeEpoch == 0L) {
+                            if(neverHadHandshakeCounter >= HandshakeStatus.NEVER_CONNECTED_TO_UNHEALTHY_TIME_LIMIT_SEC) {
+                                _handshakeStatus.emit(HandshakeStatus.NEVER_CONNECTED)
+                            } else {
+                                _handshakeStatus.emit(HandshakeStatus.NOT_STARTED)
+                            }
+                            if(neverHadHandshakeCounter <= HandshakeStatus.NEVER_CONNECTED_TO_UNHEALTHY_TIME_LIMIT_SEC) {
+                                neverHadHandshakeCounter += (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 == Tunnel.State.DOWN) {
-
+            if(this::statsJob.isInitialized) {
-    private fun startTunnelStatisticsJob() = applicationScope.launch(ioDispatcher) {
+                statsJob.cancel()
-        while (true) {
-            if (backendIsAmneziaUserspace) {
-                emitBackendStatistics(AmneziaStatistics(userspaceAmneziaBackend.getStatistics(this@WireGuardTunnel)))
-            } else {
-                emitBackendStatistics(WireGuardStatistics(backend.getStatistics(this@WireGuardTunnel)))
             }
-            delay(Constants.VPN_STATISTIC_CHECK_INTERVAL)
+            _handshakeStatus.tryEmit(HandshakeStatus.NOT_STARTED)
+            _lastHandshake.tryEmit(emptyMap())
         }
     }
 
-    override fun onStateChange(state: State) {
+
-        handleStateChange(TunnelState.from(state))
+}
-    }
-}

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

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

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

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

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

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

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

@@ -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
-)

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

@@ -1,123 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui
-
-import android.content.ActivityNotFoundException
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import androidx.lifecycle.ViewModel
-import com.wireguard.android.backend.GoBackend
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
-import timber.log.Timber
-import javax.inject.Inject
-
-@HiltViewModel
-class AppViewModel
-@Inject
-constructor() : 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.update {
-            it.copy(
-                requestPermissions = true,
-            )
-        }
-    }
-
-    fun permissionsRequested() {
-        _appUiState.update {
-            it.copy(
-                requestPermissions = false,
-            )
-        }
-    }
-
-    fun openWebPage(url: String, context: Context) {
-        try {
-            val webpage: Uri = Uri.parse(url)
-            val intent = Intent(Intent.ACTION_VIEW, webpage).apply {
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            }
-            context.startActivity(intent)
-        } catch (e: ActivityNotFoundException) {
-            Timber.e(e)
-            showSnackbarMessage(context.getString(R.string.no_browser_detected))
-        }
-    }
-
-    fun onVpnPermissionAccepted() {
-        _appUiState.update {
-            it.copy(
-                vpnPermissionAccepted = true,
-            )
-        }
-    }
-
-    fun launchEmail(context: Context) {
-        try {
-            val intent =
-                Intent(Intent.ACTION_SENDTO).apply {
-                    type = Constants.EMAIL_MIME_TYPE
-                    putExtra(Intent.EXTRA_EMAIL, arrayOf(context.getString(R.string.my_email)))
-                    putExtra(Intent.EXTRA_SUBJECT, context.getString(R.string.email_subject))
-                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                }
-            context.startActivity(
-                Intent.createChooser(intent, context.getString(R.string.email_chooser)).apply {
-                    addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                },
-            )
-        } catch (e: ActivityNotFoundException) {
-            Timber.e(e)
-            showSnackbarMessage(context.getString(R.string.no_email_detected))
-        }
-    }
-
-    fun showSnackbarMessage(message: String) {
-        _appUiState.update {
-            it.copy(
-                snackbarMessage = message,
-                snackbarMessageConsumed = false,
-            )
-        }
-    }
-
-    fun snackbarMessageConsumed() {
-        _appUiState.update {
-            it.copy(
-                snackbarMessage = "",
-                snackbarMessageConsumed = true,
-            )
-        }
-    }
-
-    fun setNotificationPermissionAccepted(accepted: Boolean) {
-        _appUiState.update {
-            it.copy(
-                notificationPermissionAccepted = accepted,
-            )
-        }
-    }
-}

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

@@ -2,4 +2,4 @@ package com.zaneschepke.wireguardautotunnel.ui
 
 import com.journeyapps.barcodescanner.CaptureActivity
 
-class CaptureActivityPortrait : CaptureActivity()
+class CaptureActivityPortrait : CaptureActivity()

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

@@ -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.animation.ExitTransition
-import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.animation.ExperimentalAnimationApi
-import androidx.compose.foundation.layout.padding
+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,266 +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.input.key.onKeyEvent
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.lifecycleScope
-import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
-import androidx.navigation.navArgument
 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.ui.common.PermissionRequestFailedScreen
-import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavBar
 import com.zaneschepke.wireguardautotunnel.ui.common.prompt.CustomSnackBar
 import com.zaneschepke.wireguardautotunnel.ui.screens.config.ConfigScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.ConfigType
 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 timber.log.Timber
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
 
-    @Inject
+    @OptIn(ExperimentalAnimationApi::class,
-    lateinit var dataStoreManager: DataStoreManager
+        ExperimentalPermissionsApi::class
-
-    @Inject
-    lateinit var settingsRepository: SettingsRepository
-
-    @Inject
-    lateinit var serviceManager: ServiceManager
-
-    @OptIn(
-        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()
-            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 =
+            WireguardAutoTunnelTheme {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU)
+                TransparentSystemBars()
-                    rememberPermissionState(Manifest.permission.POST_NOTIFICATIONS) else null
 
-            val snackbarHostState = remember { SnackbarHostState() }
+                val snackbarHostState = remember { SnackbarHostState() }
 
-            val vpnActivityResultState =
+                val notificationPermissionState =
-                rememberLauncherForActivityResult(
+                    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) {
+                fun showSnackBarMessage(message : String) {
-                lifecycleScope.launch(Dispatchers.Main) {
+                    lifecycleScope.launch(Dispatchers.Main) {
-                    val result =
+                        val result = snackbarHostState.showSnackbar(
-                        snackbarHostState.showSnackbar(
+                            message = message,
-                            message = message.asString(this@MainActivity),
+                            actionLabel = applicationContext.getString(R.string.okay),
                             duration = SnackbarDuration.Short,
                         )
-                    when (result) {
+                        when (result) {
-                        SnackbarResult.ActionPerformed,
+                            SnackbarResult.ActionPerformed -> { snackbarHostState.currentSnackbarData?.dismiss() }
-                        SnackbarResult.Dismissed -> {
+                            SnackbarResult.Dismissed -> { snackbarHostState.currentSnackbarData?.dismiss() }
-                            snackbarHostState.currentSnackbarData?.dismiss()
                         }
                     }
                 }
-            }
 
-            LaunchedEffect(appUiState.requestPermissions) {
+                Scaffold(snackbarHost = {
-                if (appUiState.requestPermissions) {
-                    appViewModel.permissionsRequested()
-                    if (notificationPermissionState != null && !notificationPermissionState.status.isGranted
-                    ) {
-                        showSnackBarMessage(StringValue.StringResource(R.string.notification_permission_required))
-                        return@LaunchedEffect notificationPermissionState.launchPermissionRequest()
-                    }
-                    if (!appUiState.vpnPermissionAccepted) {
-                        return@LaunchedEffect appViewModel.vpnIntent?.let {
-                            vpnActivityResultState.launch(
-                                it,
-                            )
-                        }!!
-                    }
-                }
-            }
-
-            WireguardAutoTunnelTheme {
-                LaunchedEffect(Unit) {
-                    appViewModel.setNotificationPermissionAccepted(
-                        notificationPermissionState?.status?.isGranted ?: true,
-                    )
-                }
-
-                LaunchedEffect(appUiState.snackbarMessageConsumed) {
-                    if (!appUiState.snackbarMessageConsumed) {
-                        showSnackBarMessage(StringValue.DynamicString(appUiState.snackbarMessage))
-                        appViewModel.snackbarMessageConsumed()
-                    }
-                }
-
-                val focusRequester = remember { FocusRequester() }
-
-                Scaffold(
-                    snackbarHost = {
                         SnackbarHost(snackbarHostState) { snackbarData: SnackbarData ->
                             CustomSnackBar(
                                 snackbarData.visuals.message,
                                 isRtl = false,
-                                containerColor =
+                                containerColor = MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp)
-                                MaterialTheme.colorScheme.surfaceColorAtElevation(
-                                    2.dp,
-                                ),
                             )
                         }
                     },
-                    //TODO refactor
+                    modifier = Modifier.onKeyEvent {
-                    modifier = Modifier
+                        if (it.nativeKeyEvent.action == KeyEvent.ACTION_UP) {
-                        .focusable()
+                            when (it.nativeKeyEvent.keyCode) {
-                        .focusProperties {
+                                KeyEvent.KEYCODE_DPAD_UP -> {
-                            when (navBackStackEntry?.destination?.route) {
+                                    try {
-                                Screen.Lock.route -> Unit
+                                        focusRequester.requestFocus()
-                                else -> up = focusRequester
+                                    } catch(e : IllegalStateException) {
+                                        Timber.e("No D-Pad focus request modifier added to element on screen")
+                                    }
+                                    false
+                                } else -> {
+                                   false
+                                }
                             }
-                        },
+                        } else {
-                    bottomBar = {
+                            false
-                        BottomNavBar(
+                        }
-                            navController,
+                    },
-                            listOf(
+                    bottomBar = if (vpnIntent == null && notificationPermissionState.status.isGranted) {
-                                Screen.Main.navItem,
+                        { BottomNavBar(navController, Routes.navItems) }
-                                Screen.Settings.navItem,
+                    } else {
-                                Screen.Support.navItem,
+                        {}
-                            ),
+                    },
+                )
+                { padding ->
+                    if (vpnIntent != null) {
+                        PermissionRequestFailedScreen(
+                            padding = padding,
+                            onRequestAgain = { vpnActivityResultState.launch(vpnIntent) },
+                            message = getString(R.string.vpn_permission_required),
+                            getString(R.string.retry)
                         )
-                    },
+                        return@Scaffold
-                ) { padding ->
+                    }
-                    NavHost(
+                    if (!notificationPermissionState.status.isGranted) {
-                        navController,
+                        PermissionRequestFailedScreen(
-                        startDestination =
+                            padding = padding,
-                        (if (PinManager.pinExists()) Screen.Lock.route else Screen.Main.route),
+                            onRequestAgain = {
-                        modifier =
+                                val intentSettings =
-                        Modifier
+                                    Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-                            .padding(padding)
+                                intentSettings.data =
-                            .fillMaxSize(),
+                                    Uri.fromParts(Constants.URI_PACKAGE_SCHEME, this.packageName, null)
-                    ) {
+                                startActivity(intentSettings)
-                        composable(
+                            },
-                            Screen.Main.route,
+                            message = getString(R.string.notification_permission_required),
-                        ) {
+                            getString(R.string.open_settings)
-                            MainScreen(
+                        )
-                                focusRequester = focusRequester,
+                        return@Scaffold
-                                appViewModel = appViewModel,
+                    }
-                                navController = navController,
+
-                            )
+                    NavHost(navController, startDestination = Routes.Main.name) {
-                        }
+                        composable(Routes.Main.name, enterTransition = {
-                        composable(
+                            when (initialState.destination.route) {
-                            Screen.Settings.route,
+                                Routes.Settings.name, Routes.Support.name ->
-                        ) {
+                                    slideInHorizontally(
-                            SettingsScreen(
+                                        initialOffsetX = { -Constants.SLIDE_IN_TRANSITION_OFFSET },
-                                appViewModel = appViewModel,
+                                        animationSpec = tween(Constants.SLIDE_IN_ANIMATION_DURATION)
-                                navController = navController,
+                                    )
-                                focusRequester = focusRequester,
+
-                            )
+                                else -> {
-                        }
+                                    fadeIn(animationSpec = tween(Constants.FADE_IN_ANIMATION_DURATION))
-                        composable(
+                                }
-                            Screen.Support.route,
-                        ) {
-                            SupportScreen(
-                                focusRequester = focusRequester,
-                                appViewModel = appViewModel,
-                                navController = navController,
-                            )
-                        }
-                        composable(Screen.Support.Logs.route) {
-                            LogsScreen()
-                        }
-                        composable(
-                            "${Screen.Config.route}/{id}?configType={configType}",
-                            arguments =
-                            listOf(
-                                navArgument("id") {
-                                    type = NavType.StringType
-                                    defaultValue = "0"
-                                },
-                                navArgument("configType") {
-                                    type = NavType.StringType
-                                    defaultValue = ConfigType.WIREGUARD.name
-                                },
-                            ),
-                        ) {
-                            val id = it.arguments?.getString("id")
-                            val configType = ConfigType.valueOf(
-                                it.arguments?.getString("configType") ?: ConfigType.WIREGUARD.name,
-                            )
-                            if (!id.isNullOrBlank()) {
-                                ConfigScreen(
-                                    navController = navController,
-                                    tunnelId = id,
-                                    appViewModel = appViewModel,
-                                    focusRequester = focusRequester,
-                                    configType = configType,
-                                )
                             }
+                        }, exitTransition = {
+                            ExitTransition.None
                         }
-                        composable("${Screen.Option.route}/{id}") {
+                            ) {
-                            val id = it.arguments?.getString("id")
+                            MainScreen(padding = padding, showSnackbarMessage = { message -> showSnackBarMessage(message) }, navController = navController)
-                            if (!id.isNullOrBlank()) {
+                        }
-                                OptionsScreen(
+                        composable(Routes.Settings.name, enterTransition = {
-                                    navController = navController,
+                            when (initialState.destination.route) {
-                                    tunnelId = id,
+                                Routes.Main.name ->
-                                    appViewModel = appViewModel,
+                                    slideInHorizontally(
-                                    focusRequester = focusRequester,
+                                        initialOffsetX = { Constants.SLIDE_IN_TRANSITION_OFFSET },
-                                )
+                                        animationSpec = tween(Constants.SLIDE_IN_ANIMATION_DURATION)
+                                    )
+
+                                Routes.Support.name -> {
+                                    slideInHorizontally(
+                                        initialOffsetX = { -Constants.SLIDE_IN_TRANSITION_OFFSET },
+                                        animationSpec = tween(Constants.SLIDE_IN_ANIMATION_DURATION)
+                                    )
+                                }
+
+                                else -> {
+                                    fadeIn(animationSpec = tween(Constants.FADE_IN_ANIMATION_DURATION))
+                                }
                             }
-                        }
+                        }) { SettingsScreen(padding = padding, showSnackbarMessage = { message -> showSnackBarMessage(message) }, focusRequester = focusRequester) }
-                        composable(Screen.Lock.route) {
+                        composable(Routes.Support.name, enterTransition = {
-                            PinLockScreen(
+                            when (initialState.destination.route) {
-                                navController = navController,
+                                Routes.Settings.name, Routes.Main.name ->
-                                appViewModel = appViewModel,
+                                    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)}
                         }
                     }
                 }

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

@@ -0,0 +1,35 @@
+package com.zaneschepke.wireguardautotunnel.ui
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.rounded.Home
+import androidx.compose.material.icons.rounded.QuestionMark
+import androidx.compose.material.icons.rounded.Settings
+import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavItem
+
+enum class Routes {
+    Main,
+    Settings,
+    Support,
+    Config;
+
+
+    companion object {
+        val navItems = listOf(
+            BottomNavItem(
+                name = "Tunnels",
+                route = Main.name,
+                icon = Icons.Rounded.Home,
+            ),
+            BottomNavItem(
+                name = "Settings",
+                route = Settings.name,
+                icon = Icons.Rounded.Settings,
+            ),
+            BottomNavItem(
+                name = "Support",
+                route = Support.name,
+                icon = Icons.Rounded.QuestionMark,
+            )
+        )
+    }
+}

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

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

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

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

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

@@ -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)
+        }
+    }
+}

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

@@ -15,70 +15,60 @@ 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.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStatistics
+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(
+fun RowListItem(icon : @Composable () -> Unit, text : String, onHold : () -> Unit,
-    icon: @Composable () -> Unit,
+                onClick: () -> Unit, rowButton : @Composable () -> Unit,
-    text: String,
+                expanded : Boolean, statistics: Statistics?
-    onHold: () -> Unit,
+                ) {
-    onClick: () -> Unit,
-    rowButton: @Composable () -> Unit,
-    expanded: Boolean,
-    statistics: TunnelStatistics?
-) {
     Box(
-        modifier =
+        modifier = Modifier
-        Modifier
             .animateContentSize()
             .clip(RoundedCornerShape(30.dp))
             .combinedClickable(
-                onClick = { onClick() },
+                onClick = {
-                onLongClick = { onHold() },
+                    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(
+                Row(verticalAlignment = Alignment.CenterVertically,) {
-                    verticalAlignment = Alignment.CenterVertically,
-                    modifier = Modifier.fillMaxWidth(13 / 20f),
-                ) {
                     icon()
-                    Text(text, maxLines = 1, overflow = TextOverflow.Ellipsis)
+                    Text(text)
                 }
                 rowButton()
             }
-            if (expanded) {
+            if(expanded) {
-                statistics?.getPeers()?.forEach {
+                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 handshakeEpoch = statistics.peerStats(it)!!.latestHandshakeEpochMillis
+                        val peerTx = statistics.peer(it)!!.txBytes
-                        val peerTx = statistics.peerStats(it)!!.txBytes
+                        val peerRx = statistics.peer(it)!!.rxBytes
-                        val peerRx = statistics.peerStats(it)!!.rxBytes
+                        val peerId = it.toBase64().subSequence(0,3).toString() + "***"
-                        val peerId = it.toBase64().subSequence(0, 3).toString() + "***"
+                        val handshakeSec = NumberUtils.getSecondsBetweenTimestampAndNow(handshakeEpoch)
-                        val handshakeSec =
+                        val handshake = if(handshakeSec == null) "never" else "$handshakeSec secs ago"
-                            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
@@ -91,4 +81,4 @@ fun RowListItem(
             }
         }
     }
-}
+}

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

@@ -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) }
@@ -44,28 +46,25 @@ fun SearchBar(onQuery: (queryString: String) -> Unit) {
             onQuery(onQueryChanged)
         },
         leadingIcon = {
-            val icon = Icons.Rounded.Search
             Icon(
-                imageVector = icon,
+                imageVector = Icons.Rounded.Search,
                 tint = MaterialTheme.colorScheme.onBackground,
-                contentDescription = icon.name,
+                contentDescription = stringResource(id = R.string.search_icon)
             )
         },
         trailingIcon = {
             if (showClearIcon) {
                 IconButton(onClick = { query = "" }) {
-                    val icon = Icons.Rounded.Clear
                     Icon(
-                        imageVector = icon,
+                        imageVector = Icons.Rounded.Clear,
                         tint = MaterialTheme.colorScheme.onBackground,
-                        contentDescription = icon.name,
+                        contentDescription = stringResource(id = R.string.clear_icon)
                     )
                 }
             }
         },
         maxLines = 1,
-        colors =
+        colors = TextFieldDefaults.colors(
-        TextFieldDefaults.colors(
             focusedContainerColor = Color.Transparent,
             unfocusedContainerColor = Color.Transparent,
             disabledContainerColor = Color.Transparent,
@@ -74,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)
     )
-}
+}