feat: add amneziawg support

.editorconfig

@@ -1,14 +1,8 @@
-root = true
-
-[*]
-charset = utf-8
-indent_size = 4
-indent_style = tab
-max_line_length = 150
-trim_trailing_whitespace = true
-insert_final_newline = true
-
 [{*.kt,*.kts}]
+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
@@ -17,6 +11,8 @@ 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
@@ -24,7 +20,10 @@ ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_
 ij_kotlin_block_comment_at_first_column = true
 ij_kotlin_call_parameters_new_line_after_left_paren = true
 ij_kotlin_call_parameters_right_paren_on_new_line = false
+ij_kotlin_call_parameters_wrap = on_every_item
 ij_kotlin_catch_on_new_line = false
+ij_kotlin_class_annotation_wrap = split_into_lines
+ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
 ij_kotlin_continuation_indent_for_chained_calls = true
 ij_kotlin_continuation_indent_for_expression_bodies = true
 ij_kotlin_continuation_indent_in_argument_lists = true
@@ -53,6 +52,7 @@ ij_kotlin_method_annotation_wrap = split_into_lines
 ij_kotlin_method_call_chain_wrap = normal
 ij_kotlin_method_parameters_new_line_after_left_paren = true
 ij_kotlin_method_parameters_right_paren_on_new_line = true
+ij_kotlin_method_parameters_wrap = on_every_item
 ij_kotlin_name_count_to_use_star_import = 9999
 ij_kotlin_name_count_to_use_star_import_for_members = 9999
 ij_kotlin_parameter_annotation_wrap = off
@@ -82,16 +82,4 @@ 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
-#compose
-ktlint_standard_filename = disabled
-ktlint_standard_no-wildcard-imports = disabled
-ktlint_standard_function-naming = disabled
-ktlint_standard_property-naming = disabled
-ktlint_standard_package-naming = disabled
-ktlint_function_naming_ignore_when_annotated_with = Composable
-ktlint_code_style = android_studio
-ktlint_standard_import-ordering = disabled
-ktlint_standard_package-naming = disabled
-ij_kotlin_allow_trailing_comma = true
-ij_kotlin_allow_trailing_comma_on_call_site = true
+ij_kotlin_wrap_first_method_in_call_chain = false

.github/CODE_OF_CONDUCT.md

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

.github/FUNDING.yml

@@ -1,3 +1,2 @@
 ko_fi: zaneschepke
-liberapay: zaneschepke
-github: zaneschepke
+liberapay: zaneschepke

.github/ISSUE_TEMPLATE/bug_report.md

@@ -15,7 +15,6 @@ A clear and concise description of what the bug is.
 - Device: [e.g. Pixel 4a]
 - Android Version: [e.g. Android 13]
 - App Version [e.g. 3.3.3]
-- Backend: [e.g. Kernel, Userspace]
 
 **To Reproduce**
 Steps to reproduce the behavior:

.github/workflows/build.yml

@@ -1,116 +0,0 @@
-name: build
-on:
-  workflow_dispatch:
-    inputs:
-      build_type:
-        type: choice
-        description: "Build type"
-        required: true
-        default: debug
-        options:
-          - debug
-          - prerelease
-          - nightly
-          - release
-    secrets:
-      SIGNING_KEY_ALIAS:
-        required: false
-      SIGNING_KEY_PASSWORD:
-        required: false
-      SIGNING_STORE_PASSWORD:
-        required: false
-      SERVICE_ACCOUNT_JSON:
-        required: false
-      KEYSTORE:
-        required: false
-  workflow_call:
-    inputs:
-      build_type:
-        type: string
-        description: "Build type"
-        required: true
-        default: debug
-    secrets:
-      SIGNING_KEY_ALIAS:
-        required: false
-      SIGNING_KEY_PASSWORD:
-        required: false
-      SIGNING_STORE_PASSWORD:
-        required: false
-      SERVICE_ACCOUNT_JSON:
-        required: false
-      KEYSTORE:
-        required: false
-env:
-  UPLOAD_DIR_ANDROID: android_artifacts
-
-jobs:
-  build:
-    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/
-    outputs:
-      UPLOAD_DIR_ANDROID: ${{ env.UPLOAD_DIR_ANDROID }}
-    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
-        if: ${{ inputs.build_type != 'debug' }}
-        run: |
-          store_path=${{ env.KEY_STORE_LOCATION }}${{ env.KEY_STORE_FILE }}
-          echo "KEY_STORE_PATH=$store_path" >> $GITHUB_ENV
-
-      - name: Create service_account.json
-        if: ${{ inputs.build_type != 'debug' }}
-        id: createServiceAccount
-        run: echo '${{ secrets.ANDROID_SERVICE_ACCOUNT_JSON }}' > service_account.json
-
-      - name: Build Fdroid Release APK
-        if: ${{ inputs.build_type == 'release' }}
-        run: ./gradlew :app:assembleFdroidRelease --info
-
-      - name: Build Fdroid Prerelease APK
-        if: ${{ inputs.build_type == 'prerelease' }}
-        run: ./gradlew :app:assembleFdroidPrerelease --info
-
-      - name: Build Fdroid Nightly APK
-        if: ${{ inputs.build_type == 'nightly' }}
-        run: ./gradlew :app:assembleFdroidNightly --info
-
-      - name: Build Debug APK
-        if: ${{ inputs.build_type == 'debug' }}
-        run: ./gradlew :app:assembleFdroidDebug --stacktrace
-
-      - name: Get release apk path
-        id: apk-path
-        run: echo "path=$(find . -regex '^.*/build/outputs/apk/fdroid/${{ inputs.build_type }}/.*\.apk$' -type f | head -1 | tail -c+2)" >> $GITHUB_OUTPUT
-
-      - name: Upload release apk
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.UPLOAD_DIR_ANDROID }}
-          path: ${{github.workspace}}/${{ steps.apk-path.outputs.path }}
-          retention-days: 1

.github/workflows/on-issue.yml

@@ -1,20 +0,0 @@
-name: on-issue
-
-on:
-  issues:
-    types: [ opened, closed, reopened ]
-
-
-jobs:
-
-  on-issue:
-    name: On new issue
-    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/on-pr.yml

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

.github/workflows/on-publish.yml

@@ -1,21 +0,0 @@
-name: on-publish
-
-on:
-  release:
-    types: [ published ]
-
-
-jobs:
-
-  on-publish:
-    name: On publish
-    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/pre-release.yml

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

.github/workflows/publish.yml

@@ -1,262 +0,0 @@
-name: publish
-
-on:
-  schedule:
-  - cron: "4 3 * * *"
-  workflow_dispatch:
-    inputs:
-      track:
-        type: choice
-        description: "Google play release track"
-        options:
-          - none
-          - internal
-          - alpha
-          - beta
-          - production
-        default: none
-        required: true
-      release_type:
-        type: choice
-        description: "GitHub release type"
-        options:
-          - none
-          - prerelease
-          - nightly
-          - release
-        default: release
-        required: true
-      tag_name:
-        description: "Tag name for release"
-        required: false
-        default: nightly
-  workflow_call:
-env:
-  UPLOAD_DIR_ANDROID: android_artifacts
-
-jobs:
-  check_commits:
-    name: Check for New Commits
-    runs-on: ubuntu-latest
-    outputs:
-      has_new_commits: ${{ steps.check.outputs.new_commits }}
-
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0  # This fetches all history so we can check commits
-
-      - name: Check for new commits
-        id: check
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          # This script checks for commits newer than 23 hours ago
-          NEW_COMMITS=$(git rev-list --count --after="$(date -Iseconds -d '23 hours ago')" ${{ github.sha }})
-          echo "new_commits=$NEW_COMMITS" >> $GITHUB_OUTPUT
-
-  build:
-    if: ${{ inputs.release_type != 'none' }}
-    uses: ./.github/workflows/build.yml
-    secrets: inherit
-    with:
-      build_type: ${{ inputs.release_type == '' && 'nightly' || inputs.release_type }}
-
-  publish:
-    needs:
-      - check_commits
-      - build
-    if: ${{ needs.check_commits.outputs.has_new_commits > 0 && inputs.release_type != 'none' }}
-    name: Build Signed APK
-    runs-on: ubuntu-latest
-    env:
-      GH_USER: ${{ secrets.GH_USER }}
-      # GH needed for gh cli
-      GH_TOKEN: ${{ secrets.GH_TOKEN }}
-      GH_REPO: ${{ github.repository }}
-
-    steps:
-      - name: Install system dependencies
-        run: |
-          sudo apt update && sudo apt install -y gh apksigner
-
-      # update latest tag
-      - name: Set latest tag
-        uses: rickstaa/action-create-tag@v1
-        id: tag_creation
-        with:
-          tag: "latest"  # or any tag name you wish to use
-          message: "Automated tag for HEAD commit"
-          force_push_tag: true
-          tag_exists_error: false
-
-      - name: Get latest release
-        id: latest_release
-        uses: kaliber5/action-get-release@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          latest: true
-
-      - name: Generate Changelog
-        id: changelog
-        uses: requarks/changelog-action@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          toTag: ${{ github.event_name == 'schedule' && 'nightly' || steps.latest_release.outputs.tag_name }}
-          fromTag: "latest"
-          writeToFile: false  # we won't write to file, just output
-
-      - name: Get version code
-        if: ${{ inputs.release_type == 'release' }}
-        run: |
-          version_code=$(grep "VERSION_CODE" buildSrc/src/main/kotlin/Constants.kt | awk '{print $5}' | tr -d '\n')
-          echo "VERSION_CODE=$version_code" >> $GITHUB_ENV
-
-      - name: Commit and push versionCode changes
-        if: ${{ inputs.release_type == '' || inputs.release_type == 'nightly'  || inputs.release_type == 'prerelease' }}
-        run: |
-          git config --global user.name 'GitHub Actions'
-          git config --global user.email 'actions@github.com'
-          git add versionCode.txt
-          git commit -m "Automated build update"
-
-      - name: Push changes
-        if: ${{ inputs.release_type == '' || inputs.release_type == 'nightly'  || inputs.release_type == 'prerelease' }}
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ github.ref }}
-
-      - name: Make download dir
-        run: mkdir ${{ github.workspace }}/temp
-
-      - name: Download artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{ env.UPLOAD_DIR_ANDROID }}
-          path: ${{ github.workspace }}/temp
-
-      # Setup TAG_NAME, which is used as a general "name"
-      - if: github.event_name == 'workflow_dispatch'
-        run: echo "TAG_NAME=${{ github.event.inputs.tag_name }}" >> $GITHUB_ENV
-      - if: github.event_name == 'schedule'
-        run: echo "TAG_NAME=nightly" >> $GITHUB_ENV
-
-      - name: Set version release notes
-        if: ${{ inputs.release_type == 'release' }}
-        run: |
-          RELEASE_NOTES="$(cat ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/${{ env.VERSION_CODE }}.txt)"
-          echo "RELEASE_NOTES<<EOF" >> $GITHUB_ENV
-          echo "$RELEASE_NOTES" >> $GITHUB_ENV
-          echo "EOF" >> $GITHUB_ENV
-
-      - name: On nightly release notes
-        if: ${{ contains(env.TAG_NAME, 'nightly') }}
-        run: |
-          echo "RELEASE_NOTES=Nightly build for the latest development version of the app." >> $GITHUB_ENV
-          gh release delete nightly --yes || true
-          git push origin :nightly || true
-
-      - name: On prerelease release notes
-        if: ${{ inputs.release_type == 'prerelease' }}
-        run: |
-          echo "RELEASE_NOTES=Testing version of app for specific feature." >> $GITHUB_ENV
-          gh release delete ${{ github.event.inputs.tag_name }} --yes || true
-
-      - name: Get checksum
-        id: checksum
-        run: |
-          file_path=$(find ${{ github.workspace }}/temp -type f -iname "*.apk" | tail -n1)
-          echo "checksum=$(apksigner verify -print-certs $file_path | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")" >> $GITHUB_OUTPUT
-
-
-      - name: Create Release with Fastlane changelog notes
-        id: create_release
-        uses: softprops/action-gh-release@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          body: |
-            ${{ env.RELEASE_NOTES }}
-
-            SHA256 fingerprint:
-            ```${{ steps.checksum.outputs.checksum }}```
-
-            ### Changelog
-            ${{ steps.changelog.outputs.changes }}
-          tag_name: ${{ env.TAG_NAME }}
-          name: ${{ env.TAG_NAME }}
-          draft: false
-          prerelease: ${{ inputs.release_type == 'prerelease' || inputs.release_type == '' || inputs.release_type == 'nightly' }}
-          make_latest: ${{ inputs.release_type == 'release' }}
-          files: ${{ github.workspace }}/${{ env.APK_PATH }}
-
-  publish-fdroid:
-    runs-on: ubuntu-latest
-    needs:
-      - publish-github
-    if: inputs.release_type == 'release'
-    steps:
-      - name: Dispatch update for fdroid repo
-        uses: peter-evans/repository-dispatch@v3
-        with:
-          token: ${{ secrets.ANDROID_PAT }}
-          repository: zaneschepke/fdroid
-          event-type: fdroid-update
-
-  publish-play:
-    if: ${{ inputs.track != 'none' && inputs.track != '' }}
-    name: Publish to Google Play
-    runs-on: ubuntu-latest
-
-    env:
-      SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
-      SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
-      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
-      KEY_STORE_FILE: 'android_keystore.jks'
-      KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
-      GH_USER: ${{ secrets.GH_USER }}
-      GH_TOKEN: ${{ secrets.GH_TOKEN }}
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-          cache: gradle
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      # Here we need to decode keystore.jks from base64 string and place it
-      # in the folder specified in the release signing configuration
-      - name: Decode Keystore
-        id: decode_keystore
-        uses: timheuer/base64-to-file@v1.2
-        with:
-          fileName: ${{ env.KEY_STORE_FILE }}
-          fileDir: ${{ env.KEY_STORE_LOCATION }}
-          encodedString: ${{ secrets.KEYSTORE }}
-
-      # create keystore path for gradle to read
-      - name: Create keystore path env var
-        run: |
-          store_path=${{ env.KEY_STORE_LOCATION }}${{ env.KEY_STORE_FILE }}
-          echo "KEY_STORE_PATH=$store_path" >> $GITHUB_ENV
-
-      - name: Create service_account.json
-        id: createServiceAccount
-        run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
-
-      - name: Deploy with fastlane
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: '3.2' # Not needed with a .ruby-version file
-          bundler-cache: true
-
-      - name: Distribute app to Prod track 🚀
-        run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane ${{ inputs.track }})
-

.github/workflows/release.yml

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

.gitignore

@@ -71,4 +71,3 @@ app/release/output.json
 .idea/codeStyles/
 # where we keep our signing secrets locally
 app/signing.properties
-/.kotlin/

README.md

@@ -5,6 +5,7 @@ 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)
+[![X Community](https://img.shields.io/badge/X-000000?style=for-the-badge&logo=x&logoColor=white)](https://twitter.com/i/communities/1780655267685736818)
 [![Telegram](https://img.shields.io/badge/Telegram-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)](https://t.me/wgtunnel)
 
 </div>
@@ -21,8 +22,7 @@ WG Tunnel
 
 <div align="left">
 
-This is an alternative Android Application for [WireGuard](https://www.wireguard.com/)
-and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) with added
+This is an alternative Android Application for [WireGuard](https://www.wireguard.com/) 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.
@@ -53,39 +53,37 @@ and on while on different networks. This app was created to offer a free solutio
 * Auto connect to tunnels based on Wi-Fi SSID, ethernet, or mobile data
 * Split tunneling by application with search
 * WireGuard support for kernel and userspace modes
-* Amnezia support for userspace mode for DPI/censorship protection
-* Pre/Post Up/Down scripts support for all modes on a rooted device
 * Always-On VPN support
-* Export Amnezia and WireGuard tunnels to zip
+* Export tunnels to zip
 * 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 and/or tunnel restart after reboot or app update
+* Automatic auto-tunneling service restart after reboot
+* Automatic tunnel restart after reboot
 * Battery preservation measures
 * Restart tunnel on ping failure (beta)
 
-## Fdroid
-
-Want updates faster?
-
-Check out my personal [fdroid repository](https://github.com/zaneschepke/fdroid) to get updates the
-moment they are released.
-
 ## Docs
 
-Information about features, behaviors, and answers to common questions can be found in the
-app [documentation](https://zaneschepke.com/wgtunnel-docs/overview.html).
+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.
+This app is using [Weblate](https://weblate.org) to assist with translations. 
 
-Help translate WG Tunnel into your language
-at [Hosted Weblate](https://hosted.weblate.org/engage/wg-tunnel/).\
+Help translate WG Tunnel into your language at [Hosted Weblate](https://hosted.weblate.org/engage/wg-tunnel/).\
 [![Translation status](https://hosted.weblate.org/widgets/wg-tunnel/-/multi-auto.svg)](https://hosted.weblate.org/engage/wg-tunnel/)
 
+
 ## Building
 
 ```
@@ -99,11 +97,4 @@ And then build the app:
 $ ./gradlew assembleDebug
 ```
 
-## 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.
+</span>

app/build.gradle.kts

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

app/fdroid-rules.pro

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

app/proguard-rules.pro

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

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

@@ -1,225 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 10,
-    "identityHash": "c8621055524f90b4d1972f6171f59e80",
-    "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 '', `is_Active` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `ping_interval` INTEGER DEFAULT null, `ping_cooldown` INTEGER DEFAULT null, `ping_ip` TEXT DEFAULT 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
-          },
-          {
-            "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": "''"
-          },
-          {
-            "fieldPath": "isActive",
-            "columnName": "is_Active",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "pingInterval",
-            "columnName": "ping_interval",
-            "affinity": "INTEGER",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "pingCooldown",
-            "columnName": "ping_cooldown",
-            "affinity": "INTEGER",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "pingIp",
-            "columnName": "ping_ip",
-            "affinity": "TEXT",
-            "notNull": false,
-            "defaultValue": "null"
-          }
-        ],
-        "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, 'c8621055524f90b4d1972f6171f59e80')"
-    ]
-  }
-}

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

@@ -1,232 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 11,
-    "identityHash": "4c9418386f72dfac5d28ab96c1e5ea0b",
-    "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_ping_enabled` INTEGER NOT NULL DEFAULT false, `is_amnezia_enabled` INTEGER NOT NULL DEFAULT false, `is_wildcards_enabled` INTEGER NOT NULL DEFAULT false, `is_wifi_by_shell_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": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isAmneziaEnabled",
-            "columnName": "is_amnezia_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isWildcardsEnabled",
-            "columnName": "is_wildcards_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isWifiNameByShellEnabled",
-            "columnName": "is_wifi_by_shell_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 '', `is_Active` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `ping_interval` INTEGER DEFAULT null, `ping_cooldown` INTEGER DEFAULT null, `ping_ip` TEXT DEFAULT 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
-          },
-          {
-            "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": "''"
-          },
-          {
-            "fieldPath": "isActive",
-            "columnName": "is_Active",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "pingInterval",
-            "columnName": "ping_interval",
-            "affinity": "INTEGER",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "pingCooldown",
-            "columnName": "ping_cooldown",
-            "affinity": "INTEGER",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "pingIp",
-            "columnName": "ping_ip",
-            "affinity": "TEXT",
-            "notNull": false,
-            "defaultValue": "null"
-          }
-        ],
-        "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, '4c9418386f72dfac5d28ab96c1e5ea0b')"
-    ]
-  }
-}

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

@@ -1,246 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 12,
-    "identityHash": "acf79ac5defacda5be6c3f976e777de3",
-    "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_ping_enabled` INTEGER NOT NULL DEFAULT false, `is_amnezia_enabled` INTEGER NOT NULL DEFAULT false, `is_wildcards_enabled` INTEGER NOT NULL DEFAULT false, `is_wifi_by_shell_enabled` INTEGER NOT NULL DEFAULT false, `is_stop_on_no_internet_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": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isAmneziaEnabled",
-            "columnName": "is_amnezia_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isWildcardsEnabled",
-            "columnName": "is_wildcards_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isWifiNameByShellEnabled",
-            "columnName": "is_wifi_by_shell_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isStopOnNoInternetEnabled",
-            "columnName": "is_stop_on_no_internet_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 '', `is_Active` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `ping_interval` INTEGER DEFAULT null, `ping_cooldown` INTEGER DEFAULT null, `ping_ip` TEXT DEFAULT null, `is_ethernet_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"
-          },
-          {
-            "fieldPath": "amQuick",
-            "columnName": "am_quick",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isActive",
-            "columnName": "is_Active",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "pingInterval",
-            "columnName": "ping_interval",
-            "affinity": "INTEGER",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "pingCooldown",
-            "columnName": "ping_cooldown",
-            "affinity": "INTEGER",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "pingIp",
-            "columnName": "ping_ip",
-            "affinity": "TEXT",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "isEthernetTunnel",
-            "columnName": "is_ethernet_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, 'acf79ac5defacda5be6c3f976e777de3')"
-    ]
-  }
-}

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

@@ -1,267 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 13,
-    "identityHash": "ff209157b98a641c424f5086818ec585",
-    "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_ping_enabled` INTEGER NOT NULL DEFAULT false, `is_amnezia_enabled` INTEGER NOT NULL DEFAULT false, `is_wildcards_enabled` INTEGER NOT NULL DEFAULT false, `is_wifi_by_shell_enabled` INTEGER NOT NULL DEFAULT false, `is_stop_on_no_internet_enabled` INTEGER NOT NULL DEFAULT false, `is_vpn_kill_switch_enabled` INTEGER NOT NULL DEFAULT false, `is_kernel_kill_switch_enabled` INTEGER NOT NULL DEFAULT false, `is_lan_on_kill_switch_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": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isAmneziaEnabled",
-            "columnName": "is_amnezia_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isWildcardsEnabled",
-            "columnName": "is_wildcards_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isWifiNameByShellEnabled",
-            "columnName": "is_wifi_by_shell_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isStopOnNoInternetEnabled",
-            "columnName": "is_stop_on_no_internet_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isVpnKillSwitchEnabled",
-            "columnName": "is_vpn_kill_switch_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isKernelKillSwitchEnabled",
-            "columnName": "is_kernel_kill_switch_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isLanOnKillSwitchEnabled",
-            "columnName": "is_lan_on_kill_switch_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 '', `is_Active` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `ping_interval` INTEGER DEFAULT null, `ping_cooldown` INTEGER DEFAULT null, `ping_ip` TEXT DEFAULT null, `is_ethernet_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"
-          },
-          {
-            "fieldPath": "amQuick",
-            "columnName": "am_quick",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isActive",
-            "columnName": "is_Active",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "pingInterval",
-            "columnName": "ping_interval",
-            "affinity": "INTEGER",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "pingCooldown",
-            "columnName": "ping_cooldown",
-            "affinity": "INTEGER",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "pingIp",
-            "columnName": "ping_ip",
-            "affinity": "TEXT",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "isEthernetTunnel",
-            "columnName": "is_ethernet_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, 'ff209157b98a641c424f5086818ec585')"
-    ]
-  }
-}

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/schemas/com.zaneschepke.wireguardautotunnel.data.AppDatabase/9.json

@@ -1,197 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 9,
-    "identityHash": "e2c91dbf1885a9da592d3f54f1e08302",
-    "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 '', `is_Active` 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"
-          },
-          {
-            "fieldPath": "amQuick",
-            "columnName": "am_quick",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isActive",
-            "columnName": "is_Active",
-            "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, 'e2c91dbf1885a9da592d3f54f1e08302')"
-    ]
-  }
-}

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

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

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

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

app/src/main/AndroidManifest.xml

@@ -3,7 +3,17 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32"
+        tools:ignore="ScopedStorage" />
+    <uses-permission
+        android:name="android.permission.ACCESS_WIFI_STATE"
+        android:maxSdkVersion="30"
+        tools:ignore="LeanbackUsesWifi" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -12,8 +22,7 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <!--foreground service exempt android 14-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
-    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"
-		tools:ignore="ProtectedPermissions" />
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
 
     <!--foreground service permissions-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -22,12 +31,6 @@
     <!--start service on boot permission-->
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <!--android tv support-->
-
-	<permission
-		android:name="${applicationId}.permission.CONTROL_TUNNELS"
-		android:icon="@mipmap/ic_launcher"
-		android:protectionLevel="dangerous" />
-
     <uses-feature
         android:name="android.software.leanback"
         android:required="false" />
@@ -40,12 +43,6 @@
     <uses-feature
         android:name="android.hardware.screen.portrait"
         android:required="false" />
-	<uses-feature
-		android:name="android.hardware.gamepad"
-		android:required="false"/>
-
-	<uses-feature android:name="android.hardware.wifi"
-		android:required="false"/>
 
     <queries>
         <intent>
@@ -54,7 +51,7 @@
     </queries>
     <application
         android:name=".WireGuardAutoTunnel"
-        android:allowBackup="false"
+        android:allowBackup="true"
         android:banner="@drawable/ic_banner"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:enableOnBackInvokedCallback="true"
@@ -63,48 +60,44 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.App.Start"
+        android:theme="@style/Theme.WireguardAutoTunnel"
         tools:targetApi="tiramisu">
         <activity
             android:name=".ui.MainActivity"
             android:exported="true"
-			android:windowSoftInputMode="adjustResize"
-            android:theme="@style/Theme.WireguardAutoTunnel"
-			android:configChanges="orientation|screenSize|keyboardHidden"
-			>
+            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" />
             </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
         </activity>
         <activity
-            android:name="com.journeyapps.barcodescanner.CaptureActivity"
-            android:screenOrientation="portrait"
-            tools:replace="screenOrientation" />
-
+            android:name=".ui.CaptureActivityPortrait"
+            android:screenOrientation="fullSensor"
+            android:stateNotNeeded="true"
+            android:theme="@style/zxing_CaptureTheme"
+            android:windowSoftInputMode="stateAlwaysHidden"
+            tools:ignore="DiscouragedApi" />
         <activity
             android:name=".service.shortcut.ShortcutsActivity"
             android:enabled="true"
             android:exported="true"
-			android:noHistory="true"
-			android:excludeFromRecents="true"
-			android:finishOnTaskLaunch="true"
-			android:launchMode="singleInstance"
+            android:finishOnTaskLaunch="true"
             android:theme="@android:style/Theme.NoDisplay" />
 
-		<provider
-			android:name="androidx.core.content.FileProvider"
-			android:authorities="@string/provider"
-			android:exported="false"
-			android:grantUriPermissions="true">
-			<meta-data
-				android:name="android.support.FILE_PROVIDER_PATHS"
-				android:resource="@xml/file_paths" />
-		</provider>
-
+        <service
+            android:name=".service.foreground.ForegroundService"
+            android:enabled="true"
+            android:exported="false"
+            android:foregroundServiceType="systemExempted"
+            tools:node="merge" />
         <service
             android:name=".service.tile.TunnelControlTile"
             android:exported="true"
@@ -139,23 +132,23 @@
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
         </service>
-		<service
-			android:name=".service.tunnel.AlwaysOnVpnService"
-			android:enabled="true"
-			android:exported="false"
-			android:foregroundServiceType="systemExempted"
-			android:permission="android.permission.BIND_VPN_SERVICE"
-			android:persistent="true"
-			tools:node="merge">
-			<intent-filter>
-				<action android:name="android.net.VpnService" />
-			</intent-filter>
-			<meta-data
-				android:name="android.net.VpnService.SUPPORTS_ALWAYS_ON"
-				android:value="true" />
-		</service>
         <service
-            android:name=".service.foreground.autotunnel.AutoTunnelService"
+            android:name=".service.foreground.WireGuardTunnelService"
+            android:enabled="true"
+            android:exported="false"
+            android:foregroundServiceType="systemExempted"
+            android:permission="android.permission.BIND_VPN_SERVICE"
+            android:persistent="true"
+            tools:node="merge">
+            <intent-filter>
+                <action android:name="android.net.VpnService" />
+            </intent-filter>
+            <meta-data
+                android:name="android.net.VpnService.SUPPORTS_ALWAYS_ON"
+                android:value="true" />
+        </service>
+        <service
+            android:name=".service.foreground.WireGuardConnectivityWatcherService"
             android:enabled="true"
             android:exported="false"
             android:foregroundServiceType="systemExempted"
@@ -163,17 +156,6 @@
             android:stopWithTask="false"
             tools:node="merge" />
 
-		<service
-			android:name=".service.foreground.TunnelBackgroundService"
-			android:exported="false"
-			android:persistent="true"
-			android:foregroundServiceType="systemExempted"
-			android:permission="android.permission.BIND_VPN_SERVICE">
-			<intent-filter>
-				<action android:name="android.net.VpnService" />
-			</intent-filter>
-		</service>
-
         <receiver
             android:name=".receiver.BootReceiver"
             android:enabled="true"
@@ -187,25 +169,8 @@
                 <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
             </intent-filter>
         </receiver>
-		<receiver
-			android:name=".receiver.AppUpdateReceiver"
-			android:exported="false">
-			<intent-filter>
-				<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
-			</intent-filter>
-		</receiver>
-		<receiver
-			android:name=".receiver.KernelReceiver"
-			android:exported="false"
-			android:permission="${applicationId}.permission.CONTROL_TUNNELS">
-			<intent-filter>
-				<action android:name="com.wireguard.android.action.REFRESH_TUNNEL_STATES" />
-			</intent-filter>
-		</receiver>
-		<receiver
-			android:name=".receiver.NotificationActionReceiver"
-			android:exported="false"
-			android:permission="${applicationId}.permission.CONTROL_TUNNELS">
-		</receiver>
+        <receiver
+            android:name=".receiver.NotificationActionReceiver"
+            android:exported="false" />
     </application>
-</manifest>
+</manifest>

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

@@ -1,93 +1,46 @@
 package com.zaneschepke.wireguardautotunnel
 
 import android.app.Application
-import android.os.StrictMode
-import android.os.StrictMode.ThreadPolicy
-import com.zaneschepke.logcatter.LogReader
-import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.module.MainDispatcher
-import com.zaneschepke.wireguardautotunnel.service.tunnel.BackendState
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
+import android.content.ComponentName
+import android.content.Context
+import android.content.pm.PackageManager
+import android.service.quicksettings.TileService
+import com.zaneschepke.wireguardautotunnel.service.tile.AutoTunnelControlTile
+import com.zaneschepke.wireguardautotunnel.service.tile.TunnelControlTile
 import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
-import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import dagger.hilt.android.HiltAndroidApp
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import timber.log.Timber
-import javax.inject.Inject
+import xyz.teamgravity.pin_lock_compose.PinManager
 
 @HiltAndroidApp
 class WireGuardAutoTunnel : Application() {
+    override fun onCreate() {
+        super.onCreate()
+        instance = this
+        if (BuildConfig.DEBUG) Timber.plant(Timber.DebugTree()) else Timber.plant(ReleaseTree())
+        PinManager.initialize(this)
+    }
 
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
+    companion object {
+        lateinit var instance: WireGuardAutoTunnel
+            private set
 
-	@Inject
-	lateinit var logReader: LogReader
+        fun isRunningOnAndroidTv(): Boolean {
+            return instance.packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
+        }
 
-	@Inject
-	lateinit var appStateRepository: AppStateRepository
+        fun requestTunnelTileServiceStateUpdate(context: Context) {
+            TileService.requestListeningState(
+                context,
+                ComponentName(instance, TunnelControlTile::class.java),
+            )
+        }
 
-	@Inject
-	lateinit var settingsRepository: SettingsRepository
-
-	@Inject
-	lateinit var tunnelService: TunnelService
-
-	@Inject
-	@IoDispatcher
-	lateinit var ioDispatcher: CoroutineDispatcher
-
-	@Inject
-	@MainDispatcher
-	lateinit var mainDispatcher: CoroutineDispatcher
-
-	override fun onCreate() {
-		super.onCreate()
-		instance = this
-		if (BuildConfig.DEBUG) {
-			Timber.plant(Timber.DebugTree())
-			StrictMode.setThreadPolicy(
-				ThreadPolicy.Builder()
-					.detectDiskReads()
-					.detectDiskWrites()
-					.detectNetwork()
-					.penaltyLog()
-					.build(),
-			)
-		} else {
-			Timber.plant(ReleaseTree())
-		}
-
-		applicationScope.launch {
-			withContext(mainDispatcher) {
-				if (appStateRepository.isLocalLogsEnabled() && !isRunningOnTv()) logReader.initialize()
-			}
-			if (!settingsRepository.getSettings().isKernelEnabled) {
-				tunnelService.setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
-			}
-			appStateRepository.getLocale()?.let {
-				LocaleUtil.changeLocale(it)
-			}
-		}
-	}
-
-	override fun onTerminate() {
-		applicationScope.launch {
-			tunnelService.setBackendState(BackendState.INACTIVE, emptyList())
-		}
-		super.onTerminate()
-	}
-
-	companion object {
-		lateinit var instance: WireGuardAutoTunnel
-			private set
-	}
+        fun requestAutoTunnelTileServiceUpdate(context: Context) {
+            TileService.requestListeningState(
+                context,
+                ComponentName(instance, AutoTunnelControlTile::class.java),
+            )
+        }
+    }
 }

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

@@ -6,71 +6,49 @@ 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
+import com.zaneschepke.wireguardautotunnel.data.model.Settings
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 
 @Database(
-	entities = [Settings::class, TunnelConfig::class],
-	version = 13,
-	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),
-		AutoMigration(8, 9),
-		AutoMigration(9, 10),
-		AutoMigration(
-			from = 10,
-			to = 11,
-			spec = RemoveTunnelPauseMigration::class,
-		),
-		AutoMigration(
-			from = 11,
-			to = 12,
-		),
-		AutoMigration(
-			from = 12,
-			to = 13,
-		),
-	],
-	exportSchema = true,
+    entities = [Settings::class, TunnelConfig::class],
+    version = 7,
+    autoMigrations =
+    [
+        AutoMigration(from = 1, to = 2),
+        AutoMigration(from = 2, to = 3),
+        AutoMigration(
+            from = 3,
+            to = 4,
+        ),
+        AutoMigration(
+            from = 4,
+            to = 5,
+        ),
+        AutoMigration(
+            from = 5,
+            to = 6,
+        ),
+        AutoMigration(
+            from = 6,
+            to = 7,
+            spec = RemoveLegacySettingColumnsMigration::class,
+        ),
+    ],
+    exportSchema = true,
 )
 @TypeConverters(DatabaseListConverters::class)
 abstract class AppDatabase : RoomDatabase() {
-	abstract fun settingDao(): SettingsDao
+    abstract fun settingDao(): SettingsDao
 
-	abstract fun tunnelConfigDoa(): TunnelConfigDao
+    abstract fun tunnelConfigDoa(): TunnelConfigDao
 }
 
 @DeleteColumn(
-	tableName = "Settings",
-	columnName = "default_tunnel",
+    tableName = "Settings",
+    columnName = "default_tunnel",
 )
 @DeleteColumn(
-	tableName = "Settings",
-	columnName = "is_battery_saver_enabled",
+    tableName = "Settings",
+    columnName = "is_battery_saver_enabled",
 )
 class RemoveLegacySettingColumnsMigration : AutoMigrationSpec
-
-@DeleteColumn(
-	tableName = "Settings",
-	columnName = "is_auto_tunnel_paused",
-)
-class RemoveTunnelPauseMigration : AutoMigrationSpec

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

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

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

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

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

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

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

@@ -5,32 +5,32 @@ 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.data.model.Settings
 import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface SettingsDao {
-	@Insert(onConflict = OnConflictStrategy.REPLACE)
-	suspend fun save(t: Settings)
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun save(t: Settings)
 
-	@Insert(onConflict = OnConflictStrategy.REPLACE)
-	suspend fun saveAll(t: List<Settings>)
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun saveAll(t: List<Settings>)
 
-	@Query("SELECT * FROM settings WHERE id=:id")
-	suspend fun getById(id: Long): Settings?
+    @Query("SELECT * FROM settings WHERE id=:id")
+    suspend fun getById(id: Long): Settings?
 
-	@Query("SELECT * FROM settings")
-	suspend fun getAll(): List<Settings>
+    @Query("SELECT * FROM settings")
+    suspend fun getAll(): List<Settings>
 
-	@Query("SELECT * FROM settings LIMIT 1")
-	fun getSettingsFlow(): Flow<Settings>
+    @Query("SELECT * FROM settings LIMIT 1")
+    fun getSettingsFlow(): Flow<Settings>
 
-	@Query("SELECT * FROM settings")
-	fun getAllFlow(): Flow<MutableList<Settings>>
+    @Query("SELECT * FROM settings")
+    fun getAllFlow(): Flow<MutableList<Settings>>
 
-	@Delete
-	suspend fun delete(t: Settings)
+    @Delete
+    suspend fun delete(t: Settings)
 
-	@Query("SELECT COUNT('id') FROM settings")
-	suspend fun count(): Long
+    @Query("SELECT COUNT('id') FROM settings")
+    suspend fun count(): Long
 }

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

@@ -5,54 +5,45 @@ 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.extensions.TunnelConfigs
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.util.TunnelConfigs
 import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface TunnelConfigDao {
-	@Insert(onConflict = OnConflictStrategy.REPLACE)
-	suspend fun save(t: TunnelConfig)
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun save(t: TunnelConfig)
 
-	@Insert(onConflict = OnConflictStrategy.REPLACE)
-	suspend fun saveAll(t: TunnelConfigs)
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun saveAll(t: TunnelConfigs)
 
-	@Query("SELECT * FROM TunnelConfig WHERE id=:id")
-	suspend fun getById(id: Long): TunnelConfig?
+    @Query("SELECT * FROM TunnelConfig WHERE id=:id")
+    suspend fun getById(id: Long): TunnelConfig?
 
-	@Query("SELECT * FROM TunnelConfig WHERE name=:name")
-	suspend fun getByName(name: String): TunnelConfig?
+    @Query("SELECT * FROM TunnelConfig")
+    suspend fun getAll(): TunnelConfigs
 
-	@Query("SELECT * FROM TunnelConfig WHERE is_Active=1")
-	suspend fun getActive(): TunnelConfigs
+    @Delete
+    suspend fun delete(t: TunnelConfig)
 
-	@Query("SELECT * FROM TunnelConfig")
-	suspend fun getAll(): TunnelConfigs
+    @Query("SELECT COUNT('id') FROM TunnelConfig")
+    suspend fun count(): Long
 
-	@Delete
-	suspend fun delete(t: TunnelConfig)
+    @Query("SELECT * FROM TunnelConfig WHERE tunnel_networks LIKE '%' || :name || '%'")
+    suspend fun findByTunnelNetworkName(name: String): TunnelConfigs
 
-	@Query("SELECT COUNT('id') FROM TunnelConfig")
-	suspend fun count(): Long
+    @Query("UPDATE TunnelConfig SET is_primary_tunnel = 0 WHERE is_primary_tunnel =1")
+    fun resetPrimaryTunnel()
 
-	@Query("SELECT * FROM TunnelConfig WHERE tunnel_networks LIKE '%' || :name || '%'")
-	suspend fun findByTunnelNetworkName(name: String): TunnelConfigs
+    @Query("UPDATE TunnelConfig SET is_mobile_data_tunnel = 0 WHERE is_mobile_data_tunnel =1")
+    fun resetMobileDataTunnel()
 
-	@Query("UPDATE TunnelConfig SET is_primary_tunnel = 0 WHERE is_primary_tunnel =1")
-	suspend fun resetPrimaryTunnel()
+    @Query("SELECT * FROM TUNNELCONFIG WHERE is_primary_tunnel=1")
+    suspend fun findByPrimary(): TunnelConfigs
 
-	@Query("UPDATE TunnelConfig SET is_mobile_data_tunnel = 0 WHERE is_mobile_data_tunnel =1")
-	suspend fun resetMobileDataTunnel()
+    @Query("SELECT * FROM TUNNELCONFIG WHERE is_mobile_data_tunnel=1")
+    suspend fun findByMobileDataTunnel(): TunnelConfigs
 
-	@Query("UPDATE TunnelConfig SET is_ethernet_tunnel = 0 WHERE is_ethernet_tunnel =1")
-	suspend fun resetEthernetTunnel()
-
-	@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>>
+    @Query("SELECT * FROM tunnelconfig")
+    fun getAllFlow(): Flow<MutableList<TunnelConfig>>
 }

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

@@ -4,90 +4,67 @@ 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 locationDisclosureShown = booleanPreferencesKey("LOCATION_DISCLOSURE_SHOWN")
-		val batteryDisableShown = booleanPreferencesKey("BATTERY_OPTIMIZE_DISABLE_SHOWN")
-		val currentSSID = stringPreferencesKey("CURRENT_SSID")
-		val pinLockEnabled = booleanPreferencesKey("PIN_LOCK_ENABLED")
-		val tunnelStatsExpanded = booleanPreferencesKey("TUNNEL_STATS_EXPANDED")
-		val isLocalLogsEnabled = booleanPreferencesKey("LOCAL_LOGS_ENABLED")
-		val locale = stringPreferencesKey("LOCALE")
-		val theme = stringPreferencesKey("THEME")
-	}
+class DataStoreManager(private val context: Context) {
+    companion object {
+        val LOCATION_DISCLOSURE_SHOWN = booleanPreferencesKey("LOCATION_DISCLOSURE_SHOWN")
+        val BATTERY_OPTIMIZE_DISABLE_SHOWN = booleanPreferencesKey("BATTERY_OPTIMIZE_DISABLE_SHOWN")
+        val TUNNEL_RUNNING_FROM_MANUAL_START =
+            booleanPreferencesKey("TUNNEL_RUNNING_FROM_MANUAL_START")
+        val ACTIVE_TUNNEL = intPreferencesKey("ACTIVE_TUNNEL")
+        val CURRENT_SSID = stringPreferencesKey("CURRENT_SSID")
+    }
 
-	// preferences
-	private val preferencesKey = "preferences"
-	private val Context.dataStore by
-		preferencesDataStore(
-			name = preferencesKey,
-		)
+    // 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 init() {
+        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)
-			}
-		}
-	}
+    suspend fun <T> saveToDataStore(key: Preferences.Key<T>, value: T) {
+        try {
+            context.dataStore.edit { it[key] = value }
+        } catch (e: IOException) {
+            Timber.e(e)
+        } catch (e: Exception) {
+            Timber.e(e)
+        }
+    }
 
-	suspend fun <T> removeFromDataStore(key: Preferences.Key<T>) {
-		withContext(ioDispatcher) {
-			try {
-				context.dataStore.edit { it.remove(key) }
-			} catch (e: IOException) {
-				Timber.e(e)
-			} catch (e: Exception) {
-				Timber.e(e)
-			}
-		}
-	}
 
-	fun <T> getFromStoreFlow(key: Preferences.Key<T>) = context.dataStore.data.map { it[key] }
+    fun <T> getFromStoreFlow(key: Preferences.Key<T>) = context.dataStore.data.map { it[key] }
 
-	suspend fun <T> getFromStore(key: Preferences.Key<T>): T? {
-		return withContext(ioDispatcher) {
-			try {
-				context.dataStore.data.map { it[key] }.first()
-			} catch (e: IOException) {
-				Timber.e(e)
-				null
-			}
-		}
-	}
+    suspend fun <T> getFromStore(key: Preferences.Key<T>): T? {
+        return try {
+            context.dataStore.data.map { it[key] }.first()
+        } catch (e: IOException) {
+            Timber.e(e)
+            null
+        }
+    }
 
-	fun <T> getFromStoreBlocking(key: Preferences.Key<T>) = runBlocking {
-		context.dataStore.data.map { it[key] }.first()
-	}
 
-	val preferencesFlow: Flow<Preferences?> = context.dataStore.data
+    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,21 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.domain
-
-import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
-
-data class GeneralState(
-	val isLocationDisclosureShown: Boolean = LOCATION_DISCLOSURE_SHOWN_DEFAULT,
-	val isBatteryOptimizationDisableShown: Boolean = BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
-	val isPinLockEnabled: Boolean = PIN_LOCK_ENABLED_DEFAULT,
-	val isTunnelStatsExpanded: Boolean = IS_TUNNEL_STATS_EXPANDED,
-	val isLocalLogsEnabled: Boolean = IS_LOGS_ENABLED_DEFAULT,
-	val locale: String? = null,
-	val theme: Theme = Theme.AUTOMATIC,
-) {
-	companion object {
-		const val LOCATION_DISCLOSURE_SHOWN_DEFAULT = false
-		const val BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT = false
-		const val PIN_LOCK_ENABLED_DEFAULT = false
-		const val IS_TUNNEL_STATS_EXPANDED = false
-		const val IS_LOGS_ENABLED_DEFAULT = false
-	}
-}

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

@@ -1,83 +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_ping_enabled",
-		defaultValue = "false",
-	)
-	val isPingEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_amnezia_enabled",
-		defaultValue = "false",
-	)
-	val isAmneziaEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_wildcards_enabled",
-		defaultValue = "false",
-	)
-	val isWildcardsEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_wifi_by_shell_enabled",
-		defaultValue = "false",
-	)
-	val isWifiNameByShellEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_stop_on_no_internet_enabled",
-		defaultValue = "false",
-	)
-	val isStopOnNoInternetEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_vpn_kill_switch_enabled",
-		defaultValue = "false",
-	)
-	val isVpnKillSwitchEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_kernel_kill_switch_enabled",
-		defaultValue = "false",
-	)
-	val isKernelKillSwitchEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_lan_on_kill_switch_enabled",
-		defaultValue = "false",
-	)
-	val isLanOnKillSwitchEnabled: Boolean = false,
-)

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

@@ -1,109 +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 com.zaneschepke.wireguardautotunnel.util.extensions.toWgQuickString
-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,
-	@ColumnInfo(
-		name = "is_Active",
-		defaultValue = "false",
-	)
-	val isActive: Boolean = false,
-	@ColumnInfo(
-		name = "is_ping_enabled",
-		defaultValue = "false",
-	)
-	val isPingEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "ping_interval",
-		defaultValue = "null",
-	)
-	val pingInterval: Long? = null,
-	@ColumnInfo(
-		name = "ping_cooldown",
-		defaultValue = "null",
-	)
-	val pingCooldown: Long? = null,
-	@ColumnInfo(
-		name = "ping_ip",
-		defaultValue = "null",
-	)
-	var pingIp: String? = null,
-	@ColumnInfo(
-		name = "is_ethernet_tunnel",
-		defaultValue = "false",
-	)
-	var isEthernetTunnel: Boolean = false,
-) {
-
-	fun toAmConfig(): org.amnezia.awg.config.Config {
-		return configFromAmQuick(if (amQuick != "") amQuick else wgQuick)
-	}
-
-	fun toWgConfig(): Config {
-		return configFromWgQuick(wgQuick)
-	}
-
-	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)
-			}
-		}
-
-		fun tunnelConfigFromAmConfig(config: org.amnezia.awg.config.Config, name: String): TunnelConfig {
-			val amQuick = config.toAwgQuickString(true)
-			val wgQuick = config.toWgQuickString()
-			return TunnelConfig(name = name, wgQuick = wgQuick, amQuick = amQuick)
-		}
-
-		const val AM_QUICK_DEFAULT = ""
-
-		val IPV4_PUBLIC_NETWORKS = setOf(
-			"0.0.0.0/5", "8.0.0.0/7", "11.0.0.0/8", "12.0.0.0/6", "16.0.0.0/4", "32.0.0.0/3",
-			"64.0.0.0/2", "128.0.0.0/3", "160.0.0.0/5", "168.0.0.0/6", "172.0.0.0/12",
-			"172.32.0.0/11", "172.64.0.0/10", "172.128.0.0/9", "173.0.0.0/8", "174.0.0.0/7",
-			"176.0.0.0/4", "192.0.0.0/9", "192.128.0.0/11", "192.160.0.0/13", "192.169.0.0/16",
-			"192.170.0.0/15", "192.172.0.0/14", "192.176.0.0/12", "192.192.0.0/10",
-			"193.0.0.0/8", "194.0.0.0/7", "196.0.0.0/6", "200.0.0.0/5", "208.0.0.0/4",
-		)
-	}
-}

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

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

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

@@ -0,0 +1,53 @@
+package com.zaneschepke.wireguardautotunnel.data.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity
+data class Settings(
+    @PrimaryKey(autoGenerate = true) val id: Int = 0,
+    @ColumnInfo(name = "is_tunnel_enabled") 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,
+)

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

@@ -0,0 +1,38 @@
+package com.zaneschepke.wireguardautotunnel.data.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.Index
+import androidx.room.PrimaryKey
+import org.amnezia.awg.config.Config
+import java.io.InputStream
+
+@Entity(indices = [Index(value = ["name"], unique = true)])
+data class TunnelConfig(
+    @PrimaryKey(autoGenerate = true) val id: Int = 0,
+    @ColumnInfo(name = "name") val name: String,
+    @ColumnInfo(name = "wg_quick") val wgQuick: String,
+    @ColumnInfo(
+        name = "tunnel_networks",
+        defaultValue = "",
+    )
+    val tunnelNetworks: MutableList<String> = mutableListOf(),
+    @ColumnInfo(
+        name = "is_mobile_data_tunnel",
+        defaultValue = "false",
+    )
+    val isMobileDataTunnel: Boolean = false,
+    @ColumnInfo(
+        name = "is_primary_tunnel",
+        defaultValue = "false",
+    )
+    val isPrimaryTunnel: Boolean = false,
+) {
+    companion object {
+        fun configFromQuick(wgQuick: String): Config {
+            val inputStream: InputStream = wgQuick.byteInputStream()
+            val reader = inputStream.bufferedReader(Charsets.UTF_8)
+            return Config.parse(reader)
+        }
+    }
+}

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

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

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

@@ -1,23 +1,34 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 import javax.inject.Inject
 
-class AppDataRoomRepository
-@Inject
-constructor(
-	override val settings: SettingsRepository,
-	override val tunnels: TunnelConfigRepository,
-	override val appState: AppStateRepository,
+class AppDataRoomRepository @Inject constructor(
+    override val settings: SettingsRepository,
+    override val tunnels: TunnelConfigRepository,
+    override val appState: AppStateRepository
 ) : AppDataRepository {
-	override suspend fun getPrimaryOrFirstTunnel(): TunnelConfig? {
-		return tunnels.findPrimary().firstOrNull() ?: tunnels.getAll().firstOrNull()
-	}
+    override suspend fun getPrimaryOrFirstTunnel(): TunnelConfig? {
+        return tunnels.findPrimary().firstOrNull() ?: tunnels.getAll().firstOrNull()
+    }
 
-	override suspend fun getStartTunnelConfig(): TunnelConfig? {
-		tunnels.getActive().let {
-			if (it.isNotEmpty()) return it.first()
-			return getPrimaryOrFirstTunnel()
-		}
-	}
+    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,37 +1,26 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
-import com.zaneschepke.wireguardautotunnel.data.domain.GeneralState
-import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
+import com.zaneschepke.wireguardautotunnel.data.model.GeneralState
 import kotlinx.coroutines.flow.Flow
 
 interface AppStateRepository {
-	suspend fun isLocationDisclosureShown(): Boolean
+    suspend fun isLocationDisclosureShown(): Boolean
+    suspend fun setLocationDisclosureShown(shown: Boolean)
 
-	suspend fun setLocationDisclosureShown(shown: Boolean)
+    suspend fun isBatteryOptimizationDisableShown(): Boolean
+    suspend fun setBatteryOptimizationDisableShown(shown: Boolean)
 
-	suspend fun isPinLockEnabled(): Boolean
+    suspend fun isTunnelRunningFromManualStart(): Boolean
+    suspend fun setTunnelRunningFromManualStart(id: Int)
 
-	suspend fun setPinLockEnabled(enabled: Boolean)
+    suspend fun setManualStop()
 
-	suspend fun isBatteryOptimizationDisableShown(): Boolean
+    suspend fun getActiveTunnelId(): Int?
 
-	suspend fun setBatteryOptimizationDisableShown(shown: Boolean)
+    suspend fun getCurrentSsid(): String?
 
-	suspend fun isTunnelStatsExpanded(): Boolean
+    suspend fun setCurrentSsid(ssid: String)
 
-	suspend fun setTunnelStatsExpanded(expanded: Boolean)
+    val generalStateFlow: Flow<GeneralState>
 
-	suspend fun setTheme(theme: Theme)
-
-	suspend fun getTheme(): Theme
-
-	suspend fun isLocalLogsEnabled(): Boolean
-
-	suspend fun setLocalLogsEnabled(enabled: Boolean)
-
-	suspend fun setLocale(localeTag: String)
-
-	suspend fun getLocale(): String?
-
-	val generalStateFlow: Flow<GeneralState>
 }

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

@@ -1,105 +1,81 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
-import com.zaneschepke.wireguardautotunnel.data.domain.GeneralState
-import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
+import com.zaneschepke.wireguardautotunnel.data.model.GeneralState
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import timber.log.Timber
 
-class DataStoreAppStateRepository(
-	private val dataStoreManager: DataStoreManager,
-) :
-	AppStateRepository {
-	override suspend fun isLocationDisclosureShown(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.locationDisclosureShown)
-			?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT
-	}
+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.locationDisclosureShown, shown)
-	}
+    override suspend fun setLocationDisclosureShown(shown: Boolean) {
+        dataStoreManager.saveToDataStore(DataStoreManager.LOCATION_DISCLOSURE_SHOWN, shown)
+    }
 
-	override suspend fun isPinLockEnabled(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.pinLockEnabled)
-			?: GeneralState.PIN_LOCK_ENABLED_DEFAULT
-	}
+    override suspend fun isBatteryOptimizationDisableShown(): Boolean {
+        return dataStoreManager.getFromStore(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN)
+            ?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT
+    }
 
-	override suspend fun setPinLockEnabled(enabled: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.pinLockEnabled, enabled)
-	}
+    override suspend fun setBatteryOptimizationDisableShown(shown: Boolean) {
+        dataStoreManager.saveToDataStore(DataStoreManager.BATTERY_OPTIMIZE_DISABLE_SHOWN, shown)
+    }
 
-	override suspend fun isBatteryOptimizationDisableShown(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.batteryDisableShown)
-			?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT
-	}
+    override suspend fun isTunnelRunningFromManualStart(): Boolean {
+        return dataStoreManager.getFromStore(DataStoreManager.TUNNEL_RUNNING_FROM_MANUAL_START)
+            ?: GeneralState.TUNNELING_RUNNING_FROM_MANUAL_START_DEFAULT
+    }
 
-	override suspend fun setBatteryOptimizationDisableShown(shown: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.batteryDisableShown, shown)
-	}
+    override suspend fun setTunnelRunningFromManualStart(id: Int) {
+        setTunnelRunningFromManualStart(true)
+        setActiveTunnelId(id)
+    }
 
-	override suspend fun isTunnelStatsExpanded(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.tunnelStatsExpanded)
-			?: GeneralState.IS_TUNNEL_STATS_EXPANDED
-	}
+    override suspend fun setManualStop() {
+        setTunnelRunningFromManualStart(false)
+    }
 
-	override suspend fun setTunnelStatsExpanded(expanded: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.tunnelStatsExpanded, expanded)
-	}
+    private suspend fun setTunnelRunningFromManualStart(running: Boolean) {
+        dataStoreManager.saveToDataStore(DataStoreManager.TUNNEL_RUNNING_FROM_MANUAL_START, running)
+    }
 
-	override suspend fun setTheme(theme: Theme) {
-		dataStoreManager.saveToDataStore(DataStoreManager.theme, theme.name)
-	}
+    override suspend fun getActiveTunnelId(): Int? {
+        return dataStoreManager.getFromStore(DataStoreManager.ACTIVE_TUNNEL)
+    }
 
-	override suspend fun getTheme(): Theme {
-		return dataStoreManager.getFromStore(DataStoreManager.theme)?.let {
-			try {
-				Theme.valueOf(it)
-			} catch (_: IllegalArgumentException) {
-				Theme.AUTOMATIC
-			}
-		} ?: Theme.AUTOMATIC
-	}
+    private suspend fun setActiveTunnelId(id: Int) {
+        dataStoreManager.saveToDataStore(DataStoreManager.ACTIVE_TUNNEL, id)
+    }
 
-	override suspend fun isLocalLogsEnabled(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.isLocalLogsEnabled) ?: GeneralState.IS_LOGS_ENABLED_DEFAULT
-	}
+    override suspend fun getCurrentSsid(): String? {
+        return dataStoreManager.getFromStore(DataStoreManager.CURRENT_SSID)
+    }
 
-	override suspend fun setLocalLogsEnabled(enabled: Boolean) {
-		dataStoreManager.saveToDataStore(DataStoreManager.isLocalLogsEnabled, enabled)
-	}
+    override suspend fun setCurrentSsid(ssid: String) {
+        dataStoreManager.saveToDataStore(DataStoreManager.CURRENT_SSID, ssid)
+    }
 
-	override suspend fun setLocale(localeTag: String) {
-		dataStoreManager.saveToDataStore(DataStoreManager.locale, localeTag)
-	}
-
-	override suspend fun getLocale(): String? {
-		return dataStoreManager.getFromStore(DataStoreManager.locale)
-	}
-
-	override val generalStateFlow: Flow<GeneralState> =
-		dataStoreManager.preferencesFlow.map { prefs ->
-			prefs?.let { pref ->
-				try {
-					GeneralState(
-						isLocationDisclosureShown =
-						pref[DataStoreManager.locationDisclosureShown]
-							?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT,
-						isBatteryOptimizationDisableShown =
-						pref[DataStoreManager.batteryDisableShown]
-							?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
-						isPinLockEnabled =
-						pref[DataStoreManager.pinLockEnabled]
-							?: GeneralState.PIN_LOCK_ENABLED_DEFAULT,
-						isTunnelStatsExpanded = pref[DataStoreManager.tunnelStatsExpanded] ?: GeneralState.IS_TUNNEL_STATS_EXPANDED,
-						isLocalLogsEnabled = pref[DataStoreManager.isLocalLogsEnabled] ?: GeneralState.IS_LOGS_ENABLED_DEFAULT,
-						locale = pref[DataStoreManager.locale],
-						theme = getTheme(),
-					)
-				} catch (e: IllegalArgumentException) {
-					Timber.e(e)
-					GeneralState()
-				}
-			} ?: GeneralState()
-		}
+    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,30 +1,24 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.SettingsDao
-import com.zaneschepke.wireguardautotunnel.data.domain.Settings
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import kotlinx.coroutines.CoroutineDispatcher
+import com.zaneschepke.wireguardautotunnel.data.model.Settings
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.withContext
 
-class RoomSettingsRepository(private val settingsDoa: SettingsDao, @IoDispatcher private val ioDispatcher: CoroutineDispatcher) : SettingsRepository {
-	override suspend fun save(settings: Settings) {
-		withContext(ioDispatcher) {
-			settingsDoa.save(settings)
-		}
-	}
+class RoomSettingsRepository(private val settingsDoa: SettingsDao) : SettingsRepository {
 
-	override fun getSettingsFlow(): Flow<Settings> {
-		return settingsDoa.getSettingsFlow()
-	}
+    override suspend fun save(settings: Settings) {
+        settingsDoa.save(settings)
+    }
 
-	override suspend fun getSettings(): Settings {
-		return withContext(ioDispatcher) {
-			settingsDoa.getAll().firstOrNull() ?: Settings()
-		}
-	}
+    override fun getSettingsFlow(): Flow<Settings> {
+        return settingsDoa.getSettingsFlow()
+    }
 
-	override suspend fun getAll(): List<Settings> {
-		return withContext(ioDispatcher) { settingsDoa.getAll() }
-	}
+    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,104 +1,68 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
-import kotlinx.coroutines.CoroutineDispatcher
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.util.TunnelConfigs
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.withContext
 
-class RoomTunnelConfigRepository(
-	private val tunnelConfigDao: TunnelConfigDao,
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-) :
-	TunnelConfigRepository {
-	override fun getTunnelConfigsFlow(): Flow<TunnelConfigs> {
-		return tunnelConfigDao.getAllFlow()
-	}
+class RoomTunnelConfigRepository(private val tunnelConfigDao: TunnelConfigDao) :
+    TunnelConfigRepository {
+    override fun getTunnelConfigsFlow(): Flow<TunnelConfigs> {
+        return tunnelConfigDao.getAllFlow()
+    }
 
-	override suspend fun getAll(): TunnelConfigs {
-		return withContext(ioDispatcher) { tunnelConfigDao.getAll() }
-	}
+    override suspend fun getAll(): TunnelConfigs {
+        return tunnelConfigDao.getAll()
+    }
 
-	override suspend fun save(tunnelConfig: TunnelConfig) {
-		withContext(ioDispatcher) {
-			tunnelConfigDao.save(tunnelConfig)
-		}
-	}
+    override suspend fun save(tunnelConfig: TunnelConfig) {
+        tunnelConfigDao.save(tunnelConfig)
+    }
 
-	override suspend fun updatePrimaryTunnel(tunnelConfig: TunnelConfig?) {
-		withContext(ioDispatcher) {
-			tunnelConfigDao.resetPrimaryTunnel()
-			tunnelConfig?.let {
-				save(
-					it.copy(
-						isPrimaryTunnel = true,
-					),
-				)
-			}
-		}
-	}
+    override suspend fun updatePrimaryTunnel(tunnelConfig: TunnelConfig?) {
+        tunnelConfigDao.resetPrimaryTunnel()
+        tunnelConfig?.let {
+            save(
+                it.copy(
+                    isPrimaryTunnel = true,
+                ),
+            )
+        }
 
-	override suspend fun updateMobileDataTunnel(tunnelConfig: TunnelConfig?) {
-		withContext(ioDispatcher) {
-			tunnelConfigDao.resetMobileDataTunnel()
-			tunnelConfig?.let {
-				save(
-					it.copy(
-						isMobileDataTunnel = true,
-					),
-				)
-			}
-		}
-	}
+    }
 
-	override suspend fun updateEthernetTunnel(tunnelConfig: TunnelConfig?) {
-		withContext(ioDispatcher) {
-			tunnelConfigDao.resetEthernetTunnel()
-			tunnelConfig?.let {
-				save(
-					it.copy(
-						isEthernetTunnel = true,
-					),
-				)
-			}
-		}
-	}
+    override suspend fun updateMobileDataTunnel(tunnelConfig: TunnelConfig?) {
+        tunnelConfigDao.resetMobileDataTunnel()
+        tunnelConfig?.let {
+            save(
+                it.copy(
+                    isMobileDataTunnel = true,
+                ),
+            )
+        }
+    }
 
-	override suspend fun delete(tunnelConfig: TunnelConfig) {
-		withContext(ioDispatcher) {
-			tunnelConfigDao.delete(tunnelConfig)
-		}
-	}
+    override suspend fun delete(tunnelConfig: TunnelConfig) {
+        tunnelConfigDao.delete(tunnelConfig)
+    }
 
-	override suspend fun getById(id: Int): TunnelConfig? {
-		return withContext(ioDispatcher) { tunnelConfigDao.getById(id.toLong()) }
-	}
+    override suspend fun getById(id: Int): TunnelConfig? {
+        return tunnelConfigDao.getById(id.toLong())
+    }
 
-	override suspend fun getActive(): TunnelConfigs {
-		return withContext(ioDispatcher) {
-			tunnelConfigDao.getActive()
-		}
-	}
+    override suspend fun count(): Int {
+        return tunnelConfigDao.count().toInt()
+    }
 
-	override suspend fun count(): Int {
-		return withContext(ioDispatcher) { tunnelConfigDao.count().toInt() }
-	}
+    override suspend fun findByTunnelNetworksName(name: String): TunnelConfigs {
+        return tunnelConfigDao.findByTunnelNetworkName(name)
+    }
 
-	override suspend fun findByTunnelName(name: String): TunnelConfig? {
-		return withContext(ioDispatcher) { tunnelConfigDao.getByName(name) }
-	}
+    override suspend fun findByMobileDataTunnel(): TunnelConfigs {
+        return tunnelConfigDao.findByMobileDataTunnel()
+    }
 
-	override suspend fun findByTunnelNetworksName(name: String): TunnelConfigs {
-		return withContext(ioDispatcher) { tunnelConfigDao.findByTunnelNetworkName(name) }
-	}
-
-	override suspend fun findByMobileDataTunnel(): TunnelConfigs {
-		return withContext(ioDispatcher) { tunnelConfigDao.findByMobileDataTunnel() }
-	}
-
-	override suspend fun findPrimary(): TunnelConfigs {
-		return withContext(ioDispatcher) { tunnelConfigDao.findByPrimary() }
-	}
+    override suspend fun findPrimary(): TunnelConfigs {
+        return tunnelConfigDao.findByPrimary()
+    }
 }

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

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

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

@@ -1,35 +1,30 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.util.TunnelConfigs
 import kotlinx.coroutines.flow.Flow
 
 interface TunnelConfigRepository {
-	fun getTunnelConfigsFlow(): Flow<TunnelConfigs>
 
-	suspend fun getAll(): TunnelConfigs
+    fun getTunnelConfigsFlow(): Flow<TunnelConfigs>
 
-	suspend fun save(tunnelConfig: TunnelConfig)
+    suspend fun getAll(): TunnelConfigs
 
-	suspend fun updatePrimaryTunnel(tunnelConfig: TunnelConfig?)
+    suspend fun save(tunnelConfig: TunnelConfig)
 
-	suspend fun updateMobileDataTunnel(tunnelConfig: TunnelConfig?)
+    suspend fun updatePrimaryTunnel(tunnelConfig: TunnelConfig?)
 
-	suspend fun updateEthernetTunnel(tunnelConfig: TunnelConfig?)
+    suspend fun updateMobileDataTunnel(tunnelConfig: TunnelConfig?)
 
-	suspend fun delete(tunnelConfig: TunnelConfig)
+    suspend fun delete(tunnelConfig: TunnelConfig)
 
-	suspend fun getById(id: Int): TunnelConfig?
+    suspend fun getById(id: Int): TunnelConfig?
 
-	suspend fun getActive(): TunnelConfigs
+    suspend fun count(): Int
 
-	suspend fun count(): Int
+    suspend fun findByTunnelNetworksName(name: String): TunnelConfigs
 
-	suspend fun findByTunnelName(name: String): TunnelConfig?
+    suspend fun findByMobileDataTunnel(): TunnelConfigs
 
-	suspend fun findByTunnelNetworksName(name: String): TunnelConfigs
-
-	suspend fun findByMobileDataTunnel(): TunnelConfigs
-
-	suspend fun findPrimary(): TunnelConfigs
+    suspend fun findPrimary(): TunnelConfigs
 }

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

@@ -1,46 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.module
-
-import android.content.Context
-import com.zaneschepke.logcatter.LogReader
-import com.zaneschepke.logcatter.LogcatReader
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
-import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
-import com.zaneschepke.wireguardautotunnel.service.shortcut.DynamicShortcutManager
-import com.zaneschepke.wireguardautotunnel.service.shortcut.ShortcutManager
-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): LogReader {
-		return LogcatReader.init(storageDir = context.filesDir.absolutePath)
-	}
-
-	@Singleton
-	@Provides
-	fun provideNotificationService(@ApplicationContext context: Context): NotificationService {
-		return WireGuardNotification(context)
-	}
-
-	@Singleton
-	@Provides
-	fun provideShortcutManager(@ApplicationContext context: Context, @IoDispatcher ioDispatcher: CoroutineDispatcher): ShortcutManager {
-		return DynamicShortcutManager(context, ioDispatcher)
-	}
-}

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

@@ -1,19 +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
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class TunnelShell
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class AppShell

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

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

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

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

@@ -1,15 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.module
-
-import javax.inject.Qualifier
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class Wifi
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class MobileData
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class Ethernet

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

@@ -1,10 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.module
 
 import android.content.Context
-import androidx.room.Room
-import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
-import com.zaneschepke.wireguardautotunnel.data.DatabaseCallback
 import com.zaneschepke.wireguardautotunnel.data.SettingsDao
 import com.zaneschepke.wireguardautotunnel.data.TunnelConfigDao
 import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
@@ -21,68 +18,56 @@ 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 {
+        return appDatabase.settingDao()
+    }
 
-	@Singleton
-	@Provides
-	fun provideSettingsDoa(appDatabase: AppDatabase): SettingsDao {
-		return appDatabase.settingDao()
-	}
+    @Singleton
+    @Provides
+    fun provideTunnelConfigDoa(appDatabase: AppDatabase): TunnelConfigDao {
+        return appDatabase.tunnelConfigDoa()
+    }
 
-	@Singleton
-	@Provides
-	fun provideTunnelConfigDoa(appDatabase: AppDatabase): TunnelConfigDao {
-		return appDatabase.tunnelConfigDoa()
-	}
+    @Singleton
+    @Provides
+    fun provideTunnelConfigRepository(tunnelConfigDao: TunnelConfigDao): TunnelConfigRepository {
+        return RoomTunnelConfigRepository(tunnelConfigDao)
+    }
 
-	@Singleton
-	@Provides
-	fun provideTunnelConfigRepository(tunnelConfigDao: TunnelConfigDao, @IoDispatcher ioDispatcher: CoroutineDispatcher): TunnelConfigRepository {
-		return RoomTunnelConfigRepository(tunnelConfigDao, ioDispatcher)
-	}
+    @Singleton
+    @Provides
+    fun provideSettingsRepository(settingsDao: SettingsDao): SettingsRepository {
+        return RoomSettingsRepository(settingsDao)
+    }
 
-	@Singleton
-	@Provides
-	fun provideSettingsRepository(settingsDao: SettingsDao, @IoDispatcher ioDispatcher: CoroutineDispatcher): SettingsRepository {
-		return RoomSettingsRepository(settingsDao, ioDispatcher)
-	}
+    @Singleton
+    @Provides
+    fun providePreferencesDataStore(@ApplicationContext context: Context): DataStoreManager {
+        return DataStoreManager(context)
+    }
 
-	@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)
+    }
 
-	@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

@@ -4,6 +4,8 @@ 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.WifiService
+import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
+import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -13,19 +15,25 @@ import dagger.hilt.android.scopes.ServiceScoped
 @Module
 @InstallIn(ServiceComponent::class)
 abstract class ServiceModule {
+    @Binds
+    @ServiceScoped
+    abstract fun provideNotificationService(
+        wireGuardNotification: WireGuardNotification
+    ): NotificationService
 
-	@Binds
-	@Wifi
-	@ServiceScoped
-	abstract fun provideWifiService(wifiService: WifiService): NetworkService
+    @Binds
+    @ServiceScoped
+    abstract fun provideWifiService(wifiService: WifiService): NetworkService<WifiService>
 
-	@Binds
-	@MobileData
-	@ServiceScoped
-	abstract fun provideMobileDataService(mobileDataService: MobileDataService): NetworkService
+    @Binds
+    @ServiceScoped
+    abstract fun provideMobileDataService(
+        mobileDataService: MobileDataService
+    ): NetworkService<MobileDataService>
 
-	@Binds
-	@Ethernet
-	@ServiceScoped
-	abstract fun provideEthernetService(ethernetService: EthernetService): NetworkService
+    @Binds
+    @ServiceScoped
+    abstract fun provideEthernetService(
+        ethernetService: EthernetService
+    ): NetworkService<EthernetService>
 }

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

@@ -1,103 +1,58 @@
 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.RootTunnelActionHandler
-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.data.repository.TunnelConfigRepository
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
 import com.zaneschepke.wireguardautotunnel.service.tunnel.WireGuardTunnel
 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 javax.inject.Provider
+import org.amnezia.awg.backend.AwgQuickBackend
+import org.amnezia.awg.backend.Backend
+import org.amnezia.awg.backend.GoBackend
+import org.amnezia.awg.util.RootShell
+import org.amnezia.awg.util.ToolsInstaller
 import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
 class TunnelModule {
+    @Provides
+    @Singleton
+    fun provideRootShell(@ApplicationContext context: Context): RootShell {
+        return RootShell(context)
+    }
 
-	@Provides
-	@Singleton
-	@TunnelShell
-	fun provideTunnelRootShell(@ApplicationContext context: Context): RootShell {
-		return RootShell(context)
-	}
+    @Provides
+    @Singleton
+    @Userspace
+    fun provideUserspaceBackend(@ApplicationContext context: Context): Backend {
+        return GoBackend(context)
+    }
 
-	@Provides
-	@Singleton
-	@AppShell
-	fun provideAppRootShell(@ApplicationContext context: Context): RootShell {
-		return RootShell(context)
-	}
+    @Provides
+    @Singleton
+    @Kernel
+    fun provideKernelBackend(@ApplicationContext context: Context, rootShell: RootShell): Backend {
+        return AwgQuickBackend(context, rootShell, ToolsInstaller(context, rootShell))
+    }
 
-	@Provides
-	@Singleton
-	fun provideRootShellAm(@ApplicationContext context: Context): org.amnezia.awg.util.RootShell {
-		return org.amnezia.awg.util.RootShell(context)
-	}
+    @Provides
+    @Singleton
+    fun provideVpnService(
+        @Userspace userspaceBackend: Backend,
+        @Kernel kernelBackend: Backend,
+        appDataRepository: AppDataRepository
+    ): VpnService {
+        return WireGuardTunnel(userspaceBackend, kernelBackend, appDataRepository)
+    }
 
-	@Provides
-	@Singleton
-	@Userspace
-	fun provideUserspaceBackend(@ApplicationContext context: Context, @TunnelShell rootShell: RootShell): Backend {
-		return GoBackend(context, RootTunnelActionHandler(rootShell))
-	}
-
-	@Provides
-	@Singleton
-	@Kernel
-	fun provideKernelBackend(@ApplicationContext context: Context, @TunnelShell rootShell: RootShell): Backend {
-		return WgQuickBackend(context, rootShell, ToolsInstaller(context, rootShell), RootTunnelActionHandler(rootShell))
-	}
-
-	@Provides
-	@Singleton
-	fun provideAmneziaBackend(@ApplicationContext context: Context, rootShell: org.amnezia.awg.util.RootShell): org.amnezia.awg.backend.Backend {
-		return org.amnezia.awg.backend.GoBackend(context, org.amnezia.awg.backend.RootTunnelActionHandler(rootShell))
-	}
-
-	@Provides
-	@Singleton
-	fun provideVpnService(
-		amneziaBackend: Provider<org.amnezia.awg.backend.Backend>,
-		@Kernel kernelBackend: Provider<Backend>,
-		appDataRepository: AppDataRepository,
-		tunnelConfigRepository: TunnelConfigRepository,
-		@ApplicationScope applicationScope: CoroutineScope,
-		@IoDispatcher ioDispatcher: CoroutineDispatcher,
-		serviceManager: ServiceManager,
-		notificationService: NotificationService,
-	): TunnelService {
-		return WireGuardTunnel(
-			amneziaBackend,
-			tunnelConfigRepository,
-			kernelBackend,
-			appDataRepository,
-			applicationScope,
-			ioDispatcher,
-			serviceManager,
-			notificationService,
-		)
-	}
-
-	@Singleton
-	@Provides
-	fun provideServiceManager(
-		@ApplicationContext context: Context,
-		@IoDispatcher ioDispatcher: CoroutineDispatcher,
-		appDataRepository: AppDataRepository,
-	): ServiceManager {
-		return ServiceManager(context, ioDispatcher, appDataRepository)
-	}
+    @Provides
+    @Singleton
+    fun provideServiceManager(appDataRepository: AppDataRepository): ServiceManager {
+        return ServiceManager(appDataRepository)
+    }
 }

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

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

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

@@ -1,21 +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/AppUpdateReceiver.kt

@@ -1,47 +0,0 @@
-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.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Provider
-
-@AndroidEntryPoint
-class AppUpdateReceiver : BroadcastReceiver() {
-
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
-
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
-
-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
-
-	@Inject
-	lateinit var serviceManager: ServiceManager
-
-	override fun onReceive(context: Context, intent: Intent) {
-		if (intent.action != Intent.ACTION_MY_PACKAGE_REPLACED) return
-		applicationScope.launch {
-			val settings = appDataRepository.settings.getSettings()
-			if (settings.isAutoTunnelEnabled) {
-				Timber.i("Restarting services after upgrade")
-				serviceManager.startAutoTunnel(true)
-			}
-			if (!settings.isAutoTunnelEnabled) {
-				val tunnels = appDataRepository.tunnels.getAll().filter { it.isActive }
-				if (tunnels.isNotEmpty()) tunnelService.get().startTunnel(tunnels.first(), true)
-			}
-		}
-	}
-}

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

@@ -4,49 +4,42 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
+import com.zaneschepke.wireguardautotunnel.util.goAsync
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
-import javax.inject.Provider
 
 @AndroidEntryPoint
 class BootReceiver : BroadcastReceiver() {
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
 
-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
+    @Inject
+    lateinit var appDataRepository: AppDataRepository
 
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
+    @Inject
+    lateinit var serviceManager: ServiceManager
 
-	@Inject
-	lateinit var serviceManager: ServiceManager
-
-	override fun onReceive(context: Context, intent: Intent) {
-		if (Intent.ACTION_BOOT_COMPLETED != intent.action) return
-		applicationScope.launch {
-			with(appDataRepository.settings.getSettings()) {
-				if (isRestoreOnBootEnabled) {
-					val activeTunnels = appDataRepository.tunnels.getActive()
-					val tunState = tunnelService.get().vpnState.value.status
-					if (activeTunnels.isNotEmpty() && tunState != TunnelState.UP) {
-						Timber.i("Starting previously active tunnel")
-						tunnelService.get().startTunnel(activeTunnels.first(), true)
-					}
-					if (isAutoTunnelEnabled) {
-						Timber.i("Starting watcher service from boot")
-						serviceManager.startAutoTunnel(true)
-					}
-				}
-			}
-		}
-	}
+    override fun onReceive(context: Context?, intent: Intent?) = goAsync {
+        if (Intent.ACTION_BOOT_COMPLETED != intent?.action) return@goAsync
+        context?.run {
+            val settings = appDataRepository.settings.getSettings()
+            if (settings.isAutoTunnelEnabled) {
+                Timber.i("Starting watcher service from boot")
+                serviceManager.startWatcherServiceForeground(context)
+            }
+            if (appDataRepository.appState.isTunnelRunningFromManualStart()) {
+                appDataRepository.appState.getActiveTunnelId()?.let {
+                    Timber.i("Starting tunnel that was active before reboot")
+                    serviceManager.startVpnServiceForeground(
+                        context,
+                        appDataRepository.tunnels.getById(it)?.id,
+                    )
+                }
+            }
+            if (settings.isAlwaysOnVpnEnabled) {
+                Timber.i("Starting vpn service from boot AOVPN")
+                serviceManager.startVpnServiceForeground(context)
+            }
+        }
+    }
 }

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

@@ -1,51 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-import javax.inject.Provider
-
-@AndroidEntryPoint
-class KernelReceiver : BroadcastReceiver() {
-
-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
-
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
-
-	@Inject
-	lateinit var tunnelConfigRepository: TunnelConfigRepository
-
-	@Inject
-	lateinit var serviceManager: ServiceManager
-
-	override fun onReceive(context: Context, intent: Intent) {
-		val action = intent.action ?: return
-		applicationScope.launch {
-			if (action == REFRESH_TUNNELS_ACTION) {
-				tunnelService.get().runningTunnelNames().forEach { name ->
-					// TODO can optimize later
-					val tunnel = tunnelConfigRepository.findByTunnelName(name)
-					tunnel?.let {
-						tunnelConfigRepository.save(it.copy(isActive = true))
-					}
-				}
-				serviceManager.updateTunnelTile()
-			}
-		}
-	}
-
-	companion object {
-		const val REFRESH_TUNNELS_ACTION = "com.wireguard.android.action.REFRESH_TUNNEL_STATES"
-	}
-}

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

@@ -3,34 +3,34 @@ package com.zaneschepke.wireguardautotunnel.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationAction
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.goAsync
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
+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
+    @Inject
+    lateinit var serviceManager: ServiceManager
 
-	@Inject
-	lateinit var tunnelService: TunnelService
-
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
-
-	override fun onReceive(context: Context, intent: Intent) {
-		applicationScope.launch {
-			when (intent.action) {
-				NotificationAction.AUTO_TUNNEL_OFF.name -> serviceManager.stopAutoTunnel()
-				NotificationAction.TUNNEL_OFF.name -> tunnelService.stopTunnel()
-			}
-		}
-	}
+    override fun onReceive(context: Context, intent: Intent?) = goAsync {
+        try {
+            //TODO fix for manual start changes when enabled
+            serviceManager.stopVpnServiceForeground(context)
+            delay(Constants.TOGGLE_TUNNEL_DELAY)
+            serviceManager.startVpnServiceForeground(context)
+        } catch (e: Exception) {
+            Timber.e(e)
+        } finally {
+            cancel()
+        }
+    }
 }

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

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

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

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

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

@@ -3,117 +3,115 @@ package com.zaneschepke.wireguardautotunnel.service.foreground
 import android.app.Service
 import android.content.Context
 import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.AutoTunnelService
-import com.zaneschepke.wireguardautotunnel.service.tile.AutoTunnelControlTile
-import com.zaneschepke.wireguardautotunnel.service.tile.TunnelControlTile
-import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
-import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
-import jakarta.inject.Inject
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.withContext
+import com.zaneschepke.wireguardautotunnel.util.Constants
 import timber.log.Timber
 
-@OptIn(ExperimentalCoroutinesApi::class)
-class ServiceManager
-@Inject constructor(private val context: Context, private val ioDispatcher: CoroutineDispatcher, private val appDataRepository: AppDataRepository) {
+class ServiceManager(private val appDataRepository: AppDataRepository) {
 
-	private val _autoTunnelActive = MutableStateFlow(false)
+    private fun <T : Service> actionOnService(
+        action: Action,
+        context: Context,
+        cls: Class<T>,
+        extras: Map<String, Int>? = null
+    ) {
+        val intent =
+            Intent(context, cls).also {
+                it.action = action.name
+                extras?.forEach { (k, v) -> it.putExtra(k, v) }
+            }
+        intent.component?.javaClass
+        try {
+            when (action) {
+                Action.START_FOREGROUND, Action.STOP_FOREGROUND -> context.startForegroundService(intent)
+                Action.START, Action.STOP -> context.startService(intent)
+            }
+        } catch (e: Exception) {
+            Timber.e(e.message)
+        }
+    }
 
-	val autoTunnelActive = _autoTunnelActive.asStateFlow()
+    suspend fun startVpnService(
+        context: Context,
+        tunnelId: Int? = null,
+        isManualStart: Boolean = false
+    ) {
+        if (isManualStart) onManualStart(tunnelId)
+        actionOnService(
+            Action.START,
+            context,
+            WireGuardTunnelService::class.java,
+            tunnelId?.let { mapOf(Constants.TUNNEL_EXTRA_KEY to it) },
+        )
+    }
 
-	var autoTunnelService = CompletableDeferred<AutoTunnelService>()
-	var backgroundService = CompletableDeferred<TunnelBackgroundService>()
-	var autoTunnelTile = CompletableDeferred<AutoTunnelControlTile>()
-	var tunnelControlTile = CompletableDeferred<TunnelControlTile>()
+    suspend fun stopVpnServiceForeground(context: Context, isManualStop: Boolean = false) {
+        if (isManualStop) onManualStop()
+        Timber.i("Stopping vpn service")
+        actionOnService(
+            Action.STOP_FOREGROUND,
+            context,
+            WireGuardTunnelService::class.java,
+        )
+    }
 
-	private fun <T : Service> startService(cls: Class<T>, background: Boolean) {
-		runCatching {
-			val intent = Intent(context, cls)
-			if (background) {
-				context.startForegroundService(intent)
-			} else {
-				context.startService(intent)
-			}
-		}.onFailure { Timber.e(it) }
-	}
+    suspend fun stopVpnService(context: Context, isManualStop: Boolean = false) {
+        if (isManualStop) onManualStop()
+        Timber.i("Stopping vpn service")
+        actionOnService(
+            Action.STOP,
+            context,
+            WireGuardTunnelService::class.java,
+        )
+    }
 
-	suspend fun startAutoTunnel(background: Boolean) {
-		val settings = appDataRepository.settings.getSettings()
-		appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = true))
-		if (autoTunnelService.isCompleted) return _autoTunnelActive.update { true }
-		kotlin.runCatching {
-			startService(AutoTunnelService::class.java, background)
-			autoTunnelService.await()
-			autoTunnelService.getCompleted().start()
-			_autoTunnelActive.update { true }
-			updateAutoTunnelTile()
-		}.onFailure {
-			Timber.e(it)
-		}
-	}
+    private suspend fun onManualStop() {
+        appDataRepository.appState.setManualStop()
+    }
 
-	suspend fun startBackgroundService(tunnelConfig: TunnelConfig?) {
-		if (backgroundService.isCompleted) return
-		kotlin.runCatching {
-			startService(TunnelBackgroundService::class.java, true)
-			backgroundService.await()
-			backgroundService.getCompleted().start(tunnelConfig)
-		}.onFailure {
-			Timber.e(it)
-		}
-	}
+    private suspend fun onManualStart(tunnelId: Int?) {
+        tunnelId?.let {
+            appDataRepository.appState.setTunnelRunningFromManualStart(it)
+        }
+    }
 
-	fun stopBackgroundService() {
-		if (!backgroundService.isCompleted) return
-		runCatching {
-			backgroundService.getCompleted().stop()
-		}.onFailure {
-			Timber.e(it)
-		}
-	}
+    suspend fun startVpnServiceForeground(
+        context: Context,
+        tunnelId: Int? = null,
+        isManualStart: Boolean = false
+    ) {
+        if (isManualStart) onManualStart(tunnelId)
+        actionOnService(
+            Action.START_FOREGROUND,
+            context,
+            WireGuardTunnelService::class.java,
+            tunnelId?.let { mapOf(Constants.TUNNEL_EXTRA_KEY to it) },
+        )
+    }
 
-	suspend fun toggleAutoTunnel(background: Boolean) {
-		withContext(ioDispatcher) {
-			if (_autoTunnelActive.value) return@withContext stopAutoTunnel()
-			startAutoTunnel(background)
-		}
-	}
+    fun startWatcherServiceForeground(
+        context: Context,
+    ) {
+        actionOnService(
+            Action.START_FOREGROUND,
+            context,
+            WireGuardConnectivityWatcherService::class.java,
+        )
+    }
 
-	private fun updateAutoTunnelTile() {
-		if (autoTunnelTile.isCompleted) {
-			autoTunnelTile.getCompleted().updateTileState()
-		} else {
-			context.requestAutoTunnelTileServiceUpdate()
-		}
-	}
+    fun startWatcherService(context: Context) {
+        actionOnService(
+            Action.START,
+            context,
+            WireGuardConnectivityWatcherService::class.java,
+        )
+    }
 
-	fun updateTunnelTile() {
-		if (tunnelControlTile.isCompleted) {
-			tunnelControlTile.getCompleted().updateTileState()
-		} else {
-			context.requestTunnelTileServiceStateUpdate()
-		}
-	}
-
-	suspend fun stopAutoTunnel() {
-		withContext(ioDispatcher) {
-			val settings = appDataRepository.settings.getSettings()
-			appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = false))
-			if (!autoTunnelService.isCompleted) return@withContext
-			runCatching {
-				autoTunnelService.getCompleted().stop()
-				_autoTunnelActive.update { false }
-				updateAutoTunnelTile()
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
-	}
+    fun stopWatcherService(context: Context) {
+        actionOnService(
+            Action.STOP,
+            context,
+            WireGuardConnectivityWatcherService::class.java,
+        )
+    }
 }

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

@@ -1,70 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground
-
-import android.app.Notification
-import android.content.Intent
-import android.os.IBinder
-import androidx.core.app.ServiceCompat
-import androidx.lifecycle.LifecycleService
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationAction
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
-import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CompletableDeferred
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class TunnelBackgroundService : LifecycleService() {
-
-	@Inject
-	lateinit var notificationService: NotificationService
-
-	@Inject
-	lateinit var serviceManager: ServiceManager
-
-	override fun onCreate() {
-		super.onCreate()
-		serviceManager.backgroundService.complete(this)
-	}
-
-	override fun onBind(intent: Intent): IBinder? {
-		super.onBind(intent)
-		return null
-	}
-
-	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-		serviceManager.backgroundService.complete(this)
-		return super.onStartCommand(intent, flags, startId)
-	}
-
-	fun start(tunnelConfig: TunnelConfig?) {
-		ServiceCompat.startForeground(
-			this,
-			NotificationService.KERNEL_SERVICE_NOTIFICATION_ID,
-			createNotification(tunnelConfig),
-			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
-		)
-	}
-
-	fun stop() {
-		stopForeground(STOP_FOREGROUND_REMOVE)
-		stopSelf()
-	}
-
-	override fun onDestroy() {
-		serviceManager.backgroundService = CompletableDeferred()
-		super.onDestroy()
-	}
-
-	private fun createNotification(tunnelConfig: TunnelConfig?): Notification {
-		return notificationService.createNotification(
-			WireGuardNotification.NotificationChannels.VPN,
-			title = "${getString(R.string.tunnel_running)} - ${tunnelConfig?.name}",
-			actions = listOf(
-				notificationService.createNotificationAction(NotificationAction.TUNNEL_OFF),
-			),
-		)
-	}
-}

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

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

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

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

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

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

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

@@ -1,300 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel
-
-import android.content.Intent
-import android.os.IBinder
-import android.os.PowerManager
-import androidx.core.app.ServiceCompat
-import androidx.lifecycle.LifecycleService
-import androidx.lifecycle.lifecycleScope
-import com.wireguard.android.util.RootShell
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.data.domain.Settings
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.module.AppShell
-import com.zaneschepke.wireguardautotunnel.module.Ethernet
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.module.MainImmediateDispatcher
-import com.zaneschepke.wireguardautotunnel.module.MobileData
-import com.zaneschepke.wireguardautotunnel.module.Wifi
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model.AutoTunnelEvent
-import com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model.AutoTunnelState
-import com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model.NetworkState
-import com.zaneschepke.wireguardautotunnel.service.network.NetworkService
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationAction
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
-import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
-import com.zaneschepke.wireguardautotunnel.util.extensions.cancelWithMessage
-import com.zaneschepke.wireguardautotunnel.util.extensions.isReachable
-import com.zaneschepke.wireguardautotunnel.util.extensions.onNotRunning
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.debounce
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.filterNot
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-import java.net.InetAddress
-import java.util.concurrent.atomic.AtomicBoolean
-import javax.inject.Inject
-import javax.inject.Provider
-
-@AndroidEntryPoint
-class AutoTunnelService : LifecycleService() {
-
-	@Inject
-	@AppShell
-	lateinit var rootShell: Provider<RootShell>
-
-	@Inject
-	@Wifi
-	lateinit var wifiService: NetworkService
-
-	@Inject
-	@MobileData
-	lateinit var mobileDataService: NetworkService
-
-	@Inject
-	@Ethernet
-	lateinit var ethernetService: NetworkService
-
-	@Inject
-	lateinit var appDataRepository: Provider<AppDataRepository>
-
-	@Inject
-	lateinit var notificationService: NotificationService
-
-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
-
-	@Inject
-	@IoDispatcher
-	lateinit var ioDispatcher: CoroutineDispatcher
-
-	@Inject
-	lateinit var serviceManager: ServiceManager
-
-	@Inject
-	@MainImmediateDispatcher
-	lateinit var mainImmediateDispatcher: CoroutineDispatcher
-
-	private val defaultState = AutoTunnelState()
-
-	private val autoTunnelStateFlow = MutableStateFlow(defaultState)
-
-	private var wakeLock: PowerManager.WakeLock? = null
-
-	private val pingTunnelRestartActive = AtomicBoolean(false)
-
-	private var pingJob: Job? = null
-
-	override fun onCreate() {
-		super.onCreate()
-		serviceManager.autoTunnelService.complete(this)
-		lifecycleScope.launch(mainImmediateDispatcher) {
-			kotlin.runCatching {
-				launchWatcherNotification()
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
-	}
-
-	override fun onBind(intent: Intent): IBinder? {
-		super.onBind(intent)
-		return null
-	}
-
-	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-		Timber.d("onStartCommand executed with startId: $startId")
-		serviceManager.autoTunnelService.complete(this)
-		return super.onStartCommand(intent, flags, startId)
-	}
-
-	fun start() {
-		kotlin.runCatching {
-			lifecycleScope.launch(mainImmediateDispatcher) {
-				launchWatcherNotification()
-				initWakeLock()
-			}
-			startAutoTunnelJob()
-			startAutoTunnelStateJob()
-			startPingStateJob()
-		}.onFailure {
-			Timber.e(it)
-		}
-	}
-
-	fun stop() {
-		wakeLock?.let { if (it.isHeld) it.release() }
-		stopSelf()
-	}
-
-	override fun onDestroy() {
-		cancelAndResetPingJob()
-		serviceManager.autoTunnelService = CompletableDeferred()
-		super.onDestroy()
-	}
-
-	private fun launchWatcherNotification(description: String = getString(R.string.monitoring_state_changes)) {
-		val notification =
-			notificationService.createNotification(
-				WireGuardNotification.NotificationChannels.AUTO_TUNNEL,
-				title = getString(R.string.auto_tunnel_title),
-				description = description,
-				actions = listOf(
-					notificationService.createNotificationAction(NotificationAction.AUTO_TUNNEL_OFF),
-				),
-			)
-		ServiceCompat.startForeground(
-			this,
-			NotificationService.AUTO_TUNNEL_NOTIFICATION_ID,
-			notification,
-			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
-		)
-	}
-
-	private fun initWakeLock() {
-		wakeLock = (getSystemService(POWER_SERVICE) as PowerManager).run {
-			val tag = this.javaClass.name
-			newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "$tag::lock").apply {
-				try {
-					Timber.i("Initiating wakelock with 10 min timeout")
-					acquire(Constants.BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT)
-				} finally {
-					release()
-				}
-			}
-		}
-	}
-
-	private fun startPingJob() = lifecycleScope.launch {
-		watchForPingFailure()
-	}
-
-	private fun startPingStateJob() = lifecycleScope.launch {
-		autoTunnelStateFlow.collect {
-			if (it == defaultState) return@collect
-			if (it.isPingEnabled()) {
-				pingJob.onNotRunning { pingJob = startPingJob() }
-			} else {
-				if (!pingTunnelRestartActive.get()) cancelAndResetPingJob()
-			}
-		}
-	}
-
-	private suspend fun watchForPingFailure() {
-		withContext(ioDispatcher) {
-			Timber.i("Starting ping watcher")
-			runCatching {
-				do {
-					val vpnState = autoTunnelStateFlow.value.vpnState
-					if (vpnState.status.isUp() && !autoTunnelStateFlow.value.isNoConnectivity()) {
-						if (vpnState.tunnelConfig != null) {
-							val config = TunnelConfig.configFromWgQuick(vpnState.tunnelConfig.wgQuick)
-							val results = if (vpnState.tunnelConfig.pingIp != null) {
-								Timber.d("Pinging custom ip : ${vpnState.tunnelConfig.pingIp}")
-								listOf(InetAddress.getByName(vpnState.tunnelConfig.pingIp).isReachable(Constants.PING_TIMEOUT.toInt()))
-							} else {
-								Timber.d("Pinging all peers")
-								config.peers.map { peer ->
-									peer.isReachable()
-								}
-							}
-							Timber.i("Ping results reachable: $results")
-							if (results.contains(false)) {
-								Timber.i("Restarting VPN for ping failure")
-								val cooldown = vpnState.tunnelConfig.pingCooldown
-								pingTunnelRestartActive.set(true)
-								tunnelService.get().bounceTunnel()
-								pingTunnelRestartActive.set(false)
-								delay(cooldown ?: Constants.PING_COOLDOWN)
-								continue
-							}
-						}
-					}
-					delay(vpnState.tunnelConfig?.pingInterval ?: Constants.PING_INTERVAL)
-				} while (true)
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
-	}
-
-	private fun startAutoTunnelStateJob() = lifecycleScope.launch(ioDispatcher) {
-		combine(
-			combineSettings(),
-			combineNetworkEventsJob(),
-		) { double, networkState ->
-			AutoTunnelState(tunnelService.get().vpnState.value, networkState, double.first, double.second)
-		}.collect { state ->
-			Timber.d("Network state: ${state.networkState}")
-			autoTunnelStateFlow.update {
-				it.copy(vpnState = state.vpnState, networkState = state.networkState, settings = state.settings, tunnels = state.tunnels)
-			}
-		}
-	}
-
-	private fun cancelAndResetPingJob() {
-		pingJob?.cancelWithMessage("Ping job canceled")
-		pingJob = null
-	}
-
-	@OptIn(FlowPreview::class)
-	private fun combineNetworkEventsJob(): Flow<NetworkState> {
-		return combine(
-			wifiService.status,
-			mobileDataService.status,
-		) { wifi, mobileData ->
-			NetworkState(
-				wifi.available,
-				mobileData.available,
-				false,
-				wifi.name,
-			)
-		}.distinctUntilChanged().filterNot { it.isWifiConnected && it.wifiName == null }.debounce(500L)
-	}
-
-	private fun combineSettings(): Flow<Pair<Settings, TunnelConfigs>> {
-		return combine(
-			appDataRepository.get().settings.getSettingsFlow(),
-			appDataRepository.get().tunnels.getTunnelConfigsFlow().map { tunnels ->
-				// isActive is ignored for equality checks so user can manually toggle off tunnel with auto-tunnel
-				tunnels.map { it.copy(isActive = false) }
-			},
-		) { settings, tunnels ->
-			Pair(settings, tunnels)
-		}.distinctUntilChanged()
-	}
-
-	@OptIn(FlowPreview::class)
-	private fun startAutoTunnelJob() = lifecycleScope.launch(ioDispatcher) {
-		Timber.i("Starting auto-tunnel network event watcher")
-		autoTunnelStateFlow.debounce(1000L).collect { watcherState ->
-			if (watcherState == defaultState) return@collect
-			Timber.d("New auto tunnel state emitted")
-			when (val event = watcherState.asAutoTunnelEvent()) {
-				is AutoTunnelEvent.Start -> tunnelService.get().startTunnel(
-					event.tunnelConfig
-						?: appDataRepository.get().getPrimaryOrFirstTunnel(),
-				)
-				is AutoTunnelEvent.Stop -> tunnelService.get().stopTunnel()
-				AutoTunnelEvent.DoNothing -> Timber.i("Auto-tunneling: no condition met")
-			}
-		}
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/foreground/autotunnel/model/AutoTunnelEvent.kt

@@ -1,9 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model
-
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-
-sealed class AutoTunnelEvent {
-	data class Start(val tunnelConfig: TunnelConfig? = null) : AutoTunnelEvent()
-	data object Stop : AutoTunnelEvent()
-	data object DoNothing : AutoTunnelEvent()
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/foreground/autotunnel/model/AutoTunnelState.kt

@@ -1,145 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model
-
-import com.zaneschepke.wireguardautotunnel.data.domain.Settings
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnState
-import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
-import com.zaneschepke.wireguardautotunnel.util.extensions.isMatchingToWildcardList
-
-data class AutoTunnelState(
-	val vpnState: VpnState = VpnState(),
-	val networkState: NetworkState = NetworkState(),
-	val settings: Settings = Settings(),
-	val tunnels: TunnelConfigs = emptyList(),
-) {
-
-	private fun isMobileDataActive(): Boolean {
-		return !networkState.isEthernetConnected && !networkState.isWifiConnected && networkState.isMobileDataConnected
-	}
-
-	private fun isMobileTunnelDataChangeNeeded(): Boolean {
-		val preferredTunnel = preferredMobileDataTunnel()
-		return preferredTunnel != null &&
-			vpnState.status.isUp() && preferredTunnel.id != vpnState.tunnelConfig?.id
-	}
-
-	private fun isEthernetTunnelChangeNeeded(): Boolean {
-		val preferredTunnel = preferredEthernetTunnel()
-		return preferredTunnel != null && vpnState.status.isUp() && preferredTunnel.id != vpnState.tunnelConfig?.id
-	}
-
-	private fun preferredMobileDataTunnel(): TunnelConfig? {
-		return tunnels.firstOrNull { it.isMobileDataTunnel } ?: tunnels.firstOrNull { it.isPrimaryTunnel }
-	}
-
-	private fun preferredEthernetTunnel(): TunnelConfig? {
-		return tunnels.firstOrNull { it.isEthernetTunnel } ?: tunnels.firstOrNull { it.isPrimaryTunnel }
-	}
-
-	private fun preferredWifiTunnel(): TunnelConfig? {
-		return getTunnelWithMatchingTunnelNetwork() ?: tunnels.firstOrNull { it.isPrimaryTunnel }
-	}
-
-	private fun isWifiActive(): Boolean {
-		return !networkState.isEthernetConnected && networkState.isWifiConnected
-	}
-
-	private fun startOnEthernet(): Boolean {
-		return networkState.isEthernetConnected && settings.isTunnelOnEthernetEnabled && vpnState.status.isDown()
-	}
-
-	private fun stopOnEthernet(): Boolean {
-		return networkState.isEthernetConnected && !settings.isTunnelOnEthernetEnabled && vpnState.status.isUp()
-	}
-
-	fun isNoConnectivity(): Boolean {
-		return !networkState.isEthernetConnected && !networkState.isWifiConnected && !networkState.isMobileDataConnected
-	}
-
-	private fun stopOnMobileData(): Boolean {
-		return isMobileDataActive() && !settings.isTunnelOnMobileDataEnabled && vpnState.status.isUp()
-	}
-
-	private fun startOnMobileData(): Boolean {
-		return isMobileDataActive() && settings.isTunnelOnMobileDataEnabled && vpnState.status.isDown()
-	}
-
-	private fun changeOnMobileData(): Boolean {
-		return isMobileDataActive() && settings.isTunnelOnMobileDataEnabled && isMobileTunnelDataChangeNeeded()
-	}
-
-	private fun changeOnEthernet(): Boolean {
-		return networkState.isEthernetConnected && settings.isTunnelOnEthernetEnabled && isEthernetTunnelChangeNeeded()
-	}
-
-	private fun stopOnWifi(): Boolean {
-		return isWifiActive() && !settings.isTunnelOnWifiEnabled && vpnState.status.isUp()
-	}
-
-	private fun stopOnTrustedWifi(): Boolean {
-		return isWifiActive() && settings.isTunnelOnWifiEnabled && vpnState.status.isUp() && isCurrentSSIDTrusted()
-	}
-
-	private fun startOnUntrustedWifi(): Boolean {
-		return isWifiActive() && settings.isTunnelOnWifiEnabled && vpnState.status.isDown() && !isCurrentSSIDTrusted()
-	}
-
-	private fun changeOnUntrustedWifi(): Boolean {
-		return isWifiActive() && settings.isTunnelOnWifiEnabled && vpnState.status.isUp() && !isCurrentSSIDTrusted() && !isWifiTunnelPreferred()
-	}
-
-	private fun isWifiTunnelPreferred(): Boolean {
-		val preferred = preferredWifiTunnel()
-		val vpnTunnel = vpnState.tunnelConfig
-		return if (preferred != null && vpnTunnel != null) {
-			preferred.id == vpnTunnel.id
-		} else {
-			true
-		}
-	}
-
-	fun asAutoTunnelEvent(): AutoTunnelEvent {
-		return when {
-			// ethernet scenarios
-			stopOnEthernet() -> AutoTunnelEvent.Stop
-			startOnEthernet() || changeOnEthernet() -> AutoTunnelEvent.Start(preferredEthernetTunnel())
-			// mobile data scenarios
-			stopOnMobileData() -> AutoTunnelEvent.Stop
-			startOnMobileData() || changeOnMobileData() -> AutoTunnelEvent.Start(preferredMobileDataTunnel())
-			// wifi scenarios
-			stopOnWifi() -> AutoTunnelEvent.Stop
-			stopOnTrustedWifi() -> AutoTunnelEvent.Stop
-			startOnUntrustedWifi() || changeOnUntrustedWifi() -> AutoTunnelEvent.Start(preferredWifiTunnel())
-			// no connectivity
-			isNoConnectivity() && settings.isStopOnNoInternetEnabled -> AutoTunnelEvent.Stop
-			else -> AutoTunnelEvent.DoNothing
-		}
-	}
-
-	private fun isCurrentSSIDTrusted(): Boolean {
-		return networkState.wifiName?.let {
-			hasTrustedWifiName(it)
-		} == true
-	}
-
-	private fun hasTrustedWifiName(wifiName: String, wifiNames: List<String> = settings.trustedNetworkSSIDs): Boolean {
-		return if (settings.isWildcardsEnabled) {
-			wifiNames.isMatchingToWildcardList(wifiName)
-		} else {
-			wifiNames.contains(wifiName)
-		}
-	}
-
-	private fun getTunnelWithMatchingTunnelNetwork(): TunnelConfig? {
-		return networkState.wifiName?.let { wifiName ->
-			tunnels.firstOrNull {
-				hasTrustedWifiName(wifiName, it.tunnelNetworks)
-			}
-		}
-	}
-
-	fun isPingEnabled(): Boolean {
-		return settings.isPingEnabled ||
-			(vpnState.status.isUp() && vpnState.tunnelConfig != null && tunnels.first { it.id == vpnState.tunnelConfig.id }.isPingEnabled)
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/service/foreground/autotunnel/model/NetworkState.kt

@@ -1,8 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model
-
-data class NetworkState(
-	val isWifiConnected: Boolean = false,
-	val isMobileDataConnected: Boolean = false,
-	val isEthernetConnected: Boolean = false,
-	val wifiName: String? = null,
-)

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

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

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

@@ -1,64 +1,9 @@
 package com.zaneschepke.wireguardautotunnel.service.network
 
 import android.content.Context
-import android.net.ConnectivityManager
-import android.net.Network
 import android.net.NetworkCapabilities
-import android.net.NetworkRequest
 import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onStart
-import timber.log.Timber
 import javax.inject.Inject
 
-class EthernetService
-@Inject
-constructor(
-	@ApplicationContext context: Context,
-) : NetworkService {
-
-	private val connectivityManager =
-		context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-
-	override val status = callbackFlow {
-		val networkStatusCallback = object : ConnectivityManager.NetworkCallback() {
-			override fun onAvailable(network: Network) {
-				trySend(NetworkStatus.Available(network))
-			}
-			override fun onLost(network: Network) {
-				trySend(NetworkStatus.Unavailable())
-			}
-			override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
-				trySend(
-					NetworkStatus.CapabilitiesChanged(
-						network,
-						networkCapabilities,
-					),
-				)
-			}
-		}
-		val request =
-			NetworkRequest.Builder()
-				.addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET)
-				.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-				.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
-				.build()
-		connectivityManager.registerNetworkCallback(request, networkStatusCallback)
-
-		awaitClose { connectivityManager.unregisterNetworkCallback(networkStatusCallback) }
-	}.onStart {
-		// needed for services that are not yet available as it will impact later combine flows if we don't emit
-		emit(NetworkStatus.Unavailable())
-	}.catch {
-		Timber.e(it)
-		emit(NetworkStatus.Unavailable())
-	}.map {
-		when (it) {
-			is NetworkStatus.Available, is NetworkStatus.CapabilitiesChanged -> Status(true, null)
-			is NetworkStatus.Unavailable -> Status(false, null)
-		}
-	}
-}
+class EthernetService @Inject constructor(@ApplicationContext context: Context) :
+    BaseNetworkService<EthernetService>(context, NetworkCapabilities.TRANSPORT_ETHERNET)

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

@@ -1,63 +1,9 @@
 package com.zaneschepke.wireguardautotunnel.service.network
 
 import android.content.Context
-import android.net.ConnectivityManager
-import android.net.Network
 import android.net.NetworkCapabilities
-import android.net.NetworkRequest
 import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onStart
-import timber.log.Timber
 import javax.inject.Inject
 
-class MobileDataService
-@Inject
-constructor(
-	@ApplicationContext context: Context,
-) : NetworkService {
-	private val connectivityManager =
-		context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-
-	override val status = callbackFlow {
-		val networkStatusCallback = object : ConnectivityManager.NetworkCallback() {
-			override fun onAvailable(network: Network) {
-				trySend(NetworkStatus.Available(network))
-			}
-			override fun onLost(network: Network) {
-				trySend(NetworkStatus.Unavailable())
-			}
-			override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
-				trySend(
-					NetworkStatus.CapabilitiesChanged(
-						network,
-						networkCapabilities,
-					),
-				)
-			}
-		}
-		val request =
-			NetworkRequest.Builder()
-				.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
-				.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-				.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
-				.build()
-		connectivityManager.registerNetworkCallback(request, networkStatusCallback)
-
-		awaitClose { connectivityManager.unregisterNetworkCallback(networkStatusCallback) }
-	}.onStart {
-		// needed for services that are not yet available as it will impact later combine flows if we don't emit
-		emit(NetworkStatus.Unavailable())
-	}.catch {
-		Timber.e(it)
-		emit(NetworkStatus.Unavailable())
-	}.map {
-		when (it) {
-			is NetworkStatus.Available, is NetworkStatus.CapabilitiesChanged -> Status(true, null)
-			is NetworkStatus.Unavailable -> Status(false, null)
-		}
-	}
-}
+class MobileDataService @Inject constructor(@ApplicationContext context: Context) :
+    BaseNetworkService<MobileDataService>(context, NetworkCapabilities.TRANSPORT_CELLULAR)

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

@@ -1,16 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.network
-
-import android.net.NetworkCapabilities
-import android.net.wifi.WifiInfo
-import android.os.Build
-
-fun NetworkCapabilities.getWifiName(): String? {
-	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-		val info: WifiInfo
-		if (transportInfo is WifiInfo) {
-			info = transportInfo as WifiInfo
-			return info.ssid
-		}
-	}
-	return null
-}

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

@@ -1,27 +1,10 @@
 package com.zaneschepke.wireguardautotunnel.service.network
 
-import android.net.Network
 import android.net.NetworkCapabilities
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
 
-interface NetworkService {
-	val status: Flow<Status>
-}
+interface NetworkService<T> {
+    fun getNetworkName(networkCapabilities: NetworkCapabilities): String?
 
-inline fun <Result> Flow<NetworkStatus>.map(
-	crossinline onUnavailable: suspend () -> Result,
-	crossinline onAvailable: suspend (network: Network) -> Result,
-	crossinline onCapabilitiesChanged:
-	suspend (network: Network, networkCapabilities: NetworkCapabilities) -> Result,
-): Flow<Result> = map { status ->
-	when (status) {
-		is NetworkStatus.Unavailable -> onUnavailable()
-		is NetworkStatus.Available -> onAvailable(status.network)
-		is NetworkStatus.CapabilitiesChanged ->
-			onCapabilitiesChanged(
-				status.network,
-				status.networkCapabilities,
-			)
-	}
+    val networkStatus: Flow<NetworkStatus>
 }

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

@@ -4,11 +4,10 @@ import android.net.Network
 import android.net.NetworkCapabilities
 
 sealed class NetworkStatus {
-	abstract val isConnected: Boolean
-	class Available(val network: Network, override val isConnected: Boolean = true) : NetworkStatus()
+    class Available(val network: Network) : NetworkStatus()
 
-	class Unavailable(override val isConnected: Boolean = false) : NetworkStatus()
+    class Unavailable(val network: Network) : NetworkStatus()
 
-	class CapabilitiesChanged(val network: Network, val networkCapabilities: NetworkCapabilities, override val isConnected: Boolean = true) :
-		NetworkStatus()
+    class CapabilitiesChanged(val network: Network, val networkCapabilities: NetworkCapabilities) :
+        NetworkStatus()
 }

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

@@ -1,6 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.network
-
-data class Status(
-	val available: Boolean,
-	val name: String?,
-)

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

@@ -1,139 +1,9 @@
 package com.zaneschepke.wireguardautotunnel.service.network
 
 import android.content.Context
-import android.net.ConnectivityManager
-import android.net.ConnectivityManager.NetworkCallback.FLAG_INCLUDE_LOCATION_INFO
-import android.net.Network
 import android.net.NetworkCapabilities
-import android.net.NetworkRequest
-import android.net.wifi.SupplicantState
-import android.net.wifi.WifiManager
-import android.os.Build
-import com.wireguard.android.util.RootShell
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.module.AppShell
-import com.zaneschepke.wireguardautotunnel.util.extensions.getCurrentWifiName
 import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.onStart
-import kotlinx.coroutines.flow.transform
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import timber.log.Timber
 import javax.inject.Inject
-import javax.inject.Provider
 
-class WifiService
-@Inject
-constructor(
-	@ApplicationContext private val context: Context,
-	private val settingsRepository: SettingsRepository,
-	@AppShell private val rootShell: Provider<RootShell>,
-) : NetworkService {
-
-	val mutex = Mutex()
-
-	private var ssid: String? = null
-	private var available: Boolean = false
-
-	private val connectivityManager =
-		context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-
-	override val status = callbackFlow {
-		val networkStatusCallback =
-			when (Build.VERSION.SDK_INT) {
-				in Build.VERSION_CODES.S..Int.MAX_VALUE -> {
-					object :
-						ConnectivityManager.NetworkCallback(
-							FLAG_INCLUDE_LOCATION_INFO,
-						) {
-						override fun onAvailable(network: Network) {
-							trySend(NetworkStatus.Available(network))
-						}
-
-						override fun onLost(network: Network) {
-							trySend(NetworkStatus.Unavailable())
-						}
-
-						override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
-							trySend(
-								NetworkStatus.CapabilitiesChanged(
-									network,
-									networkCapabilities,
-								),
-							)
-						}
-					}
-				}
-
-				else -> {
-					object : ConnectivityManager.NetworkCallback() {
-						override fun onAvailable(network: Network) {
-							trySend(NetworkStatus.Available(network))
-						}
-
-						override fun onLost(network: Network) {
-							trySend(NetworkStatus.Unavailable())
-						}
-
-						override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
-							trySend(
-								NetworkStatus.CapabilitiesChanged(
-									network,
-									networkCapabilities,
-								),
-							)
-						}
-					}
-				}
-			}
-		val request =
-			NetworkRequest.Builder()
-				.addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
-				.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-				.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
-				.build()
-		connectivityManager.registerNetworkCallback(request, networkStatusCallback)
-
-		awaitClose { connectivityManager.unregisterNetworkCallback(networkStatusCallback) }
-	}.onStart {
-		// needed for services that are not yet available as it will impact later combine flows if we don't emit
-		emit(NetworkStatus.Unavailable())
-	}.catch {
-		Timber.e(it)
-		emit(NetworkStatus.Unavailable())
-	}.transform {
-		when (it) {
-			is NetworkStatus.Available -> mutex.withLock {
-				available = true
-			}
-			is NetworkStatus.CapabilitiesChanged -> mutex.withLock {
-				if (available) {
-					available = false
-					Timber.d("Getting SSID from capabilities")
-					ssid = getNetworkName(it.networkCapabilities)
-				}
-				emit(Status(true, ssid))
-			}
-			is NetworkStatus.Unavailable -> emit(Status(false, null))
-		}
-	}
-
-	private suspend fun getNetworkName(networkCapabilities: NetworkCapabilities): String? {
-		if (settingsRepository.getSettings().isWifiNameByShellEnabled) return rootShell.get().getCurrentWifiName()
-		var ssid = networkCapabilities.getWifiName()
-		if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S) {
-			val wifiManager =
-				context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
-
-			@Suppress("DEPRECATION")
-			val info = wifiManager.connectionInfo
-			if (info.supplicantState === SupplicantState.COMPLETED) {
-				ssid = info.ssid
-			}
-		}
-		return ssid?.trim('"')
-	}
-}
+class WifiService @Inject constructor(@ApplicationContext context: Context) :
+    BaseNetworkService<WifiService>(context, NetworkCapabilities.TRANSPORT_WIFI)

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

@@ -1,17 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.notification
-
-import android.content.Context
-import com.zaneschepke.wireguardautotunnel.R
-
-enum class NotificationAction {
-	TUNNEL_OFF,
-	AUTO_TUNNEL_OFF,
-	;
-
-	fun title(context: Context): String {
-		return when (this) {
-			TUNNEL_OFF -> context.getString(R.string.stop)
-			AUTO_TUNNEL_OFF -> context.getString(R.string.stop)
-		}
-	}
-}

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

@@ -2,32 +2,21 @@ package com.zaneschepke.wireguardautotunnel.service.notification
 
 import android.app.Notification
 import android.app.NotificationManager
-import android.content.Context
-import androidx.core.app.NotificationCompat
-import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification.NotificationChannels
+import android.app.PendingIntent
 
 interface NotificationService {
-	val context: Context
-	fun createNotification(
-		channel: NotificationChannels,
-		title: String = "",
-		actions: Collection<NotificationCompat.Action> = emptyList(),
-		description: String = "",
-		showTimestamp: Boolean = false,
-		importance: Int = NotificationManager.IMPORTANCE_HIGH,
-		onGoing: Boolean = true,
-		onlyAlertOnce: Boolean = true,
-	): Notification
-
-	fun createNotificationAction(notificationAction: NotificationAction): NotificationCompat.Action
-
-	fun remove(notificationId: Int)
-
-	fun show(notificationId: Int, notification: Notification)
-
-	companion object {
-		const val KERNEL_SERVICE_NOTIFICATION_ID = 123
-		const val AUTO_TUNNEL_NOTIFICATION_ID = 122
-		const val VPN_NOTIFICATION_ID = 100
-	}
+    fun createNotification(
+        channelId: String,
+        channelName: String,
+        title: String = "",
+        action: PendingIntent? = null,
+        actionText: String? = null,
+        description: String,
+        showTimestamp: Boolean = false,
+        importance: Int = NotificationManager.IMPORTANCE_HIGH,
+        vibration: Boolean = false,
+        onGoing: Boolean = true,
+        lights: Boolean = true,
+        onlyAlertOnce: Boolean = true,
+    ): Notification
 }

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

@@ -1,143 +1,101 @@
 package com.zaneschepke.wireguardautotunnel.service.notification
 
-import android.Manifest
 import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.graphics.Color
-import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.receiver.NotificationActionReceiver
 import com.zaneschepke.wireguardautotunnel.ui.MainActivity
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
-class WireGuardNotification
-@Inject
-constructor(
-	@ApplicationContext override val context: Context,
-) : NotificationService {
+class WireGuardNotification @Inject constructor(@ApplicationContext private val context: Context) :
+    NotificationService {
+    private val notificationManager =
+        context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
 
-	enum class NotificationChannels {
-		VPN,
-		AUTO_TUNNEL,
-	}
+    private val watcherBuilder: NotificationCompat.Builder =
+        NotificationCompat.Builder(
+            context,
+            context.getString(R.string.watcher_channel_id),
+        )
+    private val tunnelBuilder: NotificationCompat.Builder =
+        NotificationCompat.Builder(
+            context,
+            context.getString(R.string.vpn_channel_id),
+        )
 
-	private val notificationManager = NotificationManagerCompat.from(context)
+    override fun createNotification(
+        channelId: String,
+        channelName: String,
+        title: String,
+        action: PendingIntent?,
+        actionText: String?,
+        description: String,
+        showTimestamp: Boolean,
+        importance: Int,
+        vibration: Boolean,
+        onGoing: Boolean,
+        lights: Boolean,
+        onlyAlertOnce: Boolean,
+    ): Notification {
+        val channel =
+            NotificationChannel(
+                channelId,
+                channelName,
+                importance,
+            )
+                .let {
+                    it.description = title
+                    it.enableLights(lights)
+                    it.lightColor = Color.RED
+                    it.enableVibration(vibration)
+                    it.vibrationPattern = longArrayOf(100, 200, 300)
+                    it
+                }
+        notificationManager.createNotificationChannel(channel)
+        val pendingIntent: PendingIntent =
+            Intent(context, MainActivity::class.java).let { notificationIntent ->
+                PendingIntent.getActivity(
+                    context,
+                    0,
+                    notificationIntent,
+                    PendingIntent.FLAG_IMMUTABLE,
+                )
+            }
 
-	override fun createNotification(
-		channel: NotificationChannels,
-		title: String,
-		actions: Collection<NotificationCompat.Action>,
-		description: String,
-		showTimestamp: Boolean,
-		importance: Int,
-		onGoing: Boolean,
-		onlyAlertOnce: Boolean,
-	): Notification {
-		notificationManager.createNotificationChannel(channel.asChannel())
-		return channel.asBuilder().apply {
-			actions.forEach {
-				addAction(it)
-			}
-			setContentTitle(title)
-			setContentIntent(
-				PendingIntent.getActivity(
-					context,
-					0,
-					Intent(context, MainActivity::class.java),
-					PendingIntent.FLAG_IMMUTABLE,
-				),
-			)
-			setContentText(description)
-			setOnlyAlertOnce(onlyAlertOnce)
-			setOngoing(onGoing)
-			setPriority(NotificationCompat.PRIORITY_HIGH)
-			setShowWhen(showTimestamp)
-			setSmallIcon(R.drawable.ic_launcher)
-		}.build()
-	}
+        val builder =
+            when (channelId) {
+                context.getString(R.string.watcher_channel_id) -> watcherBuilder
+                context.getString(R.string.vpn_channel_id) -> tunnelBuilder
+                else -> {
+                    NotificationCompat.Builder(
+                        context,
+                        channelId,
+                    )
+                }
+            }
 
-	override fun createNotificationAction(notificationAction: NotificationAction): NotificationCompat.Action {
-		val pendingIntent = PendingIntent.getBroadcast(
-			context,
-			0,
-			Intent(context, NotificationActionReceiver::class.java).apply {
-				action = notificationAction.name
-			},
-			PendingIntent.FLAG_IMMUTABLE,
-		)
-		return NotificationCompat.Action.Builder(
-			R.drawable.ic_launcher,
-			notificationAction.title(context).uppercase(),
-			pendingIntent,
-		).build()
-	}
-
-	override fun remove(notificationId: Int) {
-		notificationManager.cancel(notificationId)
-	}
-
-	override fun show(notificationId: Int, notification: Notification) {
-		with(notificationManager) {
-			if (ActivityCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
-				return
-			}
-			notify(notificationId, notification)
-		}
-	}
-
-	private fun NotificationChannels.asBuilder(): NotificationCompat.Builder {
-		return when (this) {
-			NotificationChannels.AUTO_TUNNEL -> {
-				NotificationCompat.Builder(
-					context,
-					context.getString(R.string.auto_tunnel_channel_id),
-				)
-			}
-			NotificationChannels.VPN -> {
-				NotificationCompat.Builder(
-					context,
-					context.getString(R.string.vpn_channel_id),
-				)
-			}
-		}
-	}
-
-	private fun NotificationChannels.asChannel(): NotificationChannel {
-		return when (this) {
-			NotificationChannels.VPN -> {
-				NotificationChannel(
-					context.getString(R.string.vpn_channel_id),
-					context.getString(R.string.vpn_channel_name),
-					NotificationManager.IMPORTANCE_HIGH,
-				).apply {
-					description = context.getString(R.string.vpn_channel_description)
-					enableLights(true)
-					lightColor = Color.WHITE
-					enableVibration(false)
-					vibrationPattern = longArrayOf(100, 200, 300)
-				}
-			}
-			NotificationChannels.AUTO_TUNNEL -> {
-				NotificationChannel(
-					context.getString(R.string.auto_tunnel_channel_id),
-					context.getString(R.string.auto_tunnel_channel_name),
-					NotificationManager.IMPORTANCE_HIGH,
-				).apply {
-					description = context.getString(R.string.auto_tunnel_channel_description)
-					enableLights(true)
-					lightColor = Color.WHITE
-					enableVibration(false)
-					vibrationPattern = longArrayOf(100, 200, 300)
-				}
-			}
-		}
-	}
+        return builder.let {
+            if (action != null && actionText != null) {
+                it.addAction(
+                    NotificationCompat.Action.Builder(0, actionText, action).build(),
+                )
+                it.setAutoCancel(true)
+            }
+            it.setContentTitle(title)
+                .setContentText(description)
+                .setOnlyAlertOnce(onlyAlertOnce)
+                .setContentIntent(pendingIntent)
+                .setOngoing(onGoing)
+                .setPriority(NotificationCompat.PRIORITY_HIGH)
+                .setShowWhen(showTimestamp)
+                .setSmallIcon(R.drawable.ic_launcher)
+                .build()
+        }
+    }
 }

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

@@ -1,79 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.shortcut
-
-import android.content.Context
-import android.content.Intent
-import androidx.core.content.pm.ShortcutInfoCompat
-import androidx.core.content.pm.ShortcutManagerCompat
-import androidx.core.graphics.drawable.IconCompat
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.withContext
-
-class DynamicShortcutManager(private val context: Context, @IoDispatcher private val ioDispatcher: CoroutineDispatcher) : ShortcutManager {
-	override suspend fun addShortcuts() {
-		withContext(ioDispatcher) {
-			ShortcutManagerCompat.setDynamicShortcuts(context, createShortcuts())
-		}
-	}
-
-	override suspend fun removeShortcuts() {
-		withContext(ioDispatcher) {
-			ShortcutManagerCompat.removeDynamicShortcuts(context, createShortcuts().map { it.id })
-		}
-	}
-
-	private fun createShortcuts(): List<ShortcutInfoCompat> {
-		return listOf(
-			buildShortcut(
-				context.getString(R.string.vpn_off),
-				context.getString(R.string.vpn_off),
-				context.getString(R.string.vpn_off),
-				intent = Intent(context, ShortcutsActivity::class.java).apply {
-					putExtra("className", "WireGuardTunnelService")
-					action = ShortcutsActivity.Action.STOP.name
-				},
-				shortcutIcon = R.drawable.vpn_off,
-			),
-			buildShortcut(
-				context.getString(R.string.vpn_on),
-				context.getString(R.string.vpn_on),
-				context.getString(R.string.vpn_on),
-				intent = Intent(context, ShortcutsActivity::class.java).apply {
-					putExtra("className", "WireGuardTunnelService")
-					action = ShortcutsActivity.Action.START.name
-				},
-				shortcutIcon = R.drawable.vpn_on,
-			),
-			buildShortcut(
-				context.getString(R.string.start_auto),
-				context.getString(R.string.start_auto),
-				context.getString(R.string.start_auto),
-				intent = Intent(context, ShortcutsActivity::class.java).apply {
-					putExtra("className", "WireGuardConnectivityWatcherService")
-					action = ShortcutsActivity.Action.START.name
-				},
-				shortcutIcon = R.drawable.auto_play,
-			),
-			buildShortcut(
-				context.getString(R.string.stop_auto),
-				context.getString(R.string.stop_auto),
-				context.getString(R.string.stop_auto),
-				intent = Intent(context, ShortcutsActivity::class.java).apply {
-					putExtra("className", "WireGuardConnectivityWatcherService")
-					action = ShortcutsActivity.Action.STOP.name
-				},
-				shortcutIcon = R.drawable.auto_pause,
-			),
-		)
-	}
-
-	private fun buildShortcut(id: String, shortLabel: String, longLabel: String, intent: Intent, shortcutIcon: Int): ShortcutInfoCompat {
-		return ShortcutInfoCompat.Builder(context, id)
-			.setShortLabel(shortLabel)
-			.setLongLabel(longLabel)
-			.setIntent(intent)
-			.setIcon(IconCompat.createWithResource(context, shortcutIcon))
-			.build()
-	}
-}

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

@@ -1,6 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.shortcut
-
-interface ShortcutManager {
-	suspend fun addShortcuts()
-	suspend fun removeShortcuts()
-}

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

@@ -2,76 +2,74 @@ package com.zaneschepke.wireguardautotunnel.service.shortcut
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
+import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.service.foreground.Action
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.AutoTunnelService
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import com.zaneschepke.wireguardautotunnel.service.foreground.WireGuardConnectivityWatcherService
+import com.zaneschepke.wireguardautotunnel.service.foreground.WireGuardTunnelService
 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
-import javax.inject.Provider
 
 @AndroidEntryPoint
 class ShortcutsActivity : ComponentActivity() {
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
 
-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
+    @Inject
+    lateinit var appDataRepository: AppDataRepository
 
-	@Inject
-	lateinit var serviceManager: ServiceManager
+    @Inject
+    lateinit var serviceManager: ServiceManager
 
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        lifecycleScope.launch(Dispatchers.Main) {
+            val settings = appDataRepository.settings.getSettings()
+            if (settings.isShortcutsEnabled) {
+                when (intent.getStringExtra(CLASS_NAME_EXTRA_KEY)) {
+                    WireGuardTunnelService::class.java.simpleName -> {
+                        val tunnelName = intent.getStringExtra(TUNNEL_NAME_EXTRA_KEY)
+                        val tunnelConfig = tunnelName?.let {
+                            appDataRepository.tunnels.getAll().firstOrNull {
+                                it.name == tunnelName
+                            }
+                        }
+                        when (intent.action) {
+                            Action.START.name -> serviceManager.startVpnServiceForeground(
+                                this@ShortcutsActivity, tunnelConfig?.id, isManualStart = true,
+                            )
 
-	override fun onCreate(savedInstanceState: Bundle?) {
-		super.onCreate(savedInstanceState)
-		applicationScope.launch {
-			val settings = appDataRepository.settings.getSettings()
-			if (settings.isShortcutsEnabled) {
-				when (intent.getStringExtra(CLASS_NAME_EXTRA_KEY)) {
-					LEGACY_TUNNEL_SERVICE_NAME, TunnelService::class.java.simpleName -> {
-						val tunnelName = intent.getStringExtra(TUNNEL_NAME_EXTRA_KEY)
-						Timber.d("Tunnel name extra: $tunnelName")
-						val tunnelConfig = tunnelName?.let {
-							appDataRepository.tunnels.getAll()
-								.firstOrNull { it.name == tunnelName }
-						} ?: appDataRepository.getStartTunnelConfig()
-						Timber.d("Shortcut action on name: ${tunnelConfig?.name}")
-						tunnelConfig?.let {
-							when (intent.action) {
-								Action.START.name -> tunnelService.get().startTunnel(it, true)
-								Action.STOP.name -> tunnelService.get().stopTunnel()
-								else -> Unit
-							}
-						}
-					}
-					AutoTunnelService::class.java.simpleName, LEGACY_AUTO_TUNNEL_SERVICE_NAME -> {
-						when (intent.action) {
-							Action.START.name -> serviceManager.startAutoTunnel(true)
-							Action.STOP.name -> serviceManager.stopAutoTunnel()
-						}
-					}
-				}
-			}
-		}
-		finish()
-	}
+                            Action.STOP.name -> serviceManager.stopVpnServiceForeground(
+                                this@ShortcutsActivity,
+                                isManualStop = true,
+                            )
+                        }
+                    }
 
-	enum class Action {
-		START,
-		STOP,
-	}
+                    WireGuardConnectivityWatcherService::class.java.simpleName -> {
+                        when (intent.action) {
+                            Action.START.name -> appDataRepository.settings.save(
+                                settings.copy(
+                                    isAutoTunnelPaused = false,
+                                ),
+                            )
 
-	companion object {
-		const val LEGACY_TUNNEL_SERVICE_NAME = "WireGuardTunnelService"
-		const val LEGACY_AUTO_TUNNEL_SERVICE_NAME = "WireGuardConnectivityWatcherService"
-		const val TUNNEL_NAME_EXTRA_KEY = "tunnelName"
-		const val CLASS_NAME_EXTRA_KEY = "className"
-	}
+                            Action.STOP.name -> appDataRepository.settings.save(
+                                settings.copy(
+                                    isAutoTunnelPaused = true,
+                                ),
+                            )
+                        }
+                    }
+                }
+            }
+        }
+        finish()
+    }
+
+    companion object {
+        const val TUNNEL_NAME_EXTRA_KEY = "tunnelName"
+        const val CLASS_NAME_EXTRA_KEY = "className"
+    }
 }

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

@@ -1,86 +1,111 @@
 package com.zaneschepke.wireguardautotunnel.service.tile
 
+import android.os.Build
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
+import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
 class AutoTunnelControlTile : TileService() {
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
 
-	@Inject
-	lateinit var serviceManager: ServiceManager
+    @Inject
+    lateinit var appDataRepository: AppDataRepository
 
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
+    @Inject
+    lateinit var serviceManager: ServiceManager
 
-	override fun onCreate() {
-		super.onCreate()
-		serviceManager.autoTunnelTile.complete(this)
-	}
+    private val scope = CoroutineScope(Dispatchers.IO)
 
-	override fun onDestroy() {
-		super.onDestroy()
-		serviceManager.autoTunnelTile = CompletableDeferred()
-	}
+    private var manualStartConfig: TunnelConfig? = null
 
-	override fun onStartListening() {
-		super.onStartListening()
-		serviceManager.autoTunnelTile.complete(this)
-		applicationScope.launch {
-			if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
-			updateTileState()
-		}
-	}
+    override fun onStartListening() {
+        super.onStartListening()
+        scope.launch {
+            appDataRepository.settings.getSettingsFlow().collectLatest {
+                when (it.isAutoTunnelEnabled) {
+                    true -> {
+                        if (it.isAutoTunnelPaused) {
+                            setInactive()
+                            setTileDescription(this@AutoTunnelControlTile.getString(R.string.paused))
+                        } else {
+                            setActive()
+                            setTileDescription(this@AutoTunnelControlTile.getString(R.string.active))
+                        }
+                    }
 
-	fun updateTileState() {
-		serviceManager.autoTunnelActive.value.let {
-			if (it) setActive() else setInactive()
-		}
-	}
+                    false -> {
+                        setTileDescription(this@AutoTunnelControlTile.getString(R.string.disabled))
+                        setUnavailable()
+                    }
+                }
+            }
+        }
+    }
 
-	override fun onClick() {
-		super.onClick()
-		unlockAndRun {
-			applicationScope.launch {
-				if (serviceManager.autoTunnelActive.value) {
-					serviceManager.stopAutoTunnel()
-					setInactive()
-				} else {
-					serviceManager.startAutoTunnel(true)
-					setActive()
-				}
-			}
-		}
-	}
+    override fun onTileAdded() {
+        super.onTileAdded()
+        onStartListening()
+    }
 
-	private fun setActive() {
-		kotlin.runCatching {
-			qsTile.state = Tile.STATE_ACTIVE
-			qsTile.updateTile()
-		}
-	}
+    override fun onDestroy() {
+        super.onDestroy()
+        scope.cancel()
+    }
 
-	private fun setInactive() {
-		kotlin.runCatching {
-			qsTile.state = Tile.STATE_INACTIVE
-			qsTile.updateTile()
-		}
-	}
+    override fun onTileRemoved() {
+        super.onTileRemoved()
+        scope.cancel()
+    }
 
-	private fun setUnavailable() {
-		kotlin.runCatching {
-			qsTile.state = Tile.STATE_UNAVAILABLE
-			qsTile.updateTile()
-		}
-	}
+    override fun onClick() {
+        super.onClick()
+        unlockAndRun {
+            scope.launch {
+                try {
+                    appDataRepository.toggleWatcherServicePause()
+                } catch (e: Exception) {
+                    Timber.e(e.message)
+                } finally {
+                    cancel()
+                }
+            }
+        }
+    }
+
+    private fun setActive() {
+        qsTile.state = Tile.STATE_ACTIVE
+        qsTile.updateTile()
+    }
+
+    private fun setInactive() {
+        qsTile.state = Tile.STATE_INACTIVE
+        qsTile.updateTile()
+    }
+
+    private fun setUnavailable() {
+        manualStartConfig = null
+        qsTile.state = Tile.STATE_UNAVAILABLE
+        qsTile.updateTile()
+    }
+
+    private fun setTileDescription(description: String) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            qsTile.subtitle = description
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            qsTile.stateDescription = description
+        }
+        qsTile.updateTile()
+    }
 }

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

@@ -3,117 +3,124 @@ 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.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnService
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
+import org.amnezia.awg.backend.Tunnel
+import timber.log.Timber
 import javax.inject.Inject
-import javax.inject.Provider
 
 @AndroidEntryPoint
 class TunnelControlTile : TileService() {
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
 
-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
+    @Inject
+    lateinit var appDataRepository: AppDataRepository
 
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
+    @Inject
+    lateinit var vpnService: VpnService
 
-	@Inject
-	lateinit var serviceManager: ServiceManager
+    @Inject
+    lateinit var serviceManager: ServiceManager
 
-	override fun onCreate() {
-		super.onCreate()
-		serviceManager.tunnelControlTile.complete(this)
-	}
+    private val scope = CoroutineScope(Dispatchers.IO)
 
-	override fun onDestroy() {
-		super.onDestroy()
-		serviceManager.tunnelControlTile = CompletableDeferred()
-	}
+    private var manualStartConfig: TunnelConfig? = null
 
-	override fun onStartListening() {
-		super.onStartListening()
-		serviceManager.tunnelControlTile.complete(this)
-		applicationScope.launch {
-			if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
-			updateTileState()
-		}
-	}
+    override fun onStartListening() {
+        super.onStartListening()
+        Timber.d("On start listening called")
+        scope.launch {
+            vpnService.vpnState.collect { it ->
+                when (it.status) {
+                    Tunnel.State.UP -> {
+                        setActive()
+                        it.tunnelConfig?.name?.let { name -> setTileDescription(name) }
+                    }
 
-	fun updateTileState() = applicationScope.launch {
-		val lastActive = appDataRepository.getStartTunnelConfig()
-		lastActive?.let {
-			updateTile(it)
-		}
-	}
+                    Tunnel.State.DOWN -> {
+                        setInactive()
+                        val config = appDataRepository.getStartTunnelConfig()?.also { config ->
+                            manualStartConfig = config
+                        } ?: appDataRepository.getPrimaryOrFirstTunnel()
+                        config?.let {
+                            setTileDescription(it.name)
+                        } ?: setUnavailable()
+                    }
 
-	override fun onClick() {
-		super.onClick()
-		unlockAndRun {
-			applicationScope.launch {
-				val lastActive = appDataRepository.getStartTunnelConfig()
-				lastActive?.let { tunnel ->
-					if (tunnel.isActive) {
-						tunnelService.get().stopTunnel()
-					} else {
-						tunnelService.get().startTunnel(tunnel, true)
-					}
-					updateTileState()
-				}
-			}
-		}
-	}
+                    else -> setInactive()
+                }
+            }
+        }
+    }
 
-	private fun setActive() {
-		kotlin.runCatching {
-			qsTile.state = Tile.STATE_ACTIVE
-			qsTile.updateTile()
-		}
-	}
+    override fun onDestroy() {
+        super.onDestroy()
+        scope.cancel()
+    }
 
-	private fun setInactive() {
-		kotlin.runCatching {
-			qsTile.state = Tile.STATE_INACTIVE
-			qsTile.updateTile()
-		}
-	}
+    override fun onTileRemoved() {
+        super.onTileRemoved()
+        scope.cancel()
+    }
 
-	private fun setUnavailable() {
-		kotlin.runCatching {
-			qsTile.state = Tile.STATE_UNAVAILABLE
-			setTileDescription("")
-			qsTile.updateTile()
-		}
-	}
+    override fun onTileAdded() {
+        super.onTileAdded()
+        onStartListening()
+    }
 
-	private fun setTileDescription(description: String) {
-		kotlin.runCatching {
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-				qsTile.subtitle = description
-			}
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-				qsTile.stateDescription = description
-			}
-			qsTile.updateTile()
-		}
-	}
+    override fun onClick() {
+        super.onClick()
+        unlockAndRun {
+            scope.launch {
+                try {
+                    if (vpnService.getState() == Tunnel.State.UP) {
+                        serviceManager.stopVpnServiceForeground(
+                            this@TunnelControlTile,
+                            isManualStop = true,
+                        )
+                    } else {
+                        serviceManager.startVpnServiceForeground(
+                            this@TunnelControlTile, manualStartConfig?.id, isManualStart = true,
+                        )
+                    }
+                } catch (e: Exception) {
+                    Timber.e(e.message)
+                } finally {
+                    cancel()
+                }
+            }
+        }
+    }
 
-	private fun updateTile(tunnelConfig: TunnelConfig?) {
-		kotlin.runCatching {
-			tunnelConfig?.let {
-				setTileDescription(it.name)
-				if (it.isActive) return setActive()
-				setInactive()
-			}
-		}
-	}
+    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/tunnel/AlwaysOnVpnService.kt

@@ -1,46 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.tunnel
-
-import android.content.Intent
-import android.os.IBinder
-import androidx.lifecycle.LifecycleService
-import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Provider
-
-@AndroidEntryPoint
-class AlwaysOnVpnService : LifecycleService() {
-
-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
-
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
-
-	override fun onBind(intent: Intent): IBinder? {
-		super.onBind(intent)
-		// We don't provide binding, so return null
-		return null
-	}
-
-	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-		if (intent == null || intent.component == null || intent.component!!.packageName != packageName) {
-			Timber.i("Always-on VPN requested started")
-			lifecycleScope.launch {
-				val settings = appDataRepository.settings.getSettings()
-				if (settings.isAlwaysOnVpnEnabled) {
-					val tunnel = appDataRepository.getPrimaryOrFirstTunnel()
-					tunnel?.let {
-						tunnelService.get().startTunnel(it)
-					}
-				} else {
-					Timber.w("Always-on VPN is not enabled in app settings")
-				}
-			}
-		}
-		return super.onStartCommand(intent, flags, startId)
-	}
-}

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

@@ -1,7 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.tunnel
-
-enum class BackendState {
-	KILL_SWITCH_ACTIVE,
-	SERVICE_ACTIVE,
-	INACTIVE,
-}

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

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

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

@@ -1,28 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.tunnel
-
-import com.wireguard.android.backend.Tunnel
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import kotlinx.coroutines.flow.StateFlow
-
-interface TunnelService : Tunnel, org.amnezia.awg.backend.Tunnel {
-
-	suspend fun startTunnel(tunnelConfig: TunnelConfig?, background: Boolean = false)
-
-	suspend fun stopTunnel()
-
-	suspend fun bounceTunnel()
-
-	suspend fun getBackendState(): BackendState
-
-	suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>)
-
-	val vpnState: StateFlow<VpnState>
-
-	suspend fun runningTunnelNames(): Set<String>
-
-	suspend fun getState(): TunnelState
-
-	fun cancelActiveTunnelJobs()
-
-	fun startActiveTunnelJobs()
-}

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

@@ -1,52 +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
-		}
-	}
-
-	fun isDown(): Boolean {
-		return this == DOWN
-	}
-
-	fun isUp(): Boolean {
-		return this == UP
-	}
-
-	companion object {
-		fun from(state: Tunnel.State): TunnelState {
-			return when (state) {
-				Tunnel.State.DOWN -> DOWN
-				Tunnel.State.TOGGLE -> TOGGLE
-				Tunnel.State.UP -> UP
-			}
-		}
-
-		fun from(state: org.amnezia.awg.backend.Tunnel.State): TunnelState {
-			return when (state) {
-				org.amnezia.awg.backend.Tunnel.State.DOWN -> DOWN
-				org.amnezia.awg.backend.Tunnel.State.TOGGLE -> TOGGLE
-				org.amnezia.awg.backend.Tunnel.State.UP -> UP
-			}
-		}
-	}
-}

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

@@ -0,0 +1,15 @@
+package com.zaneschepke.wireguardautotunnel.service.tunnel
+
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import kotlinx.coroutines.flow.StateFlow
+import org.amnezia.awg.backend.Tunnel
+
+interface VpnService : Tunnel {
+    suspend fun startTunnel(tunnelConfig: TunnelConfig? = null): Tunnel.State
+
+    suspend fun stopTunnel()
+
+    val vpnState: StateFlow<VpnState>
+
+    fun getState(): Tunnel.State
+}

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

@@ -1,10 +1,11 @@
 package com.zaneschepke.wireguardautotunnel.service.tunnel
 
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStatistics
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import org.amnezia.awg.backend.Statistics
+import org.amnezia.awg.backend.Tunnel
 
 data class VpnState(
-	val status: TunnelState = TunnelState.DOWN,
-	val tunnelConfig: TunnelConfig? = null,
-	val statistics: TunnelStatistics? = null,
+    val status: Tunnel.State = Tunnel.State.DOWN,
+    val tunnelConfig: TunnelConfig? = null,
+    val statistics: Statistics? = null
 )

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

@@ -1,347 +1,145 @@
 package com.zaneschepke.wireguardautotunnel.service.tunnel
 
-import com.wireguard.android.backend.Backend
-import com.wireguard.android.backend.Tunnel.State
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.module.Kernel
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationAction
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService.Companion.VPN_NOTIFICATION_ID
-import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
-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.extensions.asAmBackendState
-import com.zaneschepke.wireguardautotunnel.util.extensions.asBackendState
-import kotlinx.coroutines.CoroutineDispatcher
+import com.zaneschepke.wireguardautotunnel.module.Userspace
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withContext
+import org.amnezia.awg.backend.Backend
+import org.amnezia.awg.backend.BackendException
+import org.amnezia.awg.backend.Statistics
 import org.amnezia.awg.backend.Tunnel
 import timber.log.Timber
 import javax.inject.Inject
-import javax.inject.Provider
 
 class WireGuardTunnel
 @Inject
 constructor(
-	private val amneziaBackend: Provider<org.amnezia.awg.backend.Backend>,
-	private val tunnelConfigRepository: TunnelConfigRepository,
-	@Kernel private val kernelBackend: Provider<Backend>,
-	private val appDataRepository: AppDataRepository,
-	@ApplicationScope private val applicationScope: CoroutineScope,
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-	private val serviceManager: ServiceManager,
-	private val notificationService: NotificationService,
-) : TunnelService {
+    @Userspace private val userspaceBackend: Backend,
+    @Kernel private val kernelBackend: Backend,
+    private val appDataRepository: AppDataRepository,
+) : VpnService {
+    private val _vpnState = MutableStateFlow(VpnState())
+    override val vpnState: StateFlow<VpnState> = _vpnState.asStateFlow()
 
-	private val _vpnState = MutableStateFlow(VpnState())
-	override val vpnState: StateFlow<VpnState> = _vpnState.asStateFlow()
+    private val scope = CoroutineScope(Dispatchers.IO)
 
-	private var statsJob: Job? = null
-	private var tunnelChangesJob: Job? = null
+    private var statsJob: Job? = null
 
-	@get:Synchronized @set:Synchronized
-	private var isKernelBackend: Boolean? = null
+    private var backend: Backend = userspaceBackend
 
-	private val tunnelControlMutex = Mutex()
+    private var backendIsUserspace = true
 
-	init {
-		applicationScope.launch(ioDispatcher) {
-			appDataRepository.settings.getSettingsFlow().collect {
-				isKernelBackend = it.isKernelEnabled
-			}
-		}
-	}
+    init {
+        scope.launch {
+            appDataRepository.settings.getSettingsFlow().collect {
+                if (it.isKernelEnabled && backendIsUserspace) {
+                    Timber.d("Setting kernel backend")
+                    backend = kernelBackend
+                    backendIsUserspace = false
+                } else if (!it.isKernelEnabled && !backendIsUserspace) {
+                    Timber.d("Setting userspace backend")
+                    backend = userspaceBackend
+                    backendIsUserspace = true
+                }
+            }
+        }
+    }
 
-	private suspend fun backend(): Any {
-		val isKernelEnabled = isKernelBackend
-			?: appDataRepository.settings.getSettings().isKernelEnabled
-		if (isKernelEnabled) return kernelBackend.get()
-		return amneziaBackend.get()
-	}
+    override suspend fun startTunnel(tunnelConfig: TunnelConfig?): Tunnel.State {
+        return try {
+            //TODO we need better error handling here
+            val config = tunnelConfig ?: appDataRepository.getPrimaryOrFirstTunnel()
+            if (config != null) {
+                emitTunnelConfig(config)
+                val wgConfig = TunnelConfig.configFromQuick(config.wgQuick)
+                val state =
+                    backend.setState(
+                        this,
+                        Tunnel.State.UP,
+                        wgConfig,
+                    )
+                state
+            } else throw Exception("No tunnels")
+        } catch (e: BackendException) {
+            Timber.e("Failed to start tunnel with error: ${e.message}")
+            Tunnel.State.DOWN
+        }
+    }
 
-	override suspend fun runningTunnelNames(): Set<String> {
-		return when (val backend = backend()) {
-			is Backend -> backend.runningTunnelNames
-			is org.amnezia.awg.backend.Backend -> backend.runningTunnelNames
-			else -> emptySet()
-		}
-	}
+    private fun emitTunnelState(state: Tunnel.State) {
+        _vpnState.tryEmit(
+            _vpnState.value.copy(
+                status = state,
+            ),
+        )
+    }
 
-	private suspend fun setState(tunnelConfig: TunnelConfig, tunnelState: TunnelState): Result<TunnelState> {
-		return runCatching {
-			when (val backend = backend()) {
-				is Backend -> backend.setState(this, tunnelState.toWgState(), TunnelConfig.configFromWgQuick(tunnelConfig.wgQuick)).let { TunnelState.from(it) }
-				is org.amnezia.awg.backend.Backend -> {
-					val config = if (tunnelConfig.amQuick.isBlank()) {
-						TunnelConfig.configFromAmQuick(
-							tunnelConfig.wgQuick,
-						)
-					} else {
-						TunnelConfig.configFromAmQuick(tunnelConfig.amQuick)
-					}
-					backend.setState(this, tunnelState.toAmState(), config).let {
-						TunnelState.from(it)
-					}
-				}
-				else -> throw NotImplementedError()
-			}
-		}.onFailure {
-			// TODO add better error message to user, especially for kernel as exceptions contain no details
-			Timber.e(it)
-		}
-	}
+    private fun emitBackendStatistics(statistics: Statistics) {
+        _vpnState.tryEmit(
+            _vpnState.value.copy(
+                statistics = statistics,
+            ),
+        )
+    }
 
-	private fun isTunnelAlreadyRunning(tunnelConfig: TunnelConfig): Boolean {
-		val isRunning = tunnelConfig == _vpnState.value.tunnelConfig && _vpnState.value.status.isUp()
-		if (isRunning) Timber.w("Tunnel already running")
-		return isRunning
-	}
+    private suspend fun emitTunnelConfig(tunnelConfig: TunnelConfig?) {
+        _vpnState.emit(
+            _vpnState.value.copy(
+                tunnelConfig = tunnelConfig,
+            ),
+        )
+    }
 
-	override suspend fun startTunnel(tunnelConfig: TunnelConfig?, background: Boolean) {
-		withContext(ioDispatcher) {
-			if (tunnelConfig == null || isTunnelAlreadyRunning(tunnelConfig)) return@withContext
-			updateTunnelConfig(tunnelConfig) // need to update this here
-			withServiceActive {
-				onBeforeStart(background)
-				tunnelControlMutex.withLock {
-					setState(tunnelConfig, TunnelState.UP).onSuccess {
-						updateTunnelState(it, tunnelConfig)
-						onTunnelStart(tunnelConfig, background)
-					}
-				}.onFailure {
-					Timber.e(it)
-				}
-			}
-		}
-	}
+    override suspend fun stopTunnel() {
+        try {
+            if (getState() == Tunnel.State.UP) {
+                val state = backend.setState(this, Tunnel.State.DOWN, null)
+                emitTunnelState(state)
+            }
+        } catch (e: BackendException) {
+            Timber.e("Failed to stop tunnel with error: ${e.message}")
+        }
+    }
 
-	override suspend fun stopTunnel() {
-		withContext(ioDispatcher) {
-			if (_vpnState.value.status.isDown()) return@withContext
-			with(_vpnState.value) {
-				if (tunnelConfig == null) return@withContext
-				tunnelControlMutex.withLock {
-					setState(tunnelConfig, TunnelState.DOWN).onSuccess {
-						onTunnelStop(tunnelConfig)
-						updateTunnelState(it, null)
-					}.onFailure {
-						Timber.e(it)
-					}
-				}
-			}
-		}
-	}
+    override fun getState(): Tunnel.State {
+        return backend.getState(this)
+    }
 
-	private suspend fun toggleTunnel(tunnelConfig: TunnelConfig) {
-		withContext(ioDispatcher) {
-			tunnelControlMutex.withLock {
-				setState(tunnelConfig, TunnelState.TOGGLE)
-			}
-		}
-	}
+    override fun getName(): String {
+        return _vpnState.value.tunnelConfig?.name ?: ""
+    }
 
-	// utility to keep vpnService alive during rapid changes to prevent bad states
-	private suspend fun withServiceActive(callback: suspend () -> Unit) {
-		when (val backend = backend()) {
-			is org.amnezia.awg.backend.Backend -> {
-				val backendState = backend.backendState
-				if (backendState == org.amnezia.awg.backend.Backend.BackendState.INACTIVE) {
-					backend.setBackendState(org.amnezia.awg.backend.Backend.BackendState.SERVICE_ACTIVE, emptyList())
-				}
-				callback()
-			}
-			is Backend -> callback()
-		}
-	}
-
-	override suspend fun bounceTunnel() {
-		_vpnState.value.tunnelConfig?.let {
-			withServiceActive {
-				toggleTunnel(it)
-				toggleTunnel(it)
-			}
-		}
-	}
-
-	override suspend fun getBackendState(): BackendState {
-		return when (val backend = backend()) {
-			is org.amnezia.awg.backend.Backend -> {
-				backend.backendState.asBackendState()
-			}
-			is Backend -> BackendState.SERVICE_ACTIVE
-			else -> BackendState.INACTIVE
-		}
-	}
-
-	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
-		kotlin.runCatching {
-			when (val backend = backend()) {
-				is org.amnezia.awg.backend.Backend -> {
-					backend.setBackendState(backendState.asAmBackendState(), allowedIps)
-				}
-				is Backend -> {
-					// TODO not yet implemented
-					Timber.d("Kernel backend state not yet implemented")
-				}
-				else -> Unit
-			}
-		}
-	}
-
-	private suspend fun onBeforeStart(background: Boolean) {
-		with(_vpnState.value) {
-			if (status.isUp()) stopTunnel() else clearJobsAndStats()
-			if (isKernelBackend == true || background) serviceManager.startBackgroundService(tunnelConfig)
-		}
-	}
-
-	private suspend fun onTunnelStart(tunnelConfig: TunnelConfig, background: Boolean) {
-		startActiveTunnelJobs()
-		if (_vpnState.value.status.isUp()) {
-			appDataRepository.tunnels.save(tunnelConfig.copy(isActive = true))
-		}
-		if (isKernelBackend == false && !background) launchUserspaceTunnelNotification()
-	}
-
-	private fun launchUserspaceTunnelNotification() {
-		with(notificationService) {
-			val notification = createNotification(
-				WireGuardNotification.NotificationChannels.VPN,
-				title = "${context.getString(R.string.tunnel_running)} - ${_vpnState.value.tunnelConfig?.name}",
-				actions = listOf(
-					notificationService.createNotificationAction(NotificationAction.TUNNEL_OFF),
-				),
-			)
-			show(VPN_NOTIFICATION_ID, notification)
-		}
-	}
-
-	private suspend fun onTunnelStop(tunnelConfig: TunnelConfig) {
-		runCatching {
-			appDataRepository.tunnels.save(tunnelConfig.copy(isActive = false))
-			serviceManager.stopBackgroundService()
-			notificationService.remove(VPN_NOTIFICATION_ID)
-			clearJobsAndStats()
-		}
-	}
-
-	private fun clearJobsAndStats() {
-		cancelActiveTunnelJobs()
-		resetBackendStatistics()
-	}
-
-	private fun updateTunnelState(state: TunnelState, tunnelConfig: TunnelConfig?) {
-		_vpnState.update {
-			it.copy(status = state, tunnelConfig = tunnelConfig)
-		}
-	}
-
-	private fun updateTunnelConfig(tunnelConfig: TunnelConfig?) {
-		_vpnState.update {
-			it.copy(tunnelConfig = tunnelConfig)
-		}
-	}
-
-	private fun updateBackendStatistics(statistics: TunnelStatistics) {
-		_vpnState.update {
-			it.copy(statistics = statistics)
-		}
-	}
-
-	private fun resetBackendStatistics() {
-		_vpnState.update {
-			it.copy(statistics = null)
-		}
-	}
-
-	override suspend fun getState(): TunnelState {
-		return when (val backend = backend()) {
-			is Backend -> backend.getState(this).let { TunnelState.from(it) }
-			is org.amnezia.awg.backend.Backend -> backend.getState(this).let { TunnelState.from(it) }
-			else -> TunnelState.DOWN
-		}
-	}
-
-	override fun cancelActiveTunnelJobs() {
-		statsJob?.cancel()
-		tunnelChangesJob?.cancel()
-	}
-
-	override fun startActiveTunnelJobs() {
-		statsJob = startTunnelStatisticsJob()
-		tunnelChangesJob = startTunnelConfigChangesJob()
-	}
-
-	override fun getName(): String {
-		return _vpnState.value.tunnelConfig?.name ?: ""
-	}
-
-	private fun startTunnelStatisticsJob() = applicationScope.launch(ioDispatcher) {
-		val backend = backend()
-		delay(STATS_START_DELAY)
-		while (true) {
-			when (backend) {
-				is Backend -> updateBackendStatistics(
-					WireGuardStatistics(backend.getStatistics(this@WireGuardTunnel)),
-				)
-				is org.amnezia.awg.backend.Backend -> updateBackendStatistics(
-					AmneziaStatistics(
-						backend.getStatistics(this@WireGuardTunnel),
-					),
-				)
-			}
-			delay(VPN_STATISTIC_CHECK_INTERVAL)
-		}
-	}
-
-	private fun startTunnelConfigChangesJob() = applicationScope.launch(ioDispatcher) {
-		tunnelConfigRepository.getTunnelConfigsFlow().collect {
-			with(_vpnState.value) {
-				if (status.isDown() || tunnelConfig == null) return@collect
-				val vpnConfigFromStorage = it.first { it.id == tunnelConfig.id }
-				val isRestartNeeded = vpnConfigFromStorage.wgQuick != tunnelConfig.wgQuick ||
-					vpnConfigFromStorage.amQuick != tunnelConfig.amQuick
-				updateTunnelConfig(vpnConfigFromStorage)
-				if (isRestartNeeded) {
-					Timber.d("Bouncing tunnel on config change")
-					bounceTunnel()
-				}
-			}
-		}
-	}
-
-	override fun onStateChange(newState: Tunnel.State) {
-		_vpnState.update {
-			it.copy(status = TunnelState.from(newState))
-		}
-		serviceManager.updateTunnelTile()
-	}
-
-	override fun onStateChange(state: State) {
-		_vpnState.update {
-			it.copy(status = TunnelState.from(state))
-		}
-		serviceManager.updateTunnelTile()
-	}
-
-	companion object {
-		const val STATS_START_DELAY = 1_000L
-		const val VPN_STATISTIC_CHECK_INTERVAL = 1_000L
-	}
+    override fun onStateChange(state: Tunnel.State) {
+        val tunnel = this
+        emitTunnelState(state)
+        WireGuardAutoTunnel.requestTunnelTileServiceStateUpdate(WireGuardAutoTunnel.instance)
+        if (state == Tunnel.State.UP) {
+            statsJob =
+                scope.launch {
+                    while (true) {
+                        val statistics = backend.getStatistics(tunnel)
+                        emitBackendStatistics(statistics)
+                        delay(Constants.VPN_STATISTIC_CHECK_INTERVAL)
+                    }
+                }
+        }
+        if (state == Tunnel.State.DOWN) {
+            try {
+                statsJob?.cancel()
+            } catch (e : CancellationException) {
+                Timber.i("Stats job cancelled")
+            }
+        }
+    }
 }

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