chore(deps): bump actions/setup-java from 4 to 5

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4 to 5.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

.editorconfig

@@ -1,97 +0,0 @@
-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}]
-ij_continuation_indent_size = 4
-ij_java_names_count_to_use_import_on_demand = 9999
-ij_kotlin_align_in_columns_case_branch = false
-ij_kotlin_align_multiline_binary_operation = false
-ij_kotlin_align_multiline_extends_list = false
-ij_kotlin_align_multiline_method_parentheses = false
-ij_kotlin_align_multiline_parameters = true
-ij_kotlin_align_multiline_parameters_in_calls = false
-ij_kotlin_assignment_wrap = normal
-ij_kotlin_blank_lines_after_class_header = 0
-ij_kotlin_blank_lines_around_block_when_branches = 0
-ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1
-ij_kotlin_block_comment_at_first_column = true
-ij_kotlin_call_parameters_new_line_after_left_paren = true
-ij_kotlin_call_parameters_right_paren_on_new_line = false
-ij_kotlin_catch_on_new_line = false
-ij_kotlin_continuation_indent_for_chained_calls = true
-ij_kotlin_continuation_indent_for_expression_bodies = true
-ij_kotlin_continuation_indent_in_argument_lists = true
-ij_kotlin_continuation_indent_in_elvis = false
-ij_kotlin_continuation_indent_in_if_conditions = false
-ij_kotlin_continuation_indent_in_parameter_lists = false
-ij_kotlin_continuation_indent_in_supertype_lists = false
-ij_kotlin_else_on_new_line = false
-ij_kotlin_enum_constants_wrap = off
-ij_kotlin_extends_list_wrap = normal
-ij_kotlin_field_annotation_wrap = split_into_lines
-ij_kotlin_finally_on_new_line = false
-ij_kotlin_if_rparen_on_new_line = false
-ij_kotlin_import_nested_classes = false
-ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
-ij_kotlin_keep_blank_lines_before_right_brace = 2
-ij_kotlin_keep_blank_lines_in_code = 2
-ij_kotlin_keep_blank_lines_in_declarations = 2
-ij_kotlin_keep_first_column_comment = true
-ij_kotlin_keep_indents_on_empty_lines = false
-ij_kotlin_keep_line_breaks = true
-ij_kotlin_lbrace_on_next_line = false
-ij_kotlin_line_comment_add_space = false
-ij_kotlin_line_comment_at_first_column = true
-ij_kotlin_method_annotation_wrap = split_into_lines
-ij_kotlin_method_call_chain_wrap = normal
-ij_kotlin_method_parameters_new_line_after_left_paren = true
-ij_kotlin_method_parameters_right_paren_on_new_line = true
-ij_kotlin_name_count_to_use_star_import = 9999
-ij_kotlin_name_count_to_use_star_import_for_members = 9999
-ij_kotlin_parameter_annotation_wrap = off
-ij_kotlin_space_after_comma = true
-ij_kotlin_space_after_extend_colon = true
-ij_kotlin_space_after_type_colon = true
-ij_kotlin_space_before_catch_parentheses = true
-ij_kotlin_space_before_comma = false
-ij_kotlin_space_before_extend_colon = true
-ij_kotlin_space_before_for_parentheses = true
-ij_kotlin_space_before_if_parentheses = true
-ij_kotlin_space_before_lambda_arrow = true
-ij_kotlin_space_before_type_colon = false
-ij_kotlin_space_before_when_parentheses = true
-ij_kotlin_space_before_while_parentheses = true
-ij_kotlin_spaces_around_additive_operators = true
-ij_kotlin_spaces_around_assignment_operators = true
-ij_kotlin_spaces_around_equality_operators = true
-ij_kotlin_spaces_around_function_type_arrow = true
-ij_kotlin_spaces_around_logical_operators = true
-ij_kotlin_spaces_around_multiplicative_operators = true
-ij_kotlin_spaces_around_range = false
-ij_kotlin_spaces_around_relational_operators = true
-ij_kotlin_spaces_around_unary_operator = false
-ij_kotlin_spaces_around_when_arrow = true
-ij_kotlin_variable_annotation_wrap = off
-ij_kotlin_while_on_new_line = false
-ij_kotlin_wrap_elvis_expressions = 1
-ij_kotlin_wrap_expression_body_functions = 1
-ij_kotlin_wrap_first_method_in_call_chain = false
-#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

.github/workflows/build.yml

@@ -1,4 +1,7 @@
 name: build
+permissions:
+  contents: read
+
 on:
   workflow_dispatch:
     inputs:
@@ -9,9 +12,16 @@ on:
         default: debug
         options:
           - debug
-          - prerelease
           - nightly
           - release
+      flavor:
+        type: choice
+        description: "Product flavor"
+        required: true
+        default: fdroid
+        options:
+          - fdroid
+          - standalone
     secrets:
       SIGNING_KEY_ALIAS:
         required: false
@@ -30,6 +40,11 @@ on:
         description: "Build type"
         required: true
         default: debug
+      flavor:
+        type: string
+        description: "Product flavor"
+        required: false
+        default: fdroid
     secrets:
       SIGNING_KEY_ALIAS:
         required: false
@@ -41,6 +56,7 @@ on:
         required: false
       KEYSTORE:
         required: false
+
 env:
   UPLOAD_DIR_ANDROID: android_artifacts
 
@@ -57,17 +73,16 @@ jobs:
       UPLOAD_DIR_ANDROID: ${{ env.UPLOAD_DIR_ANDROID }}
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         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
@@ -75,51 +90,39 @@ jobs:
           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
+      - name: Build APK
-        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
-
-      # bump versionCode for nightly and prerelease builds
-      - name: Commit and push versionCode changes
-        if: ${{ inputs.build_type == 'nightly' || inputs.build_type == 'prerelease' }}
         run: |
-          git config --global user.name 'GitHub Actions'
+          flavor=${{ inputs.flavor }}
-          git config --global user.email 'actions@github.com'
+          build_type=${{ inputs.build_type }}
-          git add versionCode.txt
+          case $build_type in
-          git commit -m "Automated build update"
+            "release")
-
+              ./gradlew :app:assemble${flavor^}Release --info
+              ;;
+            "nightly")
+              ./gradlew :app:assemble${flavor^}Nightly --info
+              ;;
+            "debug")
+              ./gradlew :app:assemble${flavor^}Debug --stacktrace
+              ;;
+          esac
       - 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
+        run: echo "path=$(find . -regex '^.*/build/outputs/apk/${{ inputs.flavor }}/${{ inputs.build_type }}/.*\.apk$' -type f | head -1 | tail -c+2)" >> $GITHUB_OUTPUT
-
+      - name: Upload APK
-      - name: Upload release apk
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.UPLOAD_DIR_ANDROID }}
+          name: android_artifacts_${{ inputs.flavor }}
-          path: ${{github.workspace}}/${{ steps.apk-path.outputs.path }}
+          path: >-
+            app/build/outputs/apk/${{ inputs.flavor }}/${{ inputs.build_type }}/${{
+              inputs.flavor == 'fdroid' && inputs.build_type == 'release'
+                && 'wgtunnel-fdroid-release-*.apk'
+                || format('wgtunnel-{0}-v*.apk', inputs.flavor)
+            }}
           retention-days: 1
+          if-no-files-found: warn

.github/workflows/nightly.yml

@@ -0,0 +1,127 @@
+name: nightly
+permissions:
+  contents: write
+  packages: write
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "4 3 * * *"
+
+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@v4
+      - name: Check for new commits
+        id: check
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          NEW_COMMITS=$(git rev-list --count --after="$(date -Iseconds -d '23 hours ago')" ${{ github.sha }})
+          echo "new_commits=$NEW_COMMITS" >> $GITHUB_OUTPUT
+
+  build-standalone-nightly:
+    uses: ./.github/workflows/build.yml
+    secrets: inherit
+    with:
+      build_type: "nightly"
+      flavor: standalone
+
+  publish:
+    needs:
+      - check_commits
+      - build-standalone-nightly
+    if: ${{ needs.check_commits.outputs.has_new_commits > 0 && inputs.release_type != 'none' }}
+    name: publish-nightly
+    runs-on: ubuntu-latest
+    steps:
+
+      - uses: actions/checkout@v4
+
+      - name: Install system dependencies
+        run: |
+          sudo apt update && sudo apt install -y gh apksigner
+      - name: Set latest tag
+        uses: rickstaa/action-create-tag@v1
+        id: tag_creation
+        with:
+          tag: "latest"
+          message: "Automated tag for HEAD commit"
+          force_push_tag: true
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          tag_exists_error: false
+
+      - name: Generate Changelog
+        id: changelog
+        uses: requarks/changelog-action@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          toTag: "nightly"
+          fromTag: "latest"
+          writeToFile: false
+
+      - name: Make download dir
+        run: mkdir ${{ github.workspace }}/temp
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v5
+        with:
+          pattern: android_artifacts_*
+          path: ${{ github.workspace }}/temp
+
+      - name: Set release notes
+        run: |
+          echo "RELEASE_NOTES=Nightly build for the latest development version of the app." >> $GITHUB_ENV
+
+      - name: Delete previous nightly version
+        uses: ClementTsang/delete-tag-and-release@v0.4.0
+        with:
+          tag_name: "nightly"
+          delete_release: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get checksum
+        id: checksum
+        run: |
+          file_path=$(find ${{ github.workspace }}/temp -type f -iname "*.apk" | head -n 1)
+          if [ -z "$file_path" ]; then
+            echo "No APK file found"
+            exit 1
+          fi
+          checksum=$(apksigner verify --print-certs "$file_path" | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")
+          echo "checksum=$checksum" >> $GITHUB_OUTPUT
+
+      - name: Create nightly release
+        id: create_release
+        uses: softprops/action-gh-release@v2
+        with:
+          body: |
+            ${{ env.RELEASE_NOTES }}
+
+            SHA-256 fingerprints for the 4096-bit signing certificate:
+            ```sh
+            ${{ steps.checksum.outputs.checksum }}
+            ```
+
+            To verify fingerprint:
+            ```sh
+            apksigner verify --print-certs [path to APK file] | grep SHA-256
+            ```
+
+            ### Changelog
+            ${{ steps.changelog.outputs.changes }}
+          tag_name: nightly
+          name: nightly
+          draft: false
+          prerelease: true
+          make_latest: false
+          files: |
+            ${{ github.workspace }}/temp/**/*.apk
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.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-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/pr.yml

@@ -1,4 +1,6 @@
 name: on-pr
+permissions:
+  contents: read
 
 on:
     workflow_dispatch:
@@ -10,7 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
@@ -19,5 +21,5 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
-      - name: Run ktlint
+      - name: Run ktfmt
-        run: ./gradlew ktlintCheck
+        run: ./gradlew ktfmtCheck

.github/workflows/publish.yml

@@ -1,13 +1,17 @@
 name: publish
+permissions:
+  contents: write
+  packages: write
 
 on:
-  schedule:
+  push:
-  - cron: "4 3 * * *"
+    tags:
+      - '[0-9]*.[0-9]*.[0-9]*'
   workflow_dispatch:
     inputs:
       track:
         type: choice
-        description: "Google play release track"
+        description: "Google Play release track"
         options:
           - none
           - internal
@@ -21,77 +25,69 @@ on:
         description: "GitHub release type"
         options:
           - none
-          - prerelease
-          - nightly
           - release
         default: release
         required: true
       tag_name:
         description: "Tag name for release"
         required: false
-        default: nightly
+        default: 1.1.1
+      flavor:
+        type: choice
+        description: "Product flavor"
+        required: true
+        default: standalone
+        options:
+          - fdroid
+          - standalone
   workflow_call:
-env:
+    inputs:
-  UPLOAD_DIR_ANDROID: android_artifacts
+      flavor:
+        type: string
+        description: "Product flavor"
+        required: false
+        default: standalone
 
 jobs:
-  check_commits:
-    name: Check for New Commits
-    runs-on: ubuntu-latest
-    outputs:
-      has_new_commits: ${{ steps.check.outputs.new_commits }}
 
-    steps:
+  build-fdroid:
-      - name: Checkout Repository
+    if: ${{ github.event_name == 'push' || inputs.release_type == 'release' || inputs.flavor == 'fdroid' }}
-        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 }}
+      build_type: ${{ github.event_name == 'push' && 'release' || inputs.release_type }}
+      flavor: fdroid
+
+  build-standalone:
+    if: ${{ github.event_name == 'push' || inputs.release_type == 'release' || inputs.release_type == 'debug' || inputs.flavor == 'standalone' }}
+    uses: ./.github/workflows/build.yml
+    secrets: inherit
+    with:
+      build_type: ${{ github.event_name == 'push' && 'release' || inputs.release_type }}
+      flavor: standalone
 
   publish:
     needs:
-      - check_commits
+      - build-standalone
-      - build
-    if: ${{ needs.check_commits.outputs.has_new_commits > 0 && inputs.release_type != 'none' }}
     name: publish-github
     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:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event_name == 'push' && github.ref || 'main' }}
       - 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
+          tag: "latest"
           message: "Automated tag for HEAD commit"
           force_push_tag: true
+          github_token: ${{ secrets.GITHUB_TOKEN }}
           tag_exists_error: false
-
       - name: Get latest release
         id: latest_release
         uses: kaliber5/action-get-release@v1
@@ -104,76 +100,48 @@ jobs:
         uses: requarks/changelog-action@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          toTag: ${{ github.event_name == 'schedule' && 'nightly' || steps.latest_release.outputs.tag_name }}
+          toTag: ${{ steps.latest_release.outputs.tag_name }}
           fromTag: "latest"
-          writeToFile: false  # we won't write to file, just output
+          writeToFile: false
-
-      - 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: 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
+        uses: actions/download-artifact@v5
         with:
-          name: ${{ env.UPLOAD_DIR_ANDROID }}
+          pattern: android_artifacts_*
           path: ${{ github.workspace }}/temp
-
+          merge-multiple: true
-      # 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' }}
+        if: ${{ github.event_name == 'push' || inputs.release_type == 'release' }}
         run: |
-          RELEASE_NOTES="$(cat ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/${{ env.VERSION_CODE }}.txt)"
+          VERSION_NAME=$(grep "const val VERSION_NAME" buildSrc/src/main/kotlin/Constants.kt | awk -F'"' '{print $2}')
+          RELEASE_NOTES="$(cat ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/${VERSION_NAME}.txt || echo "No changelog found for ${VERSION_NAME}")"
           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)
+          file_path=$(find ${{ github.workspace }}/temp -type f -iname "*.apk" | head -n 1)
-          echo "checksum=$(apksigner verify -print-certs $file_path | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")" >> $GITHUB_OUTPUT
+          if [ -z "$file_path" ]; then
+            echo "No APK file found"
+            exit 1
+          fi
+          checksum=$(apksigner verify --print-certs "$file_path" | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")
+          echo "checksum=$checksum" >> $GITHUB_OUTPUT
 
-
+      - name: Create Release
-      - 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 }}
 
-            SHA-256 fingerprint for the 4096-bit signing certificate:
+            SHA-256 fingerprints for the 4096-bit signing certificate:
             ```sh
             ${{ steps.checksum.outputs.checksum }}
             ```
@@ -185,29 +153,31 @@ jobs:
 
             ### Changelog
             ${{ steps.changelog.outputs.changes }}
-          tag_name: ${{ env.TAG_NAME }}
+          tag_name: ${{ github.event_name == 'push' && github.ref_name || github.event.inputs.tag_name }}
-          name: ${{ env.TAG_NAME }}
+          name: ${{ github.event_name == 'push' && github.ref_name || github.event.inputs.tag_name }}
           draft: false
-          prerelease: ${{ inputs.release_type == 'prerelease' || inputs.release_type == '' || inputs.release_type == 'nightly' }}
+          prerelease: false
-          make_latest: ${{ inputs.release_type == 'release' }}
+          make_latest: true
           files: |
-            ${{ github.workspace }}/temp/*
+            ${{ github.workspace }}/temp/**/*.apk
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  publish-fdroid:
+  publish-fdroid-public:
     runs-on: ubuntu-latest
     needs:
-      - build
+      - build-fdroid
-    if: inputs.release_type == 'release'
+    if: ${{ github.event_name == 'push' || inputs.release_type == 'release' }}
     steps:
       - name: Dispatch update for fdroid repo
         uses: peter-evans/repository-dispatch@v3
         with:
-          token: ${{ secrets.PAT }}
+          token: ${{ secrets.GITHUB_TOKEN }}
-          repository: zaneschepke/fdroid
+          repository: wgtunnel/fdroid
           event-type: fdroid-update
 
   publish-play:
-    if: ${{ inputs.track != 'none' && inputs.track != '' }}
+    if: ${{ github.event_name == 'push' || inputs.track != 'none' }}
     name: Publish to Google Play
     runs-on: ubuntu-latest
 
@@ -217,13 +187,11 @@ jobs:
       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
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
@@ -259,5 +227,6 @@ jobs:
           bundler-cache: true
 
       - name: Distribute app to Prod track 🚀
-        run: (cd ${{ github.workspace }} && bundle install && bundle exec fastlane ${{ inputs.track }})
+        run: |
-
+          track=${{ github.event_name == 'push' && 'production' || inputs.track }}
+          (cd ${{ github.workspace }} && bundle install && bundle exec fastlane $track)

.gitignore

@@ -70,5 +70,5 @@ lint/tmp/
 app/release/output.json
 .idea/codeStyles/
 # where we keep our signing secrets locally
-app/signing.properties
 /.kotlin/
+/app/keystore/

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 WG Auto Tunnel
+Copyright ©  2023-2025 Zane Schepke
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -4,7 +4,7 @@ WG Tunnel
 
 <div align="center">
 
-An alternative Android client app for [WireGuard®](https://www.wireguard.com/)
+An alternative Android client app for [WireGuard](https://www.wireguard.com/)
 and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/)
 <br />
 <br />
@@ -23,14 +23,14 @@ and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/)
 [![Google Play](https://img.shields.io/badge/Google_Play-414141?style=for-the-badge&logo=google-play&logoColor=white)](https://play.google.com/store/apps/details?id=com.zaneschepke.wireguardautotunnel)
 [![F-Droid](https://img.shields.io/static/v1?style=for-the-badge&message=F-Droid&color=1976D2&logo=F-Droid&logoColor=FFFFFF&label=)](https://f-droid.org/packages/com.zaneschepke.wireguardautotunnel/)
 [![Personal](https://img.shields.io/static/v1?style=for-the-badge&message=Personal&color=1976D2&logo=F-Droid&logoColor=FFFFFF&label=)](https://github.com/zaneschepke/fdroid)
+[![Obtainium](https://img.shields.io/badge/Obtainium-414141?style=for-the-badge&logo=Obtainium&logoColor=white)](https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22com.zaneschepke.wireguardautotunnel%22%2C%22url%22%3A%22https%3A%2F%2Fgithub.com%2Fzaneschepke%2Fwgtunnel%22%2C%22author%22%3A%22zaneschepke%22%2C%22name%22%3A%22WG%20Tunnel%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22includePrereleases%5C%22%3Afalse%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22filterReleaseNotesByRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22verifyLatestTag%5C%22%3Atrue%2C%5C%22sortMethodChoice%5C%22%3A%5C%22date%5C%22%2C%5C%22useLatestAssetDateAsReleaseDate%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%2C%5C%22trackOnly%5C%22%3Afalse%2C%5C%22versionExtractionRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22matchGroupToUse%5C%22%3A%5C%22%5C%22%2C%5C%22versionDetection%5C%22%3Atrue%2C%5C%22releaseDateAsVersion%5C%22%3Afalse%2C%5C%22useVersionCodeAsOSVersion%5C%22%3Afalse%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22invertAPKFilter%5C%22%3Afalse%2C%5C%22autoApkFilterByArch%5C%22%3Atrue%2C%5C%22appName%5C%22%3A%5C%22WG%20Tunnel%5C%22%2C%5C%22appAuthor%5C%22%3A%5C%22Zane%20Schepke%5C%22%2C%5C%22shizukuPretendToBeGooglePlay%5C%22%3Afalse%2C%5C%22allowInsecure%5C%22%3Afalse%2C%5C%22exemptFromBackgroundUpdates%5C%22%3Afalse%2C%5C%22skipUpdateNotifications%5C%22%3Afalse%2C%5C%22about%5C%22%3A%5C%22%5C%22%2C%5C%22refreshBeforeDownload%5C%22%3Afalse%7D%22%2C%22overrideSource%22%3Anull%7D)
 
 </div>
 
 <div align="center">
 
-[![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/rbRRNh6H7V)
+[<img  src="https://img.shields.io/badge/Telegram-26A5E4.svg?style=for-the-badge&logo=Telegram&logoColor=white">](https://t.me/wgtunnel)
-[![Telegram](https://img.shields.io/badge/Telegram-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)](https://t.me/wgtunnel)
+[<img src="https://img.shields.io/badge/Matrix-000000.svg?style=for-the-badge&logo=Matrix&logoColor=white">](https://matrix.to/#/#wg-tunnel-space:matrix.org)
-
 </div>
 
 <details open="open">
@@ -49,7 +49,7 @@ and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/)
 <div style="text-align: left;">
 
 ## About
-Inspired by the official [wireguard-android](https://github.com/WireGuard/wireguard-android) app, WG Tunnel was created to address features and support missing from the official app. This app combines support for both [WireGuard®](https://www.wireguard.com/)
+Inspired by the official [wireguard-android](https://github.com/WireGuard/wireguard-android) app, WG Tunnel was created to address features and support missing from the official app. This app combines support for both [WireGuard](https://www.wireguard.com/)
 and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/), with its primary feature of auto-tunneling (on-demand tunneling).
 
 </div>
@@ -61,14 +61,14 @@ and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/), with its pr
 Thank you to the following:
 
 - All of the users that have helped contribute to the project with ideas, translations, feedback, bug reports, testing, and donations.
-- [WireGuard®](https://www.wireguard.com/) - © Jason A. Donenfeld (https://github.com/WireGuard/wireguard-android)
+- [WireGuard](https://www.wireguard.com/) - Jason A. Donenfeld (https://github.com/WireGuard/wireguard-android)
 
 - [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) - Amnezia Team (https://github.com/amnezia-vpn/amneziawg-android)
 
 ## Screenshots
 
 </div>
-<div style="display: flex; flex-wrap: wrap; justify-content: center; gap: 10px;">
+<div style="display: flex; flex-wrap: wrap; justify-content: left; gap: 10px;">
  <img label="Main" src="fastlane/metadata/android/en-US/images/phoneScreenshots/main_screen.png" width="200" />
  <img label="Settings" src="fastlane/metadata/android/en-US/images/phoneScreenshots/settings_screen.png" width="200" />
   <img label="Auto" src="fastlane/metadata/android/en-US/images/phoneScreenshots/auto_screen.png" width="200" />

app/.gitignore

@@ -1,2 +1,3 @@
 /build
 /release
+/src/main/assets/licenses.json

app/build.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
@@ -6,53 +8,33 @@ plugins {
     alias(libs.plugins.ksp)
     alias(libs.plugins.compose.compiler)
     alias(libs.plugins.grgit)
-}
+    alias(libs.plugins.licensee)
-
-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().trim().toInt() + 1
-			} else {
-				1
-			}
-		}
-		else -> 0
-	}
 }
 
 android {
     namespace = Constants.APP_ID
     compileSdk = Constants.TARGET_SDK
 
-	androidResources {
+    androidResources { generateLocaleConfig = true }
-		generateLocaleConfig = true
-	}
 
-	// reproducibility
     dependenciesInfo {
-		// Disables dependency metadata when building APKs.
         includeInApk = false
-		// Disables dependency metadata when building Android App Bundles.
         includeInBundle = false
     }
 
+    ksp { arg("room.schemaLocation", "$projectDir/schemas") }
+
     defaultConfig {
         applicationId = Constants.APP_ID
         minSdk = Constants.MIN_SDK
         targetSdk = Constants.TARGET_SDK
-		versionCode = Constants.VERSION_CODE + versionCodeIncrement
+        versionCode = computeVersionCode()
-		versionName = determineVersionName()
+        versionName = computeVersionName()
 
-		ksp { arg("room.schemaLocation", "$projectDir/schemas") }
+        sourceSets { getByName("debug").assets.srcDirs(files("$projectDir/schemas")) }
 
-		sourceSets {
+        val languagesArray = buildLanguagesArray(languageList())
-			getByName("debug").assets.srcDirs(files("$projectDir/schemas")) // Room
+        buildConfigField("String[]", "LANGUAGES", "new String[]{ $languagesArray }")
-		}
-
-		buildConfigField("String[]", "LANGUAGES", "new String[]{ ${languageList().joinToString(separator = ", ") { "\"$it\"" }} }")
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables { useSupportLibrary = true }
@@ -60,17 +42,20 @@ android {
 
     signingConfigs {
         create(Constants.RELEASE) {
-			storeFile = getStoreFile()
+            storeFile = file(System.getenv("KEY_STORE_PATH") ?: "keystore/android_keystore.jks")
-			storePassword = getSigningProperty(Constants.STORE_PASS_VAR)
+            storePassword =
-			keyAlias = getSigningProperty(Constants.KEY_ALIAS_VAR)
+                LocalProperties.get("SIGNING_STORE_PASSWORD")
-			keyPassword = getSigningProperty(Constants.KEY_PASS_VAR)
+                    ?: System.getenv("SIGNING_STORE_PASSWORD")
+            keyAlias =
+                LocalProperties.get("SIGNING_KEY_ALIAS") ?: System.getenv("SIGNING_KEY_ALIAS")
+            keyPassword =
+                LocalProperties.get("SIGNING_KEY_PASSWORD") ?: System.getenv("SIGNING_KEY_PASSWORD")
         }
     }
 
     buildTypes {
-		// don't strip
         packaging.jniLibs.keepDebugSymbols.addAll(
-			listOf("libwg-go.so", "libwg-quick.so", "libwg.so"),
+            listOf("libwg-go.so", "libwg-quick.so", "libwg.so")
         )
 
         release {
@@ -84,29 +69,61 @@ android {
             signingConfig = signingConfigs.getByName(Constants.RELEASE)
             resValue("string", "provider", "\"${Constants.APP_NAME}.provider\"")
         }
+
         debug {
             applicationIdSuffix = ".debug"
-			versionNameSuffix = "-debug"
+            resValue("string", "app_name", "WG Tunnel 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", "app_name", "WG Tunnel - Nightly")
             resValue("string", "provider", "\"${Constants.APP_NAME}.provider.nightly\"")
         }
+    }
+
+    flavorDimensions.add("type")
+    productFlavors {
+        create("fdroid") {
+            dimension = "type"
+            buildConfigField("String", "FLAVOR", "\"fdroid\"")
+        }
+        create("google") {
+            dimension = "type"
+            buildConfigField("String", "FLAVOR", "\"google\"")
+        }
+        create("standalone") {
+            dimension = "type"
+            buildConfigField("String", "FLAVOR", "\"standalone\"")
+        }
+    }
+
+    compileOptions {
+        isCoreLibraryDesugaringEnabled = true
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+            freeCompilerArgs = listOf("-XXLanguage:+PropertyParamAnnotationDefaultTargetMode")
+        }
+    }
+
+    buildFeatures {
+        compose = true
+        buildConfig = true
+    }
+    packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
+
+    licensee {
+        allowedLicenses().forEach { allow(it) }
+        allowedLicenseUrls().forEach { allowUrl(it) }
+    }
 
     applicationVariants.all {
         val variant = this
@@ -114,34 +131,15 @@ android {
             .map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
             .forEach { output ->
                 val outputFileName =
-						"${Constants.APP_NAME}-${variant.flavorName}-" +
+                    if (variant.flavorName == "fdroid" && variant.buildType.name == "release") {
-							"${variant.buildType.name}-${variant.versionName}.apk"
+                        "${Constants.APP_NAME}-fdroid-release-${variant.versionName}.apk"
+                    } else {
+                        "${Constants.APP_NAME}-${variant.flavorName}-v${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}" } }
-}
 
 dependencies {
     implementation(project(":logcatter"))
@@ -149,8 +147,6 @@ dependencies {
 
     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))
@@ -160,8 +156,8 @@ dependencies {
     implementation(libs.androidx.material3)
     implementation(libs.androidx.appcompat)
     implementation(libs.material)
+    implementation(libs.androidx.storage)
 
-	// test
     testImplementation(libs.junit)
     testImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.junit)
@@ -172,84 +168,82 @@ dependencies {
     debugImplementation(libs.androidx.compose.ui.tooling)
     debugImplementation(libs.androidx.compose.manifest)
 
-	// tunnel
     implementation(libs.tunnel)
     implementation(libs.amneziawg.android)
     coreLibraryDesugaring(libs.desugar.jdk.libs)
 
-	// logging
     implementation(libs.timber)
 
-	// compose navigation
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.hilt.navigation.compose)
 
-	// hilt
     implementation(libs.hilt.android)
     ksp(libs.hilt.android.compiler)
     ksp(libs.androidx.hilt.compiler)
 
-	// accompanist
     implementation(libs.accompanist.permissions)
     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)
 
-	// 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)
 
-	// barcode scanning
     implementation(libs.zxing.android.embedded)
 
-	// bio
+    implementation(libs.material.icons.extended)
+
     implementation(libs.androidx.biometric.ktx)
     implementation(libs.pin.lock.compose)
 
-	// shortcuts
     implementation(libs.androidx.core)
 
-	// splash
     implementation(libs.androidx.core.splashscreen)
 
-	// worker
     implementation(libs.androidx.work.runtime)
     implementation(libs.androidx.hilt.work)
-}
 
-fun determineVersionName(): String {
+    implementation(libs.qrose)
-	return with(getBuildTaskName().lowercase()) {
+    implementation(libs.semver4j)
-		when {
+
-			contains(Constants.NIGHTLY) || contains(Constants.PRERELEASE) ->
+    implementation(libs.ktor.client.core)
-				Constants.VERSION_NAME +
+    implementation(libs.ktor.client.okhttp)
-					"-${grgitService.service.get().grgit.head().abbreviatedId}"
+    implementation(libs.ktor.client.cio)
-			else -> Constants.VERSION_NAME
+    implementation(libs.ktor.client.content.negotiation)
-		}
+    implementation(libs.ktor.serialization.kotlinx.json)
+    implementation(libs.slf4j.android)
+    implementation(libs.icmp4a)
+
+    // shizuku
+    implementation(libs.shizuku.api)
+    implementation(libs.shizuku.provider)
+
+    implementation(libs.reorderable)
+    implementation(libs.roomdatabasebackup) {
+        exclude(group = "org.reactivestreams", module = "reactive-streams")
     }
 }
 
-val incrementVersionCode by tasks.registering {
+tasks.register<Copy>("copyLicenseeJsonToAssets") {
-	doLast {
+    dependsOn("licensee")
-		val versionFile = file("$rootDir/versionCode.txt")
+    val outputAssets = layout.projectDirectory.dir("src/main/assets")
-		if (versionFile.exists()) {
+    from(layout.buildDirectory.file("reports/licensee/androidFdroidRelease/artifacts.json")) {
-			versionFile.writeText(versionCodeIncrement.toString())
+        rename("artifacts.json", "licenses.json")
-			println("Incremented versionCode to $versionCodeIncrement")
-		}
     }
+    into(outputAssets)
 }
 
+tasks.named("preBuild") { dependsOn("copyLicenseeJsonToAssets") }
+
+// https://gist.github.com/obfusk/61046e09cee352ae6dd109911534b12e#fix-proposed-by-linsui-disable-baseline-profiles
 tasks.whenTaskAdded {
-	if (name.startsWith("assemble") && !name.lowercase().contains("debug")) {
+    if (name.contains("ArtProfile")) {
-		dependsOn(incrementVersionCode)
+        enabled = false
     }
 }

app/fdroid-rules.pro

@@ -1,42 +0,0 @@
--dontwarn com.google.errorprone.annotations.**
-
--keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
-    <fields>;
-}
-
-# Keep all classes in the org.xbill.DNS package and subpackages
--keep class org.xbill.DNS.** { *; }
--dontwarn org.xbill.DNS.**
-
-# Preserve JNA classes if used (e.g., for IPHlpAPI on Windows)
--keep class com.sun.jna.** { *; }
--dontwarn com.sun.jna.**
-
-# Keep DNS resolver configuration classes that might be loaded dynamically
--keep class org.xbill.DNS.config.** { *; }
--dontwarn org.xbill.DNS.config.**
-
--keep class org.xbill.DNS.** { *; }
-
-# Prevent optimization issues with native or reflection-based calls
--dontoptimize
--dontshrink
-# Uncomment the above if errors persist, but use sparingly as they’re broad
-
-# Suppress warnings about missing classes if not all features are used
--dontwarn java.lang.management.**
--dontwarn sun.nio.ch.**
-
--dontwarn com.google.api.client.http.GenericUrl
--dontwarn com.google.api.client.http.HttpHeaders
--dontwarn com.google.api.client.http.HttpRequest
--dontwarn com.google.api.client.http.HttpRequestFactory
--dontwarn com.google.api.client.http.HttpResponse
--dontwarn com.google.api.client.http.HttpTransport
--dontwarn com.google.api.client.http.javanet.NetHttpTransport$Builder
--dontwarn com.google.api.client.http.javanet.NetHttpTransport
--dontwarn javax.lang.model.element.Modifier
--dontwarn org.joda.time.Instant
--dontwarn org.slf4j.impl.StaticLoggerBinder
--dontwarn org.slf4j.impl.StaticMDCBinder
--dontwarn org.slf4j.impl.StaticMarkerBinder

app/proguard-rules.pro

@@ -1,61 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
--keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
-    <fields>;
-}
-
-# Keep all classes in the org.xbill.DNS package and subpackages
--keep class org.xbill.DNS.** { *; }
--dontwarn org.xbill.DNS.**
-
-# Preserve JNA classes if used (e.g., for IPHlpAPI on Windows)
--keep class com.sun.jna.** { *; }
--dontwarn com.sun.jna.**
-
-# Keep DNS resolver configuration classes that might be loaded dynamically
--keep class org.xbill.DNS.config.** { *; }
--dontwarn org.xbill.DNS.config.**
-
--keep class org.xbill.DNS.** { *; }
-
-# Prevent optimization issues with native or reflection-based calls
--dontoptimize
--dontshrink
-# Uncomment the above if errors persist, but use sparingly as they’re broad
-
-# Suppress warnings about missing classes if not all features are used
--dontwarn java.lang.management.**
--dontwarn sun.nio.ch.**
-
--dontwarn com.google.api.client.http.GenericUrl
--dontwarn com.google.api.client.http.HttpHeaders
--dontwarn com.google.api.client.http.HttpRequest
--dontwarn com.google.api.client.http.HttpRequestFactory
--dontwarn com.google.api.client.http.HttpResponse
--dontwarn com.google.api.client.http.HttpTransport
--dontwarn com.google.api.client.http.javanet.NetHttpTransport$Builder
--dontwarn com.google.api.client.http.javanet.NetHttpTransport
--dontwarn javax.lang.model.element.Modifier
--dontwarn org.joda.time.Instant
--dontwarn org.slf4j.impl.StaticLoggerBinder
--dontwarn org.slf4j.impl.StaticMDCBinder
--dontwarn org.slf4j.impl.StaticMarkerBinder

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

@@ -155,9 +155,7 @@
           "columnNames": [
             "id"
           ]
-        },
+        }
-        "indices": [],
-        "foreignKeys": []
       },
       {
         "tableName": "TunnelConfig",
@@ -227,21 +225,18 @@
             "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"
           },
           {
@@ -275,11 +270,9 @@
             "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, 'ae51793c4d09ea3194ecd26f0606f35c')"

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

@@ -0,0 +1,295 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 17,
+    "identityHash": "380d82359c99933cc9ce783347c4ec31",
+    "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_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, `debounce_delay_seconds` INTEGER NOT NULL DEFAULT 3, `is_disable_kill_switch_on_trusted_enabled` INTEGER NOT NULL DEFAULT false, `is_tunnel_on_unsecure_enabled` INTEGER NOT NULL DEFAULT false, `split_tunnel_apps` TEXT NOT NULL DEFAULT '', `wifi_detection_method` INTEGER NOT NULL DEFAULT 0)",
+        "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": "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"
+          },
+          {
+            "fieldPath": "debounceDelaySeconds",
+            "columnName": "debounce_delay_seconds",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "3"
+          },
+          {
+            "fieldPath": "isDisableKillSwitchOnTrustedEnabled",
+            "columnName": "is_disable_kill_switch_on_trusted_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isTunnelOnUnsecureEnabled",
+            "columnName": "is_tunnel_on_unsecure_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "splitTunnelApps",
+            "columnName": "split_tunnel_apps",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "wifiDetectionMethod",
+            "columnName": "wifi_detection_method",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "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, `is_ipv4_preferred` INTEGER NOT NULL DEFAULT true)",
+        "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",
+            "defaultValue": "null"
+          },
+          {
+            "fieldPath": "pingCooldown",
+            "columnName": "ping_cooldown",
+            "affinity": "INTEGER",
+            "defaultValue": "null"
+          },
+          {
+            "fieldPath": "pingIp",
+            "columnName": "ping_ip",
+            "affinity": "TEXT",
+            "defaultValue": "null"
+          },
+          {
+            "fieldPath": "isEthernetTunnel",
+            "columnName": "is_ethernet_tunnel",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isIpv4Preferred",
+            "columnName": "is_ipv4_preferred",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "true"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_TunnelConfig_name",
+            "unique": true,
+            "columnNames": [
+              "name"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_TunnelConfig_name` ON `${TABLE_NAME}` (`name`)"
+          }
+        ]
+      }
+    ],
+    "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, '380d82359c99933cc9ce783347c4ec31')"
+    ]
+  }
+}

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

@@ -0,0 +1,302 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 18,
+    "identityHash": "505728bad740c12bab998a066b569333",
+    "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_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, `debounce_delay_seconds` INTEGER NOT NULL DEFAULT 3, `is_disable_kill_switch_on_trusted_enabled` INTEGER NOT NULL DEFAULT false, `is_tunnel_on_unsecure_enabled` INTEGER NOT NULL DEFAULT false, `split_tunnel_apps` TEXT NOT NULL DEFAULT '', `wifi_detection_method` INTEGER NOT NULL DEFAULT 0)",
+        "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": "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"
+          },
+          {
+            "fieldPath": "debounceDelaySeconds",
+            "columnName": "debounce_delay_seconds",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "3"
+          },
+          {
+            "fieldPath": "isDisableKillSwitchOnTrustedEnabled",
+            "columnName": "is_disable_kill_switch_on_trusted_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isTunnelOnUnsecureEnabled",
+            "columnName": "is_tunnel_on_unsecure_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "splitTunnelApps",
+            "columnName": "split_tunnel_apps",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "wifiDetectionMethod",
+            "columnName": "wifi_detection_method",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "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, `is_ipv4_preferred` INTEGER NOT NULL DEFAULT true, `position` INTEGER NOT NULL DEFAULT 0)",
+        "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",
+            "defaultValue": "null"
+          },
+          {
+            "fieldPath": "pingCooldown",
+            "columnName": "ping_cooldown",
+            "affinity": "INTEGER",
+            "defaultValue": "null"
+          },
+          {
+            "fieldPath": "pingIp",
+            "columnName": "ping_ip",
+            "affinity": "TEXT",
+            "defaultValue": "null"
+          },
+          {
+            "fieldPath": "isEthernetTunnel",
+            "columnName": "is_ethernet_tunnel",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isIpv4Preferred",
+            "columnName": "is_ipv4_preferred",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "true"
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "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`)"
+          }
+        ]
+      }
+    ],
+    "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, '505728bad740c12bab998a066b569333')"
+    ]
+  }
+}

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

@@ -0,0 +1,316 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 19,
+    "identityHash": "82bdb96b7a9f8695a34ad1ec21d9aea8",
+    "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_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, `debounce_delay_seconds` INTEGER NOT NULL DEFAULT 3, `is_disable_kill_switch_on_trusted_enabled` INTEGER NOT NULL DEFAULT false, `is_tunnel_on_unsecure_enabled` INTEGER NOT NULL DEFAULT false, `wifi_detection_method` INTEGER NOT NULL DEFAULT 0, `is_ping_monitoring_enabled` INTEGER NOT NULL DEFAULT true, `tunnel_ping_interval_sec` INTEGER NOT NULL DEFAULT 30, `tunnel_ping_attempts` INTEGER NOT NULL DEFAULT 3, `tunnel_ping_timeout_sec` INTEGER)",
+        "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": "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"
+          },
+          {
+            "fieldPath": "debounceDelaySeconds",
+            "columnName": "debounce_delay_seconds",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "3"
+          },
+          {
+            "fieldPath": "isDisableKillSwitchOnTrustedEnabled",
+            "columnName": "is_disable_kill_switch_on_trusted_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isTunnelOnUnsecureEnabled",
+            "columnName": "is_tunnel_on_unsecure_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "wifiDetectionMethod",
+            "columnName": "wifi_detection_method",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isPingMonitoringEnabled",
+            "columnName": "is_ping_monitoring_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "true"
+          },
+          {
+            "fieldPath": "tunnelPingIntervalSeconds",
+            "columnName": "tunnel_ping_interval_sec",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "30"
+          },
+          {
+            "fieldPath": "tunnelPingAttempts",
+            "columnName": "tunnel_ping_attempts",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "3"
+          },
+          {
+            "fieldPath": "tunnelPingTimeoutSeconds",
+            "columnName": "tunnel_ping_timeout_sec",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "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, `restart_on_ping_failure` INTEGER NOT NULL DEFAULT false, `ping_target` TEXT DEFAULT null, `is_ethernet_tunnel` INTEGER NOT NULL DEFAULT false, `is_ipv4_preferred` INTEGER NOT NULL DEFAULT true, `position` INTEGER NOT NULL DEFAULT 0, `auto_tunnel_apps` 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": "''"
+          },
+          {
+            "fieldPath": "isActive",
+            "columnName": "is_Active",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "restartOnPingFailure",
+            "columnName": "restart_on_ping_failure",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "pingTarget",
+            "columnName": "ping_target",
+            "affinity": "TEXT",
+            "defaultValue": "null"
+          },
+          {
+            "fieldPath": "isEthernetTunnel",
+            "columnName": "is_ethernet_tunnel",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isIpv4Preferred",
+            "columnName": "is_ipv4_preferred",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "true"
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "autoTunnelApps",
+            "columnName": "auto_tunnel_apps",
+            "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`)"
+          }
+        ]
+      }
+    ],
+    "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, '82bdb96b7a9f8695a34ad1ec21d9aea8')"
+    ]
+  }
+}

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

@@ -5,10 +5,10 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
 import com.zaneschepke.wireguardautotunnel.data.Queries
+import java.io.IOException
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
-import java.io.IOException
 
 @RunWith(AndroidJUnit4::class)
 class MigrationTest {
@@ -16,10 +16,7 @@ class MigrationTest {
 
     @get:Rule
     val helper: MigrationTestHelper =
-		MigrationTestHelper(
+        MigrationTestHelper(InstrumentationRegistry.getInstrumentation(), AppDatabase::class.java)
-			InstrumentationRegistry.getInstrumentation(),
-			AppDatabase::class.java,
-		)
 
     @Test
     @Throws(IOException::class)
@@ -28,9 +25,7 @@ class MigrationTest {
             // 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(
+            execSQL(Queries.createTunnelConfig())
-				Queries.createTunnelConfig(),
-			)
             // Prepare for the next version.
             close()
         }

app/src/debug/res/values/colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#648DB3</color>
+</resources>

app/src/main/AndroidManifest.xml

@@ -12,14 +12,14 @@
 
     <!--foreground service permissions-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     <!--start service on boot permission-->
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <!--android tv support-->
 
 	<permission
 		android:name="${applicationId}.permission.CONTROL_TUNNELS"
+		android:label="@string/app_permission_title"
+		android:description="@string/app_permission_description"
 		android:icon="@mipmap/ic_launcher"
 		android:protectionLevel="dangerous" />
 
@@ -45,12 +45,17 @@
     <queries>
         <intent>
             <action android:name="android.intent.action.MAIN" />
+			<category android:name="android.intent.category.LAUNCHER" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.MAIN" />
+            <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
         </intent>
     </queries>
     <application
         android:name=".WireGuardAutoTunnel"
         android:allowBackup="false"
-        android:banner="@drawable/ic_banner"
+        android:banner="@mipmap/ic_banner"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:enableOnBackInvokedCallback="true"
         android:fullBackupContent="@xml/backup_rules"
@@ -60,10 +65,14 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.App.Start"
         tools:targetApi="tiramisu">
+		<activity
+			android:name="com.journeyapps.barcodescanner.CaptureActivity"
+			android:screenOrientation="portrait"
+			tools:replace="screenOrientation" />
         <activity
             android:name=".MainActivity"
             android:exported="true"
-			android:windowSoftInputMode="adjustResize"
+			android:windowSoftInputMode="adjustNothing"
             android:theme="@style/Theme.WireguardAutoTunnel"
 			android:configChanges="orientation|screenSize|keyboardHidden"
 			>
@@ -76,15 +85,11 @@
                 <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
             </intent-filter>
         </activity>
-        <activity
-            android:name="com.journeyapps.barcodescanner.CaptureActivity"
-            android:screenOrientation="portrait"
-            tools:replace="screenOrientation" />
 
         <activity
             android:name=".core.shortcut.ShortcutsActivity"
             android:enabled="true"
-            android:exported="true"
+            android:exported="false"
 			android:noHistory="true"
 			android:excludeFromRecents="true"
 			android:finishOnTaskLaunch="true"
@@ -111,7 +116,7 @@
         <service
             android:name=".core.service.tile.TunnelControlTile"
             android:exported="true"
-            android:icon="@drawable/ic_launcher"
+            android:icon="@drawable/ic_notification"
             android:label="@string/tunnel_control"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <meta-data
@@ -128,7 +133,7 @@
         <service
             android:name=".core.service.tile.AutoTunnelControlTile"
             android:exported="true"
-            android:icon="@drawable/ic_launcher"
+            android:icon="@drawable/ic_notification"
             android:label="@string/auto_tunnel"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <meta-data
@@ -161,13 +166,11 @@
 				<action android:name="android.net.VpnService" />
 			</intent-filter>
 		</service>
-
         <receiver
             android:name=".core.broadcast.RestartReceiver"
             android:enabled="true"
-            android:exported="true">
+            android:exported="false">
             <intent-filter>
-                <category android:name="android.intent.category.DEFAULT" />
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
                 <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
@@ -182,6 +185,20 @@
 				<action android:name="com.wireguard.android.action.REFRESH_TUNNEL_STATES" />
 			</intent-filter>
 		</receiver>
+		<!--custom security solution for easier user integration-->
+		<receiver
+			android:name=".core.broadcast.RemoteControlReceiver"
+			android:enabled="true"
+			android:exported="true" tools:ignore="ExportedReceiver">
+			<intent-filter>
+				<action android:name="com.zaneschepke.wireguardautotunnel.START_TUNNEL" />
+				<action android:name="com.zaneschepke.wireguardautotunnel.STOP_TUNNEL" />
+				<action android:name="com.zaneschepke.wireguardautotunnel.START_AUTO_TUNNEL" />
+				<action android:name="com.zaneschepke.wireguardautotunnel.STOP_AUTO_TUNNEL" />
+				<action android:name="com.zaneschepke.wireguardautotunnel.START_KILL_SWITCH" />
+				<action android:name="com.zaneschepke.wireguardautotunnel.STOP_KILL_SWITCH" />
+			</intent-filter>
+		</receiver>
 		<receiver
 			android:name=".core.broadcast.NotificationActionReceiver"
 			android:exported="false"

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

@@ -1,88 +1,110 @@
 package com.zaneschepke.wireguardautotunnel
 
+import android.annotation.SuppressLint
 import android.content.Intent
 import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
+import android.provider.Settings
 import androidx.activity.SystemBarStyle
-import androidx.activity.compose.BackHandler
+import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.animation.core.tween
+import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.fadeIn
+import androidx.compose.animation.slideInVertically
-import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideOutVertically
-import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.gestures.detectTapGestures
-import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.*
-import androidx.compose.material.icons.Icons
+import androidx.compose.runtime.*
-import androidx.compose.material.icons.rounded.Home
-import androidx.compose.material.icons.rounded.QuestionMark
-import androidx.compose.material.icons.rounded.Settings
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.SnackbarData
-import androidx.compose.material3.SnackbarHost
-import androidx.compose.material3.surfaceColorAtElevation
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.unit.dp
+import androidx.core.net.toUri
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
+import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
-import com.zaneschepke.wireguardautotunnel.core.shortcut.ShortcutManager
+import com.zaneschepke.networkmonitor.NetworkMonitor
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.data.AppDatabase
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.di.MainDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavBar
+import com.zaneschepke.wireguardautotunnel.ui.common.dialog.VpnDeniedDialog
-import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavItem
-import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.CustomSnackBar
-import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarControllerProvider
+import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.ConfigScreen
+import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.navigation.components.BottomNavbar
+import com.zaneschepke.wireguardautotunnel.ui.navigation.components.DynamicTopAppBar
+import com.zaneschepke.wireguardautotunnel.ui.navigation.components.currentNavBackStackEntryAsNavBarState
+import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.AutoTunnelScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.advanced.AutoTunnelAdvancedScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.detection.WifiDetectionMethodScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.disclosure.LocationDisclosureScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.MainScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.OptionsScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.autotunnel.TunnelAutoTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.PinLockScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.ConfigScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.ScannerScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.sort.SortScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.SplitTunnelScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.SplitTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.TunnelAutoTunnelScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.tunneloptions.TunnelOptionsScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.AdvancedScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.pin.PinLockScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.AppearanceScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.DisplayScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.KillSwitchScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.LanguageScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.LocationDisclosureScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.SettingsScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.AutoTunnelScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.advanced.SettingsAdvancedScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.support.LogsScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.AppearanceScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.display.DisplayScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.language.LanguageScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.killswitch.KillSwitchScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.logs.LogsScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.monitoring.TunnelMonitoringScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.SupportScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.support.license.LicenseScreen
 import com.zaneschepke.wireguardautotunnel.ui.theme.WireguardAutoTunnelTheme
-import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+import com.zaneschepke.wireguardautotunnel.util.extensions.restartApp
+import com.zaneschepke.wireguardautotunnel.util.extensions.showToast
 import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 import dagger.hilt.android.AndroidEntryPoint
+import de.raphaelebner.roomdatabasebackup.core.RoomBackup
 import javax.inject.Inject
 import kotlin.system.exitProcess
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.launch
+import org.amnezia.awg.backend.GoBackend.VpnService
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
 
-	@Inject
+    @Inject lateinit var appStateRepository: AppStateRepository
-	lateinit var appStateRepository: AppStateRepository
 
-	@Inject
+    @Inject lateinit var tunnelManager: TunnelManager
-	lateinit var tunnelManager: TunnelManager
 
-	@Inject
+    @Inject lateinit var networkMonitor: NetworkMonitor
-	lateinit var shortcutManager: ShortcutManager
 
+    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
+
+    @Inject @MainDispatcher lateinit var mainDispatcher: CoroutineDispatcher
+
+    @Inject lateinit var appDatabase: AppDatabase
+
+    private var lastLocationPermissionState: Boolean? = null
+
+    private lateinit var roomBackup: RoomBackup
+
+    val REQUEST_CODE = 123
+
+    @SuppressLint("BatteryLife")
     override fun onCreate(savedInstanceState: Bundle?) {
         enableEdgeToEdge(
             statusBarStyle = SystemBarStyle.Companion.auto(Color.TRANSPARENT, Color.TRANSPARENT),
@@ -92,161 +114,228 @@ class MainActivity : AppCompatActivity() {
             window.isNavigationBarContrastEnforced = false
         }
         super.onCreate(savedInstanceState)
+        roomBackup = RoomBackup(this)
 
         val viewModel by viewModels<AppViewModel>()
 
         installSplashScreen().apply {
-			setKeepOnScreenCondition {
+            setKeepOnScreenCondition { !viewModel.appViewState.value.isAppReady }
-				!viewModel.isAppReady.value
-			}
         }
 
         setContent {
+            val isTv = isRunningOnTv()
             val appUiState by viewModel.uiState.collectAsStateWithLifecycle()
-			val configurationChange by viewModel.configurationChange.collectAsStateWithLifecycle()
+            val appViewState by viewModel.appViewState.collectAsStateWithLifecycle()
-			val navController = rememberNavController()
 
-			LaunchedEffect(configurationChange) {
+            val navController = rememberNavController()
-				if (configurationChange) {
+            val backStackEntry by navController.currentBackStackEntryAsState()
+            val navBarState by
+                currentNavBackStackEntryAsNavBarState(
+                    navController,
+                    backStackEntry,
+                    viewModel,
+                    appUiState,
+                    appViewState,
+                )
+            val snackbar = remember { SnackbarHostState() }
+            var showVpnPermissionDialog by remember { mutableStateOf(false) }
+            var vpnPermissionDenied by remember { mutableStateOf(false) }
+
+            val vpnActivity =
+                rememberLauncherForActivityResult(
+                    ActivityResultContracts.StartActivityForResult(),
+                    onResult = {
+                        if (it.resultCode != RESULT_OK) {
+                            showVpnPermissionDialog = true
+                            vpnPermissionDenied = true
+                        } else {
+                            vpnPermissionDenied = false
+                            showVpnPermissionDialog = false
+                        }
+                    },
+                )
+
+            LaunchedEffect(appUiState.tunnels) {
+                if (!appViewState.isAppReady) {
+                    viewModel.handleEvent(AppEvent.AppReadyCheck(appUiState.tunnels))
+                }
+            }
+
+            val batteryActivity =
+                rememberLauncherForActivityResult(
+                    ActivityResultContracts.StartActivityForResult()
+                ) { _: ActivityResult ->
+                    viewModel.handleEvent(AppEvent.SetBatteryOptimizeDisableShown)
+                }
+
+            with(appViewState) {
+                LaunchedEffect(isConfigChanged) {
+                    if (isConfigChanged) {
                         Intent(this@MainActivity, MainActivity::class.java).also {
                             startActivity(it)
                             exitProcess(0)
                         }
                     }
                 }
-
+                LaunchedEffect(errorMessage) {
-			LaunchedEffect(Unit) {
+                    errorMessage?.let {
-				viewModel.getEmitSplitTunnelApps(this@MainActivity)
+                        snackbar.showSnackbar(it.asString(this@MainActivity))
+                        viewModel.handleEvent(AppEvent.MessageShown)
+                    }
+                }
+                LaunchedEffect(popBackStack) {
+                    if (popBackStack) {
+                        navController.popBackStack()
+                        viewModel.handleEvent(AppEvent.PopBackStack(false))
+                    }
+                }
+                LaunchedEffect(requestVpnPermission) {
+                    if (requestVpnPermission) {
+                        if (!vpnPermissionDenied) {
+                            vpnActivity.launch(VpnService.prepare(this@MainActivity))
+                        } else {
+                            showVpnPermissionDialog = true
+                        }
+                        viewModel.handleEvent(AppEvent.VpnPermissionRequested)
+                    }
+                }
+                LaunchedEffect(requestBatteryPermission) {
+                    if (requestBatteryPermission) {
+                        batteryActivity.launch(
+                            Intent().apply {
+                                action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
+                                data = "package:${this@MainActivity.packageName}".toUri()
+                            }
+                        )
                     }
-
-			with(appUiState.appSettings) {
-				LaunchedEffect(isShortcutsEnabled) {
-					if (!isShortcutsEnabled) return@LaunchedEffect shortcutManager.removeShortcuts()
-					shortcutManager.addShortcuts()
                 }
             }
 
+            CompositionLocalProvider(LocalIsAndroidTV provides isTv) {
                 CompositionLocalProvider(LocalNavController provides navController) {
-				SnackbarControllerProvider { host ->
+                    WireguardAutoTunnelTheme(theme = appUiState.appState.theme) {
-					WireguardAutoTunnelTheme(theme = appUiState.generalState.theme) {
+                        VpnDeniedDialog(
+                            showVpnPermissionDialog,
+                            onDismiss = {
+                                showVpnPermissionDialog = false
+                                vpnPermissionDenied = false
+                            },
+                        )
+
                         Scaffold(
-							contentWindowInsets = WindowInsets(0),
+                            modifier =
+                                Modifier.pointerInput(Unit) {
+                                    detectTapGestures {
+                                        viewModel.handleEvent(AppEvent.ClearSelectedTunnels)
+                                    }
+                                },
                             snackbarHost = {
-								SnackbarHost(host) { snackbarData: SnackbarData ->
+                                SnackbarHost(snackbar) { snackbarData: SnackbarData ->
                                     CustomSnackBar(
                                         snackbarData.visuals.message,
                                         isRtl = false,
                                         containerColor =
-										MaterialTheme.colorScheme.surfaceColorAtElevation(
+                                            MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp),
-											2.dp,
-										),
                                     )
                                 }
                             },
+                            topBar = { DynamicTopAppBar(navBarState) },
                             bottomBar = {
-								BottomNavBar(
+                                AnimatedVisibility(
-									navController,
+                                    visible = navBarState.showBottom,
-									listOf(
+                                    enter = slideInVertically(initialOffsetY = { it }),
-										BottomNavItem(
+                                    exit = slideOutVertically(targetOffsetY = { it }),
-											name = stringResource(R.string.tunnels),
+                                ) {
-											route = Route.Main,
+                                    BottomNavbar(appUiState = appUiState)
-											icon = Icons.Rounded.Home,
+                                }
-										),
-										BottomNavItem(
-											name = stringResource(R.string.settings),
-											route = Route.Settings,
-											icon = Icons.Rounded.Settings,
-										),
-										BottomNavItem(
-											name = stringResource(R.string.support),
-											route = Route.Support,
-											icon = Icons.Rounded.QuestionMark,
-										),
-									),
-								)
                             },
                         ) { padding ->
-							Box(modifier = Modifier.Companion.fillMaxSize().padding(padding)) {
+                            Box(
+                                modifier =
+                                    Modifier.fillMaxSize()
+                                        .background(MaterialTheme.colorScheme.surface)
+                                        .padding(padding)
+                                        .consumeWindowInsets(padding)
+                                        .imePadding()
+                            ) {
                                 NavHost(
                                     navController,
-									enterTransition = { fadeIn(tween(Constants.TRANSITION_ANIMATION_TIME)) },
+                                    startDestination =
-									exitTransition = { fadeOut(tween(Constants.TRANSITION_ANIMATION_TIME)) },
+                                        (if (appUiState.appState.isPinLockEnabled) Route.Lock
-									startDestination = (if (appUiState.generalState.isPinLockEnabled) Route.Lock else Route.Main),
+                                        else Route.Main),
                                 ) {
                                     composable<Route.Main> {
-										MainScreen(
+                                        MainScreen(appUiState, appViewState, viewModel)
-											uiState = appUiState,
-										)
                                     }
                                     composable<Route.Settings> {
-										SettingsScreen(
+                                        SettingsScreen(appUiState, appViewState, viewModel)
-											appViewModel = viewModel,
+                                    }
-											uiState = appUiState,
+                                    composable<Route.SettingsAdvanced> {
-										)
+                                        SettingsAdvancedScreen(appUiState, viewModel)
                                     }
                                     composable<Route.LocationDisclosure> {
-										LocationDisclosureScreen(viewModel, appUiState)
+                                        LocationDisclosureScreen(viewModel)
                                     }
                                     composable<Route.AutoTunnel> {
-										AutoTunnelScreen(
+                                        AutoTunnelScreen(appUiState, viewModel)
-											appUiState.appSettings,
-										)
-									}
-									composable<Route.Appearance> {
-										AppearanceScreen()
                                     }
+                                    composable<Route.Appearance> { AppearanceScreen() }
                                     composable<Route.Language> {
                                         LanguageScreen(appUiState, viewModel)
                                     }
                                     composable<Route.Display> {
-										DisplayScreen(appUiState)
+                                        DisplayScreen(appUiState, viewModel)
                                     }
                                     composable<Route.Support> {
-										SupportScreen(appUiState, viewModel)
+                                        SupportScreen(appViewModel = viewModel)
                                     }
+                                    composable<Route.License> { LicenseScreen() }
                                     composable<Route.AutoTunnelAdvanced> {
-										AdvancedScreen(appUiState.appSettings, viewModel)
+                                        AutoTunnelAdvancedScreen(appUiState, viewModel)
                                     }
-									composable<Route.Logs> {
+                                    composable<Route.WifiDetectionMethod> {
-										LogsScreen()
+                                        WifiDetectionMethodScreen(appUiState, viewModel)
                                     }
+                                    composable<Route.Logs> { LogsScreen(appViewState, viewModel) }
                                     composable<Route.Config> { backStack ->
                                         val args = backStack.toRoute<Route.Config>()
                                         val config =
                                             appUiState.tunnels.firstOrNull { it.id == args.id }
-										ConfigScreen(config, viewModel)
+                                        ConfigScreen(config, appUiState, viewModel)
                                     }
                                     composable<Route.TunnelOptions> { backStack ->
                                         val args = backStack.toRoute<Route.TunnelOptions>()
-										appUiState.tunnels.firstOrNull { it.id == args.id }?.let { config ->
+                                        appUiState.tunnels
-											OptionsScreen(config, appUiState)
+                                            .firstOrNull { it.id == args.id }
+                                            ?.let { config ->
+                                                TunnelOptionsScreen(
+                                                    config,
+                                                    viewModel,
+                                                    appViewState,
+                                                    appUiState.appSettings,
+                                                )
                                             }
                                     }
-									composable<Route.Lock> {
+                                    composable<Route.Lock> { PinLockScreen(viewModel) }
-										PinLockScreen(viewModel)
-									}
-									composable<Route.Scanner> {
-										ScannerScreen()
-									}
                                     composable<Route.KillSwitch> {
                                         KillSwitchScreen(appUiState, viewModel)
                                     }
-									composable<Route.SplitTunnel> { backStack ->
+                                    composable<Route.SplitTunnel> { SplitTunnelScreen(viewModel) }
-										val args = backStack.toRoute<Route.SplitTunnel>()
-										appUiState.tunnels.firstOrNull { it.id == args.id }?.let {
-											SplitTunnelScreen(it, viewModel)
-										}
-									}
                                     composable<Route.TunnelAutoTunnel> { backStack ->
                                         val args = backStack.toRoute<Route.TunnelOptions>()
-										appUiState.tunnels.firstOrNull { it.id == args.id }?.let {
+                                        appUiState.tunnels
-											TunnelAutoTunnelScreen(it, appUiState.appSettings)
+                                            .firstOrNull { it.id == args.id }
+                                            ?.let {
+                                                TunnelAutoTunnelScreen(
+                                                    it,
+                                                    appUiState.appSettings,
+                                                    viewModel,
+                                                )
                                             }
                                     }
-								}
+                                    composable<Route.Sort> { SortScreen(appUiState, viewModel) }
-								BackHandler {
+                                    composable<Route.TunnelMonitoring> {
-									if (navController.previousBackStackEntry == null || !navController.popBackStack()) {
+                                        TunnelMonitoringScreen(appUiState, viewModel)
-										this@MainActivity.finish()
                                     }
                                 }
                             }
@@ -256,4 +345,64 @@ class MainActivity : AppCompatActivity() {
             }
         }
     }
+
+    override fun onResume() {
+        super.onResume()
+        WireGuardAutoTunnel.setUiActive(true)
+        networkMonitor.checkPermissionsAndUpdateState()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        WireGuardAutoTunnel.setUiActive(false)
+    }
+
+    fun performBackup() =
+        lifecycleScope.launch(ioDispatcher) {
+            roomBackup
+                .database(appDatabase)
+                .backupLocation(RoomBackup.BACKUP_FILE_LOCATION_CUSTOM_DIALOG)
+                .enableLogDebug(true)
+                .maxFileCount(5)
+                .apply {
+                    onCompleteListener { success, message, exitCode ->
+                        lifecycleScope.launch(mainDispatcher) {
+                            if (success) {
+                                showToast(
+                                    getString(
+                                        R.string.backup_success,
+                                        getString(R.string.restarting_app),
+                                    )
+                                )
+                                restartApp()
+                            } else showToast(R.string.backup_failed)
+                        }
+                    }
+                }
+                .backup()
+        }
+
+    fun performRestore() =
+        lifecycleScope.launch {
+            roomBackup
+                .database(appDatabase)
+                .enableLogDebug(true)
+                .backupLocation(RoomBackup.BACKUP_FILE_LOCATION_CUSTOM_DIALOG)
+                .apply {
+                    onCompleteListener { success, message, exitCode ->
+                        lifecycleScope.launch(mainDispatcher) {
+                            if (success) {
+                                showToast(
+                                    getString(
+                                        R.string.restore_success,
+                                        getString(R.string.restarting_app),
+                                    )
+                                )
+                                restartApp()
+                            } else showToast(R.string.restore_failed)
+                        }
+                    }
+                }
+                .restore()
+        }
 }

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

@@ -4,66 +4,52 @@ import android.app.Application
 import android.os.StrictMode
 import android.os.StrictMode.ThreadPolicy
 import androidx.hilt.work.HiltWorkerFactory
-import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.work.Configuration
 import com.wireguard.android.backend.GoBackend
 import com.zaneschepke.logcatter.LogReader
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationMonitor
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.core.worker.ServiceWorker
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.di.MainDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendStatus
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
 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 kotlinx.coroutines.*
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.update
+import timber.log.Timber
 
 @HiltAndroidApp
 class WireGuardAutoTunnel : Application(), Configuration.Provider {
 
-	@Inject
+    @Inject lateinit var workerFactory: HiltWorkerFactory
-	lateinit var workerFactory: HiltWorkerFactory
 
     override val workManagerConfiguration: Configuration
-		get() = Configuration.Builder()
+        get() = Configuration.Builder().setWorkerFactory(workerFactory).build()
-			.setWorkerFactory(workerFactory)
-			.build()
 
-	@Inject
+    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
 
-	@Inject
+    @Inject lateinit var logReader: LogReader
-	lateinit var logReader: LogReader
 
-	@Inject
+    @Inject lateinit var appDataRepository: AppDataRepository
-	lateinit var appDataRepository: AppDataRepository
 
-	@Inject
+    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
-	@IoDispatcher
-	lateinit var ioDispatcher: CoroutineDispatcher
 
-	@Inject
+    @Inject @MainDispatcher lateinit var mainDispatcher: CoroutineDispatcher
-	@MainDispatcher
-	lateinit var mainDispatcher: CoroutineDispatcher
 
-	@Inject
+    @Inject lateinit var notificationMonitor: NotificationMonitor
-	lateinit var tunnelManager: TunnelManager
+
+    @Inject lateinit var tunnelManager: TunnelManager
 
     override fun onCreate() {
         super.onCreate()
         instance = this
-		ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifecycleObserver())
         if (BuildConfig.DEBUG) {
             Timber.plant(Timber.DebugTree())
             StrictMode.setThreadPolicy(
@@ -72,7 +58,7 @@ class WireGuardAutoTunnel : Application(), Configuration.Provider {
                     .detectDiskWrites()
                     .detectNetwork()
                     .penaltyLog()
-					.build(),
+                    .build()
             )
         } else {
             Timber.plant(ReleaseTree())
@@ -83,11 +69,9 @@ class WireGuardAutoTunnel : Application(), Configuration.Provider {
                 val settings = appDataRepository.settings.get()
                 if (settings.isAlwaysOnVpnEnabled) {
                     val tunnel = appDataRepository.getPrimaryOrFirstTunnel()
-					tunnel?.let {
+                    tunnel?.let { tunnelManager.startTunnel(it) }
-						tunnelManager.startTunnel(it)
-					}
                 } else {
-					Timber.Forest.w("Always-on VPN is not enabled in app settings")
+                    Timber.w("Always-on VPN is not enabled in app settings")
                 }
             }
         }
@@ -95,44 +79,43 @@ class WireGuardAutoTunnel : Application(), Configuration.Provider {
         ServiceWorker.start(this)
 
         applicationScope.launch {
-			withContext(mainDispatcher) {
+            launch { notificationMonitor.handleApplicationNotifications() }
-				if (appDataRepository.appState.isLocalLogsEnabled() && !isRunningOnTv()) logReader.start()
-			}
-			if (!appDataRepository.settings.get().isKernelEnabled) {
-				tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
-			}
             appDataRepository.appState.getLocale()?.let {
-				withContext(mainDispatcher) {
+                withContext(mainDispatcher) { LocaleUtil.changeLocale(it) }
-					LocaleUtil.changeLocale(it)
             }
+            appDataRepository.appState.isLocalLogsEnabled().let { enabled ->
+                if (enabled) logReader.start()
             }
         }
     }
 
     override fun onTerminate() {
-		applicationScope.launch {
+        applicationScope.cancel()
-			tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
+        tunnelManager.setBackendStatus(BackendStatus.Inactive)
-		}
         super.onTerminate()
     }
 
-	class AppLifecycleObserver : DefaultLifecycleObserver {
-
-		override fun onStart(owner: LifecycleOwner) {
-			Timber.d("Application entered foreground")
-			foreground = true
-		}
-		override fun onPause(owner: LifecycleOwner) {
-			Timber.d("Application entered background")
-			foreground = false
-		}
-	}
-
     companion object {
-		private var foreground = false
 
-		fun isForeground(): Boolean {
+        private val _uiActive = MutableStateFlow(false)
-			return foreground
+
+        val uiActive: StateFlow<Boolean>
+            get() = _uiActive
+
+        fun setUiActive(active: Boolean) {
+            _uiActive.update { active }
+        }
+
+        @Volatile private var lastActiveTunnels: List<Int> = emptyList()
+
+        @Synchronized
+        fun getLastActiveTunnels(): List<Int> {
+            return lastActiveTunnels
+        }
+
+        @Synchronized
+        fun setLastActiveTunnels(newTunnels: List<Int>) {
+            lastActiveTunnels = newTunnels
         }
 
         lateinit var instance: WireGuardAutoTunnel

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/broadcast/KernelReceiver.kt

@@ -3,30 +3,25 @@ package com.zaneschepke.wireguardautotunnel.core.broadcast
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class KernelReceiver : BroadcastReceiver() {
 
-	@Inject
+    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
 
-	@Inject
+    @Inject lateinit var tunnelRepository: TunnelRepository
-	lateinit var tunnelRepository: TunnelRepository
 
-	@Inject
+    @Inject lateinit var serviceManager: ServiceManager
-	lateinit var serviceManager: ServiceManager
 
-	@Inject
+    @Inject lateinit var tunnelManager: TunnelManager
-	lateinit var tunnelManager: TunnelManager
 
     override fun onReceive(context: Context, intent: Intent) {
         val action = intent.action ?: return
@@ -34,9 +29,7 @@ class KernelReceiver : BroadcastReceiver() {
             if (action == REFRESH_TUNNELS_ACTION) {
                 tunnelManager.runningTunnelNames().forEach { name ->
                     val tunnel = tunnelRepository.findByTunnelName(name)
-					tunnel?.let {
+                    tunnel?.let { tunnelRepository.save(it.copy(isActive = true)) }
-						tunnelRepository.save(it.copy(isActive = true))
-					}
                 }
                 serviceManager.updateTunnelTile()
             }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/broadcast/NotificationActionReceiver.kt

@@ -4,31 +4,26 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class NotificationActionReceiver : BroadcastReceiver() {
 
-	@Inject
+    @Inject lateinit var serviceManager: ServiceManager
-	lateinit var serviceManager: ServiceManager
 
-	@Inject
+    @Inject lateinit var tunnelManager: TunnelManager
-	lateinit var tunnelManager: TunnelManager
 
-	@Inject
+    @Inject lateinit var tunnelRepository: TunnelRepository
-	lateinit var tunnelRepository: TunnelRepository
 
-	@Inject
+    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
 
     override fun onReceive(context: Context, intent: Intent) {
         applicationScope.launch {
@@ -36,11 +31,15 @@ class NotificationActionReceiver : BroadcastReceiver() {
                 NotificationAction.AUTO_TUNNEL_OFF.name -> serviceManager.stopAutoTunnel()
                 NotificationAction.TUNNEL_OFF.name -> {
                     val tunnelId = intent.getIntExtra(NotificationManager.EXTRA_ID, 0)
-					if (tunnelId == 0) return@launch tunnelManager.stopTunnel()
+                    if (tunnelId == STOP_ALL_TUNNELS_ID) return@launch tunnelManager.stopTunnel()
                     val tunnel = tunnelRepository.getById(tunnelId)
                     tunnelManager.stopTunnel(tunnel)
                 }
             }
         }
     }
+
+    companion object {
+        const val STOP_ALL_TUNNELS_ID = 0
+    }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/broadcast/RemoteControlReceiver.kt

@@ -0,0 +1,96 @@
+package com.zaneschepke.wireguardautotunnel.core.broadcast
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+@AndroidEntryPoint
+class RemoteControlReceiver : BroadcastReceiver() {
+
+    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
+
+    @Inject lateinit var appDataRepository: AppDataRepository
+
+    @Inject lateinit var serviceManager: ServiceManager
+
+    @Inject lateinit var tunnelManager: TunnelManager
+
+    enum class Action(private val suffix: String) {
+        START_TUNNEL("START_TUNNEL"),
+        STOP_TUNNEL("STOP_TUNNEL"),
+        START_AUTO_TUNNEL("START_AUTO_TUNNEL"),
+        STOP_AUTO_TUNNEL("STOP_AUTO_TUNNEL");
+
+        fun getFullAction(): String {
+            return "${Constants.BASE_PACKAGE}.$suffix"
+        }
+
+        companion object {
+            fun fromAction(action: String): Action? {
+                for (a in entries) {
+                    if (a.getFullAction() == action) {
+                        return a
+                    }
+                }
+                return null
+            }
+        }
+    }
+
+    override fun onReceive(context: Context, intent: Intent) {
+        Timber.i("onReceive")
+        val action = intent.action ?: return
+        val appAction = Action.fromAction(action) ?: return Timber.w("Unknown action $action")
+        applicationScope.launch {
+            if (!appDataRepository.appState.isRemoteControlEnabled())
+                return@launch Timber.w("Remote control disabled")
+            val key =
+                appDataRepository.appState.getRemoteKey()
+                    ?: return@launch Timber.w("Remote control key missing")
+            if (key != intent.getStringExtra(EXTRA_KEY)?.trim())
+                return@launch Timber.w("Invalid remote control key")
+            when (appAction) {
+                Action.START_TUNNEL -> {
+                    val tunnelName =
+                        intent.getStringExtra(EXTRA_TUN_NAME) ?: return@launch startDefaultTunnel()
+                    val tunnel =
+                        appDataRepository.tunnels.findByTunnelName(tunnelName)
+                            ?: return@launch startDefaultTunnel()
+                    tunnelManager.startTunnel(tunnel)
+                }
+                Action.STOP_TUNNEL -> {
+                    val tunnelName =
+                        intent.getStringExtra(EXTRA_TUN_NAME)
+                            ?: return@launch tunnelManager.stopTunnel()
+                    val tunnel =
+                        appDataRepository.tunnels.findByTunnelName(tunnelName)
+                            ?: return@launch tunnelManager.stopTunnel()
+                    tunnelManager.stopTunnel(tunnel)
+                }
+                Action.START_AUTO_TUNNEL -> serviceManager.startAutoTunnel()
+                Action.STOP_AUTO_TUNNEL -> serviceManager.stopAutoTunnel()
+            }
+        }
+    }
+
+    private suspend fun startDefaultTunnel() {
+        appDataRepository.getPrimaryOrFirstTunnel()?.let { tunnel ->
+            tunnelManager.startTunnel(tunnel)
+        }
+    }
+
+    companion object {
+        const val EXTRA_TUN_NAME = "tunnelName"
+        const val EXTRA_KEY = "key"
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/broadcast/RestartReceiver.kt

@@ -3,55 +3,45 @@ package com.zaneschepke.wireguardautotunnel.core.broadcast
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.logcatter.LogReader
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class RestartReceiver : BroadcastReceiver() {
-	@Inject
+    @Inject lateinit var appDataRepository: AppDataRepository
-	lateinit var appDataRepository: AppDataRepository
 
-	@Inject
+    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
 
-	@Inject
+    @Inject lateinit var serviceManager: ServiceManager
-	lateinit var serviceManager: ServiceManager
 
-	@Inject
+    @Inject lateinit var tunnelManager: TunnelManager
-	lateinit var tunnelManager: TunnelManager
 
-	@Inject
+    @Inject lateinit var logReader: LogReader
-	@IoDispatcher
+
-	lateinit var ioDispatcher: CoroutineDispatcher
+    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
 
     override fun onReceive(context: Context, intent: Intent) {
-		val action = intent.action ?: return
-		if (action != Intent.ACTION_BOOT_COMPLETED &&
-			action != Intent.ACTION_MY_PACKAGE_REPLACED &&
-			action != "com.htc.intent.action.QUICKBOOT_POWERON"
-		) {
-			return
-		}
-
         Timber.d("RestartReceiver triggered with action: ${intent.action}")
-		applicationScope.launch(ioDispatcher) {
         serviceManager.updateTunnelTile()
         serviceManager.updateAutoTunnelTile()
+        applicationScope.launch(ioDispatcher) {
             val settings = appDataRepository.settings.get()
             if (settings.isRestoreOnBootEnabled) {
-				if (settings.isAutoTunnelEnabled && !serviceManager.autoTunnelActive.value) {
+                if (
+                    settings.isAutoTunnelEnabled && serviceManager.autoTunnelService.value == null
+                ) {
                     Timber.d("Starting auto-tunnel on boot/update")
-					serviceManager.startAutoTunnel(true)
+                    serviceManager.startAutoTunnel()
                 } else {
                     Timber.d("Restoring previous tunnel state")
                     tunnelManager.restorePreviousState()
@@ -59,6 +49,7 @@ class RestartReceiver : BroadcastReceiver() {
             } else {
                 Timber.d("Restore on boot disabled, skipping")
             }
+            if (intent.action == Intent.ACTION_MY_PACKAGE_REPLACED) logReader.deleteAndClearLogs()
         }
     }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/notification/NotificationManager.kt

@@ -4,12 +4,13 @@ import android.app.Notification
 import android.app.NotificationManager
 import android.content.Context
 import androidx.core.app.NotificationCompat
-import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification.NotificationChannels
+import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.util.StringValue
 
 interface NotificationManager {
     val context: Context
+
     fun createNotification(
         channel: NotificationChannels,
         title: String = "",
@@ -32,16 +33,24 @@ interface NotificationManager {
         onlyAlertOnce: Boolean = true,
     ): Notification
 
-	fun createNotificationAction(notificationAction: NotificationAction, extraId: Int? = null): NotificationCompat.Action
+    fun createNotificationAction(
+        notificationAction: NotificationAction,
+        extraId: Int? = null,
+    ): 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_LOCATION_PERMISSION_ID = 123
+        const val AUTO_TUNNEL_LOCATION_SERVICES_ID = 124
+        // For auto tunnel foreground notification
         const val AUTO_TUNNEL_NOTIFICATION_ID = 122
+        // for tunnel foreground notification
         const val VPN_NOTIFICATION_ID = 100
+        const val TUNNEL_ERROR_NOTIFICATION_ID = 101
+        const val TUNNEL_MESSAGES_NOTIFICATION_ID = 102
         const val EXTRA_ID = "id"
     }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/notification/NotificationMonitor.kt

@@ -0,0 +1,63 @@
+package com.zaneschepke.wireguardautotunnel.core.notification
+
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.domain.events.BackendError
+import com.zaneschepke.wireguardautotunnel.util.StringValue
+import jakarta.inject.Inject
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+
+class NotificationMonitor
+@Inject
+constructor(
+    private val tunnelManager: TunnelManager,
+    private val notificationManager: NotificationManager,
+) {
+    suspend fun handleApplicationNotifications() = coroutineScope {
+        launch { handleTunnelErrors() }
+        launch { handleTunnelMessages() }
+    }
+
+    private suspend fun handleTunnelErrors() =
+        tunnelManager.errorEvents.collectLatest { (tunnelConf, error) ->
+            if (!WireGuardAutoTunnel.uiActive.value) {
+                val notification =
+                    notificationManager.createNotification(
+                        WireGuardNotification.NotificationChannels.VPN,
+                        title = StringValue.DynamicString(tunnelConf.name),
+                        description =
+                            when (error) {
+                                is BackendError.BounceFailed -> error.toStringValue()
+                                else ->
+                                    StringValue.StringResource(
+                                        R.string.tunnel_error_template,
+                                        error.toStringRes(),
+                                    )
+                            },
+                    )
+                notificationManager.show(
+                    NotificationManager.TUNNEL_ERROR_NOTIFICATION_ID,
+                    notification,
+                )
+            }
+        }
+
+    private suspend fun handleTunnelMessages() =
+        tunnelManager.messageEvents.collectLatest { (tunnelConf, message) ->
+            if (!WireGuardAutoTunnel.uiActive.value) {
+                val notification =
+                    notificationManager.createNotification(
+                        WireGuardNotification.NotificationChannels.VPN,
+                        title = StringValue.DynamicString(tunnelConf.name),
+                        description = message.toStringValue(),
+                    )
+                notificationManager.show(
+                    NotificationManager.TUNNEL_MESSAGES_NOTIFICATION_ID,
+                    notification,
+                )
+            }
+        }
+}

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

@@ -12,20 +12,17 @@ import android.graphics.Color
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
+import com.zaneschepke.wireguardautotunnel.MainActivity
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.core.broadcast.NotificationActionReceiver
-import com.zaneschepke.wireguardautotunnel.MainActivity
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager.Companion.EXTRA_ID
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.util.StringValue
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
-class WireGuardNotification
+class WireGuardNotification @Inject constructor(@ApplicationContext override val context: Context) :
-@Inject
+    com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager {
-constructor(
-	@ApplicationContext override val context: Context,
-) : com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager {
 
     enum class NotificationChannels {
         VPN,
@@ -45,10 +42,10 @@ constructor(
         onlyAlertOnce: Boolean,
     ): Notification {
         notificationManager.createNotificationChannel(channel.asChannel())
-		return channel.asBuilder().apply {
+        return channel
-			actions.forEach {
+            .asBuilder()
-				addAction(it)
+            .apply {
-			}
+                actions.forEach { addAction(it) }
                 setContentTitle(title)
                 setContentIntent(
                     PendingIntent.getActivity(
@@ -56,15 +53,16 @@ constructor(
                         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)
+                setSmallIcon(R.drawable.ic_notification)
-		}.build()
+            }
+            .build()
     }
 
     override fun createNotification(
@@ -89,8 +87,12 @@ constructor(
         )
     }
 
-	override fun createNotificationAction(notificationAction: NotificationAction, extraId: Int?): NotificationCompat.Action {
+    override fun createNotificationAction(
-		val pendingIntent = PendingIntent.getBroadcast(
+        notificationAction: NotificationAction,
+        extraId: Int?,
+    ): NotificationCompat.Action {
+        val pendingIntent =
+            PendingIntent.getBroadcast(
                 context,
                 0,
                 Intent(context, NotificationActionReceiver::class.java).apply {
@@ -100,10 +102,11 @@ constructor(
                 PendingIntent.FLAG_IMMUTABLE,
             )
         return NotificationCompat.Action.Builder(
-			R.drawable.ic_launcher,
+                R.drawable.ic_notification,
                 notificationAction.title(context).uppercase(),
                 pendingIntent,
-		).build()
+            )
+            .build()
     }
 
     override fun remove(notificationId: Int) {
@@ -112,7 +115,12 @@ constructor(
 
     override fun show(notificationId: Int, notification: Notification) {
         with(notificationManager) {
-			if (ActivityCompat.checkSelfPermission(context, Manifest.permission.POST_NOTIFICATIONS) != PackageManager.PERMISSION_GRANTED) {
+            if (
+                ActivityCompat.checkSelfPermission(
+                    context,
+                    Manifest.permission.POST_NOTIFICATIONS,
+                ) != PackageManager.PERMISSION_GRANTED
+            ) {
                 return
             }
             notify(notificationId, notification)
@@ -128,10 +136,7 @@ constructor(
                 )
             }
             NotificationChannels.VPN -> {
-				NotificationCompat.Builder(
+                NotificationCompat.Builder(context, context.getString(R.string.vpn_channel_id))
-					context,
-					context.getString(R.string.vpn_channel_id),
-				)
             }
         }
     }
@@ -143,7 +148,8 @@ constructor(
                         context.getString(R.string.vpn_channel_id),
                         context.getString(R.string.vpn_channel_name),
                         NotificationManager.IMPORTANCE_HIGH,
-				).apply {
+                    )
+                    .apply {
                         description = context.getString(R.string.vpn_channel_description)
                         enableLights(true)
                         lightColor = Color.WHITE
@@ -156,7 +162,8 @@ constructor(
                         context.getString(R.string.auto_tunnel_channel_id),
                         context.getString(R.string.auto_tunnel_channel_name),
                         NotificationManager.IMPORTANCE_HIGH,
-				).apply {
+                    )
+                    .apply {
                         description = context.getString(R.string.auto_tunnel_channel_description)
                         enableLights(true)
                         lightColor = Color.WHITE

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

@@ -1,160 +1,151 @@
 package com.zaneschepke.wireguardautotunnel.core.service
 
-import android.app.Service
+import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
+import android.content.ServiceConnection
+import android.net.VpnService
+import android.os.IBinder
 import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelService
-import com.zaneschepke.wireguardautotunnel.core.service.tile.AutoTunnelControlTile
-import com.zaneschepke.wireguardautotunnel.core.service.tile.TunnelControlTile
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 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.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 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 kotlinx.coroutines.withTimeoutOrNull
 import timber.log.Timber
 
-class ServiceManager @Inject constructor(
+class ServiceManager
+@Inject
+constructor(
     private val context: Context,
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+    private val ioDispatcher: CoroutineDispatcher,
-	@ApplicationScope private val applicationScope: CoroutineScope,
+    private val applicationScope: CoroutineScope,
+    private val mainDispatcher: CoroutineDispatcher,
     private val appDataRepository: AppDataRepository,
 ) {
 
-	private val _autoTunnelActive = MutableStateFlow(false)
+    private val autoTunnelMutex = Mutex()
-	val autoTunnelActive = _autoTunnelActive.asStateFlow()
 
-	var autoTunnelService = CompletableDeferred<AutoTunnelService>()
+    private val _tunnelService = MutableStateFlow<TunnelForegroundService?>(null)
-	var backgroundService = CompletableDeferred<TunnelForegroundService>()
+    private val _autoTunnelService = MutableStateFlow<AutoTunnelService?>(null)
-	var autoTunnelTile = CompletableDeferred<AutoTunnelControlTile>()
+    val autoTunnelService = _autoTunnelService.asStateFlow()
-	var tunnelControlTile = CompletableDeferred<TunnelControlTile>()
 
-	private fun <T : Service> startService(cls: Class<T>, background: Boolean) {
+    private val tunnelServiceConnection =
-		runCatching {
+        object : ServiceConnection {
-			val intent = Intent(context, cls)
+            override fun onServiceConnected(name: ComponentName, service: IBinder) {
-			if (background) {
+                val binder = service as? TunnelForegroundService.LocalBinder
-				context.startForegroundService(intent)
+                _tunnelService.value = binder?.service
-			} else {
+                Timber.d("TunnelForegroundService connected")
-				context.startService(intent)
-			}
-		}.onFailure { Timber.e(it) }
             }
 
-	fun startAutoTunnel(background: Boolean) {
+            override fun onServiceDisconnected(name: ComponentName) {
-		applicationScope.launch(ioDispatcher) {
+                _tunnelService.value = null
+                Timber.d("TunnelForegroundService disconnected")
+            }
+        }
+
+    private val autoTunnelServiceConnection =
+        object : ServiceConnection {
+            override fun onServiceConnected(name: ComponentName, service: IBinder) {
+                val binder = service as? AutoTunnelService.LocalBinder
+                _autoTunnelService.value = binder?.service
+                Timber.d("AutoTunnelService connected")
+            }
+
+            override fun onServiceDisconnected(name: ComponentName) {
+                _autoTunnelService.value = null
+                Timber.d("AutoTunnelService disconnected")
+            }
+        }
+
+    fun hasVpnPermission(): Boolean {
+        return VpnService.prepare(context) == null
+    }
+
+    suspend fun startAutoTunnel() {
+        autoTunnelMutex.withLock {
             val settings = appDataRepository.settings.get()
             appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = true))
-			if (autoTunnelService.isCompleted) {
+            if (_autoTunnelService.value != null) return
-				_autoTunnelActive.update { true }
-				return@launch
-			}
-			runCatching {
-				autoTunnelService = CompletableDeferred()
-				startService(AutoTunnelService::class.java, background)
-				val service = withTimeoutOrNull(SERVICE_START_TIMEOUT) { autoTunnelService.await() }
-					?: throw IllegalStateException("AutoTunnelService start timed out")
-				service.start()
-				_autoTunnelActive.update { true }
-				updateAutoTunnelTile()
-			}.onFailure {
-				Timber.e(it)
-				_autoTunnelActive.update { false }
-			}
-		}
-	}
-
-	fun startBackgroundService(tunnelConf: TunnelConf) {
-		applicationScope.launch(ioDispatcher) {
-			if (backgroundService.isCompleted) return@launch
-			runCatching {
-				backgroundService = CompletableDeferred()
-				startService(TunnelForegroundService::class.java, true)
-				val service = withTimeoutOrNull(SERVICE_START_TIMEOUT) { backgroundService.await() }
-					?: throw IllegalStateException("Background service start timed out")
-				service.start(tunnelConf)
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
-	}
-
-	fun stopBackgroundService() {
-		applicationScope.launch(ioDispatcher) {
-			if (!backgroundService.isCompleted) return@launch
-			runCatching {
-				val service = backgroundService.await()
-				service.stop()
-				backgroundService = CompletableDeferred()
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
-	}
-
-	fun toggleAutoTunnel(background: Boolean) {
-		applicationScope.launch(ioDispatcher) {
-			if (_autoTunnelActive.value) stopAutoTunnel() else startAutoTunnel(background)
-		}
-	}
-
-	suspend fun updateAutoTunnelTile() {
             withContext(ioDispatcher) {
-			runCatching {
+                val intent = Intent(context, AutoTunnelService::class.java)
-				val service = withTimeoutOrNull(SERVICE_START_TIMEOUT) { autoTunnelTile.await() }
+                context.startForegroundService(intent)
-					?: run {
+                context.bindService(intent, autoTunnelServiceConnection, Context.BIND_AUTO_CREATE)
-						context.requestAutoTunnelTileServiceUpdate()
+                withContext(mainDispatcher) { updateAutoTunnelTile() }
-						return@withContext
-					}
-				service.updateTileState()
-			}.onFailure {
-				Timber.e(it)
             }
         }
     }
 
-	suspend fun updateTunnelTile() {
+    suspend fun stopAutoTunnel() {
-		withContext(ioDispatcher) {
+        autoTunnelMutex.withLock {
-			runCatching {
-				val service = withTimeoutOrNull(SERVICE_START_TIMEOUT) { tunnelControlTile.await() }
-					?: run {
-						context.requestTunnelTileServiceStateUpdate()
-						return@withContext
-					}
-				service.updateTileState()
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
-	}
-
-	fun stopAutoTunnel() {
-		applicationScope.launch(ioDispatcher) {
             val settings = appDataRepository.settings.get()
             appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = false))
-			if (!autoTunnelService.isCompleted) return@launch
+            if (_autoTunnelService.value == null) return
-			runCatching {
+            _autoTunnelService.value?.let { service ->
-				val service = autoTunnelService.await()
                 service.stop()
-				_autoTunnelActive.update { false }
+                try {
-				autoTunnelService = CompletableDeferred()
+                    context.unbindService(autoTunnelServiceConnection)
-				updateAutoTunnelTile()
+                } catch (e: Exception) {
-			}.onFailure {
+                    Timber.e(e, "Failed to unbind AutoTunnelService")
-				Timber.e(it)
+                } finally {
+                    _tunnelService.value = null
+                }
+            }
+            withContext(mainDispatcher) { updateAutoTunnelTile() }
+        }
+    }
+
+    suspend fun startTunnelForegroundService() {
+        if (_tunnelService.value != null) return
+        withContext(ioDispatcher) {
+            applicationScope.launch(ioDispatcher) {
+                val intent = Intent(context, TunnelForegroundService::class.java)
+                context.startForegroundService(intent)
+                context.bindService(intent, tunnelServiceConnection, Context.BIND_AUTO_CREATE)
             }
         }
     }
 
-	companion object {
+    fun stopTunnelForegroundService() {
-		const val SERVICE_START_TIMEOUT = 5_000L
+        _tunnelService.value?.let { service ->
+            service.stop()
+            try {
+                context.unbindService(tunnelServiceConnection)
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to stop TunnelForegroundService")
+            } finally {
+                _tunnelService.value = null
+            }
+        }
+    }
+
+    fun toggleAutoTunnel() {
+        applicationScope.launch(ioDispatcher) {
+            if (_autoTunnelService.value != null) stopAutoTunnel() else startAutoTunnel()
+        }
+    }
+
+    fun updateAutoTunnelTile() {
+        context.requestAutoTunnelTileServiceUpdate()
+    }
+
+    fun updateTunnelTile() {
+        context.requestTunnelTileServiceStateUpdate()
+    }
+
+    fun handleTunnelServiceDestroy() {
+        _tunnelService.update { null }
+    }
+
+    fun handleAutoTunnelServiceDestroy() {
+        _autoTunnelService.update { null }
     }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/service/TunnelForegroundService.kt

@@ -2,69 +2,153 @@ package com.zaneschepke.wireguardautotunnel.core.service
 
 import android.app.Notification
 import android.content.Intent
+import android.os.Binder
 import android.os.IBinder
 import androidx.core.app.ServiceCompat
 import androidx.lifecycle.LifecycleService
+import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelMonitor
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.extensions.distinctByKeys
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CompletableDeferred
+import io.ktor.util.collections.*
 import javax.inject.Inject
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import timber.log.Timber
 
 @AndroidEntryPoint
 class TunnelForegroundService : LifecycleService() {
 
-	@Inject
+    @Inject lateinit var notificationManager: NotificationManager
-	lateinit var notificationManager: NotificationManager
 
-	@Inject
+    @Inject lateinit var serviceManager: ServiceManager
-	lateinit var serviceManager: ServiceManager
+
+    @Inject lateinit var tunnelManager: TunnelManager
+
+    @Inject lateinit var tunnelMonitor: TunnelMonitor
+
+    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
+
+    @Inject lateinit var appDataRepository: AppDataRepository
+
+    class LocalBinder(val service: TunnelForegroundService) : Binder()
+
+    private val tunnelJobs = ConcurrentMap<TunnelConf, Job>()
+
+    private val binder = LocalBinder(this)
 
     override fun onCreate() {
         super.onCreate()
-		serviceManager.backgroundService.complete(this)
+        ServiceCompat.startForeground(
+            this@TunnelForegroundService,
+            NotificationManager.VPN_NOTIFICATION_ID,
+            onCreateNotification(),
+            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+        )
     }
 
-	override fun onBind(intent: Intent): IBinder? {
+    override fun onBind(intent: Intent): IBinder {
         super.onBind(intent)
-		return null
+        return binder
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-		serviceManager.backgroundService.complete(this)
+        super.onStartCommand(intent, flags, startId)
-		return super.onStartCommand(intent, flags, startId)
-	}
-
-	fun start(tunnelConf: TunnelConf) {
         ServiceCompat.startForeground(
             this@TunnelForegroundService,
-			NotificationManager.KERNEL_SERVICE_NOTIFICATION_ID,
+            NotificationManager.VPN_NOTIFICATION_ID,
-			createNotification(tunnelConf),
+            onCreateNotification(),
+            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+        )
+        start()
+        return START_STICKY
+    }
+
+    fun start() =
+        lifecycleScope.launch(ioDispatcher) {
+            tunnelManager.activeTunnels.distinctByKeys().collect { activeTunnels ->
+                val activeTunConfigs = activeTunnels.keys
+                val obsoleteJobs = tunnelJobs.keys - activeTunConfigs
+                obsoleteJobs.forEach { tunnelConf -> tunnelJobs[tunnelConf]?.cancel() }
+                activeTunConfigs.forEach { tun ->
+                    if (tunnelJobs.containsKey(tun)) return@forEach
+                    tunnelJobs[tun] = launch { tunnelMonitor.startMonitoring(tun, true) }
+                }
+                updateServiceNotification(activeTunnels)
+            }
+        }
+
+    // TODO Would be cool to have this include kill switch
+    private fun updateServiceNotification(activeTunnels: Map<TunnelConf, TunnelState>) {
+        val notification =
+            when (activeTunnels.size) {
+                0 -> onCreateNotification()
+                1 -> createTunnelNotification(activeTunnels.keys.first())
+                else -> createTunnelsNotification()
+            }
+        ServiceCompat.startForeground(
+            this@TunnelForegroundService,
+            NotificationManager.VPN_NOTIFICATION_ID,
+            notification,
             Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
         )
     }
 
     fun stop() {
-		stopForeground(STOP_FOREGROUND_REMOVE)
+        Timber.d("Stop called")
+        tunnelJobs.forEach { it.value.cancel() }
+        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
         stopSelf()
     }
 
     override fun onDestroy() {
-		serviceManager.backgroundService = CompletableDeferred()
+        tunnelJobs.forEach { it.value.cancel() }
+        serviceManager.handleTunnelServiceDestroy()
+        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
+        Timber.d("onDestroy")
         super.onDestroy()
     }
 
-	private fun createNotification(tunnelConf: TunnelConf): Notification {
+    private fun createTunnelNotification(tunnelConf: TunnelConf): Notification {
         return notificationManager.createNotification(
             WireGuardNotification.NotificationChannels.VPN,
             title = "${getString(R.string.tunnel_running)} - ${tunnelConf.tunName}",
-			actions = listOf(
+            actions =
-				notificationManager.createNotificationAction(NotificationAction.TUNNEL_OFF, tunnelConf.id),
+                listOf(
+                    notificationManager.createNotificationAction(
+                        NotificationAction.TUNNEL_OFF,
+                        tunnelConf.id,
+                    )
                 ),
         )
     }
+
+    private fun createTunnelsNotification(): Notification {
+        return notificationManager.createNotification(
+            WireGuardNotification.NotificationChannels.VPN,
+            title = "${getString(R.string.tunnel_running)} - ${getString(R.string.multiple)}",
+            actions =
+                listOf(
+                    notificationManager.createNotificationAction(NotificationAction.TUNNEL_OFF, 0)
+                ),
+        )
+    }
+
+    private fun onCreateNotification(): Notification {
+        return notificationManager.createNotification(
+            WireGuardNotification.NotificationChannels.VPN,
+            title = getString(R.string.tunnel_starting),
+        )
+    }
 }

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

@@ -1,136 +1,138 @@
 package com.zaneschepke.wireguardautotunnel.core.service.autotunnel
 
 import android.content.Intent
+import android.os.Binder
 import android.os.IBinder
-import android.os.PowerManager
 import androidx.core.app.ServiceCompat
 import androidx.lifecycle.LifecycleService
 import androidx.lifecycle.lifecycleScope
+import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
+import com.zaneschepke.networkmonitor.ConnectivityState
 import com.zaneschepke.networkmonitor.NetworkMonitor
-import com.zaneschepke.networkmonitor.NetworkStatus
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelMonitor
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.di.MainImmediateDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendStatus
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus.StopReason.Ping
 import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
-import com.zaneschepke.wireguardautotunnel.domain.events.KillSwitchEvent
+import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.AutoTunnelState
 import com.zaneschepke.wireguardautotunnel.domain.state.NetworkState
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.extensions.Tunnels
+import com.zaneschepke.wireguardautotunnel.util.extensions.toMillis
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.FlowPreview
-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.flatMapLatest
-import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Provider
+import kotlin.math.pow
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import timber.log.Timber
 
 @AndroidEntryPoint
 class AutoTunnelService : LifecycleService() {
 
-	@Inject
+    @Inject lateinit var networkMonitor: NetworkMonitor
-	lateinit var networkMonitor: NetworkMonitor
 
-	@Inject
+    @Inject lateinit var appDataRepository: Provider<AppDataRepository>
-	lateinit var appDataRepository: Provider<AppDataRepository>
 
-	@Inject
+    @Inject lateinit var notificationManager: NotificationManager
-	lateinit var notificationManager: NotificationManager
 
-	@Inject
+    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
-	@IoDispatcher
-	lateinit var ioDispatcher: CoroutineDispatcher
 
-	@Inject
+    @Inject lateinit var serviceManager: ServiceManager
-	lateinit var serviceManager: ServiceManager
 
-	@Inject
+    @Inject lateinit var tunnelManager: TunnelManager
-	@MainImmediateDispatcher
-	lateinit var mainImmediateDispatcher: CoroutineDispatcher
 
-	@Inject
+    @Inject lateinit var tunnelMonitor: TunnelMonitor
-	lateinit var tunnelManager: TunnelManager
 
     private val defaultState = AutoTunnelState()
 
+    private val autoTunMutex = Mutex()
+
     private val autoTunnelStateFlow = MutableStateFlow(defaultState)
 
-	private var wakeLock: PowerManager.WakeLock? = null
+    private val bounceCounts = MutableStateFlow<Map<Int, Int>>(emptyMap())
+
+    private var eventHandlerJob: Job? = null
+
+    private val lastBounceTimes = mutableMapOf<Int, Long>()
+
+    class LocalBinder(val service: AutoTunnelService) : Binder()
+
+    private val binder = LocalBinder(this)
 
     override fun onCreate() {
         super.onCreate()
-		serviceManager.autoTunnelService.complete(this)
-		lifecycleScope.launch(mainImmediateDispatcher) {
-			runCatching {
         launchWatcherNotification()
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
     }
 
-	override fun onBind(intent: Intent): IBinder? {
+    override fun onBind(intent: Intent): IBinder {
         super.onBind(intent)
-		return null
+        return binder
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        super.onStartCommand(intent, flags, startId)
         Timber.d("onStartCommand executed with startId: $startId")
-		serviceManager.autoTunnelService.complete(this)
+        start()
-		return super.onStartCommand(intent, flags, startId)
+        return START_STICKY
     }
 
     fun start() {
-		kotlin.runCatching {
-			lifecycleScope.launch(mainImmediateDispatcher) {
         launchWatcherNotification()
-				initWakeLock()
-			}
-			startAutoTunnelJob()
         startAutoTunnelStateJob()
-			startKillSwitchJob()
+        startLocationPermissionsNotificationJob()
-		}.onFailure {
-			Timber.e(it)
-		}
     }
 
     fun stop() {
-		wakeLock?.let { if (it.isHeld) it.release() }
         stopSelf()
     }
 
     override fun onDestroy() {
-		serviceManager.autoTunnelService = CompletableDeferred()
+        serviceManager.handleAutoTunnelServiceDestroy()
+        restoreVpnKillSwitch()
+        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
         super.onDestroy()
     }
 
-	private fun launchWatcherNotification(description: String = getString(R.string.monitoring_state_changes)) {
+    private fun restoreVpnKillSwitch() {
+        with(autoTunnelStateFlow.value) {
+            if (
+                settings.isVpnKillSwitchEnabled &&
+                    tunnelManager.getBackendStatus() !is BackendStatus.KillSwitch
+            ) {
+                eventHandlerJob?.cancel()
+                val allowedIps =
+                    if (settings.isLanOnKillSwitchEnabled) TunnelConf.LAN_BYPASS_ALLOWED_IPS
+                    else emptyList()
+                tunnelManager.setBackendStatus(BackendStatus.KillSwitch(allowedIps))
+            }
+        }
+    }
+
+    private fun launchWatcherNotification(
+        description: String = getString(R.string.monitoring_state_changes)
+    ) {
         val notification =
             notificationManager.createNotification(
                 WireGuardNotification.NotificationChannels.AUTO_TUNNEL,
                 title = getString(R.string.auto_tunnel_title),
                 description = description,
-				actions = listOf(
+                actions =
-					notificationManager.createNotificationAction(NotificationAction.AUTO_TUNNEL_OFF),
+                    listOf(
+                        notificationManager.createNotificationAction(
+                            NotificationAction.AUTO_TUNNEL_OFF
+                        )
                     ),
             )
         ServiceCompat.startForeground(
@@ -141,113 +143,320 @@ class AutoTunnelService : LifecycleService() {
         )
     }
 
-	private fun initWakeLock() {
+    private fun startAutoTunnelStateJob() =
-		wakeLock = (getSystemService(POWER_SERVICE) as PowerManager).run {
+        lifecycleScope.launch(ioDispatcher) {
-			val tag = this.javaClass.name
+            val networkFlow =
-			newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "$tag::lock").apply {
+                debouncedConnectivityStateFlow
-				try {
-					Timber.i("Initiating wakelock with 10 min timeout")
-					acquire(Constants.BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT)
-				} finally {
-					release()
-				}
-			}
-		}
-	}
-
-	private fun buildNetworkState(networkStatus: NetworkStatus): NetworkState {
-		return with(autoTunnelStateFlow.value.networkState) {
-			val wifiName = when (networkStatus) {
-				is NetworkStatus.Connected -> {
-					networkStatus.wifiSsid
-				}
-				else -> null
-			}
-			copy(
-				isWifiConnected = networkStatus.wifiConnected,
-				isMobileDataConnected = networkStatus.cellularConnected,
-				isEthernetConnected = networkStatus.ethernetConnected,
-				wifiName = wifiName,
-			)
-		}
-	}
-
-	@OptIn(ExperimentalCoroutinesApi::class)
-	private fun startAutoTunnelStateJob() = lifecycleScope.launch(ioDispatcher) {
-		combine(
-			combineSettings(),
-			appDataRepository.get().settings.flow
-				.distinctUntilChanged { old, new -> old.isKernelEnabled == new.isKernelEnabled } // Only emit when isKernelEnabled changes
-				.flatMapLatest { settings ->
-					networkMonitor.getNetworkStatusFlow(true, settings.isKernelEnabled)
                     .flowOn(ioDispatcher)
-						.map { buildNetworkState(it) }
+                    .map(NetworkState::from)
-				}
+                    .map { StateChange.NetworkChange(it) }
-				.distinctUntilChanged(),
+                    .distinctUntilChanged()
-		) { double, networkState ->
+
-			AutoTunnelState(
+            val settingsFlow =
-				tunnelManager.activeTunnels.value,
+                combineSettings().map { StateChange.SettingsChange(it.first, it.second) }
-				networkState,
+
-				double.first,
+            val tunnelsFlow =
-				double.second,
+                tunnelManager.activeTunnels.map { StateChange.ActiveTunnelsChange(it) }
-			)
+
-		}.collect { state ->
+            val monitoringFlow =
+                tunnelManager.activeTunnels
+                    .map { map -> map.mapValues { (_, state) -> state.pingStates } }
+                    .distinctUntilChanged()
+                    .map { StateChange.MonitoringChange(it) }
+
+            var reevaluationJob: Job? = null
+
+            // get everything in sync before we use merge
+            combine(networkFlow, settingsFlow, tunnelsFlow, monitoringFlow) {
+                    network,
+                    settings,
+                    tunnels,
+                    monitoring ->
                     autoTunnelStateFlow.update {
                         it.copy(
-					activeTunnels = state.activeTunnels,
+                            activeTunnels = tunnels.activeTunnels,
-					networkState = state.networkState,
+                            networkState = network.networkState,
-					settings = state.settings,
+                            settings = settings.settings,
-					tunnels = state.tunnels,
+                            tunnels = settings.tunnels,
                         )
                     }
                 }
+                .first()
+
+            // use merge to limit the noise of a combine and also increase the scalability of auto
+            // tunnel handling new states
+            merge(networkFlow, settingsFlow, tunnelsFlow, monitoringFlow).collect { change ->
+                if (change !is StateChange.ActiveTunnelsChange) {
+                    Timber.d("New state changed to ${change.javaClass.simpleName}")
+                }
+
+                when (change) {
+                    is StateChange.NetworkChange -> {
+                        reevaluationJob?.cancel()
+                        val previousState = autoTunnelStateFlow.value
+                        autoTunnelStateFlow.update { it.copy(networkState = change.networkState) }
+                        // Android late mobile data state change, we can ignore handling this
+                        if (
+                            isAndroidLateCellularActiveChange(
+                                previousState.networkState,
+                                change.networkState,
+                            )
+                        ) {
+                            Timber.d("Android late cellular active state change")
+                            return@collect
+                        }
+                    }
+                    is StateChange.SettingsChange -> {
+                        reevaluationJob?.cancel()
+                        autoTunnelStateFlow.update {
+                            it.copy(settings = change.settings, tunnels = change.tunnels)
+                        }
+                    }
+                    is StateChange.ActiveTunnelsChange -> {
+                        autoTunnelStateFlow.update { it.copy(activeTunnels = change.activeTunnels) }
+                        return@collect
+                    }
+                    is StateChange.MonitoringChange -> {
+                        change.pingStates.forEach { (config, pingState) ->
+                            Timber.d("Ping state $pingState")
+                            if (pingState?.all { it.value.isReachable } == true) {
+                                Timber.d("Clearing bounce count on success")
+                                bounceCounts.update { current ->
+                                    current.toMutableMap().apply { remove(config.id) }
+                                }
+                            }
+                        }
+                        return@collect handleAutoTunnelEvent(
+                            autoTunnelStateFlow.value.determineAutoTunnelEvent(
+                                StateChange.MonitoringChange(change.pingStates)
+                            )
+                        )
+                    }
+                }
+
+                handleAutoTunnelEvent(autoTunnelStateFlow.value.determineAutoTunnelEvent(change))
+
+                reevaluationJob = launch {
+                    delay(REEVALUATE_CHECK_DELAY)
+                    val currentState = autoTunnelStateFlow.value
+                    if (currentState != defaultState) {
+                        Timber.d("Re-evaluating auto-tunnel state..")
+                        handleAutoTunnelEvent(currentState.determineAutoTunnelEvent(change))
+                    }
+                }
+            }
+        }
+
+    private fun isAndroidLateCellularActiveChange(
+        previous: NetworkState,
+        new: NetworkState,
+    ): Boolean {
+        return (previous.isWifiConnected != new.isWifiConnected &&
+            previous.wifiName == new.wifiName &&
+            previous.isMobileDataConnected != new.isMobileDataConnected)
+    }
+
+    // all relevant settings to auto tunnel
+    private fun areAutoTunnelSettingsTheSame(old: AppSettings, new: AppSettings): Boolean {
+        return (old.isTunnelOnWifiEnabled == new.isTunnelOnWifiEnabled &&
+            old.isTunnelOnMobileDataEnabled == new.isTunnelOnMobileDataEnabled &&
+            old.isTunnelOnEthernetEnabled == new.isTunnelOnEthernetEnabled &&
+            old.trustedNetworkSSIDs == new.trustedNetworkSSIDs &&
+            old.isPingEnabled == new.isPingEnabled &&
+            old.debounceDelaySeconds == new.debounceDelaySeconds &&
+            old.wifiDetectionMethod == new.wifiDetectionMethod &&
+            old.isVpnKillSwitchEnabled == new.isVpnKillSwitchEnabled &&
+            old.isLanOnKillSwitchEnabled == new.isLanOnKillSwitchEnabled &&
+            old.isDisableKillSwitchOnTrustedEnabled == new.isDisableKillSwitchOnTrustedEnabled &&
+            old.isStopOnNoInternetEnabled == new.isStopOnNoInternetEnabled)
     }
 
     private fun combineSettings(): Flow<Pair<AppSettings, Tunnels>> {
         return combine(
-			appDataRepository.get().settings.flow,
+                appDataRepository
+                    .get()
+                    .settings
+                    .flow
+                    .distinctUntilChanged(::areAutoTunnelSettingsTheSame),
                 appDataRepository.get().tunnels.flow.map { tunnels ->
-				// isActive is ignored for equality checks so user can manually toggle off tunnel with auto-tunnel
+                    // 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()
+            }
+            .distinctUntilChanged()
     }
 
-	private fun startKillSwitchJob() = lifecycleScope.launch(ioDispatcher) {
+    private fun areAutoTunnelPermissionsRequiredTheSame(
-		autoTunnelStateFlow.collect {
+        old: AutoTunnelState,
-			if (it == defaultState) return@collect
+        new: AutoTunnelState,
-			when (val event = it.asKillSwitchEvent()) {
+    ): Boolean {
-				KillSwitchEvent.DoNothing -> Unit
+        return (old.settings.wifiDetectionMethod == new.settings.wifiDetectionMethod &&
-				is KillSwitchEvent.Start -> {
+            old.networkState.locationPermissionGranted ==
-					Timber.d("Starting kill switch")
+                new.networkState.locationPermissionGranted &&
-					tunnelManager.setBackendState(BackendState.KILL_SWITCH_ACTIVE, event.allowedIps)
+            old.networkState.locationServicesEnabled == new.networkState.locationServicesEnabled &&
+            old.tunnels == new.tunnels &&
+            old.settings.trustedNetworkSSIDs == new.settings.trustedNetworkSSIDs)
     }
-				KillSwitchEvent.Stop -> {
+
-					Timber.d("Stopping kill switch")
+    //     watch for changes to location permission and notify user it will impact auto-tunneling
-					tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, emptySet())
+    //     TODO or a recheck button for location permission so we dont have to poll it
+    private fun startLocationPermissionsNotificationJob(): Job =
+        lifecycleScope.launch(ioDispatcher) {
+            var locationServicesShown = false
+            var locationPermissionsShown = false
+
+            data class NetworkPermissionState(
+                val detectionMethod: AndroidNetworkMonitor.WifiDetectionMethod,
+                val locationServicesEnabled: Boolean,
+                val locationPermissionsEnabled: Boolean,
+                val ssidReadRequired: Boolean,
+            )
+
+            autoTunnelStateFlow
+                .distinctUntilChanged(::areAutoTunnelPermissionsRequiredTheSame)
+                .map {
+                    NetworkPermissionState(
+                        it.settings.wifiDetectionMethod,
+                        it.networkState.locationServicesEnabled == true,
+                        it.networkState.locationPermissionGranted == true,
+                        (it.tunnels.any { tunnel -> tunnel.tunnelNetworks.isNotEmpty() } ||
+                            it.settings.trustedNetworkSSIDs.isNotEmpty()),
+                    )
                 }
+                .collect { state ->
+                    when (state.detectionMethod) {
+                        AndroidNetworkMonitor.WifiDetectionMethod.DEFAULT,
+                        AndroidNetworkMonitor.WifiDetectionMethod.LEGACY -> {
+                            if (
+                                !state.locationPermissionsEnabled &&
+                                    !locationPermissionsShown &&
+                                    state.ssidReadRequired
+                            ) {
+                                locationPermissionsShown = true
+                                val notification =
+                                    notificationManager.createNotification(
+                                        WireGuardNotification.NotificationChannels.AUTO_TUNNEL,
+                                        title = getString(R.string.warning),
+                                        description =
+                                            getString(R.string.location_permissions_missing),
+                                    )
+                                notificationManager.show(
+                                    NotificationManager.AUTO_TUNNEL_LOCATION_PERMISSION_ID,
+                                    notification,
+                                )
+                            }
+                            if (
+                                !state.locationServicesEnabled &&
+                                    !locationServicesShown &&
+                                    state.ssidReadRequired
+                            ) {
+                                locationServicesShown = true
+                                val notification =
+                                    notificationManager.createNotification(
+                                        WireGuardNotification.NotificationChannels.AUTO_TUNNEL,
+                                        title = getString(R.string.warning),
+                                        description =
+                                            getString(R.string.location_services_not_detected),
+                                    )
+                                notificationManager.show(
+                                    NotificationManager.AUTO_TUNNEL_LOCATION_SERVICES_ID,
+                                    notification,
+                                )
+                            }
+                            if (state.locationServicesEnabled || !state.ssidReadRequired) {
+                                notificationManager.remove(
+                                    NotificationManager.AUTO_TUNNEL_LOCATION_SERVICES_ID
+                                )
+                                locationServicesShown = false
+                            }
+                            if (state.locationPermissionsEnabled || !state.ssidReadRequired) {
+                                notificationManager.remove(
+                                    NotificationManager.AUTO_TUNNEL_LOCATION_PERMISSION_ID
+                                )
+                                locationPermissionsShown = false
+                            }
+                        }
+                        else -> Unit
                     }
                 }
         }
 
-	@OptIn(FlowPreview::class)
+    private suspend fun handleAutoTunnelEvent(autoTunnelEvent: AutoTunnelEvent) {
-	private fun startAutoTunnelJob() = lifecycleScope.launch(ioDispatcher) {
+        autoTunMutex.withLock {
-		Timber.i("Starting auto-tunnel network event watcher")
+            when (
-		val settings = appDataRepository.get().settings.get()
+                val event =
-		Timber.d("Starting with debounce delay of: ${settings.debounceDelaySeconds} seconds")
+                    autoTunnelEvent.also {
-		autoTunnelStateFlow.debounce(settings.debounceDelayMillis()).collect { watcherState ->
+                        Timber.i("Auto tunnel event: ${it.javaClass.simpleName}")
-			if (watcherState == defaultState) return@collect
+                    }
-			Timber.d("New auto tunnel state emitted ${watcherState.networkState}")
+            ) {
-			when (val event = watcherState.asAutoTunnelEvent()) {
+                is AutoTunnelEvent.Start ->
-				is AutoTunnelEvent.Start -> (event.tunnelConf ?: appDataRepository.get().getPrimaryOrFirstTunnel())?.let {
+                    (event.tunnelConf ?: appDataRepository.get().getPrimaryOrFirstTunnel())?.let {
                         tunnelManager.startTunnel(it)
                     }
-				// TODO improve this to target specific tunnels to better support multi-tunnel
                 is AutoTunnelEvent.Stop -> tunnelManager.stopTunnel()
-				AutoTunnelEvent.DoNothing -> Timber.i("Auto-tunneling: no condition met")
+                AutoTunnelEvent.DoNothing -> Timber.i("Auto-tunneling: nothing to do")
+                is AutoTunnelEvent.Bounce ->
+                    handleBounceWithBackoff(event.configsPeerKeyResolvedMap)
+                is AutoTunnelEvent.StartKillSwitch -> {
+                    Timber.d("Starting kill switch")
+                    tunnelManager.setBackendStatus(BackendStatus.KillSwitch(event.allowedIps))
+                }
+                AutoTunnelEvent.StopKillSwitch -> {
+                    Timber.d("Stopping kill switch")
+                    tunnelManager.setBackendStatus(BackendStatus.Active)
                 }
             }
         }
     }
+
+    private suspend fun handleBounceWithBackoff(
+        configsPeerKeyResolvedMap: List<Pair<TunnelConf, Map<String, String?>>>
+    ) { // Simplified param: no failureCount
+        val settings = appDataRepository.get().settings.get()
+        val pingIntervalMillis = settings.tunnelPingIntervalSeconds.toMillis()
+        configsPeerKeyResolvedMap.forEach { (config, peerMap) ->
+            val bounceCount = bounceCounts.value.getOrDefault(config.id, 0)
+            val exponent = bounceCount.toDouble()
+            val backoffDelay =
+                (pingIntervalMillis * 2.0.pow(exponent)).toLong().coerceAtMost(MAX_BACKOFF_MS)
+            val currentTime = System.currentTimeMillis()
+            val lastTime = lastBounceTimes.getOrDefault(config.id, 0L)
+            if (currentTime - lastTime >= backoffDelay) {
+                Timber.d(
+                    "Bouncing tunnel ${config.name} after detecting failure, with bounce count $bounceCount and calculated backoff delay $backoffDelay ms"
+                )
+                tunnelManager.bounceTunnel(config, Ping(peerMap))
+                lastBounceTimes[config.id] = currentTime
+                bounceCounts.update { current ->
+                    current.toMutableMap().apply { this[config.id] = (this[config.id] ?: 0) + 1 }
+                }
+            } else {
+                Timber.d(
+                    "Backoff in progress for tunnel ${config.name}, skipping bounce (required delay: $backoffDelay ms)"
+                )
+            }
+        }
+    }
+
+    @OptIn(FlowPreview::class, ExperimentalCoroutinesApi::class)
+    private val debouncedConnectivityStateFlow: Flow<ConnectivityState> by lazy {
+        appDataRepository
+            .get()
+            .settings
+            .flow
+            .map { it.debounceDelaySeconds.toMillis() }
+            .distinctUntilChanged()
+            .flatMapLatest { debounceMillis ->
+                networkMonitor.connectivityStateFlow.debounce(debounceMillis)
+            }
+    }
+
+    companion object {
+        // try to keep this window short as it will interrupt manual overrides
+        const val REEVALUATE_CHECK_DELAY = 2_000L
+        const val MAX_BACKOFF_MS = 300_000L // 5 minutes
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/service/autotunnel/StateChange.kt

@@ -0,0 +1,20 @@
+package com.zaneschepke.wireguardautotunnel.core.service.autotunnel
+
+import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.state.NetworkState
+import com.zaneschepke.wireguardautotunnel.domain.state.PingState
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
+import com.zaneschepke.wireguardautotunnel.util.extensions.Tunnels
+import org.amnezia.awg.crypto.Key
+
+sealed class StateChange {
+    data class NetworkChange(val networkState: NetworkState) : StateChange()
+
+    data class SettingsChange(val settings: AppSettings, val tunnels: Tunnels) : StateChange()
+
+    data class ActiveTunnelsChange(val activeTunnels: Map<TunnelConf, TunnelState>) : StateChange()
+
+    data class MonitoringChange(val pingStates: Map<TunnelConf, Map<Key, PingState>?>) :
+        StateChange()
+}

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

@@ -4,62 +4,63 @@ import android.content.Intent
 import android.os.IBinder
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import androidx.lifecycle.Lifecycle
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CompletableDeferred
+import javax.inject.Inject
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 @AndroidEntryPoint
-class AutoTunnelControlTile : TileService() {
+class AutoTunnelControlTile : TileService(), LifecycleOwner {
-	@Inject
+    @Inject lateinit var appDataRepository: AppDataRepository
-	lateinit var appDataRepository: AppDataRepository
 
-	@Inject
+    @Inject lateinit var serviceManager: ServiceManager
-	lateinit var serviceManager: ServiceManager
 
-	@Inject
+    private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
 
     override fun onCreate() {
         super.onCreate()
-		serviceManager.autoTunnelTile.complete(this)
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
     }
 
     override fun onDestroy() {
         super.onDestroy()
-		serviceManager.autoTunnelTile = CompletableDeferred()
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
     }
 
     override fun onStartListening() {
         super.onStartListening()
-		serviceManager.autoTunnelTile.complete(this)
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
-		applicationScope.launch {
+        Timber.d("Start listening called for auto tunnel tile")
-			if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
+        lifecycleScope.launch {
-			updateTileState()
+            serviceManager.autoTunnelService.collect {
+                if (it != null) return@collect setActive()
+                setInactive()
+            }
+        }
+        lifecycleScope.launch {
+            appDataRepository.tunnels.flow.collect {
+                if (it.isEmpty()) {
+                    setUnavailable()
                 }
             }
-
-	fun updateTileState() {
-		serviceManager.autoTunnelActive.value.let {
-			if (it) setActive() else setInactive()
         }
     }
 
     override fun onClick() {
         super.onClick()
         unlockAndRun {
-			applicationScope.launch {
+            lifecycleScope.launch {
-				if (serviceManager.autoTunnelActive.value) {
+                if (serviceManager.autoTunnelService.value != null) {
                     serviceManager.stopAutoTunnel()
                     setInactive()
                 } else {
-					serviceManager.startAutoTunnel(true)
+                    serviceManager.startAutoTunnel()
                     setActive()
                 }
             }
@@ -97,4 +98,7 @@ class AutoTunnelControlTile : TileService() {
             qsTile.updateTile()
         }
     }
+
+    override val lifecycle: Lifecycle
+        get() = lifecycleRegistry
 }

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

@@ -5,74 +5,120 @@ import android.os.Build
 import android.os.IBinder
 import android.service.quicksettings.Tile
 import android.service.quicksettings.TileService
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.LifecycleRegistry
+import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CompletableDeferred
+import javax.inject.Inject
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 @AndroidEntryPoint
-class TunnelControlTile : TileService() {
+class TunnelControlTile : TileService(), LifecycleOwner {
-	@Inject
+    @Inject lateinit var appDataRepository: AppDataRepository
-	lateinit var appDataRepository: AppDataRepository
 
-	@Inject
+    @Inject lateinit var serviceManager: ServiceManager
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
 
-	@Inject
+    @Inject lateinit var tunnelManager: TunnelManager
-	lateinit var serviceManager: ServiceManager
 
-	@Inject
+    private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
-	lateinit var tunnelManager: TunnelManager
+
+    private var isCollecting = false
 
     override fun onCreate() {
         super.onCreate()
-		serviceManager.tunnelControlTile.complete(this)
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
     }
 
     override fun onDestroy() {
         super.onDestroy()
-		serviceManager.tunnelControlTile = CompletableDeferred()
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
     }
 
     override fun onStartListening() {
         super.onStartListening()
-		Timber.d("Start listening called")
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
-		serviceManager.tunnelControlTile.complete(this)
+        Timber.d("Start listening called for tunnel tile")
-		applicationScope.launch {
+        if (isCollecting) return
-			updateTileState()
+        isCollecting = true
+        lifecycleScope.launch { tunnelManager.activeTunnels.collect { updateTileState() } }
+    }
+
+    private suspend fun updateTileState() {
+        try {
+            val tunnels = appDataRepository.tunnels.getAll()
+            if (tunnels.isEmpty()) {
+                setUnavailable()
+                return
+            }
+
+            val activeTunnels =
+                tunnelManager.activeTunnels.value.filter { it.value.status.isUpOrStarting() }
+
+            when {
+                activeTunnels.isNotEmpty() -> {
+                    val activeIds = activeTunnels.map { it.key.id }
+                    // TODO improvements would be needed to make this work well with toggling
+                    // multiple tunnels
+                    // this would be better managed elsewhere
+                    WireGuardAutoTunnel.setLastActiveTunnels(activeIds)
+                    updateTileForActiveTunnels(activeTunnels)
+                }
+                else -> updateTileForLastActiveTunnels()
+            }
+        } catch (e: Exception) {
+            setUnavailable()
         }
     }
 
-	fun updateTileState() = applicationScope.launch {
+    private fun updateTileForActiveTunnels(activeTunnels: Map<TunnelConf, TunnelState>) {
-		val tunnels = appDataRepository.tunnels.getAll()
+        val tileName =
-		if (tunnels.isEmpty()) return@launch setUnavailable()
+            when (activeTunnels.size) {
-		with(tunnelManager.activeTunnels.value) {
+                1 -> activeTunnels.keys.first().tunName
-			if (isNotEmpty()) if (size == 1) {
+                else -> getString(R.string.multiple)
-				tunnels.firstOrNull { it.id == keys.first() }?.let { return@launch updateTile(it.tunName, true) }
-			} else {
-				return@launch updateTile(getString(R.string.multiple), true)
             }
+        updateTile(tileName, true)
+    }
+
+    private suspend fun updateTileForLastActiveTunnels() {
+        val lastActiveIds = WireGuardAutoTunnel.getLastActiveTunnels()
+        when {
+            lastActiveIds.isEmpty() -> {
+                appDataRepository.getStartTunnelConfig()?.let { config ->
+                    updateTile(config.tunName, false)
+                } ?: setUnavailable()
+            }
+            lastActiveIds.size > 1 -> updateTile(getString(R.string.multiple), false)
+            else -> {
+                val tunnelId = lastActiveIds.first()
+                appDataRepository.tunnels.getById(tunnelId)?.let { tunnel ->
+                    updateTile(tunnel.tunName, false)
+                } ?: setUnavailable()
             }
-		appDataRepository.getStartTunnelConfig()?.let {
-			updateTile(it.tunName, false)
         }
     }
 
     override fun onClick() {
         super.onClick()
         unlockAndRun {
-			applicationScope.launch {
+            lifecycleScope.launch {
-				if (tunnelManager.activeTunnels.value.isNotEmpty()) return@launch tunnelManager.stopTunnel()
+                if (tunnelManager.activeTunnels.value.isNotEmpty())
-				appDataRepository.getStartTunnelConfig()?.let {
+                    return@launch tunnelManager.stopTunnel()
-					tunnelManager.startTunnel(it)
+                val lastActive = WireGuardAutoTunnel.getLastActiveTunnels()
+                if (lastActive.isEmpty()) {
+                    appDataRepository.getStartTunnelConfig()?.let { tunnelManager.startTunnel(it) }
+                } else {
+                    lastActive.forEach { id ->
+                        appDataRepository.tunnels.getById(id)?.let { tunnelManager.startTunnel(it) }
+                    }
                 }
             }
         }
@@ -102,11 +148,12 @@ class TunnelControlTile : TileService() {
 
     private fun setTileDescription(description: String) {
         runCatching {
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            if (qsTile == null) return@runCatching
-				qsTile.subtitle = description
-			}
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                qsTile.subtitle = description
                 qsTile.stateDescription = description
+            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                qsTile.subtitle = description
             }
             qsTile.updateTile()
         }
@@ -128,8 +175,10 @@ class TunnelControlTile : TileService() {
                 setTileDescription(name)
                 if (active) return setActive()
                 setInactive()
-		}.onFailure {
-			Timber.e(it)
             }
+            .onFailure { Timber.e(it) }
     }
+
+    override val lifecycle: Lifecycle
+        get() = lifecycleRegistry
 }

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

@@ -10,7 +10,10 @@ import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 
-class DynamicShortcutManager(private val context: Context, @IoDispatcher private val ioDispatcher: CoroutineDispatcher) : ShortcutManager {
+class DynamicShortcutManager(
+    private val context: Context,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) : ShortcutManager {
     override suspend fun addShortcuts() {
         withContext(ioDispatcher) {
             ShortcutManagerCompat.setDynamicShortcuts(context, createShortcuts())
@@ -29,7 +32,8 @@ class DynamicShortcutManager(private val context: Context, @IoDispatcher private
                 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 {
+                intent =
+                    Intent(context, ShortcutsActivity::class.java).apply {
                         putExtra("className", "WireGuardTunnelService")
                         action = ShortcutsActivity.Action.STOP.name
                     },
@@ -39,7 +43,8 @@ class DynamicShortcutManager(private val context: Context, @IoDispatcher private
                 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 {
+                intent =
+                    Intent(context, ShortcutsActivity::class.java).apply {
                         putExtra("className", "WireGuardTunnelService")
                         action = ShortcutsActivity.Action.START.name
                     },
@@ -49,7 +54,8 @@ class DynamicShortcutManager(private val context: Context, @IoDispatcher private
                 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 {
+                intent =
+                    Intent(context, ShortcutsActivity::class.java).apply {
                         putExtra("className", "WireGuardConnectivityWatcherService")
                         action = ShortcutsActivity.Action.START.name
                     },
@@ -59,7 +65,8 @@ class DynamicShortcutManager(private val context: Context, @IoDispatcher private
                 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 {
+                intent =
+                    Intent(context, ShortcutsActivity::class.java).apply {
                         putExtra("className", "WireGuardConnectivityWatcherService")
                         action = ShortcutsActivity.Action.STOP.name
                     },
@@ -68,7 +75,13 @@ class DynamicShortcutManager(private val context: Context, @IoDispatcher private
         )
     }
 
-	private fun buildShortcut(id: String, shortLabel: String, longLabel: String, intent: Intent, shortcutIcon: Int): ShortcutInfoCompat {
+    private fun buildShortcut(
+        id: String,
+        shortLabel: String,
+        longLabel: String,
+        intent: Intent,
+        shortcutIcon: Int,
+    ): ShortcutInfoCompat {
         return ShortcutInfoCompat.Builder(context, id)
             .setShortLabel(shortLabel)
             .setLongLabel(longLabel)

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

@@ -2,5 +2,6 @@ package com.zaneschepke.wireguardautotunnel.core.shortcut
 
 interface ShortcutManager {
     suspend fun addShortcuts()
+
     suspend fun removeShortcuts()
 }

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

@@ -2,32 +2,27 @@ package com.zaneschepke.wireguardautotunnel.core.shortcut
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelService
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
-import javax.inject.Inject
 
 @AndroidEntryPoint
 class ShortcutsActivity : ComponentActivity() {
-	@Inject
+    @Inject lateinit var appDataRepository: AppDataRepository
-	lateinit var appDataRepository: AppDataRepository
 
-	@Inject
+    @Inject lateinit var serviceManager: ServiceManager
-	lateinit var serviceManager: ServiceManager
 
-	@Inject
+    @Inject lateinit var tunnelManager: TunnelManager
-	lateinit var tunnelManager: TunnelManager
 
-	@Inject
+    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -35,12 +30,15 @@ class ShortcutsActivity : ComponentActivity() {
             val settings = appDataRepository.settings.get()
             if (settings.isShortcutsEnabled) {
                 when (intent.getStringExtra(CLASS_NAME_EXTRA_KEY)) {
-					LEGACY_TUNNEL_SERVICE_NAME, TunnelProvider::class.java.simpleName -> {
+                    LEGACY_TUNNEL_SERVICE_NAME,
+                    TunnelProvider::class.java.simpleName -> {
                         val tunnelName = intent.getStringExtra(TUNNEL_NAME_EXTRA_KEY)
                         Timber.d("Tunnel name extra: $tunnelName")
-						val tunnelConfig = tunnelName?.let {
+                        val tunnelConfig =
-							appDataRepository.tunnels.getAll()
+                            tunnelName?.let {
-								.firstOrNull { it.tunName == tunnelName }
+                                appDataRepository.tunnels.getAll().firstOrNull {
+                                    it.tunName == tunnelName
+                                }
                             } ?: appDataRepository.getStartTunnelConfig()
                         Timber.d("Shortcut action on name: ${tunnelConfig?.tunName}")
                         tunnelConfig?.let {
@@ -51,9 +49,10 @@ class ShortcutsActivity : ComponentActivity() {
                             }
                         }
                     }
-					AutoTunnelService::class.java.simpleName, LEGACY_AUTO_TUNNEL_SERVICE_NAME -> {
+                    AutoTunnelService::class.java.simpleName,
+                    LEGACY_AUTO_TUNNEL_SERVICE_NAME -> {
                         when (intent.action) {
-							Action.START.name -> serviceManager.startAutoTunnel(true)
+                            Action.START.name -> serviceManager.startAutoTunnel()
                             Action.STOP.name -> serviceManager.stopAutoTunnel()
                         }
                     }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/BaseTunnel.kt

@@ -1,256 +1,292 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
 import com.wireguard.android.backend.Tunnel
-import com.zaneschepke.networkmonitor.NetworkMonitor
-import com.zaneschepke.networkmonitor.NetworkStatus
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
-import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider.Companion.CHECK_INTERVAL
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendError
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
+import com.zaneschepke.wireguardautotunnel.domain.events.BackendError
+import com.zaneschepke.wireguardautotunnel.domain.events.BackendMessage
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.domain.state.PingState
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
-import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
+import com.zaneschepke.wireguardautotunnel.ui.state.ConfigProxy
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.StringValue
 import com.zaneschepke.wireguardautotunnel.util.extensions.asTunnelState
-import com.zaneschepke.wireguardautotunnel.util.extensions.cancelWithMessage
+import java.util.concurrent.ConcurrentHashMap
-import kotlinx.coroutines.CoroutineDispatcher
+import kotlin.coroutines.cancellation.CancellationException
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import org.amnezia.awg.crypto.Key
 import timber.log.Timber
-import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.atomic.AtomicBoolean
 
-open class BaseTunnel(
+abstract class BaseTunnel(
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+    private val applicationScope: CoroutineScope,
-	@ApplicationScope private val applicationScope: CoroutineScope,
-	private val networkMonitor: NetworkMonitor,
     private val appDataRepository: AppDataRepository,
     private val serviceManager: ServiceManager,
-	private val notificationManager: NotificationManager,
 ) : TunnelProvider {
 
-	internal val tunnels = MutableStateFlow<List<TunnelConf>>(emptyList())
+    private val _errorEvents = MutableSharedFlow<Pair<TunnelConf, BackendError>>()
+    override val errorEvents = _errorEvents.asSharedFlow()
 
-	private val _tunnelStates = MutableStateFlow<Map<Int, TunnelState>>(emptyMap())
+    private val _messageEvents = MutableSharedFlow<Pair<TunnelConf, BackendMessage>>()
+    override val messageEvents = _messageEvents.asSharedFlow()
 
-	private val tunnelJobs = ConcurrentHashMap<Int, Job>()
+    private val activeTuns = MutableStateFlow<Map<TunnelConf, TunnelState>>(emptyMap())
+    private val tunJobs = ConcurrentHashMap<Int, Job>()
+    override val activeTunnels = activeTuns.asStateFlow()
 
-	private val isNetworkAvailable = AtomicBoolean(false)
+    private val tunMutex = Mutex()
+    private val tunStatusMutex = Mutex()
+    private val bounceTunnelMutex = Mutex()
 
-	init {
+    override val bouncingTunnelIds = ConcurrentHashMap<Int, TunnelStatus.StopReason>()
-		applicationScope.launch(ioDispatcher) {
-			launch { startNetworkJob() }
-			launch { monitorTunnelConfigChanges() }
-			tunnels.collect { tuns ->
-				val previousTunIds = tunnelJobs.keys.toSet()
-				val currentTunIds = tuns.map { it.id }.toSet()
-				val newTuns = tuns.filter { it.id !in previousTunIds }
-				val removedTunIds = previousTunIds - currentTunIds
 
-				newTuns.forEach { tun ->
+    abstract suspend fun startBackend(tunnel: TunnelConf)
-					Timber.d("Starting tunnel jobs for tun ${tun.name} (ID: ${tun.id})")
+
-					tunnelJobs[tun.id] = startTunnelJobs(tun)
+    abstract fun stopBackend(tunnel: TunnelConf)
+
+    override fun hasVpnPermission(): Boolean {
+        return serviceManager.hasVpnPermission()
     }
 
-				removedTunIds.forEach { tunId ->
+    override suspend fun updateTunnelStatus(
-					tunnelJobs[tunId]?.cancelWithMessage("Canceling tunnel jobs for tunnel ID: $tunId")
+        tunnelConf: TunnelConf,
-					tunnelJobs.remove(tunId)
+        status: TunnelStatus?,
-					_tunnelStates.update { it - tunId }
+        stats: TunnelStatistics?,
-					serviceManager.updateTunnelTile()
+        pingStates: Map<Key, PingState>?,
+        handshakeSuccessLogs: Boolean?,
+    ) {
+        tunStatusMutex.withLock {
+            activeTuns.update { currentTuns ->
+                val originalConf = currentTuns.getKeyById(tunnelConf.id) ?: tunnelConf
+                val existingState = currentTuns.getValueById(tunnelConf.id) ?: TunnelState()
+                val newStatus = status ?: existingState.status
+                if (newStatus == TunnelStatus.Down) {
+                    Timber.d("Removing tunnel ${tunnelConf.id} from activeTunnels as state is DOWN")
+                    cleanUpTunJob(tunnelConf)
+                    currentTuns - originalConf
+                } else if (
+                    existingState.status == newStatus &&
+                        stats == null &&
+                        pingStates == null &&
+                        handshakeSuccessLogs == null
+                ) {
+                    Timber.d("Skipping redundant state update for ${tunnelConf.id}: $newStatus")
+                    currentTuns
+                } else {
+                    val updated =
+                        existingState.copy(
+                            status = newStatus,
+                            statistics = stats ?: existingState.statistics,
+                            pingStates = pingStates ?: existingState.pingStates,
+                            handshakeSuccessLogs =
+                                handshakeSuccessLogs ?: existingState.handshakeSuccessLogs,
+                        )
+                    currentTuns + (originalConf to updated)
                 }
             }
+            handleServiceStateOnChange()
         }
     }
 
-	private fun startTunnelJobs(tunnel: TunnelConf) = applicationScope.launch(ioDispatcher) {
+    private suspend fun stopActiveTunnels() {
-		launch { startTunnelStatisticsJob(tunnel) }
+        activeTunnels.value.forEach { (config, state) ->
-		if (tunnel.isPingEnabled) launch { startPingJob(tunnel) }
+            if (state.status.isUpOrStarting()) {
+                stopTunnel(config)
             }
-
-	private fun updateTunnelState(tunnelId: Int, newState: TunnelStatus) {
-		Timber.d("Updating tunnel state for ID $tunnelId to $newState")
-		_tunnelStates.update { current ->
-			val currentState = current[tunnelId]
-			val updatedState = currentState?.copy(state = newState) ?: TunnelState(state = newState)
-			val newMap = current + (tunnelId to updatedState)
-			Timber.d("New tunnel states: $newMap")
-			newMap
         }
     }
 
-	internal fun beforeStartTunnel(tunnelConf: TunnelConf) {
+    private fun configureTunnelCallbacks(tunnelConf: TunnelConf) {
+        Timber.d("Configuring TunnelConf instance: ${tunnelConf.hashCode()}")
         tunnelConf.setStateChangeCallback { state ->
-			Timber.d("New tunnel state $state")
+            applicationScope.launch {
+                Timber.d(
+                    "State change callback triggered for tunnel ${tunnelConf.id}: ${tunnelConf.tunName} with state $state at ${System.currentTimeMillis()}"
+                )
                 when (state) {
-				is Tunnel.State -> updateTunnelState(tunnelConf.id, state.asTunnelState())
+                    is Tunnel.State -> updateTunnelStatus(tunnelConf, state.asTunnelState())
-				is org.amnezia.awg.backend.Tunnel.State -> updateTunnelState(tunnelConf.id, state.asTunnelState())
+                    is org.amnezia.awg.backend.Tunnel.State ->
+                        updateTunnelStatus(tunnelConf, state.asTunnelState())
+                }
+                handleServiceStateOnChange()
             }
-			applicationScope.launch(ioDispatcher) {
             serviceManager.updateTunnelTile()
         }
     }
-	}
 
-	override fun startTunnel(tunnelConf: TunnelConf) {
+    override suspend fun startTunnel(tunnelConf: TunnelConf) {
-		applicationScope.launch(ioDispatcher) {
+        if (activeTuns.exists(tunnelConf.id) || tunJobs.containsKey(tunnelConf.id))
-			serviceManager.startBackgroundService(tunnelConf)
+            return Timber.w("Tunnel is already running ${tunnelConf.name}")
-			appDataRepository.tunnels.save(tunnelConf.copy(isActive = true))
+        // For userspace, we need to make sure all previous tunnels are down
-			addToActiveTunnels(tunnelConf)
+        if (this@BaseTunnel is UserspaceTunnel) stopActiveTunnels()
-		}
+        tunMutex.withLock {
-	}
+            val job =
-
+                applicationScope.launch {
-	override fun stopTunnel(tunnelConf: TunnelConf?) {
+                    try {
-		// Default empty implementation; subclasses override
+                        Timber.d("Starting tunnel ${tunnelConf.id}...")
-	}
+                        startTunnelInner(tunnelConf)
-
+                        Timber.d("Started complete for tunnel ${tunnelConf.name}...")
-	override suspend fun bounceTunnel(tunnelConf: TunnelConf) {
+                        // catch cancellation that could occur before and during startTunnelInner
-		stopTunnel(tunnelConf)
+                        // and trigger at that suspend point
-		delay(1000)
+                    } catch (e: CancellationException) {
-		startTunnel(tunnelConf)
+                        Timber.w(
-	}
+                            "Tunnel start has been cancelled as ${tunnelConf.name} failed to start"
-
-	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
-		// Default empty implementation
-	}
-
-	override suspend fun runningTunnelNames(): Set<String> {
-		return emptySet()
-	}
-
-	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
-		throw NotImplementedError("Get statistics not implemented in base class")
-	}
-
-	override val activeTunnels: StateFlow<Map<Int, TunnelState>>
-		get() = _tunnelStates.asStateFlow()
-
-	internal suspend fun onTunnelStop(tunnelConf: TunnelConf) {
-		appDataRepository.tunnels.save(tunnelConf.copy(isActive = false))
-		removeFromActiveTunnels(tunnelConf)
-		if (tunnels.value.isEmpty()) serviceManager.stopBackgroundService()
-	}
-
-	internal fun stopAllTunnels() {
-		tunnels.value.forEach {
-			stopTunnel(it)
-		}
-	}
-
-	private fun addToActiveTunnels(conf: TunnelConf) {
-		tunnels.update {
-			it.toMutableList().apply {
-				add(conf)
-			}
-		}
-	}
-
-	private fun removeFromActiveTunnels(conf: TunnelConf) {
-		tunnels.update {
-			it.toMutableList().apply {
-				remove(conf)
-			}
-		}
-	}
-
-	private suspend fun startNetworkJob() = coroutineScope {
-		networkMonitor.getNetworkStatusFlow(includeWifiSsid = false, useRootShell = false)
-			.flowOn(ioDispatcher).collect {
-				isNetworkAvailable.set(it !is NetworkStatus.Disconnected)
-			}
-	}
-
-	private suspend fun startPingJob(tunnel: TunnelConf) = coroutineScope {
-		while (isActive) {
-			runCatching {
-				if (isNetworkAvailable.get() && tunnel.isActive) {
-					val pingSuccess = tunnel.isTunnelPingable(ioDispatcher)
-					handlePingResult(tunnel, pingSuccess)
-				}
-				delay(tunnel.pingInterval ?: Constants.PING_INTERVAL)
-			}
-		}
-	}
-
-	private suspend fun handlePingResult(tunnel: TunnelConf, pingSuccess: Boolean) {
-		if (!pingSuccess) {
-			if (isNetworkAvailable.get()) {
-				Timber.i("Ping result: target was not reachable, bouncing the tunnel")
-				bounceTunnel(tunnel)
-				delay(tunnel.pingCooldown ?: Constants.PING_COOLDOWN)
-			} else {
-				Timber.i("Ping result: target was not reachable, but no network available")
-			}
-		} else {
-			Timber.i("Ping result: all ping targets were reached successfully")
-		}
-	}
-
-	internal fun handleBackendThrowable(backendError: BackendError) {
-		val message = when (backendError) {
-			BackendError.Config -> StringValue.StringResource(R.string.start_failed_config)
-			BackendError.DNS -> StringValue.StringResource(R.string.dns_error)
-			BackendError.Unauthorized -> StringValue.StringResource(R.string.unauthorized)
-		}
-		if (WireGuardAutoTunnel.isForeground()) {
-			SnackbarController.showMessage(message)
-		} else {
-			notificationManager.show(
-				NotificationManager.VPN_NOTIFICATION_ID,
-				notificationManager.createNotification(
-					WireGuardNotification.NotificationChannels.VPN,
-					title = StringValue.StringResource(R.string.tunne_start_failed_title),
-					description = message,
-				),
                         )
                     }
                 }
-
+            tunJobs[tunnelConf.id] = job
-	private suspend fun monitorTunnelConfigChanges() = coroutineScope {
+            job.invokeOnCompletion {
-		appDataRepository.tunnels.flow.collect { storageTuns ->
+                tunJobs.remove(tunnelConf.id)
-			storageTuns.forEach { storageTun ->
+                Timber.d("Start job completed for tunnel ${tunnelConf.id}")
-				val currentTun = tunnels.value.firstOrNull { it.id == storageTun.id }
-				if (currentTun != null) {
-					if (!currentTun.isQuickConfigMatching(storageTun)) {
-						Timber.d("Tunnel config changed for ID $storageTun, bouncing tunnel")
-						bounceTunnel(storageTun)
-					}
-				}
             }
         }
     }
 
-	private suspend fun startTunnelStatisticsJob(tunnel: TunnelConf) = coroutineScope {
+    private suspend fun startTunnelInner(tunnelConf: TunnelConf) {
-		while (this.isActive) {
+        configureTunnelCallbacks(tunnelConf)
+        Timber.d("Starting backend for tunnel ${tunnelConf.id}...")
+
+        var currentConf = tunnelConf
+        var restoreAttempted = false
+        var originalError: BackendError? = null
+
+        while (true) {
+            try {
+                startBackend(currentConf)
+                updateTunnelStatus(currentConf, TunnelStatus.Up)
+                Timber.d("Started for tun ${currentConf.id}...")
+                saveTunnelActiveState(currentConf, true)
+                serviceManager.startTunnelForegroundService()
+                if (restoreAttempted)
+                    _messageEvents.emit(tunnelConf to BackendMessage.BounceRecovery)
+                if (bouncingTunnelIds[currentConf.id] is TunnelStatus.StopReason.Ping) {
+                    _messageEvents.emit(tunnelConf to BackendMessage.BounceSuccess)
+                }
+                return // Success, return
+            } catch (e: BackendError) {
+                originalError = originalError ?: e
+                val bounceReason = bouncingTunnelIds[currentConf.id]
+                if (!restoreAttempted && bounceReason is TunnelStatus.StopReason.Ping) {
+                    Timber.i(
+                        "Attempting to recover bounce failure with previously resolved endpoints for ${currentConf.name}"
+                    )
+                    try {
+                        val previouslyResolved = bounceReason.previouslyResolvedEndpoints
+                        val configProxy = ConfigProxy.from(currentConf.toAmConfig())
+                        val updatedConfigProxy =
+                            configProxy.copy(
+                                peers =
+                                    configProxy.peers.map {
+                                        it.copy(
+                                            endpoint =
+                                                previouslyResolved[it.publicKey] ?: it.endpoint
+                                        )
+                                    }
+                            )
+                        val (wg, amnezia) = updatedConfigProxy.buildConfigs()
+                        currentConf =
+                            currentConf.copyWithCallback(
+                                amQuick = amnezia.toAwgQuickString(true),
+                                wgQuick = wg.toWgQuickString(true),
+                            )
+                        bouncingTunnelIds.remove(currentConf.id)
+                        restoreAttempted = true
+                        continue // Retry
+                    } catch (e: Exception) {
+                        Timber.e(
+                            e,
+                            "Failed to update config with resolved endpoints for ${currentConf.name}",
+                        )
+                        // Fall through to failure (will emit BounceFailed since
+                        // retryAttempted=true)
+                    }
+                }
+                Timber.e(e, "Failed to start backend for ${currentConf.name}")
+                val emitError =
+                    if (restoreAttempted) BackendError.BounceFailed(originalError) else e
+                _errorEvents.emit(currentConf to emitError)
+                updateTunnelStatus(currentConf, TunnelStatus.Down)
+                return
+            }
+        }
+    }
+
+    private suspend fun saveTunnelActiveState(tunnelConf: TunnelConf, active: Boolean) {
+        val tunnelCopy = tunnelConf.copyWithCallback(isActive = active)
+        appDataRepository.tunnels.save(tunnelCopy)
+    }
+
+    override suspend fun stopTunnel(tunnelConf: TunnelConf?, reason: TunnelStatus.StopReason) {
+        if (tunnelConf == null) return stopActiveTunnels()
+        tunMutex.withLock {
+            if (activeTuns.isStarting(tunnelConf.id))
+                return handleStuckStartingTunnelShutdown(tunnelConf)
+            updateTunnelStatus(tunnelConf, TunnelStatus.Stopping(reason))
+            stopTunnelInner(tunnelConf)
+        }
+    }
+
+    private suspend fun stopTunnelInner(tunnelConf: TunnelConf) {
+        try {
+            val tunnel = activeTuns.findTunnel(tunnelConf.id) ?: return
+            stopBackend(tunnel)
+            saveTunnelActiveState(tunnelConf, false)
+            removeActiveTunnel(tunnel)
+        } catch (e: BackendError) {
+            Timber.e(e, "Failed to stop tunnel ${tunnelConf.id}")
+            _errorEvents.emit(tunnelConf to e)
+            updateTunnelStatus(tunnelConf, TunnelStatus.Down)
+        }
+    }
+
+    private fun handleServiceStateOnChange() {
+        if (activeTuns.value.isEmpty()) serviceManager.stopTunnelForegroundService()
+    }
+
+    private suspend fun handleStuckStartingTunnelShutdown(tunnel: TunnelConf) {
+        Timber.d("Stuck in starting state so cancelling job for tunnel ${tunnel.name}")
+        try {
+            tunJobs[tunnel.id]?.cancel() ?: Timber.d("No job found for ${tunnel.name}")
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to cancel job for ${tunnel.name}")
+        } finally {
+            updateTunnelStatus(tunnel, TunnelStatus.Down)
+        }
+    }
+
+    private fun cleanUpTunJob(tunnel: TunnelConf) {
+        Timber.d("Removing job for ${tunnel.name}")
+        tunJobs -= tunnel.id
+    }
+
+    private fun removeActiveTunnel(tunnelConf: TunnelConf) {
+        activeTuns.update { current -> current.toMutableMap().apply { remove(tunnelConf) } }
+    }
+
+    override suspend fun bounceTunnel(tunnelConf: TunnelConf, reason: TunnelStatus.StopReason) {
+        bounceTunnelMutex.withLock {
+            Timber.i(
+                "Bounce tunnel ${tunnelConf.name} for reason: $reason, current bouncing: ${bouncingTunnelIds.size}"
+            )
+            bouncingTunnelIds[tunnelConf.id] = reason
             runCatching {
-				val stats = getStatistics(tunnel)
+                stopTunnel(tunnelConf, reason)
-				_tunnelStates.update { currentStates ->
+                delay(BOUNCE_DELAY)
-					val updatedState = currentStates[tunnel.id]?.copy(statistics = stats)
+                startTunnel(tunnelConf)
-						?: TunnelState(statistics = stats)
-					currentStates + (tunnel.id to updatedState)
-				}
-				delay(CHECK_INTERVAL)
-			}.onFailure { exception ->
-				Timber.e(exception, "Failed to update tunnel statistics for ${tunnel.tunName}")
             }
         }
     }
+
+    override suspend fun runningTunnelNames(): Set<String> =
+        activeTuns.value.keys.map { it.tunName }.toSet()
+
+    companion object {
+        const val BOUNCE_DELAY = 300L
+    }
 }

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

@@ -0,0 +1,50 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel
+
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
+import kotlinx.coroutines.flow.MutableStateFlow
+
+fun Map<TunnelConf, TunnelState>.allDown(): Boolean {
+    return this.all { it.value.status.isDown() }
+}
+
+fun Map<TunnelConf, TunnelState>.hasActive(): Boolean {
+    return this.any { it.value.status.isUp() }
+}
+
+fun Map<TunnelConf, TunnelState>.getValueById(id: Int): TunnelState? {
+    val key = this.keys.find { it.id == id }
+    return key?.let { this@getValueById[it] }
+}
+
+fun Map<TunnelConf, TunnelState>.getKeyById(id: Int): TunnelConf? {
+    return this.keys.find { it.id == id }
+}
+
+fun Map<TunnelConf, TunnelState>.isUp(tunnelConf: TunnelConf): Boolean {
+    return this.getValueById(tunnelConf.id)?.status?.isUp() ?: false
+}
+
+fun MutableStateFlow<Map<TunnelConf, TunnelState>>.exists(id: Int): Boolean {
+    return this.value.any { it.key.id == id }
+}
+
+fun MutableStateFlow<Map<TunnelConf, TunnelState>>.isUp(id: Int): Boolean {
+    return this.value.any { it.key.id == id && it.value.status == TunnelStatus.Up }
+}
+
+fun MutableStateFlow<Map<TunnelConf, TunnelState>>.isStarting(id: Int): Boolean {
+    return this.value.any { it.key.id == id && it.value.status == TunnelStatus.Starting }
+}
+
+fun MutableStateFlow<Map<TunnelConf, TunnelState>>.findTunnel(id: Int): TunnelConf? {
+    return this.value.keys.find { it.id == id }
+}
+
+private val URL_PATTERN =
+    Regex("""^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}:[0-9]{1,5}$""")
+
+fun String.isUrl(): Boolean {
+    return URL_PATTERN.matches(this)
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/KernelTunnel.kt

@@ -3,76 +3,70 @@ package com.zaneschepke.wireguardautotunnel.core.tunnel
 import com.wireguard.android.backend.Backend
 import com.wireguard.android.backend.BackendException
 import com.wireguard.android.backend.Tunnel
-import com.zaneschepke.networkmonitor.NetworkMonitor
-import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendStatus
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+import com.zaneschepke.wireguardautotunnel.domain.events.BackendError
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import com.zaneschepke.wireguardautotunnel.domain.state.WireGuardStatistics
 import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import timber.log.Timber
 import javax.inject.Inject
+import kotlinx.coroutines.CoroutineScope
+import timber.log.Timber
 
-class KernelTunnel @Inject constructor(
+class KernelTunnel
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+@Inject
+constructor(
     @ApplicationScope private val applicationScope: CoroutineScope,
     serviceManager: ServiceManager,
     appDataRepository: AppDataRepository,
-	notificationManager: NotificationManager,
     private val backend: Backend,
-	networkMonitor: NetworkMonitor,
+) : BaseTunnel(applicationScope, appDataRepository, serviceManager) {
-) : BaseTunnel(ioDispatcher, applicationScope, networkMonitor, appDataRepository, serviceManager, notificationManager) {
 
-	override fun startTunnel(tunnelConf: TunnelConf) {
+    override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
-		Timber.d("Starting tunnel ${tunnelConf.id} kernel")
+        return try {
-		applicationScope.launch(ioDispatcher) {
+            WireGuardStatistics(backend.getStatistics(tunnelConf))
-			if (tunnels.value.any { it.id == tunnelConf.id }) return@launch Timber.w("Tunnel already running")
+        } catch (e: Exception) {
-			runCatching {
+            Timber.e(e)
-				Timber.d("Setting backend state UP")
+            null
-				super.beforeStartTunnel(tunnelConf)
-				backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toWgConfig())
-				Timber.d("Calling super.startTunnel")
-				super.startTunnel(tunnelConf)
-			}.onFailure {
-				Timber.e(it, "Failed to start tunnel ${tunnelConf.id} kernel")
-				onTunnelStop(tunnelConf)
-				if (it is BackendException) {
-					handleBackendThrowable(it.toBackendError())
-				} else {
-					Timber.e(it)
-				}
-			}
         }
     }
 
-	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
+    override suspend fun startBackend(tunnel: TunnelConf) {
-		return WireGuardStatistics(backend.getStatistics(tunnelConf))
+        // name too long for kernel mode
-	}
+        if (!tunnel.isNameKernelCompatible) throw BackendError.TunnelNameTooLong
-
+        try {
-	override fun stopTunnel(tunnelConf: TunnelConf?) {
+            updateTunnelStatus(tunnel, TunnelStatus.Starting)
-		applicationScope.launch(ioDispatcher) {
+            backend.setState(tunnel, Tunnel.State.UP, tunnel.toWgConfig())
-			runCatching {
+        } catch (e: BackendException) {
-				tunnels.value.firstOrNull { it.id == tunnelConf?.id }?.let {
+            Timber.e(e, "Failed to start up backend for tunnel ${tunnel.name}")
-					backend.setState(it, Tunnel.State.DOWN, it.toWgConfig())
+            throw e.toBackendError()
-					onTunnelStop(it)
+        } catch (e: IllegalArgumentException) {
-				} ?: stopAllTunnels()
+            Timber.e(e, "Failed to start up backend for tunnel ${tunnel.name}")
-			}.onFailure {
+            throw BackendError.Config
-				Timber.e(it)
-			}
         }
     }
 
-	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
+    override fun stopBackend(tunnel: TunnelConf) {
+        Timber.i("Stopping tunnel ${tunnel.id} kernel")
+        try {
+            backend.setState(tunnel, Tunnel.State.DOWN, tunnel.toWgConfig())
+        } catch (e: BackendException) {
+            throw e.toBackendError()
+        }
+    }
+
+    override fun setBackendStatus(backendStatus: BackendStatus) {
         Timber.w("Not yet implemented for kernel")
     }
 
+    override fun getBackendStatus(): BackendStatus {
+        return BackendStatus.Inactive
+    }
+
     override suspend fun runningTunnelNames(): Set<String> {
         return backend.runningTunnelNames
     }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/TunnelManager.kt

@@ -1,38 +1,41 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendStatus
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
-import com.zaneschepke.wireguardautotunnel.di.Kernel
+import com.zaneschepke.wireguardautotunnel.domain.events.BackendError
-import com.zaneschepke.wireguardautotunnel.di.Userspace
+import com.zaneschepke.wireguardautotunnel.domain.events.BackendMessage
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.domain.state.PingState
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
+import java.util.concurrent.ConcurrentHashMap
+import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.plus
-import javax.inject.Inject
+import org.amnezia.awg.crypto.Key
 
-class TunnelManager @Inject constructor(
+@OptIn(ExperimentalCoroutinesApi::class)
-	@Kernel private val kernelTunnel: TunnelProvider,
+class TunnelManager
-	@Userspace private val userspaceTunnel: TunnelProvider,
+@Inject
+constructor(
+    private val kernelTunnel: TunnelProvider,
+    private val userspaceTunnel: TunnelProvider,
     private val appDataRepository: AppDataRepository,
-	@ApplicationScope private val applicationScope: CoroutineScope,
+    applicationScope: CoroutineScope,
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+    ioDispatcher: CoroutineDispatcher,
 ) : TunnelProvider {
 
     @OptIn(ExperimentalCoroutinesApi::class)
-	private val tunnelProviderFlow = appDataRepository.settings.flow
+    private val tunnelProviderFlow =
+        appDataRepository.settings.flow
             .filterNotNull()
             .flatMapLatest { settings ->
-			MutableStateFlow(if (settings.isKernelEnabled) kernelTunnel else userspaceTunnel)
+                val backend = if (settings.isKernelEnabled) kernelTunnel else userspaceTunnel
+                MutableStateFlow(backend)
             }
             .stateIn(
                 scope = applicationScope.plus(ioDispatcher),
@@ -40,55 +43,91 @@ class TunnelManager @Inject constructor(
                 initialValue = userspaceTunnel,
             )
 
+    override val activeTunnels: StateFlow<Map<TunnelConf, TunnelState>> =
+        tunnelProviderFlow.value.activeTunnels
+
     @OptIn(ExperimentalCoroutinesApi::class)
-	override val activeTunnels = appDataRepository.settings.flow
+    override val errorEvents: SharedFlow<Pair<TunnelConf, BackendError>> =
-		.filterNotNull()
+        tunnelProviderFlow
-		.flatMapLatest { settings ->
+            .flatMapLatest { it.errorEvents }
-			if (settings.isKernelEnabled) {
+            .shareIn(
-				kernelTunnel.activeTunnels
-			} else {
-				userspaceTunnel.activeTunnels
-			}
-		}
-		.stateIn(
                 scope = applicationScope.plus(ioDispatcher),
                 started = SharingStarted.Eagerly,
-			initialValue = emptyMap(),
+                replay = 0,
             )
 
-	override fun startTunnel(tunnelConf: TunnelConf) {
+    @OptIn(ExperimentalCoroutinesApi::class)
+    override val messageEvents: SharedFlow<Pair<TunnelConf, BackendMessage>> =
+        tunnelProviderFlow
+            .flatMapLatest { it.messageEvents }
+            .filterNotNull()
+            .shareIn(
+                scope = applicationScope.plus(ioDispatcher),
+                started = SharingStarted.Eagerly,
+                replay = 0,
+            )
+
+    override val bouncingTunnelIds: ConcurrentHashMap<Int, TunnelStatus.StopReason> =
+        tunnelProviderFlow.value.bouncingTunnelIds
+
+    override fun hasVpnPermission(): Boolean {
+        return userspaceTunnel.hasVpnPermission()
+    }
+
+    override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
+        return tunnelProviderFlow.value.getStatistics(tunnelConf)
+    }
+
+    override suspend fun startTunnel(tunnelConf: TunnelConf) {
         tunnelProviderFlow.value.startTunnel(tunnelConf)
     }
 
-	override fun stopTunnel(tunnelConf: TunnelConf?) {
+    override suspend fun stopTunnel(tunnelConf: TunnelConf?, reason: TunnelStatus.StopReason) {
-		tunnelProviderFlow.value.stopTunnel(tunnelConf)
+        tunnelProviderFlow.value.stopTunnel(tunnelConf, reason)
     }
 
-	override suspend fun bounceTunnel(tunnelConf: TunnelConf) {
+    override suspend fun bounceTunnel(tunnelConf: TunnelConf, reason: TunnelStatus.StopReason) {
-		tunnelProviderFlow.value.bounceTunnel(tunnelConf)
+        tunnelProviderFlow.value.bounceTunnel(tunnelConf, reason)
     }
 
-	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
+    override fun setBackendStatus(backendStatus: BackendStatus) {
-		tunnelProviderFlow.value.setBackendState(backendState, allowedIps)
+        tunnelProviderFlow.value.setBackendStatus(backendStatus)
+    }
+
+    override fun getBackendStatus(): BackendStatus {
+        return tunnelProviderFlow.value.getBackendStatus()
     }
 
     override suspend fun runningTunnelNames(): Set<String> {
         return tunnelProviderFlow.value.runningTunnelNames()
     }
 
-	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
+    override suspend fun updateTunnelStatus(
-		return tunnelProviderFlow.value.getStatistics(tunnelConf)
+        tunnelConf: TunnelConf,
+        status: TunnelStatus?,
+        stats: TunnelStatistics?,
+        pingStates: Map<Key, PingState>?,
+        handshakeSuccessLogs: Boolean?,
+    ) {
+        tunnelProviderFlow.value.updateTunnelStatus(
+            tunnelConf,
+            status,
+            stats,
+            pingStates,
+            handshakeSuccessLogs,
+        )
     }
 
-	fun restorePreviousState() = applicationScope.launch(ioDispatcher) {
+    suspend fun restorePreviousState() {
         val settings = appDataRepository.settings.get()
         if (settings.isRestoreOnBootEnabled) {
             val previouslyActiveTuns = appDataRepository.tunnels.getActive()
-			val tunsToStart = previouslyActiveTuns.filterNot { tun -> activeTunnels.value.any { tun.id == it.key } }
+            val tunsToStart =
-			if (settings.isKernelEnabled) {
+                previouslyActiveTuns.filterNot { tun ->
-				return@launch tunsToStart.forEach {
+                    activeTunnels.value.any { tun.id == it.key.id }
-					startTunnel(it)
                 }
+            if (settings.isKernelEnabled) {
+                return tunsToStart.forEach { startTunnel(it) }
             } else {
                 tunsToStart.firstOrNull()?.let { startTunnel(it) }
             }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/TunnelMonitor.kt

@@ -0,0 +1,269 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel
+
+import com.zaneschepke.logcatter.LogReader
+import com.zaneschepke.networkmonitor.NetworkMonitor
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.domain.state.FailureReason
+import com.zaneschepke.wireguardautotunnel.domain.state.PingState
+import com.zaneschepke.wireguardautotunnel.util.extensions.toMillis
+import com.zaneschepke.wireguardautotunnel.util.network.NetworkUtils
+import dagger.hilt.android.scopes.ServiceScoped
+import io.ktor.util.collections.*
+import javax.inject.Inject
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.*
+import org.amnezia.awg.crypto.Key
+import timber.log.Timber
+
+@ServiceScoped
+class TunnelMonitor
+@Inject
+constructor(
+    private val appDataRepository: AppDataRepository,
+    private val tunnelManager: TunnelManager,
+    private val networkMonitor: NetworkMonitor,
+    private val networkUtils: NetworkUtils,
+    private val logReader: LogReader,
+) {
+
+    @OptIn(FlowPreview::class)
+    suspend fun startMonitoring(tunnelConf: TunnelConf, withLogs: Boolean): Job = coroutineScope {
+        launch {
+            launch { startTunnelConfChangesJob(tunnelConf) }
+            launch { startPingMonitor(tunnelConf) }
+            launch { startWgStatsPoll(tunnelConf) }
+            if (withLogs) launch { startLogsMonitor(tunnelConf) }
+        }
+    }
+
+    private suspend fun startTunnelConfChangesJob(tunnelConf: TunnelConf) {
+        appDataRepository.tunnels.flow
+            .map { storedTunnels -> storedTunnels.firstOrNull { it.id == tunnelConf.id } }
+            .filterNotNull()
+            .distinctUntilChanged { old, new -> old == new }
+            .collect { storedTunnel ->
+                if (tunnelConf != storedTunnel) {
+                    Timber.d("Config changed for ${storedTunnel.tunName}, bouncing")
+                    withContext(NonCancellable) {
+                        tunnelManager.bounceTunnel(
+                            storedTunnel,
+                            TunnelStatus.StopReason.ConfigChanged,
+                        )
+                    }
+                }
+            }
+    }
+
+    private suspend fun startLogsMonitor(tunnelConf: TunnelConf) {
+        logReader.liveLogs.collect { log ->
+            val healthLogs =
+                when {
+                    log.message.contains(HANDSHAKE_RESPONSE_TEXT, true) ||
+                        log.message.contains(KEEPALIVE_RESPONSE_TEXT, true) -> true
+                    log.message.contains(HANDSHAKE_INIT_FAILED_TEXT, true) ||
+                        log.message.contains(HANDSHAKE_NOT_COMPLETED_TEXT) ||
+                        log.message.contains(DATA_PACKET_FAILED_TEXT) -> false
+
+                    else -> null
+                }
+            healthLogs?.let { healthy ->
+                tunnelManager.updateTunnelStatus(tunnelConf, null, null, null, healthy)
+            }
+        }
+    }
+
+    private suspend fun startPingMonitor(tunnelConf: TunnelConf) = coroutineScope {
+        val pingStatsFlow = MutableStateFlow<Map<Key, PingState>>(emptyMap())
+
+        val tunStateFlow =
+            tunnelManager.activeTunnels.mapNotNull { it.getValueById(tunnelConf.id) }.stateIn(this)
+
+        val connectivityStateFlow = networkMonitor.connectivityStateFlow.stateIn(this)
+
+        val isNetworkConnected = connectivityStateFlow.map { it.hasConnectivity() }.stateIn(this)
+
+        data class NetworkChangeKey(
+            val ethernetConnected: Boolean,
+            val wifiConnected: Boolean,
+            val cellularConnected: Boolean,
+            val wifiSsid: String?,
+        )
+
+        connectivityStateFlow
+            .map {
+                NetworkChangeKey(
+                    ethernetConnected = it.ethernetConnected,
+                    wifiConnected = it.wifiState.connected,
+                    cellularConnected = it.cellularConnected,
+                    wifiSsid = if (it.wifiState.connected) it.wifiState.ssid else null,
+                )
+            }
+            .distinctUntilChanged()
+            .stateIn(this)
+
+        appDataRepository.settings.flow
+            .distinctUntilChanged { old, new ->
+                old.isPingEnabled == new.isPingEnabled &&
+                    old.tunnelPingIntervalSeconds == new.tunnelPingIntervalSeconds &&
+                    old.tunnelPingAttempts == new.tunnelPingAttempts &&
+                    old.tunnelPingTimeoutSeconds == new.tunnelPingTimeoutSeconds
+            }
+            .collectLatest { settings ->
+                if (!settings.isPingEnabled) return@collectLatest
+
+                Timber.d("Starting pinger for ${tunnelConf.tunName} with settings")
+
+                val config = tunnelConf.toAmConfig()
+
+                val pingablePeers = config.peers.filter { it.allowedIps.isNotEmpty() }
+                if (pingablePeers.isEmpty()) return@collectLatest
+
+                suspend fun performPing() {
+                    val updates = ConcurrentMap<Key, PingState>()
+
+                    pingablePeers.forEach { peer ->
+                        val previousState = pingStatsFlow.value[peer.publicKey] ?: PingState()
+
+                        val allowedIpStr = peer.allowedIps.firstOrNull()?.toString()
+                        if (allowedIpStr == null) {
+                            updates[peer.publicKey] =
+                                previousState.copy(
+                                    isReachable = false,
+                                    failureReason = FailureReason.NoResolvedEndpoint,
+                                    lastPingAttemptMillis = System.currentTimeMillis(),
+                                )
+                            return@forEach
+                        }
+
+                        val host =
+                            tunnelConf.pingTarget
+                                ?: {
+                                        val parts = allowedIpStr.split("/")
+                                        val internalIp =
+                                            if (parts.size == 2) parts[0] else allowedIpStr
+
+                                        val prefix =
+                                            if (parts.size == 2) parts[1].toIntOrNull() ?: 32
+                                            else 32
+                                        if (prefix <= 1) {
+                                            CLOUDFLARE_IPV4_IP
+                                        } else {
+                                            internalIp.removeSurrounding("[", "]")
+                                        }
+                                    }
+                                    .invoke()
+
+                        val attemptTime = System.currentTimeMillis()
+                        runCatching {
+                                val pingStats =
+                                    settings.tunnelPingTimeoutSeconds?.let {
+                                        networkUtils.pingWithStats(
+                                            host,
+                                            settings.tunnelPingAttempts,
+                                            it.toMillis(),
+                                        )
+                                    }
+                                        ?: networkUtils.pingWithStats(
+                                            host,
+                                            settings.tunnelPingAttempts,
+                                        )
+
+                                updates[peer.publicKey] =
+                                    previousState.copy(
+                                        transmitted = pingStats.transmitted,
+                                        received = pingStats.received,
+                                        packetLoss = pingStats.packetLoss,
+                                        rttMin = pingStats.rttMin,
+                                        rttMax = pingStats.rttMax,
+                                        rttAvg = pingStats.rttAvg,
+                                        rttStddev = pingStats.rttStddev,
+                                        isReachable = pingStats.isReachable,
+                                        failureReason =
+                                            if (pingStats.isReachable) null
+                                            else FailureReason.PingFailed,
+                                        lastSuccessfulPingMillis =
+                                            pingStats.lastSuccessfulPingMillis
+                                                ?: previousState.lastSuccessfulPingMillis,
+                                        pingTarget = host,
+                                        lastPingAttemptMillis = attemptTime,
+                                    )
+                                Timber.d(
+                                    "Ping completed for peer ${peer.publicKey.toBase64().substring(0, 5)}.. to host $host with stats: $pingStats"
+                                )
+                            }
+                            .onFailure {
+                                Timber.e(
+                                    it,
+                                    "Ping failed for peer ${peer.publicKey} in ${tunnelConf.tunName} to host $host",
+                                )
+                                updates[peer.publicKey] =
+                                    previousState.copy(
+                                        isReachable = false,
+                                        failureReason = FailureReason.PingFailed,
+                                        pingTarget = host,
+                                        lastPingAttemptMillis = attemptTime,
+                                    )
+                            }
+                    }
+
+                    if (updates.isNotEmpty()) {
+                        pingStatsFlow.update { updates }
+                        tunnelManager.updateTunnelStatus(tunnelConf, null, null, updates)
+                    }
+                }
+
+                // Wait for the tunnel to be fully active
+                tunStateFlow.filter { state -> state.status == TunnelStatus.Up }.first()
+
+                // small delay to make sure tunnel is fully up before we actively monitor
+                delay(3_000L)
+
+                while (isActive) {
+                    if (isNetworkConnected.value) {
+                        performPing()
+                    } else {
+                        pingStatsFlow.update { current ->
+                            current.mapValues { entry ->
+                                entry.value.copy(
+                                    isReachable = false,
+                                    failureReason = FailureReason.NoConnectivity,
+                                    lastPingAttemptMillis = System.currentTimeMillis(),
+                                )
+                            }
+                        }
+                        tunnelManager.updateTunnelStatus(
+                            tunnelConf,
+                            null,
+                            null,
+                            pingStatsFlow.value,
+                        )
+                    }
+                    delay(settings.tunnelPingIntervalSeconds.toMillis())
+                }
+            }
+    }
+
+    private suspend fun startWgStatsPoll(tunnelConf: TunnelConf) = coroutineScope {
+        while (isActive) {
+            val stats = tunnelManager.getStatistics(tunnelConf)
+            tunnelManager.updateTunnelStatus(tunnelConf, null, stats, null)
+            delay(STATS_DELAY)
+        }
+    }
+
+    companion object {
+        const val CLOUDFLARE_IPV6_IP = "2606:4700:4700::1111"
+        const val CLOUDFLARE_IPV4_IP = "1.1.1.1"
+
+        const val STATS_DELAY = 1_000L
+
+        const val KEEPALIVE_RESPONSE_TEXT = "Receiving keepalive packet"
+        const val HANDSHAKE_RESPONSE_TEXT = "Received handshake response"
+        const val HANDSHAKE_INIT_FAILED_TEXT = "Failed to send handshake initiation: write udp"
+        const val DATA_PACKET_FAILED_TEXT = "Failed to send data packets"
+        const val HANDSHAKE_NOT_COMPLETED_TEXT =
+            "Handshake did not complete after 5 seconds, retrying"
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/TunnelProvider.kt

@@ -1,21 +1,69 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendStatus
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
+import com.zaneschepke.wireguardautotunnel.domain.events.BackendError
+import com.zaneschepke.wireguardautotunnel.domain.events.BackendMessage
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.state.PingState
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
+import java.util.concurrent.ConcurrentHashMap
+import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
+import org.amnezia.awg.crypto.Key
 
 interface TunnelProvider {
-	companion object {
+    /** Starts the specified tunnel configuration. */
-		const val CHECK_INTERVAL = 1000L
+    suspend fun startTunnel(tunnelConf: TunnelConf)
-	}
+
+    /**
+     * Stops the specified tunnel, or all tunnels if none is provided.
+     *
+     * @param tunnelConf The tunnel to stop, or null to stop all active tunnels.
+     * @param reason The reason for stopping, defaults to USER for manual stops. Callers should
+     *   override with specific reasons (e.g., PING, CONFIG_CHANGED) when applicable.
+     */
+    suspend fun stopTunnel(
+        tunnelConf: TunnelConf? = null,
+        reason: TunnelStatus.StopReason = TunnelStatus.StopReason.User,
+    )
+
+    /**
+     * Bounces (stops and restarts) the specified tunnel.
+     *
+     * @param tunnelConf The tunnel to bounce.
+     * @param reason The reason for bouncing, defaults to User for manual actions. Callers should
+     *   override with specific reasons (e.g., Ping, ConfigChanged) when applicable.
+     */
+    suspend fun bounceTunnel(
+        tunnelConf: TunnelConf,
+        reason: TunnelStatus.StopReason = TunnelStatus.StopReason.User,
+    )
+
+    fun setBackendStatus(backendStatus: BackendStatus)
+
+    fun getBackendStatus(): BackendStatus
 
-	fun startTunnel(tunnelConf: TunnelConf)
-	fun stopTunnel(tunnelConf: TunnelConf? = null)
-	suspend fun bounceTunnel(tunnelConf: TunnelConf)
-	suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>)
     suspend fun runningTunnelNames(): Set<String>
-	fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics
+
-	val activeTunnels: StateFlow<Map<Int, TunnelState>>
+    fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics?
+
+    val activeTunnels: StateFlow<Map<TunnelConf, TunnelState>>
+
+    val errorEvents: SharedFlow<Pair<TunnelConf, BackendError>>
+
+    val messageEvents: SharedFlow<Pair<TunnelConf, BackendMessage>>
+
+    val bouncingTunnelIds: ConcurrentHashMap<Int, TunnelStatus.StopReason>
+
+    fun hasVpnPermission(): Boolean
+
+    suspend fun updateTunnelStatus(
+        tunnelConf: TunnelConf,
+        status: TunnelStatus? = null,
+        stats: TunnelStatistics? = null,
+        pingStates: Map<Key, PingState>? = null,
+        handshakeSuccessLogs: Boolean? = null,
+    )
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/tunnel/UserspaceTunnel.kt

@@ -1,84 +1,90 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
-import com.wireguard.android.backend.BackendException
-import com.zaneschepke.networkmonitor.NetworkMonitor
-import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendStatus
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.events.BackendError
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.AmneziaStatistics
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
-import com.zaneschepke.wireguardautotunnel.util.extensions.asAmBackendState
+import com.zaneschepke.wireguardautotunnel.util.extensions.asAmBackendStatus
+import com.zaneschepke.wireguardautotunnel.util.extensions.asBackendStatus
 import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
-import kotlinx.coroutines.CoroutineDispatcher
+import javax.inject.Inject
+import kotlin.jvm.optionals.getOrNull
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
 import org.amnezia.awg.backend.Backend
+import org.amnezia.awg.backend.BackendException
 import org.amnezia.awg.backend.Tunnel
 import timber.log.Timber
-import javax.inject.Inject
 
-class UserspaceTunnel @Inject constructor(
+class UserspaceTunnel
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+@Inject
-	@ApplicationScope private val applicationScope: CoroutineScope,
+constructor(
-	serviceManager: ServiceManager,
+    applicationScope: CoroutineScope,
-	appDataRepository: AppDataRepository,
+    val serviceManager: ServiceManager,
-	notificationManager: NotificationManager,
+    val appDataRepository: AppDataRepository,
     private val backend: Backend,
-	networkMonitor: NetworkMonitor,
+) : BaseTunnel(applicationScope, appDataRepository, serviceManager) {
-) : BaseTunnel(ioDispatcher, applicationScope, networkMonitor, appDataRepository, serviceManager, notificationManager) {
 
-	override fun startTunnel(tunnelConf: TunnelConf) {
+    override suspend fun startBackend(tunnel: TunnelConf) {
-		applicationScope.launch(ioDispatcher) {
+        try {
-			Timber.d("Starting tunnel ${tunnelConf.id} userspace")
+            updateTunnelStatus(tunnel, TunnelStatus.Starting)
-			if (tunnels.value.any { it.id == tunnelConf.id }) return@launch Timber.w("Tunnel already running")
+            val amConfig = tunnel.toAmConfig()
-			if (tunnels.value.isNotEmpty()) {
+            var previousKillSwitch: Backend.BackendStatus? = null
-				Timber.d("Stopping all tunnels")
+            // prevent dns failures from bringing tuns up when vpn kill switch active
-				stopAllTunnels()
+            if (
-			}
+                amConfig.peers.any { it.endpoint.getOrNull()?.toString()?.isUrl() == true } &&
-			runCatching {
+                    backend.backendStatus is Backend.BackendStatus.KillSwitchActive
-				Timber.d("Setting backend state UP")
+            ) {
-				super.beforeStartTunnel(tunnelConf)
+                previousKillSwitch = backend.backendStatus
-				backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toAmConfig())
+                setBackendStatus(BackendStatus.Active)
-				Timber.d("Calling super.startTunnel")
-				super.startTunnel(tunnelConf)
-			}.onFailure {
-				Timber.e(it, "Failed to start tunnel ${tunnelConf.id} userspace")
-				onTunnelStop(tunnelConf)
-				if (it is BackendException) {
-					handleBackendThrowable(it.toBackendError())
-				} else {
-					Timber.e(it)
-				}
             }
+            backend.setState(tunnel, Tunnel.State.UP, amConfig)
+            previousKillSwitch?.let { backend.backendStatus = it }
+        } catch (e: BackendException) {
+            Timber.e(e, "Failed to start up backend for tunnel ${tunnel.name}")
+            throw e.toBackendError()
+        } catch (e: IllegalArgumentException) {
+            Timber.e(e, "Failed to start up backend for tunnel ${tunnel.name}")
+            throw BackendError.Config
         }
     }
 
-	override fun stopTunnel(tunnelConf: TunnelConf?) {
+    override fun stopBackend(tunnel: TunnelConf) {
-		applicationScope.launch(ioDispatcher) {
+        Timber.i("Stopping tunnel ${tunnel.name} userspace")
-			runCatching {
+        try {
-				tunnels.value.firstOrNull { it.id == tunnelConf?.id }?.let {
+            backend.setState(tunnel, Tunnel.State.DOWN, tunnel.toAmConfig())
-					backend.setState(it, Tunnel.State.DOWN, it.toAmConfig())
+        } catch (e: BackendException) {
-					onTunnelStop(it)
+            Timber.e(e, "Failed to stop tunnel ${tunnel.id}")
-				} ?: stopAllTunnels()
+            throw e.toBackendError()
-			}.onFailure {
-				Timber.e(it)
-			}
         }
     }
 
-	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
+    override fun setBackendStatus(backendStatus: BackendStatus) {
-		backend.setBackendState(backendState.asAmBackendState(), allowedIps)
+        Timber.d("Setting backend state: $backendStatus")
+        try {
+            backend.backendStatus = backendStatus.asAmBackendStatus()
+        } catch (e: BackendException) {
+            throw e.toBackendError()
+        }
+    }
+
+    override fun getBackendStatus(): BackendStatus {
+        return backend.backendStatus.asBackendStatus()
     }
 
     override suspend fun runningTunnelNames(): Set<String> {
         return backend.runningTunnelNames
     }
 
-	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
+    override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
-		return AmneziaStatistics(backend.getStatistics(tunnelConf))
+        return try {
+            AmneziaStatistics(backend.getStatistics(tunnelConf))
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to get stats for ${tunnelConf.tunName}")
+            null
+        }
     }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/worker/ServiceWorker.kt

@@ -2,24 +2,22 @@ package com.zaneschepke.wireguardautotunnel.core.worker
 
 import android.content.Context
 import androidx.hilt.work.HiltWorker
-import androidx.work.CoroutineWorker
+import androidx.work.*
-import androidx.work.ExistingPeriodicWorkPolicy
-import androidx.work.PeriodicWorkRequestBuilder
-import androidx.work.WorkManager
-import androidx.work.WorkerParameters
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
+import java.util.concurrent.TimeUnit
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import timber.log.Timber
-import java.util.concurrent.TimeUnit
 
 @HiltWorker
-class ServiceWorker @AssistedInject constructor(
+class ServiceWorker
+@AssistedInject
+constructor(
     @Assisted private val context: Context,
     @Assisted private val params: WorkerParameters,
     private val serviceManager: ServiceManager,
@@ -36,10 +34,12 @@ class ServiceWorker @AssistedInject constructor(
         }
 
         fun start(context: Context) {
-			val periodicWorkRequest = PeriodicWorkRequestBuilder<ServiceWorker>(
+            val periodicWorkRequest =
+                PeriodicWorkRequestBuilder<ServiceWorker>(
                         repeatInterval = 15,
                         repeatIntervalTimeUnit = TimeUnit.MINUTES,
-			).build()
+                    )
+                    .build()
             WorkManager.getInstance(context)
                 .enqueueUniquePeriodicWork(
                     TAG,
@@ -49,11 +49,14 @@ class ServiceWorker @AssistedInject constructor(
         }
     }
 
-	override suspend fun doWork(): Result = withContext(ioDispatcher) {
+    override suspend fun doWork(): Result =
+        withContext(ioDispatcher) {
             Timber.i("Service worker started")
             with(appDataRepository.settings.get()) {
-			if (isAutoTunnelEnabled && !serviceManager.autoTunnelActive.value) return@with serviceManager.startAutoTunnel(true)
+                if (isAutoTunnelEnabled && serviceManager.autoTunnelService.value == null)
-			if (tunnelManager.activeTunnels.value.isEmpty()) tunnelManager.restorePreviousState()
+                    return@with serviceManager.startAutoTunnel()
+                if (tunnelManager.activeTunnels.value.isEmpty())
+                    tunnelManager.restorePreviousState()
             }
             Result.success()
         }

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

@@ -1,90 +1,70 @@
 package com.zaneschepke.wireguardautotunnel.data
 
-import androidx.room.AutoMigration
+import androidx.room.*
-import androidx.room.Database
-import androidx.room.DeleteColumn
-import androidx.room.RoomDatabase
-import androidx.room.TypeConverters
 import androidx.room.migration.AutoMigrationSpec
 import com.zaneschepke.wireguardautotunnel.data.dao.SettingsDao
 import com.zaneschepke.wireguardautotunnel.data.dao.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.data.model.Settings
+import com.zaneschepke.wireguardautotunnel.data.entity.Settings
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.entity.TunnelConfig
 
 @Database(
     entities = [Settings::class, TunnelConfig::class],
-	version = 16,
+    version = 19,
     autoMigrations =
         [
             AutoMigration(from = 1, to = 2),
             AutoMigration(from = 2, to = 3),
-		AutoMigration(
+            AutoMigration(from = 3, to = 4),
-			from = 3,
+            AutoMigration(from = 4, to = 5),
-			to = 4,
+            AutoMigration(from = 5, to = 6),
-		),
+            AutoMigration(from = 6, to = 7, spec = RemoveLegacySettingColumnsMigration::class),
-		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(
+            AutoMigration(from = 10, to = 11, spec = RemoveTunnelPauseMigration::class),
-			from = 10,
+            AutoMigration(from = 11, to = 12),
-			to = 11,
+            AutoMigration(from = 12, to = 13),
-			spec = RemoveTunnelPauseMigration::class,
+            AutoMigration(from = 13, to = 14),
-		),
+            AutoMigration(from = 14, to = 15),
-		AutoMigration(
+            AutoMigration(from = 15, to = 16),
-			from = 11,
+            AutoMigration(from = 16, to = 17, spec = WifiDetectionMigration::class),
-			to = 12,
+            AutoMigration(from = 17, to = 18),
-		),
+            AutoMigration(from = 18, to = 19, spec = PingMigration::class),
-		AutoMigration(
-			from = 12,
-			to = 13,
-		),
-		AutoMigration(
-			from = 13,
-			to = 14,
-		),
-		AutoMigration(
-			from = 14,
-			to = 15,
-		),
-		AutoMigration(
-			from = 15,
-			to = 16,
-		),
         ],
     exportSchema = true,
 )
-@TypeConverters(DatabaseListConverters::class)
+@TypeConverters(DatabaseConverters::class)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun settingDao(): SettingsDao
 
     abstract fun tunnelConfigDoa(): TunnelConfigDao
 }
 
-@DeleteColumn(
+@DeleteColumn(tableName = "Settings", columnName = "default_tunnel")
-	tableName = "Settings",
+@DeleteColumn(tableName = "Settings", columnName = "is_battery_saver_enabled")
-	columnName = "default_tunnel",
-)
-@DeleteColumn(
-	tableName = "Settings",
-	columnName = "is_battery_saver_enabled",
-)
 class RemoveLegacySettingColumnsMigration : AutoMigrationSpec
 
-@DeleteColumn(
+@DeleteColumn(tableName = "Settings", columnName = "is_auto_tunnel_paused")
-	tableName = "Settings",
-	columnName = "is_auto_tunnel_paused",
-)
 class RemoveTunnelPauseMigration : AutoMigrationSpec
+
+@DeleteColumn(tableName = "Settings", columnName = "is_wifi_by_shell_enabled")
+class WifiDetectionMigration : AutoMigrationSpec
+
+@DeleteColumn.Entries(
+    DeleteColumn(tableName = "TunnelConfig", columnName = "ping_interval"),
+    DeleteColumn(tableName = "TunnelConfig", columnName = "ping_cooldown"),
+    DeleteColumn(tableName = "Settings", columnName = "split_tunnel_apps"),
+)
+@RenameColumn.Entries(
+    RenameColumn(
+        tableName = "TunnelConfig",
+        fromColumnName = "is_ping_enabled",
+        toColumnName = "restart_on_ping_failure",
+    ),
+    RenameColumn(
+        tableName = "TunnelConfig",
+        fromColumnName = "ping_ip",
+        toColumnName = "ping_target",
+    ),
+)
+class PingMigration : AutoMigrationSpec

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

@@ -7,6 +7,7 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import java.io.IOException
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
@@ -15,7 +16,6 @@ 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,
@@ -24,20 +24,19 @@ class DataStoreManager(
     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 expandedTunnelIds = stringPreferencesKey("EXPANDED_TUNNEL_IDS")
         val isLocalLogsEnabled = booleanPreferencesKey("LOCAL_LOGS_ENABLED")
         val locale = stringPreferencesKey("LOCALE")
         val theme = stringPreferencesKey("THEME")
+        val isRemoteControlEnabled = booleanPreferencesKey("IS_REMOTE_CONTROL_ENABLED")
+        val remoteKey = stringPreferencesKey("REMOTE_KEY")
+        val showDetailedPingStats = booleanPreferencesKey("SHOW_DETAILED_PING_STATS")
     }
 
     // preferences
     private val preferencesKey = "preferences"
-	private val Context.dataStore by
+    private val Context.dataStore by preferencesDataStore(name = preferencesKey)
-		preferencesDataStore(
-			name = preferencesKey,
-		)
 
     suspend fun init() {
         withContext(ioDispatcher) {

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

@@ -5,8 +5,8 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 import timber.log.Timber
 
 class DatabaseCallback : RoomDatabase.Callback() {
-	override fun onCreate(db: SupportSQLiteDatabase) = db.run {
+    override fun onCreate(db: SupportSQLiteDatabase) =
-		// Notice non-ui thread is here
+        db.run {
             beginTransaction()
             try {
                 execSQL(Queries.createDefaultSettings())

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

@@ -0,0 +1,30 @@
+package com.zaneschepke.wireguardautotunnel.data
+
+import androidx.room.TypeConverter
+import com.zaneschepke.wireguardautotunnel.data.entity.Settings
+import kotlinx.serialization.json.Json
+
+class DatabaseConverters {
+    @TypeConverter
+    fun listToString(value: List<String>): String {
+        return Json.encodeToString(value)
+    }
+
+    @TypeConverter
+    fun stringToList(value: String): List<String> {
+        if (value.isBlank() || value.isEmpty()) return mutableListOf()
+        return try {
+            Json.decodeFromString<List<String>>(value)
+        } catch (e: Exception) {
+            val list = value.split(",").toMutableList()
+            val json = listToString(list)
+            Json.decodeFromString<List<String>>(json)
+        }
+    }
+
+    @TypeConverter fun fromStatus(status: Settings.WifiDetectionMethod): Int = status.value
+
+    @TypeConverter
+    fun toStatus(value: Int): Settings.WifiDetectionMethod =
+        Settings.WifiDetectionMethod.fromValue(value)
+}

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

@@ -1,24 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data
-
-import androidx.room.TypeConverter
-import kotlinx.serialization.encodeToString
-import kotlinx.serialization.json.Json
-
-class DatabaseListConverters {
-	@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)
-		}
-	}
-}

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

@@ -24,12 +24,14 @@ object Queries {
 		        'false',
 		        'false',
 		        'false')
-		""".trimIndent()
+		"""
+            .trimIndent()
     }
 
     fun createTunnelConfig(): String {
         return """
 		INSERT INTO TunnelConfig (name, wg_quick) VALUES ('test', 'test')
-		""".trimIndent()
+		"""
+            .trimIndent()
     }
 }

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

@@ -1,36 +1,24 @@
 package com.zaneschepke.wireguardautotunnel.data.dao
 
-import androidx.room.Dao
+import androidx.room.*
-import androidx.room.Delete
+import com.zaneschepke.wireguardautotunnel.data.entity.Settings
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import com.zaneschepke.wireguardautotunnel.data.model.Settings
 import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface SettingsDao {
-	@Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun save(t: Settings)
-	suspend fun save(t: Settings)
 
-	@Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun saveAll(t: List<Settings>)
-	suspend fun saveAll(t: List<Settings>)
 
-	@Query("SELECT * FROM settings WHERE id=:id")
+    @Query("SELECT * FROM settings WHERE id=:id") suspend fun getById(id: Long): Settings?
-	suspend fun getById(id: Long): Settings?
 
-	@Query("SELECT * FROM settings")
+    @Query("SELECT * FROM settings") suspend fun getAll(): List<Settings>
-	suspend fun getAll(): List<Settings>
 
-	@Query("SELECT * FROM settings LIMIT 1")
+    @Query("SELECT * FROM settings LIMIT 1") fun getSettingsFlow(): Flow<Settings>
-	fun getSettingsFlow(): Flow<Settings>
 
-	@Query("SELECT * FROM settings")
+    @Query("SELECT * FROM settings") fun getAllFlow(): Flow<MutableList<Settings>>
-	fun getAllFlow(): Flow<MutableList<Settings>>
 
-	@Delete
+    @Delete suspend fun delete(t: Settings)
-	suspend fun delete(t: Settings)
 
-	@Query("SELECT COUNT('id') FROM settings")
+    @Query("SELECT COUNT('id') FROM settings") suspend fun count(): Long
-	suspend fun count(): Long
 }

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

@@ -1,39 +1,28 @@
 package com.zaneschepke.wireguardautotunnel.data.dao
 
-import androidx.room.Dao
+import androidx.room.*
-import androidx.room.Delete
+import com.zaneschepke.wireguardautotunnel.data.entity.TunnelConfig
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
 import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface TunnelConfigDao {
-	@Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun save(t: TunnelConfig)
-	suspend fun save(t: TunnelConfig)
 
-	@Insert(onConflict = OnConflictStrategy.REPLACE)
+    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun saveAll(t: TunnelConfigs)
-	suspend fun saveAll(t: TunnelConfigs)
 
-	@Query("SELECT * FROM TunnelConfig WHERE id=:id")
+    @Query("SELECT * FROM TunnelConfig WHERE id=:id") suspend fun getById(id: Long): TunnelConfig?
-	suspend fun getById(id: Long): TunnelConfig?
 
     @Query("SELECT * FROM TunnelConfig WHERE name=:name")
     suspend fun getByName(name: String): TunnelConfig?
 
-	@Query("SELECT * FROM TunnelConfig WHERE is_Active=1")
+    @Query("SELECT * FROM TunnelConfig WHERE is_Active=1") suspend fun getActive(): TunnelConfigs
-	suspend fun getActive(): TunnelConfigs
 
-	@Query("SELECT * FROM TunnelConfig")
+    @Query("SELECT * FROM TunnelConfig") suspend fun getAll(): TunnelConfigs
-	suspend fun getAll(): TunnelConfigs
 
-	@Delete
+    @Delete suspend fun delete(t: TunnelConfig)
-	suspend fun delete(t: TunnelConfig)
 
-	@Query("SELECT COUNT('id') FROM TunnelConfig")
+    @Query("SELECT COUNT('id') FROM TunnelConfig") suspend fun count(): Long
-	suspend fun count(): Long
 
     @Query("SELECT * FROM TunnelConfig WHERE tunnel_networks LIKE '%' || :name || '%'")
     suspend fun findByTunnelNetworkName(name: String): TunnelConfigs
@@ -53,6 +42,6 @@ interface TunnelConfigDao {
     @Query("SELECT * FROM TUNNELCONFIG WHERE is_mobile_data_tunnel=1")
     suspend fun findByMobileDataTunnel(): TunnelConfigs
 
-	@Query("SELECT * FROM tunnelconfig")
+    @Query("SELECT * FROM tunnelconfig ORDER BY position")
-	fun getAllFlow(): Flow<MutableList<TunnelConfig>>
+    fun getAllFlow(): Flow<List<TunnelConfig>>
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/entity/Asset.kt

@@ -0,0 +1,10 @@
+package com.zaneschepke.wireguardautotunnel.data.entity
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class Asset(
+    val name: String,
+    @SerialName("browser_download_url") val browserDownloadUrl: String,
+)

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

@@ -0,0 +1,26 @@
+package com.zaneschepke.wireguardautotunnel.data.entity
+
+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 expandedTunnelIds: List<Int> = emptyList(),
+    val isLocalLogsEnabled: Boolean = IS_LOGS_ENABLED_DEFAULT,
+    val isRemoteControlEnabled: Boolean = IS_REMOTE_CONTROL_ENABLED,
+    val showDetailedPingStats: Boolean = SHOW_DETAILED_PING_STATS_DEFAULT,
+    val remoteKey: String? = null,
+    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_LOGS_ENABLED_DEFAULT = false
+        const val IS_REMOTE_CONTROL_ENABLED = false
+        const val SHOW_DETAILED_PING_STATS_DEFAULT = false
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/entity/GitHubRelease.kt

@@ -0,0 +1,12 @@
+package com.zaneschepke.wireguardautotunnel.data.entity
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GitHubRelease(
+    @SerialName("tag_name") val tagName: String,
+    val name: String?,
+    val body: String?,
+    val assets: List<Asset>,
+)

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

@@ -0,0 +1,67 @@
+package com.zaneschepke.wireguardautotunnel.data.entity
+
+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: List<String> = emptyList(),
+    @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_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,
+    @ColumnInfo(name = "debounce_delay_seconds", defaultValue = "3")
+    val debounceDelaySeconds: Int = 3,
+    @ColumnInfo(name = "is_disable_kill_switch_on_trusted_enabled", defaultValue = "false")
+    val isDisableKillSwitchOnTrustedEnabled: Boolean = false,
+    @ColumnInfo(name = "is_tunnel_on_unsecure_enabled", defaultValue = "false")
+    val isTunnelOnUnsecureEnabled: Boolean = false,
+    @ColumnInfo(name = "wifi_detection_method", defaultValue = "0")
+    val wifiDetectionMethod: WifiDetectionMethod = WifiDetectionMethod.fromValue(0),
+    @ColumnInfo(name = "is_ping_monitoring_enabled", defaultValue = "true")
+    val isPingMonitoringEnabled: Boolean = true,
+    @ColumnInfo(name = "tunnel_ping_interval_sec", defaultValue = "30")
+    val tunnelPingIntervalSeconds: Int = 30,
+    @ColumnInfo(name = "tunnel_ping_attempts", defaultValue = "3") val tunnelPingAttempts: Int = 3,
+    @ColumnInfo(name = "tunnel_ping_timeout_sec") val tunnelPingTimeoutSeconds: Int? = null,
+) {
+    enum class WifiDetectionMethod(val value: Int) {
+        DEFAULT(0),
+        LEGACY(1),
+        ROOT(2),
+        SHIZUKU(3);
+
+        companion object {
+            fun fromValue(value: Int): WifiDetectionMethod =
+                entries.find { it.value == value } ?: DEFAULT
+        }
+    }
+}

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

@@ -0,0 +1,36 @@
+package com.zaneschepke.wireguardautotunnel.data.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.Index
+import androidx.room.PrimaryKey
+
+@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: List<String> = listOf(),
+    @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 = "restart_on_ping_failure", defaultValue = "false")
+    val restartOnPingFailure: Boolean = false,
+    @ColumnInfo(name = "ping_target", defaultValue = "null") var pingTarget: String? = null,
+    @ColumnInfo(name = "is_ethernet_tunnel", defaultValue = "false")
+    val isEthernetTunnel: Boolean = false,
+    @ColumnInfo(name = "is_ipv4_preferred", defaultValue = "true")
+    val isIpv4Preferred: Boolean = true,
+    @ColumnInfo(name = "position", defaultValue = "0") val position: Int = 0,
+    @ColumnInfo(name = "auto_tunnel_apps", defaultValue = "[]")
+    val autoTunnelApps: List<String> = listOf(),
+) {
+
+    companion object {
+        const val AM_QUICK_DEFAULT = ""
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/mapper/GeneralStateMapper.kt

@@ -0,0 +1,39 @@
+package com.zaneschepke.wireguardautotunnel.data.mapper
+
+import com.zaneschepke.wireguardautotunnel.data.entity.GeneralState
+import com.zaneschepke.wireguardautotunnel.domain.model.AppState
+
+object GeneralStateMapper {
+    fun toAppState(generalState: GeneralState): AppState =
+        with(generalState) {
+            AppState(
+                isLocationDisclosureShown,
+                isBatteryOptimizationDisableShown,
+                isPinLockEnabled,
+                expandedTunnelIds,
+                isLocalLogsEnabled,
+                isRemoteControlEnabled,
+                showDetailedPingStats,
+                remoteKey,
+                locale,
+                theme,
+            )
+        }
+
+    fun toGeneralState(appState: AppState): GeneralState {
+        return with(appState) {
+            GeneralState(
+                isLocationDisclosureShown,
+                isBatteryOptimizationDisableShown,
+                isPinLockEnabled,
+                expandedTunnelIds,
+                isLocalLogsEnabled,
+                isRemoteControlEnabled,
+                showDetailedPingStats,
+                remoteKey,
+                locale,
+                theme,
+            )
+        }
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/mapper/GitHubReleaseMapper.kt

@@ -0,0 +1,19 @@
+package com.zaneschepke.wireguardautotunnel.data.mapper
+
+import com.zaneschepke.wireguardautotunnel.data.entity.GitHubRelease
+import com.zaneschepke.wireguardautotunnel.domain.model.AppUpdate
+
+object GitHubReleaseMapper {
+    fun toAppUpdate(gitHubRelease: GitHubRelease, newVersion: String): AppUpdate {
+        with(gitHubRelease) {
+            val apkAsset = assets.firstOrNull { it.name.endsWith(".apk") }
+            return AppUpdate(
+                version = newVersion,
+                title = name ?: "Update $tagName",
+                releaseNotes = body ?: "No release notes provided",
+                apkUrl = apkAsset?.browserDownloadUrl,
+                apkFileName = apkAsset?.name,
+            )
+        }
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/mapper/SettingsMapper.kt

@@ -0,0 +1,71 @@
+package com.zaneschepke.wireguardautotunnel.data.mapper
+
+import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
+import com.zaneschepke.wireguardautotunnel.data.entity.Settings
+import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
+
+object SettingsMapper {
+    fun toAppSettings(settings: Settings): AppSettings {
+        return AppSettings(
+            id = settings.id,
+            isAutoTunnelEnabled = settings.isAutoTunnelEnabled,
+            isTunnelOnMobileDataEnabled = settings.isTunnelOnMobileDataEnabled,
+            trustedNetworkSSIDs = settings.trustedNetworkSSIDs,
+            isAlwaysOnVpnEnabled = settings.isAlwaysOnVpnEnabled,
+            isTunnelOnEthernetEnabled = settings.isTunnelOnEthernetEnabled,
+            isShortcutsEnabled = settings.isShortcutsEnabled,
+            isTunnelOnWifiEnabled = settings.isTunnelOnWifiEnabled,
+            isKernelEnabled = settings.isKernelEnabled,
+            isRestoreOnBootEnabled = settings.isRestoreOnBootEnabled,
+            isMultiTunnelEnabled = settings.isMultiTunnelEnabled,
+            isPingEnabled = settings.isPingEnabled,
+            isAmneziaEnabled = settings.isAmneziaEnabled,
+            isWildcardsEnabled = settings.isWildcardsEnabled,
+            isStopOnNoInternetEnabled = settings.isStopOnNoInternetEnabled,
+            isVpnKillSwitchEnabled = settings.isVpnKillSwitchEnabled,
+            isKernelKillSwitchEnabled = settings.isKernelKillSwitchEnabled,
+            isLanOnKillSwitchEnabled = settings.isLanOnKillSwitchEnabled,
+            debounceDelaySeconds = settings.debounceDelaySeconds,
+            isDisableKillSwitchOnTrustedEnabled = settings.isDisableKillSwitchOnTrustedEnabled,
+            isTunnelOnUnsecureEnabled = settings.isTunnelOnUnsecureEnabled,
+            wifiDetectionMethod =
+                AndroidNetworkMonitor.WifiDetectionMethod.fromValue(
+                    settings.wifiDetectionMethod.value
+                ),
+            tunnelPingIntervalSeconds = settings.tunnelPingIntervalSeconds,
+            tunnelPingAttempts = settings.tunnelPingAttempts,
+            tunnelPingTimeoutSeconds = settings.tunnelPingTimeoutSeconds,
+        )
+    }
+
+    fun toSettings(appSettings: AppSettings): Settings {
+        return Settings(
+            id = appSettings.id,
+            isAutoTunnelEnabled = appSettings.isAutoTunnelEnabled,
+            isTunnelOnMobileDataEnabled = appSettings.isTunnelOnMobileDataEnabled,
+            trustedNetworkSSIDs = appSettings.trustedNetworkSSIDs,
+            isAlwaysOnVpnEnabled = appSettings.isAlwaysOnVpnEnabled,
+            isTunnelOnEthernetEnabled = appSettings.isTunnelOnEthernetEnabled,
+            isShortcutsEnabled = appSettings.isShortcutsEnabled,
+            isTunnelOnWifiEnabled = appSettings.isTunnelOnWifiEnabled,
+            isKernelEnabled = appSettings.isKernelEnabled,
+            isRestoreOnBootEnabled = appSettings.isRestoreOnBootEnabled,
+            isMultiTunnelEnabled = appSettings.isMultiTunnelEnabled,
+            isPingEnabled = appSettings.isPingEnabled,
+            isAmneziaEnabled = appSettings.isAmneziaEnabled,
+            isWildcardsEnabled = appSettings.isWildcardsEnabled,
+            isStopOnNoInternetEnabled = appSettings.isStopOnNoInternetEnabled,
+            isVpnKillSwitchEnabled = appSettings.isVpnKillSwitchEnabled,
+            isKernelKillSwitchEnabled = appSettings.isKernelKillSwitchEnabled,
+            isLanOnKillSwitchEnabled = appSettings.isLanOnKillSwitchEnabled,
+            debounceDelaySeconds = appSettings.debounceDelaySeconds,
+            isDisableKillSwitchOnTrustedEnabled = appSettings.isDisableKillSwitchOnTrustedEnabled,
+            isTunnelOnUnsecureEnabled = appSettings.isTunnelOnUnsecureEnabled,
+            wifiDetectionMethod =
+                Settings.WifiDetectionMethod.fromValue(appSettings.wifiDetectionMethod.value),
+            tunnelPingIntervalSeconds = appSettings.tunnelPingIntervalSeconds,
+            tunnelPingAttempts = appSettings.tunnelPingAttempts,
+            tunnelPingTimeoutSeconds = appSettings.tunnelPingTimeoutSeconds,
+        )
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/mapper/TunnelConfigMapper.kt

@@ -0,0 +1,46 @@
+package com.zaneschepke.wireguardautotunnel.data.mapper
+
+import com.zaneschepke.wireguardautotunnel.data.entity.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
+
+object TunnelConfigMapper {
+    fun toTunnelConf(tunnelConfig: TunnelConfig): TunnelConf {
+        return with(tunnelConfig) {
+            TunnelConf(
+                id,
+                name,
+                wgQuick,
+                tunnelNetworks,
+                isMobileDataTunnel,
+                isPrimaryTunnel,
+                amQuick,
+                isActive,
+                pingTarget,
+                restartOnPingFailure,
+                isEthernetTunnel,
+                isIpv4Preferred,
+                position,
+            )
+        }
+    }
+
+    fun toTunnelConfig(tunnelConf: TunnelConf): TunnelConfig {
+        return with(tunnelConf) {
+            TunnelConfig(
+                id,
+                tunName,
+                wgQuick,
+                tunnelNetworks,
+                isMobileDataTunnel,
+                isPrimaryTunnel,
+                amQuick,
+                isActive,
+                restartOnPingFailure,
+                pingTarget,
+                isEthernetTunnel,
+                isIpv4Preferred,
+                position,
+            )
+        }
+    }
+}

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

@@ -1,46 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.model
-
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppState
-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,
-) {
-
-	fun toAppState(): AppState = AppState(
-		isLocationDisclosureShown,
-		isBatteryOptimizationDisableShown,
-		isPinLockEnabled,
-		isTunnelStatsExpanded,
-		isLocationDisclosureShown,
-		locale,
-		theme,
-	)
-
-	companion object {
-		fun from(appState: AppState): GeneralState {
-			return with(appState) {
-				GeneralState(
-					isLocationDisclosureShown,
-					isBatteryOptimizationDisableShown,
-					isPinLockEnabled,
-					isTunnelStatsExpanded,
-					isLocationDisclosureShown,
-					locale,
-					theme,
-				)
-			}
-		}
-		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/model/Settings.kt

@@ -1,118 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.model
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
-
-@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,
-	@ColumnInfo(
-		name = "debounce_delay_seconds",
-		defaultValue = "3",
-	)
-	val debounceDelaySeconds: Int = 3,
-	@ColumnInfo(
-		name = "is_disable_kill_switch_on_trusted_enabled",
-		defaultValue = "false",
-	)
-	val isDisableKillSwitchOnTrustedEnabled: Boolean = false,
-) {
-
-	fun toAppSettings(): AppSettings {
-		return AppSettings(
-			id, isAutoTunnelEnabled, isTunnelOnMobileDataEnabled, trustedNetworkSSIDs, isAlwaysOnVpnEnabled, isTunnelOnEthernetEnabled,
-			isShortcutsEnabled, isTunnelOnWifiEnabled, isKernelEnabled, isRestoreOnBootEnabled, isMultiTunnelEnabled, isPingEnabled,
-			isAmneziaEnabled, isWildcardsEnabled, isWifiNameByShellEnabled, isStopOnNoInternetEnabled, isVpnKillSwitchEnabled,
-			isKernelKillSwitchEnabled, isLanOnKillSwitchEnabled, debounceDelaySeconds, isDisableKillSwitchOnTrustedEnabled,
-		)
-	}
-
-	companion object {
-		fun from(appSettings: AppSettings): Settings {
-			return with(appSettings) {
-				Settings(
-					id, isAutoTunnelEnabled, isTunnelOnMobileDataEnabled, trustedNetworkSSIDs.toMutableList(), isAlwaysOnVpnEnabled,
-					isTunnelOnEthernetEnabled, isShortcutsEnabled, isTunnelOnWifiEnabled, isKernelEnabled, isRestoreOnBootEnabled,
-					isMultiTunnelEnabled, isPingEnabled, isAmneziaEnabled, isWildcardsEnabled, isWifiNameByShellEnabled,
-					isStopOnNoInternetEnabled, isVpnKillSwitchEnabled, isKernelKillSwitchEnabled, isLanOnKillSwitchEnabled,
-					debounceDelaySeconds, isDisableKillSwitchOnTrustedEnabled,
-				)
-			}
-		}
-	}
-}

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

@@ -1,93 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.model
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.Index
-import androidx.room.PrimaryKey
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-
-@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,
-	@ColumnInfo(
-		name = "is_ipv4_preferred",
-		defaultValue = "true",
-	)
-	var isIpv4Preferred: Boolean = true,
-) {
-
-	fun toTunnel(): TunnelConf {
-		return TunnelConf(
-			id, name, wgQuick, tunnelNetworks, isMobileDataTunnel,
-			isPrimaryTunnel, amQuick, isActive, isPingEnabled, pingInterval,
-			pingCooldown, pingIp, isEthernetTunnel, isIpv4Preferred,
-		)
-	}
-
-	companion object {
-
-		const val AM_QUICK_DEFAULT = ""
-
-		fun from(tunnelConf: TunnelConf): TunnelConfig {
-			return with(tunnelConf) {
-				return TunnelConfig(
-					id, tunName, wgQuick, tunnelNetworks.toMutableList(), isMobileDataTunnel,
-					isPrimaryTunnel, amQuick, isActive, isPingEnabled, pingInterval,
-					pingCooldown, pingIp, isEthernetTunnel, isIpv4Preferred,
-				)
-			}
-		}
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/network/GitHubApi.kt

@@ -0,0 +1,9 @@
+package com.zaneschepke.wireguardautotunnel.data.network
+
+import com.zaneschepke.wireguardautotunnel.data.entity.GitHubRelease
+
+interface GitHubApi {
+    suspend fun getLatestRelease(owner: String, repo: String): Result<GitHubRelease>
+
+    suspend fun getNightlyRelease(owner: String, repo: String): Result<GitHubRelease>
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/network/KtorClient.kt

@@ -0,0 +1,28 @@
+package com.zaneschepke.wireguardautotunnel.data.network
+
+import io.ktor.client.*
+import io.ktor.client.engine.okhttp.*
+import io.ktor.client.plugins.*
+import io.ktor.client.plugins.contentnegotiation.*
+import io.ktor.serialization.kotlinx.json.*
+import kotlinx.serialization.json.Json
+
+object KtorClient {
+    fun create(): HttpClient {
+        return HttpClient(OkHttp) {
+            install(ContentNegotiation) {
+                json(
+                    Json {
+                        ignoreUnknownKeys = true
+                        isLenient = true
+                    }
+                )
+            }
+            install(HttpTimeout) {
+                requestTimeoutMillis = 15000
+                connectTimeoutMillis = 15000
+                socketTimeoutMillis = 15000
+            }
+        }
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/network/KtorGitHubApi.kt

@@ -0,0 +1,56 @@
+package com.zaneschepke.wireguardautotunnel.data.network
+
+import com.zaneschepke.wireguardautotunnel.data.entity.GitHubRelease
+import io.ktor.client.*
+import io.ktor.client.call.*
+import io.ktor.client.plugins.*
+import io.ktor.client.request.*
+import io.ktor.http.*
+
+class KtorGitHubApi(private val client: HttpClient) : GitHubApi {
+    override suspend fun getLatestRelease(owner: String, repo: String): Result<GitHubRelease> {
+        return try {
+            val response: GitHubRelease =
+                client.get("https://api.github.com/repos/$owner/$repo/releases/latest").body()
+            Result.success(response)
+        } catch (e: ClientRequestException) {
+            when (e.response.status) {
+                HttpStatusCode.Forbidden -> Result.failure(Exception("Rate limit exceeded"))
+                HttpStatusCode.NotFound ->
+                    Result.failure(Exception("Repository or release not found"))
+                else -> Result.failure(e)
+            }
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
+
+    override suspend fun getNightlyRelease(owner: String, repo: String): Result<GitHubRelease> {
+        return try {
+            // Fetch all releases
+            val releases: List<GitHubRelease> =
+                client.get("https://api.github.com/repos/$owner/$repo/releases").body()
+
+            // Find the first release with "nightly" in the tag_name (case-insensitive)
+            val nightlyRelease =
+                releases.firstOrNull { release ->
+                    release.tagName.contains("nightly", ignoreCase = true)
+                }
+
+            if (nightlyRelease != null) {
+                Result.success(nightlyRelease)
+            } else {
+                Result.failure(Exception("No release with 'nightly' tag found"))
+            }
+        } catch (e: ClientRequestException) {
+            when (e.response.status) {
+                HttpStatusCode.Forbidden -> Result.failure(Exception("Rate limit exceeded"))
+                HttpStatusCode.NotFound ->
+                    Result.failure(Exception("Repository or release not found"))
+                else -> Result.failure(e)
+            }
+        } catch (e: Exception) {
+            Result.failure(e)
+        }
+    }
+}

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

@@ -1,10 +1,10 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import javax.inject.Inject
 
 class AppDataRoomRepository

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

@@ -1,16 +1,16 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.DataStoreManager
+import com.zaneschepke.wireguardautotunnel.data.entity.GeneralState
+import com.zaneschepke.wireguardautotunnel.data.mapper.GeneralStateMapper
+import com.zaneschepke.wireguardautotunnel.domain.model.AppState
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.data.model.GeneralState
 import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import timber.log.Timber
 
-class DataStoreAppStateRepository(
+class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager) :
-	private val dataStoreManager: DataStoreManager,
-) :
     AppStateRepository {
     override suspend fun isLocationDisclosureShown(): Boolean {
         return dataStoreManager.getFromStore(DataStoreManager.locationDisclosureShown)
@@ -39,13 +39,36 @@ class DataStoreAppStateRepository(
         dataStoreManager.saveToDataStore(DataStoreManager.batteryDisableShown, shown)
     }
 
-	override suspend fun isTunnelStatsExpanded(): Boolean {
+    override suspend fun setTunnelExpanded(id: Int) {
-		return dataStoreManager.getFromStore(DataStoreManager.tunnelStatsExpanded)
+        val ids =
-			?: GeneralState.IS_TUNNEL_STATS_EXPANDED
+            dataStoreManager
+                .getFromStore(DataStoreManager.expandedTunnelIds)
+                ?.split(",")
+                ?.mapNotNull { it.toIntOrNull() } ?: emptyList()
+
+        if (ids.contains(id)) return
+
+        val updatedList = ids.toMutableList().apply { add(id) }
+        dataStoreManager.saveToDataStore(
+            DataStoreManager.expandedTunnelIds,
+            updatedList.joinToString(","),
+        )
     }
 
-	override suspend fun setTunnelStatsExpanded(expanded: Boolean) {
+    override suspend fun removeTunnelExpanded(id: Int) {
-		dataStoreManager.saveToDataStore(DataStoreManager.tunnelStatsExpanded, expanded)
+        val ids =
+            dataStoreManager
+                .getFromStore(DataStoreManager.expandedTunnelIds)
+                ?.split(",")
+                ?.mapNotNull { it.toIntOrNull() } ?: emptyList()
+
+        if (ids.isEmpty() || !ids.contains(id)) return
+
+        val updatedList = ids.toMutableList().apply { remove(id) }
+        dataStoreManager.saveToDataStore(
+            DataStoreManager.expandedTunnelIds,
+            updatedList.joinToString(","),
+        )
     }
 
     override suspend fun setTheme(theme: Theme) {
@@ -63,7 +86,8 @@ class DataStoreAppStateRepository(
     }
 
     override suspend fun isLocalLogsEnabled(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.isLocalLogsEnabled) ?: GeneralState.IS_LOGS_ENABLED_DEFAULT
+        return dataStoreManager.getFromStore(DataStoreManager.isLocalLogsEnabled)
+            ?: GeneralState.IS_LOGS_ENABLED_DEFAULT
     }
 
     override suspend fun setLocalLogsEnabled(enabled: Boolean) {
@@ -78,8 +102,35 @@ class DataStoreAppStateRepository(
         return dataStoreManager.getFromStore(DataStoreManager.locale)
     }
 
-	override val flow: Flow<GeneralState> =
+    override suspend fun setIsRemoteControlEnabled(enabled: Boolean) {
-		dataStoreManager.preferencesFlow.map { prefs ->
+        dataStoreManager.saveToDataStore(DataStoreManager.isRemoteControlEnabled, enabled)
+    }
+
+    override suspend fun isRemoteControlEnabled(): Boolean {
+        return dataStoreManager.getFromStore(DataStoreManager.isRemoteControlEnabled)
+            ?: GeneralState.IS_REMOTE_CONTROL_ENABLED
+    }
+
+    override suspend fun setRemoteKey(key: String) {
+        dataStoreManager.saveToDataStore(DataStoreManager.remoteKey, key)
+    }
+
+    override suspend fun getRemoteKey(): String? {
+        return dataStoreManager.getFromStore(DataStoreManager.remoteKey)
+    }
+
+    override suspend fun setShowDetailedPingStats(showDetailedPing: Boolean) {
+        dataStoreManager.saveToDataStore(DataStoreManager.showDetailedPingStats, showDetailedPing)
+    }
+
+    override suspend fun getShowDetailedPing(): Boolean {
+        return dataStoreManager.getFromStore(DataStoreManager.showDetailedPingStats)
+            ?: GeneralState.SHOW_DETAILED_PING_STATS_DEFAULT
+    }
+
+    override val flow: Flow<AppState> =
+        dataStoreManager.preferencesFlow
+            .map { prefs ->
                 prefs?.let { pref ->
                     try {
                         GeneralState(
@@ -92,8 +143,20 @@ class DataStoreAppStateRepository(
                             isPinLockEnabled =
                                 pref[DataStoreManager.pinLockEnabled]
                                     ?: GeneralState.PIN_LOCK_ENABLED_DEFAULT,
-						isTunnelStatsExpanded = pref[DataStoreManager.tunnelStatsExpanded] ?: GeneralState.IS_TUNNEL_STATS_EXPANDED,
+                            expandedTunnelIds =
-						isLocalLogsEnabled = pref[DataStoreManager.isLocalLogsEnabled] ?: GeneralState.IS_LOGS_ENABLED_DEFAULT,
+                                pref[DataStoreManager.expandedTunnelIds]?.split(",")?.mapNotNull {
+                                    it.toIntOrNull()
+                                } ?: emptyList(),
+                            isLocalLogsEnabled =
+                                pref[DataStoreManager.isLocalLogsEnabled]
+                                    ?: GeneralState.IS_LOGS_ENABLED_DEFAULT,
+                            isRemoteControlEnabled =
+                                pref[DataStoreManager.isRemoteControlEnabled]
+                                    ?: GeneralState.IS_REMOTE_CONTROL_ENABLED,
+                            showDetailedPingStats =
+                                pref[DataStoreManager.showDetailedPingStats]
+                                    ?: GeneralState.SHOW_DETAILED_PING_STATS_DEFAULT,
+                            remoteKey = pref[DataStoreManager.remoteKey],
                             locale = pref[DataStoreManager.locale],
                             theme = getTheme(),
                         )
@@ -103,4 +166,5 @@ class DataStoreAppStateRepository(
                     }
                 } ?: GeneralState()
             }
+            .map(GeneralStateMapper::toAppState)
 }

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

@@ -0,0 +1,106 @@
+package com.zaneschepke.wireguardautotunnel.data.repository
+
+import android.content.Context
+import com.zaneschepke.wireguardautotunnel.BuildConfig
+import com.zaneschepke.wireguardautotunnel.data.mapper.GitHubReleaseMapper
+import com.zaneschepke.wireguardautotunnel.data.network.GitHubApi
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.model.AppUpdate
+import com.zaneschepke.wireguardautotunnel.domain.repository.UpdateRepository
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.NumberUtils
+import io.ktor.client.*
+import io.ktor.client.request.*
+import io.ktor.client.statement.*
+import io.ktor.http.*
+import io.ktor.utils.io.*
+import java.io.File
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+
+class GitHubUpdateRepository(
+    private val gitHubApi: GitHubApi,
+    private val httpClient: HttpClient,
+    private val githubOwner: String,
+    private val githubRepo: String,
+    private val context: Context,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) : UpdateRepository {
+    override suspend fun checkForUpdate(currentVersion: String): Result<AppUpdate?> =
+        withContext(ioDispatcher) {
+            Timber.i("Checking for update")
+            val isNightly = BuildConfig.VERSION_NAME.contains("nightly")
+            val release =
+                if (isNightly) {
+                    gitHubApi.getNightlyRelease(githubOwner, githubRepo).onFailure(Timber::e)
+                } else {
+                    gitHubApi.getLatestRelease(githubOwner, githubRepo).onFailure(Timber::e)
+                }
+            release.map { release ->
+                val standaloneApkAsset =
+                    release.assets.find { asset ->
+                        asset.name.startsWith("wgtunnel-${Constants.STANDALONE_FLAVOR}-v") &&
+                                asset.name.endsWith(".apk")
+                    }
+                val newVersion =
+                    standaloneApkAsset
+                        ?.name
+                        ?.removePrefix("wgtunnel-${Constants.STANDALONE_FLAVOR}-v")
+                        ?.removeSuffix(".apk") ?: return@map null
+
+                Timber.i("Latest version: $newVersion, current version: $currentVersion")
+                if (isNightly && newVersion != currentVersion)
+                    return@map GitHubReleaseMapper.toAppUpdate(release, newVersion)
+                if (NumberUtils.compareVersions(newVersion, currentVersion) > 0) {
+                    GitHubReleaseMapper.toAppUpdate(release.copy(
+                        assets = listOf(standaloneApkAsset)
+                    ), newVersion)
+                } else {
+                    null
+                }
+            }
+        }
+
+    override suspend fun downloadApk(
+        apkUrl: String,
+        fileName: String,
+        onProgress: suspend (Float) -> Unit,
+    ): Result<File> =
+        withContext(ioDispatcher) {
+            try {
+                // clean up old files
+                context.getExternalFilesDir(null)?.listFiles()?.forEach { file ->
+                    if (file.extension == "apk") file.delete()
+                }
+
+                val response: HttpResponse = httpClient.get(apkUrl)
+
+                val apkFile = File(context.getExternalFilesDir(null), fileName)
+
+                val channel: ByteReadChannel = response.bodyAsChannel()
+                val totalBytes: Long = response.contentLength() ?: -1L
+                var bytesCopied = 0L
+
+                apkFile.outputStream().use { output ->
+                    val buffer = ByteArray(8 * 1024)
+
+                    while (!channel.isClosedForRead) {
+                        val bytesRead = channel.readAvailable(buffer)
+                        if (bytesRead <= 0) break
+                        output.write(buffer, 0, bytesRead)
+                        bytesCopied += bytesRead
+
+                        if (totalBytes > 0) {
+                            val progress = bytesCopied.toFloat() / totalBytes
+                            onProgress(progress.coerceIn(0f, 1f))
+                        }
+                    }
+                }
+
+                Result.success(apkFile)
+            } catch (e: Exception) {
+                Result.failure(e)
+            }
+        }
+}

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

@@ -1,10 +1,11 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.dao.SettingsDao
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
+import com.zaneschepke.wireguardautotunnel.data.entity.Settings
-import com.zaneschepke.wireguardautotunnel.data.model.Settings
+import com.zaneschepke.wireguardautotunnel.data.mapper.SettingsMapper
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
@@ -16,16 +17,15 @@ class RoomSettingsRepository(
 ) : AppSettingRepository {
 
     override suspend fun save(appSettings: AppSettings) {
-		withContext(ioDispatcher) {
+        withContext(ioDispatcher) { settingsDoa.save(SettingsMapper.toSettings(appSettings)) }
-			settingsDoa.save(Settings.from(appSettings))
-		}
     }
 
-	override val flow = settingsDoa.getSettingsFlow().flowOn(ioDispatcher).map { it.toAppSettings() }
+    override val flow =
+        settingsDoa.getSettingsFlow().flowOn(ioDispatcher).map(SettingsMapper::toAppSettings)
 
     override suspend fun get(): AppSettings {
         return withContext(ioDispatcher) {
-			(settingsDoa.getAll().firstOrNull() ?: Settings()).toAppSettings()
+            SettingsMapper.toAppSettings(settingsDoa.getAll().firstOrNull() ?: Settings())
         }
     }
 }

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

@@ -1,10 +1,10 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.dao.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import com.zaneschepke.wireguardautotunnel.data.mapper.TunnelConfigMapper
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.util.extensions.Tunnels
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.flowOn
@@ -16,72 +16,65 @@ class RoomTunnelRepository(
     @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : TunnelRepository {
 
-	override val flow = tunnelConfigDao.getAllFlow().flowOn(ioDispatcher).map { it.map { it.toTunnel() } }
+    override val flow =
+        tunnelConfigDao.getAllFlow().flowOn(ioDispatcher).map {
+            it.map(TunnelConfigMapper::toTunnelConf)
+        }
 
     override suspend fun getAll(): Tunnels {
         return withContext(ioDispatcher) {
-			tunnelConfigDao.getAll().map { it.toTunnel() }
+            tunnelConfigDao.getAll().map(TunnelConfigMapper::toTunnelConf)
         }
     }
 
     override suspend fun save(tunnelConf: TunnelConf) {
         withContext(ioDispatcher) {
-			tunnelConfigDao.save(TunnelConfig.from(tunnelConf))
+            tunnelConfigDao.save(TunnelConfigMapper.toTunnelConfig(tunnelConf))
+        }
+    }
+
+    override suspend fun saveAll(tunnelConfList: List<TunnelConf>) {
+        withContext(ioDispatcher) {
+            tunnelConfigDao.saveAll(tunnelConfList.map(TunnelConfigMapper::toTunnelConfig))
         }
     }
 
     override suspend fun updatePrimaryTunnel(tunnelConf: TunnelConf?) {
         withContext(ioDispatcher) {
             tunnelConfigDao.resetPrimaryTunnel()
-			tunnelConf?.let {
+            tunnelConf?.let { save(it.copy(isPrimaryTunnel = true)) }
-				save(
-					it.copy(
-						isPrimaryTunnel = true,
-					),
-				)
-			}
         }
     }
 
     override suspend fun updateMobileDataTunnel(tunnelConf: TunnelConf?) {
         withContext(ioDispatcher) {
             tunnelConfigDao.resetMobileDataTunnel()
-			tunnelConf?.let {
+            tunnelConf?.let { save(it.copy(isMobileDataTunnel = true)) }
-				save(
-					it.copy(
-						isMobileDataTunnel = true,
-					),
-				)
-			}
         }
     }
 
     override suspend fun updateEthernetTunnel(tunnelConf: TunnelConf?) {
         withContext(ioDispatcher) {
             tunnelConfigDao.resetEthernetTunnel()
-			tunnelConf?.let {
+            tunnelConf?.let { save(it.copy(isEthernetTunnel = true)) }
-				save(
-					it.copy(
-						isEthernetTunnel = true,
-					),
-				)
-			}
         }
     }
 
     override suspend fun delete(tunnelConf: TunnelConf) {
         withContext(ioDispatcher) {
-			tunnelConfigDao.delete(TunnelConfig.from(tunnelConf))
+            tunnelConfigDao.delete(TunnelConfigMapper.toTunnelConfig(tunnelConf))
         }
     }
 
     override suspend fun getById(id: Int): TunnelConf? {
-		return withContext(ioDispatcher) { tunnelConfigDao.getById(id.toLong())?.toTunnel() }
+        return withContext(ioDispatcher) {
+            tunnelConfigDao.getById(id.toLong())?.let(TunnelConfigMapper::toTunnelConf)
+        }
     }
 
     override suspend fun getActive(): Tunnels {
         return withContext(ioDispatcher) {
-			tunnelConfigDao.getActive().map { it.toTunnel() }
+            tunnelConfigDao.getActive().map(TunnelConfigMapper::toTunnelConf)
         }
     }
 
@@ -90,18 +83,26 @@ class RoomTunnelRepository(
     }
 
     override suspend fun findByTunnelName(name: String): TunnelConf? {
-		return withContext(ioDispatcher) { tunnelConfigDao.getByName(name)?.toTunnel() }
+        return withContext(ioDispatcher) {
+            tunnelConfigDao.getByName(name)?.let(TunnelConfigMapper::toTunnelConf)
+        }
     }
 
     override suspend fun findByTunnelNetworksName(name: String): Tunnels {
-		return withContext(ioDispatcher) { tunnelConfigDao.findByTunnelNetworkName(name).map { it.toTunnel() } }
+        return withContext(ioDispatcher) {
+            tunnelConfigDao.findByTunnelNetworkName(name).map(TunnelConfigMapper::toTunnelConf)
+        }
     }
 
     override suspend fun findByMobileDataTunnel(): Tunnels {
-		return withContext(ioDispatcher) { tunnelConfigDao.findByMobileDataTunnel().map { it.toTunnel() } }
+        return withContext(ioDispatcher) {
+            tunnelConfigDao.findByMobileDataTunnel().map(TunnelConfigMapper::toTunnelConf)
+        }
     }
 
     override suspend fun findPrimary(): Tunnels {
-		return withContext(ioDispatcher) { tunnelConfigDao.findByPrimary().map { it.toTunnel() } }
+        return withContext(ioDispatcher) {
+            tunnelConfigDao.findByPrimary().map(TunnelConfigMapper::toTunnelConf)
+        }
     }
 }

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

@@ -4,18 +4,21 @@ import android.content.Context
 import com.zaneschepke.logcatter.LogReader
 import com.zaneschepke.logcatter.LogcatReader
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationMonitor
 import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
 import com.zaneschepke.wireguardautotunnel.core.shortcut.DynamicShortcutManager
 import com.zaneschepke.wireguardautotunnel.core.shortcut.ShortcutManager
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.util.network.NetworkUtils
 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
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
-import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -23,8 +26,9 @@ class AppModule {
     @Singleton
     @ApplicationScope
     @Provides
-	fun providesApplicationScope(@DefaultDispatcher defaultDispatcher: CoroutineDispatcher): CoroutineScope =
+    fun providesApplicationScope(
-		CoroutineScope(SupervisorJob() + defaultDispatcher)
+        @DefaultDispatcher defaultDispatcher: CoroutineDispatcher
+    ): CoroutineScope = CoroutineScope(SupervisorJob() + defaultDispatcher)
 
     @Singleton
     @Provides
@@ -40,7 +44,25 @@ class AppModule {
 
     @Singleton
     @Provides
-	fun provideShortcutManager(@ApplicationContext context: Context, @IoDispatcher ioDispatcher: CoroutineDispatcher): ShortcutManager {
+    fun provideShortcutManager(
+        @ApplicationContext context: Context,
+        @IoDispatcher ioDispatcher: CoroutineDispatcher,
+    ): ShortcutManager {
         return DynamicShortcutManager(context, ioDispatcher)
     }
+
+    @Singleton
+    @Provides
+    fun provideNetworkUtils(@IoDispatcher ioDispatcher: CoroutineDispatcher): NetworkUtils {
+        return NetworkUtils(ioDispatcher)
+    }
+
+    @Singleton
+    @Provides
+    fun provideNotificationMonitor(
+        tunnelManager: TunnelManager,
+        notificationManager: NotificationManager,
+    ): NotificationMonitor {
+        return NotificationMonitor(tunnelManager, notificationManager)
+    }
 }

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

@@ -2,18 +2,10 @@ package com.zaneschepke.wireguardautotunnel.di
 
 import javax.inject.Qualifier
 
-@Qualifier
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class TunnelShell
-@Retention(AnnotationRetention.BINARY)
-annotation class TunnelShell
 
-@Qualifier
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class AppShell
-@Retention(AnnotationRetention.BINARY)
-annotation class AppShell
 
-@Qualifier
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class Kernel
-@Retention(AnnotationRetention.BINARY)
-annotation class Kernel
 
-@Qualifier
+@Qualifier @Retention(AnnotationRetention.BINARY) annotation class Userspace
-@Retention(AnnotationRetention.BINARY)
-annotation class Userspace

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

@@ -2,26 +2,14 @@ package com.zaneschepke.wireguardautotunnel.di
 
 import javax.inject.Qualifier
 
-@Retention(AnnotationRetention.RUNTIME)
+@Retention(AnnotationRetention.RUNTIME) @Qualifier annotation class DefaultDispatcher
-@Qualifier
-annotation class DefaultDispatcher
 
-@Retention(AnnotationRetention.RUNTIME)
+@Retention(AnnotationRetention.RUNTIME) @Qualifier annotation class IoDispatcher
-@Qualifier
-annotation class IoDispatcher
 
-@Retention(AnnotationRetention.RUNTIME)
+@Retention(AnnotationRetention.RUNTIME) @Qualifier annotation class MainDispatcher
-@Qualifier
-annotation class MainDispatcher
 
-@Retention(AnnotationRetention.BINARY)
+@Retention(AnnotationRetention.BINARY) @Qualifier annotation class MainImmediateDispatcher
-@Qualifier
-annotation class MainImmediateDispatcher
 
-@Retention(AnnotationRetention.RUNTIME)
+@Retention(AnnotationRetention.RUNTIME) @Qualifier annotation class ApplicationScope
-@Qualifier
-annotation class ApplicationScope
 
-@Retention(AnnotationRetention.RUNTIME)
+@Retention(AnnotationRetention.RUNTIME) @Qualifier annotation class ServiceScope
-@Qualifier
-annotation class ServiceScope

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

@@ -14,13 +14,9 @@ object CoroutinesDispatchersModule {
     @Provides
     fun providesDefaultDispatcher(): CoroutineDispatcher = Dispatchers.Default
 
-	@IoDispatcher
+    @IoDispatcher @Provides fun providesIoDispatcher(): CoroutineDispatcher = Dispatchers.IO
-	@Provides
-	fun providesIoDispatcher(): CoroutineDispatcher = Dispatchers.IO
 
-	@MainDispatcher
+    @MainDispatcher @Provides fun providesMainDispatcher(): CoroutineDispatcher = Dispatchers.Main
-	@Provides
-	fun providesMainDispatcher(): CoroutineDispatcher = Dispatchers.Main
 
     @MainImmediateDispatcher
     @Provides

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

@@ -4,25 +4,23 @@ import android.content.Context
 import androidx.room.Room
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
+import com.zaneschepke.wireguardautotunnel.data.DataStoreManager
 import com.zaneschepke.wireguardautotunnel.data.DatabaseCallback
 import com.zaneschepke.wireguardautotunnel.data.dao.SettingsDao
 import com.zaneschepke.wireguardautotunnel.data.dao.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.data.DataStoreManager
+import com.zaneschepke.wireguardautotunnel.data.network.GitHubApi
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.data.network.KtorClient
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRoomRepository
+import com.zaneschepke.wireguardautotunnel.data.network.KtorGitHubApi
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.*
-import com.zaneschepke.wireguardautotunnel.data.repository.DataStoreAppStateRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.*
-import com.zaneschepke.wireguardautotunnel.data.repository.RoomSettingsRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.RoomTunnelRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 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 io.ktor.client.*
 import javax.inject.Singleton
+import kotlinx.coroutines.CoroutineDispatcher
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -35,7 +33,7 @@ class RepositoryModule {
                 AppDatabase::class.java,
                 context.getString(R.string.db_name),
             )
-			.fallbackToDestructiveMigration()
+            .fallbackToDestructiveMigration(true)
             .addCallback(DatabaseCallback())
             .build()
     }
@@ -54,19 +52,28 @@ class RepositoryModule {
 
     @Singleton
     @Provides
-	fun provideTunnelConfigRepository(tunnelConfigDao: TunnelConfigDao, @IoDispatcher ioDispatcher: CoroutineDispatcher): TunnelRepository {
+    fun provideTunnelConfigRepository(
+        tunnelConfigDao: TunnelConfigDao,
+        @IoDispatcher ioDispatcher: CoroutineDispatcher,
+    ): TunnelRepository {
         return RoomTunnelRepository(tunnelConfigDao, ioDispatcher)
     }
 
     @Singleton
     @Provides
-	fun provideSettingsRepository(settingsDao: SettingsDao, @IoDispatcher ioDispatcher: CoroutineDispatcher): AppSettingRepository {
+    fun provideSettingsRepository(
+        settingsDao: SettingsDao,
+        @IoDispatcher ioDispatcher: CoroutineDispatcher,
+    ): AppSettingRepository {
         return RoomSettingsRepository(settingsDao, ioDispatcher)
     }
 
     @Singleton
     @Provides
-	fun providePreferencesDataStore(@ApplicationContext context: Context, @IoDispatcher ioDispatcher: CoroutineDispatcher): DataStoreManager {
+    fun providePreferencesDataStore(
+        @ApplicationContext context: Context,
+        @IoDispatcher ioDispatcher: CoroutineDispatcher,
+    ): DataStoreManager {
         return DataStoreManager(context, ioDispatcher)
     }
 
@@ -85,4 +92,34 @@ class RepositoryModule {
     ): AppDataRepository {
         return AppDataRoomRepository(settingsRepository, tunnelRepository, appStateRepository)
     }
+
+    @Provides
+    @Singleton
+    fun provideHttpClient(): HttpClient {
+        return KtorClient.create()
+    }
+
+    @Provides
+    @Singleton
+    fun provideGitHubApi(client: HttpClient): GitHubApi {
+        return KtorGitHubApi(client)
+    }
+
+    @Provides
+    @Singleton
+    fun provideUpdateRepository(
+        gitHubApi: GitHubApi,
+        client: HttpClient,
+        @IoDispatcher ioDispatcher: CoroutineDispatcher,
+        @ApplicationContext context: Context,
+    ): UpdateRepository {
+        return GitHubUpdateRepository(
+            gitHubApi,
+            client,
+            "wgtunnel",
+            "wgtunnel",
+            context,
+            ioDispatcher,
+        )
+    }
 }

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

@@ -4,26 +4,29 @@ import android.content.Context
 import com.wireguard.android.backend.WgQuickBackend
 import com.wireguard.android.util.RootShell
 import com.wireguard.android.util.ToolsInstaller
+import com.zaneschepke.logcatter.LogReader
 import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
 import com.zaneschepke.networkmonitor.NetworkMonitor
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.core.tunnel.KernelTunnel
+import com.zaneschepke.wireguardautotunnel.core.tunnel.*
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider
-import com.zaneschepke.wireguardautotunnel.core.tunnel.UserspaceTunnel
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
+import com.zaneschepke.wireguardautotunnel.util.network.NetworkUtils
 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
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.distinctUntilChangedBy
+import kotlinx.coroutines.flow.map
 import org.amnezia.awg.backend.Backend
 import org.amnezia.awg.backend.GoBackend
 import org.amnezia.awg.backend.RootTunnelActionHandler
-import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -51,40 +54,41 @@ class TunnelModule {
 
     @Provides
     @Singleton
-	fun provideKernelBackend(@ApplicationContext context: Context, @TunnelShell shell: RootShell): com.wireguard.android.backend.Backend {
+    fun provideKernelBackend(
-		return WgQuickBackend(context, shell, ToolsInstaller(context, shell), com.wireguard.android.backend.RootTunnelActionHandler(shell)).also {
+        @ApplicationContext context: Context,
-			it.setMultipleTunnels(true)
+        @TunnelShell shell: RootShell,
-		}
+    ): com.wireguard.android.backend.Backend {
+        return WgQuickBackend(
+                context,
+                shell,
+                ToolsInstaller(context, shell),
+                com.wireguard.android.backend.RootTunnelActionHandler(shell),
+            )
+            .also { it.setMultipleTunnels(true) }
     }
 
     @Provides
     @Singleton
     @Kernel
     fun provideKernelProvider(
-		@IoDispatcher ioDispatcher: CoroutineDispatcher,
         @ApplicationScope applicationScope: CoroutineScope,
         serviceManager: ServiceManager,
         appDataRepository: AppDataRepository,
-		networkMonitor: NetworkMonitor,
-		notificationManager: NotificationManager,
         backend: com.wireguard.android.backend.Backend,
     ): TunnelProvider {
-		return KernelTunnel(ioDispatcher, applicationScope, serviceManager, appDataRepository, notificationManager, backend, networkMonitor)
+        return KernelTunnel(applicationScope, serviceManager, appDataRepository, backend)
     }
 
     @Provides
     @Singleton
     @Userspace
     fun provideUserspaceProvider(
-		@IoDispatcher ioDispatcher: CoroutineDispatcher,
         @ApplicationScope applicationScope: CoroutineScope,
         serviceManager: ServiceManager,
         appDataRepository: AppDataRepository,
-		notificationManager: NotificationManager,
-		networkMonitor: NetworkMonitor,
         backend: Backend,
     ): TunnelProvider {
-		return UserspaceTunnel(ioDispatcher, applicationScope, serviceManager, appDataRepository, notificationManager, backend, networkMonitor)
+        return UserspaceTunnel(applicationScope, serviceManager, appDataRepository, backend)
     }
 
     @Provides
@@ -95,14 +99,39 @@ class TunnelModule {
         appDataRepository: AppDataRepository,
         @IoDispatcher ioDispatcher: CoroutineDispatcher,
         @ApplicationScope applicationScope: CoroutineScope,
+        notificationManager: NotificationManager,
     ): TunnelManager {
-		return TunnelManager(kernelTunnel, userspaceTunnel, appDataRepository, applicationScope, ioDispatcher)
+        return TunnelManager(
+            kernelTunnel,
+            userspaceTunnel,
+            appDataRepository,
+            applicationScope,
+            ioDispatcher,
+        )
     }
 
     @Provides
     @Singleton
-	fun provideNetworkMonitor(@ApplicationContext context: Context): NetworkMonitor {
+    fun provideNetworkMonitor(
-		return AndroidNetworkMonitor(context)
+        @ApplicationContext context: Context,
+        settingsRepository: AppSettingRepository,
+        @ApplicationScope applicationScope: CoroutineScope,
+        @AppShell appShell: RootShell,
+    ): NetworkMonitor {
+        return AndroidNetworkMonitor(
+            context,
+            object : AndroidNetworkMonitor.ConfigurationListener {
+                override val detectionMethod: Flow<AndroidNetworkMonitor.WifiDetectionMethod>
+                    get() =
+                        settingsRepository.flow
+                            .distinctUntilChangedBy { it.wifiDetectionMethod }
+                            .map { it.wifiDetectionMethod }
+
+                override val rootShell: RootShell
+                    get() = appShell
+            },
+            applicationScope,
+        )
     }
 
     @Singleton
@@ -110,9 +139,35 @@ class TunnelModule {
     fun provideServiceManager(
         @ApplicationContext context: Context,
         @IoDispatcher ioDispatcher: CoroutineDispatcher,
+        @MainDispatcher mainCoroutineDispatcher: CoroutineDispatcher,
         @ApplicationScope applicationScope: CoroutineScope,
         appDataRepository: AppDataRepository,
     ): ServiceManager {
-		return ServiceManager(context, ioDispatcher, applicationScope, appDataRepository)
+        return ServiceManager(
+            context,
+            ioDispatcher,
+            applicationScope,
+            mainCoroutineDispatcher,
+            appDataRepository,
+        )
+    }
+
+    @Singleton
+    @Provides
+    fun provideTunnelMonitor(
+        @ApplicationContext context: Context,
+        tunnelManager: TunnelManager,
+        networkMonitor: NetworkMonitor,
+        networkUtils: NetworkUtils,
+        logReader: LogReader,
+        appDataRepository: AppDataRepository,
+    ): TunnelMonitor {
+        return TunnelMonitor(
+            appDataRepository,
+            tunnelManager,
+            networkMonitor,
+            networkUtils,
+            logReader,
+        )
     }
 }

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

@@ -15,7 +15,10 @@ import kotlinx.coroutines.CoroutineDispatcher
 class ViewModelModule {
     @ViewModelScoped
     @Provides
-	fun provideFileUtils(@ApplicationContext context: Context, @IoDispatcher ioDispatcher: CoroutineDispatcher): FileUtils {
+    fun provideFileUtils(
+        @ApplicationContext context: Context,
+        @IoDispatcher ioDispatcher: CoroutineDispatcher,
+    ): FileUtils {
         return FileUtils(context, ioDispatcher)
     }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/entity/AppSettings.kt

@@ -1,29 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.entity
-
-data class AppSettings(
-	val id: Int = 0,
-	val isAutoTunnelEnabled: Boolean = false,
-	val isTunnelOnMobileDataEnabled: Boolean = false,
-	val trustedNetworkSSIDs: List<String> = emptyList(),
-	val isAlwaysOnVpnEnabled: Boolean = false,
-	val isTunnelOnEthernetEnabled: Boolean = false,
-	val isShortcutsEnabled: Boolean = false,
-	val isTunnelOnWifiEnabled: Boolean = false,
-	val isKernelEnabled: Boolean = false,
-	val isRestoreOnBootEnabled: Boolean = false,
-	val isMultiTunnelEnabled: Boolean = false,
-	val isPingEnabled: Boolean = false,
-	val isAmneziaEnabled: Boolean = false,
-	val isWildcardsEnabled: Boolean = false,
-	val isWifiNameByShellEnabled: Boolean = false,
-	val isStopOnNoInternetEnabled: Boolean = false,
-	val isVpnKillSwitchEnabled: Boolean = false,
-	val isKernelKillSwitchEnabled: Boolean = false,
-	val isLanOnKillSwitchEnabled: Boolean = false,
-	val debounceDelaySeconds: Int = 3,
-	val isDisableKillSwitchOnTrustedEnabled: Boolean = false,
-) {
-	fun debounceDelayMillis(): Long {
-		return debounceDelaySeconds * 1000L
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/entity/AppState.kt

@@ -1,13 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.entity
-
-import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
-
-data class AppState(
-	val isLocationDisclosureShown: Boolean,
-	val isBatteryOptimizationDisableShown: Boolean,
-	val isPinLockEnabled: Boolean,
-	val isTunnelStatsExpanded: Boolean,
-	val isLocalLogsEnabled: Boolean,
-	val locale: String?,
-	val theme: Theme,
-)

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/entity/TunnelConf.kt

@@ -1,122 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.entity
-
-import com.wireguard.config.Config
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.isReachable
-import com.zaneschepke.wireguardautotunnel.util.extensions.toWgQuickString
-import kotlinx.coroutines.withContext
-import kotlinx.serialization.Transient
-import org.amnezia.awg.backend.Tunnel
-import timber.log.Timber
-import java.io.InputStream
-import java.net.InetAddress
-import kotlin.coroutines.CoroutineContext
-
-data class TunnelConf(
-	val id: Int = 0,
-	val tunName: String,
-	val wgQuick: String,
-	val tunnelNetworks: List<String> = emptyList(),
-	val isMobileDataTunnel: Boolean = false,
-	val isPrimaryTunnel: Boolean = false,
-	val amQuick: String,
-	val isActive: Boolean = false,
-	val isPingEnabled: Boolean = false,
-	val pingInterval: Long? = null,
-	val pingCooldown: Long? = null,
-	val pingIp: String? = null,
-	val isEthernetTunnel: Boolean = false,
-	val isIpv4Preferred: Boolean = true,
-	@Transient
-	private var stateChangeCallback: ((Any) -> Unit)? = null,
-) : Tunnel, com.wireguard.android.backend.Tunnel {
-
-	fun setStateChangeCallback(callback: (Any) -> Unit) {
-		stateChangeCallback = callback
-	}
-
-	fun toAmConfig(): org.amnezia.awg.config.Config {
-		return configFromAmQuick(amQuick.ifBlank { wgQuick })
-	}
-
-	fun toWgConfig(): Config {
-		return configFromWgQuick(wgQuick)
-	}
-
-	override fun getName(): String {
-		return tunName
-	}
-
-	override fun isIpv4ResolutionPreferred(): Boolean {
-		return isIpv4Preferred
-	}
-
-	override fun onStateChange(newState: com.wireguard.android.backend.Tunnel.State) {
-		stateChangeCallback?.invoke(newState)
-	}
-
-	override fun onStateChange(newState: Tunnel.State) {
-		stateChangeCallback?.invoke(newState)
-	}
-
-	fun isQuickConfigMatching(updatedConf: TunnelConf): Boolean {
-		return updatedConf.wgQuick == wgQuick ||
-			updatedConf.amQuick == amQuick
-	}
-
-	fun isPingConfigMatching(updatedConf: TunnelConf): Boolean {
-		return updatedConf.isPingEnabled == isPingEnabled &&
-			pingIp == updatedConf.pingIp &&
-			updatedConf.pingCooldown == pingCooldown &&
-			updatedConf.pingInterval == pingInterval
-	}
-
-	suspend fun isTunnelPingable(context: CoroutineContext): Boolean {
-		return withContext(context) {
-			val config = toWgConfig()
-			if (pingIp != null) {
-				return@withContext InetAddress.getByName(pingIp)
-					.isReachable(Constants.PING_TIMEOUT.toInt())
-			}
-			Timber.i("Pinging all peers")
-			config.peers.map { peer ->
-				peer.isReachable(isIpv4Preferred)
-			}.all { true }
-		}
-	}
-
-	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): TunnelConf {
-			val amQuick = config.toAwgQuickString(true)
-			val wgQuick = config.toWgQuickString()
-			return TunnelConf(tunName = name, wgQuick = wgQuick, amQuick = amQuick)
-		}
-
-		private const val IPV6_ALL_NETWORKS = "::/0"
-		private const val IPV4_ALL_NETWORKS = "0.0.0.0/0"
-		val ALL_IPS = listOf(IPV4_ALL_NETWORKS, IPV6_ALL_NETWORKS)
-		private val IPV4_PUBLIC_NETWORKS = listOf(
-			"0.0.0.0/5", "8.0.0.0/7", "11.0.0.0/8", "12.0.0.0/6", "16.0.0.0/4", "32.0.0.0/3",
-			"64.0.0.0/2", "128.0.0.0/3", "160.0.0.0/5", "168.0.0.0/6", "172.0.0.0/12",
-			"172.32.0.0/11", "172.64.0.0/10", "172.128.0.0/9", "173.0.0.0/8", "174.0.0.0/7",
-			"176.0.0.0/4", "192.0.0.0/9", "192.128.0.0/11", "192.160.0.0/13", "192.169.0.0/16",
-			"192.170.0.0/15", "192.172.0.0/14", "192.176.0.0/12", "192.192.0.0/10",
-			"193.0.0.0/8", "194.0.0.0/7", "196.0.0.0/6", "200.0.0.0/5", "208.0.0.0/4",
-		)
-		val LAN_BYPASS_ALLOWED_IPS = listOf(IPV6_ALL_NETWORKS) + IPV4_PUBLIC_NETWORKS
-	}
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/enums/BackendError.kt

@@ -1,7 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.enums
-
-sealed class BackendError() {
-	data object DNS : BackendError()
-	data object Unauthorized : BackendError()
-	data object Config : BackendError()
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/enums/BackendState.kt

@@ -1,7 +1,9 @@
 package com.zaneschepke.wireguardautotunnel.domain.enums
 
-enum class BackendState {
+sealed class BackendStatus {
-	KILL_SWITCH_ACTIVE,
+    data object Inactive : BackendStatus()
-	SERVICE_ACTIVE,
+
-	INACTIVE,
+    data object Active : BackendStatus()
+
+    data class KillSwitch(val allowedIps: List<String>) : BackendStatus()
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/enums/ConfigType.kt

@@ -1,6 +1,6 @@
 package com.zaneschepke.wireguardautotunnel.domain.enums
 
 enum class ConfigType {
-	AMNEZIA,
+    AM,
     WG,
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/enums/HandshakeStatus.kt

@@ -4,8 +4,7 @@ enum class HandshakeStatus {
     HEALTHY,
     STALE,
     UNKNOWN,
-	NOT_STARTED,
+    NOT_STARTED;
-	;
 
     companion object {
         private const val WG_TYPICAL_HANDSHAKE_INTERVAL_WHEN_HEALTHY_SEC = 180

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/enums/NotificationAction.kt

@@ -5,8 +5,7 @@ import com.zaneschepke.wireguardautotunnel.R
 
 enum class NotificationAction {
     TUNNEL_OFF,
-	AUTO_TUNNEL_OFF,
+    AUTO_TUNNEL_OFF;
-	;
 
     fun title(context: Context): String {
         return when (this) {

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/enums/TunnelStatus.kt

@@ -1,15 +1,36 @@
 package com.zaneschepke.wireguardautotunnel.domain.enums
 
-enum class TunnelStatus {
+sealed class TunnelStatus {
-	UP,
+
-	DOWN,
+    data object Up : TunnelStatus()
-	;
+
+    data object Down : TunnelStatus()
+
+    data class Stopping(val reason: StopReason) : TunnelStatus()
+
+    data object Starting : TunnelStatus()
+
+    sealed class StopReason {
+        data object User : StopReason()
+
+        data class Ping(val previouslyResolvedEndpoints: Map<String, String?>) : StopReason()
+
+        data object ConfigChanged : StopReason()
+    }
 
     fun isDown(): Boolean {
-		return this == DOWN
+        return this == Down
     }
 
     fun isUp(): Boolean {
-		return this == UP
+        return this == Up
+    }
+
+    fun isUpOrStarting(): Boolean {
+        return this == Up || this == Starting
+    }
+
+    fun isDownOrStopping(): Boolean {
+        return this == Down || this is Stopping
     }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/events/AutoTunnelEvent.kt

@@ -1,9 +1,18 @@
 package com.zaneschepke.wireguardautotunnel.domain.events
 
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 
 sealed class AutoTunnelEvent {
     data class Start(val tunnelConf: TunnelConf? = null) : AutoTunnelEvent()
+
+    data class Bounce(val configsPeerKeyResolvedMap: List<Pair<TunnelConf, Map<String, String?>>>) :
+        AutoTunnelEvent()
+
     data object Stop : AutoTunnelEvent()
+
     data object DoNothing : AutoTunnelEvent()
+
+    data class StartKillSwitch(val allowedIps: List<String>) : AutoTunnelEvent()
+
+    data object StopKillSwitch : AutoTunnelEvent()
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/events/BackendError.kt

@@ -0,0 +1,48 @@
+package com.zaneschepke.wireguardautotunnel.domain.events
+
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.util.StringValue
+
+sealed class BackendError : Exception() {
+    data object DNS : BackendError()
+
+    data object Unauthorized : BackendError()
+
+    data object Config : BackendError()
+
+    data object KernelModuleName : BackendError()
+
+    data object NotAuthorized : BackendError()
+
+    data object ServiceNotRunning : BackendError()
+
+    data object Unknown : BackendError()
+
+    data object TunnelNameTooLong : BackendError()
+
+    data class BounceFailed(val error: BackendError) : BackendError()
+
+    fun toStringRes() =
+        when (this) {
+            Config -> R.string.config_error
+            DNS -> R.string.dns_resolve_error
+            KernelModuleName -> R.string.kernel_name_error
+            NotAuthorized,
+            Unauthorized -> R.string.auth_error
+            ServiceNotRunning -> R.string.service_running_error
+            Unknown -> R.string.unknown_error
+            TunnelNameTooLong -> R.string.error_tunnel_name
+            is BounceFailed -> R.string.bounce_failed_template
+        }
+
+    fun toStringValue(): StringValue {
+        return when (val backendError = this) {
+            is BounceFailed ->
+                StringValue.StringResource(
+                    backendError.toStringRes(),
+                    backendError.error.toStringRes(),
+                )
+            else -> StringValue.StringResource(backendError.toStringRes())
+        }
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/events/BackendMessage.kt

@@ -0,0 +1,19 @@
+package com.zaneschepke.wireguardautotunnel.domain.events
+
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.util.StringValue
+
+sealed class BackendMessage {
+
+    data object BounceSuccess : BackendMessage()
+
+    data object BounceRecovery : BackendMessage()
+
+    fun toStringRes() =
+        when (this) {
+            BounceRecovery -> R.string.pinger_bounce_recovery
+            BounceSuccess -> R.string.pinger_bounce_successful
+        }
+
+    fun toStringValue() = StringValue.StringResource(this.toStringRes())
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/events/KillSwitchEvent.kt

@@ -2,6 +2,8 @@ package com.zaneschepke.wireguardautotunnel.domain.events
 
 sealed class KillSwitchEvent {
     data class Start(val allowedIps: List<String>) : KillSwitchEvent()
+
     data object Stop : KillSwitchEvent()
+
     data object DoNothing : KillSwitchEvent()
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/model/AppSettings.kt

@@ -0,0 +1,44 @@
+package com.zaneschepke.wireguardautotunnel.domain.model
+
+import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
+
+data class AppSettings(
+    val id: Int = 0,
+    val isAutoTunnelEnabled: Boolean = false,
+    val isTunnelOnMobileDataEnabled: Boolean = false,
+    val trustedNetworkSSIDs: List<String> = emptyList(),
+    val isAlwaysOnVpnEnabled: Boolean = false,
+    val isTunnelOnEthernetEnabled: Boolean = false,
+    val isShortcutsEnabled: Boolean = false,
+    val isTunnelOnWifiEnabled: Boolean = false,
+    val isKernelEnabled: Boolean = false,
+    val isRestoreOnBootEnabled: Boolean = false,
+    val isMultiTunnelEnabled: Boolean = false,
+    val isPingEnabled: Boolean = false,
+    val isAmneziaEnabled: Boolean = false,
+    val isWildcardsEnabled: Boolean = false,
+    val isStopOnNoInternetEnabled: Boolean = false,
+    val isVpnKillSwitchEnabled: Boolean = false,
+    val isKernelKillSwitchEnabled: Boolean = false,
+    val isLanOnKillSwitchEnabled: Boolean = false,
+    val debounceDelaySeconds: Int = 3,
+    val isDisableKillSwitchOnTrustedEnabled: Boolean = false,
+    val isTunnelOnUnsecureEnabled: Boolean = false,
+    val wifiDetectionMethod: AndroidNetworkMonitor.WifiDetectionMethod =
+        AndroidNetworkMonitor.WifiDetectionMethod.DEFAULT,
+    val tunnelPingIntervalSeconds: Int = 30,
+    val tunnelPingAttempts: Int = 3,
+    val tunnelPingTimeoutSeconds: Int? = null,
+) {
+    fun toAutoTunnelStateString(): String {
+        return """
+            TunnelOnWifi: $isTunnelOnWifiEnabled
+            TunnelOnMobileData: $isTunnelOnMobileDataEnabled
+            TunnelOnEthernet: $isTunnelOnEthernetEnabled
+            Wildcards: $isWildcardsEnabled
+            StopOnNoInternet: $isStopOnNoInternetEnabled
+            Trusted Networks: $trustedNetworkSSIDs
+        """
+            .trimIndent()
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/model/AppState.kt

@@ -0,0 +1,16 @@
+package com.zaneschepke.wireguardautotunnel.domain.model
+
+import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
+
+data class AppState(
+    val isLocationDisclosureShown: Boolean,
+    val isBatteryOptimizationDisableShown: Boolean,
+    val isPinLockEnabled: Boolean,
+    val expandedTunnelIds: List<Int>,
+    val isLocalLogsEnabled: Boolean,
+    val isRemoteControlEnabled: Boolean,
+    val showDetailedPingStats: Boolean,
+    val remoteKey: String?,
+    val locale: String?,
+    val theme: Theme,
+)

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/model/AppUpdate.kt

@@ -0,0 +1,9 @@
+package com.zaneschepke.wireguardautotunnel.domain.model
+
+data class AppUpdate(
+    val version: String,
+    val title: String,
+    val releaseNotes: String,
+    val apkUrl: String?,
+    val apkFileName: String?,
+)