ci: fix notifications

closes #1007

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/workflows/build.yml

@@ -1,4 +1,6 @@
-name: Build
+name: build
+permissions:
+  contents: read
 
 on:
   workflow_dispatch:
@@ -10,7 +12,6 @@ on:
         default: debug
         options:
           - debug
-          - prerelease
           - nightly
           - release
       flavor:
@@ -71,11 +72,11 @@ jobs:
     outputs:
       UPLOAD_DIR_ANDROID: ${{ env.UPLOAD_DIR_ANDROID }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         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'
@@ -94,10 +95,7 @@ jobs:
         run: |
           store_path=${{ env.KEY_STORE_LOCATION }}${{ env.KEY_STORE_FILE }}
           echo "KEY_STORE_PATH=$store_path" >> $GITHUB_ENV
-      - name: Create service_account.json
-        if: ${{ inputs.build_type != 'debug' }}
-        id: createServiceAccount
-        run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
+
       - name: Build APK
         run: |
           flavor=${{ inputs.flavor }}
@@ -106,9 +104,6 @@ jobs:
             "release")
               ./gradlew :app:assemble${flavor^}Release --info
               ;;
-            "prerelease")
-              ./gradlew :app:assemble${flavor^}Prerelease --info
-              ;;
             "nightly")
               ./gradlew :app:assemble${flavor^}Nightly --info
               ;;
@@ -123,6 +118,11 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: android_artifacts_${{ inputs.flavor }}
-          path: app/build/outputs/apk/${{ inputs.flavor }}/release/wgtunnel-${{ inputs.flavor }}-release-*.apk
+          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@v5
+      - name: Check for new commits
+        id: check
+        env:
+          GITHUB_TOKEN: ${{ secrets.PAT }}
+        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@v5
+
+      - 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: ${{ github.token }}
+          tag_exists_error: false
+
+      - name: Generate Changelog
+        id: changelog
+        uses: requarks/changelog-action@v1
+        with:
+          token: ${{ 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: ${{ 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: ${{ github.token }}

.github/workflows/notifications.yml

@@ -0,0 +1,129 @@
+name: notifications
+
+on:
+  issues:
+    types: [opened, closed]
+  release:
+    types: [published]
+
+jobs:
+  notify:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send to Telegram - New Issue
+        if: github.event_name == 'issues' && github.event.action == 'opened'
+        env:
+          TITLE: ${{ github.event.issue.title }}
+          NUMBER: ${{ github.event.issue.number }}
+          USER: ${{ github.event.issue.user.login }}
+          BODY: ${{ github.event.issue.body || 'No body provided' }}
+          URL: ${{ github.event.issue.html_url }}
+        run: |
+          BODY_TRUNC="${BODY:0:200}"  # Truncate to avoid spam
+          TEXT=$(echo -e "🆕 New Issue #$NUMBER: *$TITLE* by $USER\n\n$BODY_TRUNC\n\n[View Issue]($URL)")
+          curl -s -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage" \
+            -d chat_id="${{ vars.TELEGRAM_CHAT_ID }}" \
+            ${{ vars.TELEGRAM_THREAD_ID && format('-d message_thread_id="{0}"', vars.TELEGRAM_THREAD_ID) || '' }} \
+            -d parse_mode="Markdown" \
+            --data-urlencode "text=$TEXT"
+
+      - name: Send to Telegram - Closed Issue
+        if: github.event_name == 'issues' && github.event.action == 'closed'
+        env:
+          TITLE: ${{ github.event.issue.title }}
+          NUMBER: ${{ github.event.issue.number }}
+          USER: ${{ github.event.issue.user.login }}
+          URL: ${{ github.event.issue.html_url }}
+        run: |
+          TEXT=$(echo -e "✅ Issue Closed #$NUMBER: *$TITLE* by $USER\n\n[View Issue]($URL)")
+          curl -s -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage" \
+            -d chat_id="${{ vars.TELEGRAM_CHAT_ID }}" \
+            ${{ vars.TELEGRAM_THREAD_ID && format('-d message_thread_id="{0}"', vars.TELEGRAM_THREAD_ID) || '' }} \
+            -d parse_mode="Markdown" \
+            --data-urlencode "text=$TEXT"
+
+      - name: Send to Telegram - New Release
+        if: github.event_name == 'release' && github.event.action == 'published'
+        env:
+          NAME: ${{ github.event.release.name }}
+          TAG: ${{ github.event.release.tag_name }}
+          BODY: ${{ github.event.release.body || 'No notes provided' }}
+          URL: ${{ github.event.release.html_url }}
+        run: |
+          BODY_TRUNC="${BODY:0:200}"  # Truncate to avoid spam
+          TEXT=$(echo -e "🚀 New Release *$NAME* ($TAG)\n\n$BODY_TRUNC\n\n[View Release]($URL)")
+          curl -s -X POST "https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage" \
+            -d chat_id="${{ vars.TELEGRAM_CHAT_ID }}" \
+            ${{ vars.TELEGRAM_THREAD_ID && format('-d message_thread_id="{0}"', vars.TELEGRAM_THREAD_ID) || '' }} \
+            -d parse_mode="Markdown" \
+            --data-urlencode "text=$TEXT"
+
+      - name: Send to Matrix - New Issue
+        if: github.event_name == 'issues' && github.event.action == 'opened'
+        env:
+          NUMBER: ${{ github.event.issue.number }}
+          TITLE: ${{ github.event.issue.title }}
+          USER: ${{ github.event.issue.user.login }}
+          BODY: ${{ github.event.issue.body || 'No body provided' }}
+          URL: ${{ github.event.issue.html_url }}
+        run: |
+          PLAIN_MESSAGE=$(echo -e "🆕 New Issue #$NUMBER: $TITLE by $USER\n\n$BODY\n\nView Issue: $URL")
+          HTML_MESSAGE=$(echo -e "<p>🆕 New Issue #$NUMBER: <strong>$TITLE</strong> by $USER</p><p>$BODY</p><p><a href=\"$URL\">View Issue</a></p>")
+          PLAIN_MESSAGE="${PLAIN_MESSAGE:0:220}"
+          PAYLOAD=$(jq -n --arg body "$PLAIN_MESSAGE" --arg formatted "$HTML_MESSAGE" '{
+            "msgtype": "m.text",
+            "body": $body,
+            "format": "org.matrix.custom.html",
+            "formatted_body": $formatted
+          }')
+          TXN_ID="${{ github.run_id }}-${{ github.run_attempt }}"
+          curl -s -X PUT "https://${{ vars.MATRIX_HOMESERVER }}/_matrix/client/v3/rooms/${{ vars.MATRIX_ROOM_ID }}/send/m.room.message/$TXN_ID" \
+            -H "Authorization: Bearer ${{ secrets.MATRIX_ACCESS_TOKEN }}" \
+            -H "Content-Type: application/json" \
+            -d "$PAYLOAD"
+
+      - name: Send to Matrix - Closed Issue
+        if: github.event_name == 'issues' && github.event.action == 'closed'
+        env:
+          NUMBER: ${{ github.event.issue.number }}
+          TITLE: ${{ github.event.issue.title }}
+          USER: ${{ github.event.issue.user.login }}
+          URL: ${{ github.event.issue.html_url }}
+        run: |
+          PLAIN_MESSAGE=$(echo -e "✅ Issue Closed #$NUMBER: $TITLE by $USER\n\nView Issue: $URL")
+          HTML_MESSAGE=$(echo -e "<p>✅ Issue Closed #$NUMBER: <strong>$TITLE</strong> by $USER</p><p><a href=\"$URL\">View Issue</a></p>")
+          PLAIN_MESSAGE="${PLAIN_MESSAGE:0:220}"
+          PAYLOAD=$(jq -n --arg body "$PLAIN_MESSAGE" --arg formatted "$HTML_MESSAGE" '{
+            "msgtype": "m.text",
+            "body": $body,
+            "format": "org.matrix.custom.html",
+            "formatted_body": $formatted
+          }')
+          TXN_ID="${{ github.run_id }}-${{ github.run_attempt }}"
+          curl -s -X PUT "https://${{ vars.MATRIX_HOMESERVER }}/_matrix/client/v3/rooms/${{ vars.MATRIX_ROOM_ID }}/send/m.room.message/$TXN_ID" \
+            -H "Authorization: Bearer ${{ secrets.MATRIX_ACCESS_TOKEN }}" \
+            -H "Content-Type: application/json" \
+            -d "$PAYLOAD"
+
+      - name: Send to Matrix - New Release
+        if: github.event_name == 'release' && github.event.action == 'published'
+        env:
+          NAME: ${{ github.event.release.name }}
+          TAG: ${{ github.event.release.tag_name }}
+          BODY: ${{ github.event.release.body || 'No notes provided' }}
+          URL: ${{ github.event.release.html_url }}
+        run: |
+          PLAIN_MESSAGE=$(echo -e "🚀 New Release $NAME ($TAG)\n\n$BODY\n\nView Release: $URL")
+          HTML_MESSAGE=$(echo -e "<p>🚀 New Release <strong>$NAME</strong> ($TAG)</p><p>$BODY</p><p><a href=\"$URL\">View Release</a></p>")
+          PLAIN_MESSAGE="${PLAIN_MESSAGE:0:220}"
+          PAYLOAD=$(jq -n --arg body "$PLAIN_MESSAGE" --arg formatted "$HTML_MESSAGE" '{
+            "msgtype": "m.text",
+            "body": $body,
+            "format": "org.matrix.custom.html",
+            "formatted_body": $formatted
+          }')
+          TXN_ID="${{ github.run_id }}-${{ github.run_attempt }}"
+          curl -s -X PUT "https://${{ vars.MATRIX_HOMESERVER }}/_matrix/client/v3/rooms/${{ vars.MATRIX_ROOM_ID }}/send/m.room.message/$TXN_ID" \
+            -H "Authorization: Bearer ${{ secrets.MATRIX_ACCESS_TOKEN }}" \
+            -H "Content-Type: application/json" \
+            -d "$PAYLOAD"

.github/workflows/pr.yml

@@ -1,4 +1,6 @@
 name: on-pr
+permissions:
+  contents: read
 
 on:
     workflow_dispatch:
@@ -8,9 +10,9 @@ jobs:
   format_check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'

.github/workflows/publish.yml

@@ -1,8 +1,12 @@
 name: publish
+permissions:
+  contents: write
+  packages: write
 
 on:
-  schedule:
-    - cron: "4 3 * * *"
+  push:
+    tags:
+      - '[0-9]*.[0-9]*.[0-9]*'
   workflow_dispatch:
     inputs:
       track:
@@ -21,15 +25,13 @@ 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"
@@ -46,71 +48,37 @@ on:
         required: false
         default: standalone
 
-env:
-  UPLOAD_DIR_ANDROID: android_artifacts
-
-permissions:
-  contents: write
-  packages: write
-
 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
-        with:
-          fetch-depth: 0
-      - name: Check for new commits
-        id: check
-        env:
-          GITHUB_TOKEN: ${{ secrets.PAT }}
-        run: |
-          NEW_COMMITS=$(git rev-list --count --after="$(date -Iseconds -d '23 hours ago')" ${{ github.sha }})
-          echo "new_commits=$NEW_COMMITS" >> $GITHUB_OUTPUT
 
   build-fdroid:
-    if: ${{ inputs.release_type == 'release' || inputs.flavor == 'fdroid' }}
+    if: ${{ github.event_name == 'push' || inputs.release_type == 'release' || inputs.flavor == 'fdroid' }}
     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: ${{ inputs.release_type == 'release' || inputs.release_type == 'nightly' || inputs.release_type == 'prerelease' || inputs.flavor == '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: ${{ inputs.release_type == '' && 'nightly' || inputs.release_type }}
+      build_type: ${{ github.event_name == 'push' && 'release' || inputs.release_type }}
       flavor: standalone
 
   publish:
     needs:
-      - check_commits
       - build-standalone
-    if: ${{ needs.check_commits.outputs.has_new_commits > 0 && inputs.release_type != 'none' }}
     name: publish-github
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
-          fetch-depth: 0
-          ref: main
+          ref: ${{ github.event_name == 'push' && github.ref || 'master' }}
       - name: Install system dependencies
         run: |
           sudo apt update && sudo apt install -y gh apksigner
-      - name: Set TAG_NAME
-        run: |
-          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-            echo "TAG_NAME=${{ github.event.inputs.tag_name }}" >> $GITHUB_ENV
-          elif [ "${{ github.event_name }}" = "schedule" ]; then
-            echo "TAG_NAME=nightly" >> $GITHUB_ENV
-            echo "RELEASE_TYPE=nightly" >> $GITHUB_ENV
-          fi
+
       - name: Set latest tag
         uses: rickstaa/action-create-tag@v1
         id: tag_creation
@@ -118,32 +86,37 @@ jobs:
           tag: "latest"
           message: "Automated tag for HEAD commit"
           force_push_tag: true
-          github_token: ${{ secrets.GITHUB_TOKEN }}
+          github_token: ${{ github.token }}
           tag_exists_error: false
+
       - name: Get latest release
         id: latest_release
         uses: kaliber5/action-get-release@v1
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ github.token }}
           latest: true
+
       - name: Generate Changelog
         id: changelog
         uses: requarks/changelog-action@v1
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          toTag: ${{ github.event_name == 'schedule' && 'nightly' || steps.latest_release.outputs.tag_name }}
+          token: ${{ github.token }}
+          toTag: ${{ steps.latest_release.outputs.tag_name }}
           fromTag: "latest"
           writeToFile: false
+
       - name: Make download dir
         run: mkdir ${{ github.workspace }}/temp
+
       - name: Download artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           pattern: android_artifacts_*
           path: ${{ github.workspace }}/temp
           merge-multiple: true
+
       - name: Set version release notes
-        if: ${{ inputs.release_type == 'release' }}
+        if: ${{ github.event_name == 'push' || inputs.release_type == 'release' }}
         run: |
           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}")"
@@ -151,36 +124,17 @@ jobs:
           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
-
-      - name: On prerelease release notes
-        if: ${{ inputs.release_type == 'prerelease' }}
-        run: |
-          echo "RELEASE_NOTES=Testing version of app for specific feature." >> $GITHUB_ENV
-
-      - name: Delete previous release
-        if: ${{ contains(env.TAG_NAME, 'nightly') || inputs.release_type == 'prerelease' }}
-        uses: ClementTsang/delete-tag-and-release@v0.4.0
-        with:
-          tag_name: ${{ env.TAG_NAME }}
-          delete_release: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Get checksums
+      - name: Get checksum
         id: checksum
         run: |
-          checksums=""
-          for file_path in $(find ${{ github.workspace }}/temp -type f -iname "*.apk"); do
-            checksum=$(apksigner verify -print-certs $file_path | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")
-            checksums="$checksums\n$file_path: $checksum"
-          done
-          echo "checksum<<EOF" >> $GITHUB_OUTPUT
-          echo -e "$checksums" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
+          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 Release
         id: create_release
         uses: softprops/action-gh-release@v2
@@ -200,31 +154,31 @@ jobs:
 
             ### Changelog
             ${{ steps.changelog.outputs.changes }}
-          tag_name: ${{ env.TAG_NAME }}
-          name: ${{ env.TAG_NAME }}
+          tag_name: ${{ github.event_name == 'push' && github.ref_name || github.event.inputs.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' }}
-          make_latest: ${{ inputs.release_type == 'release' }}
+          prerelease: false
+          make_latest: true
           files: |
-            ${{ github.workspace }}/temp/*
+            ${{ github.workspace }}/temp/**/*.apk
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ github.token }}
 
   publish-fdroid-public:
     runs-on: ubuntu-latest
     needs:
       - 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
+        uses: peter-evans/repository-dispatch@v4
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.PAT }}
           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
 
@@ -236,9 +190,9 @@ jobs:
       KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
@@ -274,4 +228,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)

README.md

@@ -4,7 +4,7 @@ WG Tunnel
 
 <div align="center">
 
-An alternative Android client app for [WireGuard](https://www.wireguard.com/)
+An alternative FOSS Android client for [WireGuard](https://www.wireguard.com/)
 and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/)
 <br />
 <br />
@@ -37,11 +37,11 @@ and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/)
 <summary>Table of Contents</summary>
 
 - [About](#about)
-- [Acknowledgements](#acknowledgements)
 - [Screenshots](#screenshots)
 - [Features](#features)
 - [Building](#building)
 - [Translation](#translation)
+- [Acknowledgements](#acknowledgements)
 - [Contributing](#contributing)
 
 </details>
@@ -49,22 +49,13 @@ 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/)
-and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/), with its primary feature of auto-tunneling (on-demand tunneling).
+
+WG Tunnel is an alternative Android client for WireGuard and AmneziaWG, inspired by the official WireGuard Android app. It fills gaps in the official client by adding advanced features like auto-tunneling (on-demand VPN activation), while seamlessly supporting both protocols across app modes—including Kernel (for direct WireGuard kernel integration; AmneziaWG not supported), VPN (standard system-level tunneling), Lockdown (a custom kill switch for leak prevention), and Proxy (built-in HTTP/SOCKS5 forwarding)—for enhanced privacy, censorship resistance, and flexibility.
 
 </div>
 
 <div style="text-align: left;">
 
-## Acknowledgements
-
-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)
-
-- [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) - Amnezia Team (https://github.com/amnezia-vpn/amneziawg-android)
-
 ## Screenshots
 
 </div>
@@ -79,26 +70,26 @@ Thank you to the following:
 
 ## Features
 
-* Add tunnels via .conf file, zip, manual entry, clipboard, or QR code
-* Auto-tunnel based on Wi-Fi SSID, ethernet, or mobile data
-* Split tunneling by application with search
-* Support for kernel and userspace modes
-* Amnezia support for userspace mode for DPI/censorship protection
-* Pre/Post Up/Down scripts support for all modes on a rooted device
-* Always-On VPN support
-* Export tunnels to zip
-* Quick tile support for tunnel toggling, auto-tunneling
-* Shortcuts support for tunnel toggling, auto-tunneling
-* Intent automation support for all tunnels
-* In app VPN kill switch with LAN bypass
-* Automatic auto-tunneling service and/or tunnel restart after reboot or app update
-* Battery preservation measures
-* Restart tunnel on ping failure
+- **Tunnel Import Methods**: Easily add tunnels using .conf files, ZIP archives, manual entry, or QR code scanning.
+- **Auto-Tunneling**: Automatically activate tunnels based on Wi-Fi SSID, Ethernet connections, or mobile data networks.
+- **Split Tunneling**: Flexible support for routing specific apps or traffic through the VPN.
+- **WireGuard Modes**: Full compatibility with WireGuard in both kernel and userspace implementations.
+- **AmneziaWG Integration**: Userspace mode for AmneziaWG, providing robust censorship evasion.
+- **Always-On VPN**: Ensures continuous protection with Android's Always-On VPN feature.
+- **Quick Controls**: Quick Settings tile and home screen shortcuts for easy VPN toggling.
+- **Automation Support**: Intent-based automation for controlling tunnels.
+- **Auto-Restore**: Seamlessly restores auto-tunneling and active tunnels after device restarts or app updates.
+- **Proxying Options**: Built-in HTTP and SOCKS5 proxy support within tunnels.
+- **Lockdown Mode**: Custom kill switch for maximum leak prevention and security.
+- **Dynamic DNS Handling**: Detects and updates DNS changes without tunnel restarts.
+- **Monitoring Tools**: Advanced tunnel monitoring features for tunnel performance monitoring.
+- **Android TV Support**: Android TV support for secure streaming and browsing.
+- **Advanced DNS**: DNS over HTTPS support for tunnel endpoint resolutions.
 
 ## Building
 
 ```sh
-git clone https://github.com/zaneschepke/wgtunnel
+git clone https://github.com/wgtunnel/wgtunnel
 cd wgtunnel
 ```
 
@@ -114,6 +105,15 @@ Help translate WG Tunnel into your language
 at [Hosted Weblate](https://hosted.weblate.org/engage/wg-tunnel/).\
 [![Translation status](https://hosted.weblate.org/widgets/wg-tunnel/-/multi-auto.svg)](https://hosted.weblate.org/engage/wg-tunnel/)
 
+## Acknowledgements
+
+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)
+- [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) - Amnezia Team (https://github.com/amnezia-vpn/amneziawg-android)
+- [JetBrains](https://jetbrains.com) - For supporting open-source developers with free software licenses.
+
 ## Contributing
 
 Any contributions in the form of feedback, issues, code, or translations are welcome and much

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)
@@ -20,6 +22,11 @@ android {
         includeInBundle = false
     }
 
+    ksp { arg("room.schemaLocation", "$projectDir/schemas") }
+
+    // fix okhttp proguard issue
+    packaging { resources { pickFirsts.add("okhttp3/internal/publicsuffix/publicsuffixes.gz") } }
+
     defaultConfig {
         applicationId = Constants.APP_ID
         minSdk = Constants.MIN_SDK
@@ -27,15 +34,10 @@ android {
         versionCode = computeVersionCode()
         versionName = computeVersionName()
 
-        ksp { arg("room.schemaLocation", "$projectDir/schemas") }
-
         sourceSets { getByName("debug").assets.srcDirs(files("$projectDir/schemas")) }
 
-        buildConfigField(
-            "String[]",
-            "LANGUAGES",
-            "new String[]{ ${languageList().joinToString(separator = ", ") { "\"$it\"" }} }",
-        )
+        val languagesArray = buildLanguagesArray(languageList())
+        buildConfigField("String[]", "LANGUAGES", "new String[]{ $languagesArray }")
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables { useSupportLibrary = true }
@@ -73,22 +75,15 @@ android {
 
         debug {
             applicationIdSuffix = ".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"
-            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"
-            resValue("string", "app_name", "WG Tunnel - Nightly")
+            resValue("string", "app_name", "WG Tunnel Nightly")
             resValue("string", "provider", "\"${Constants.APP_NAME}.provider.nightly\"")
         }
     }
@@ -110,11 +105,18 @@ android {
     }
 
     compileOptions {
+        isCoreLibraryDesugaringEnabled = true
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
-        isCoreLibraryDesugaringEnabled = true
     }
-    kotlinOptions { jvmTarget = Constants.JVM_TARGET }
+
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+            freeCompilerArgs = listOf("-XXLanguage:+PropertyParamAnnotationDefaultTargetMode")
+        }
+    }
+
     buildFeatures {
         compose = true
         buildConfig = true
@@ -122,9 +124,8 @@ android {
     packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
 
     licensee {
-        Constants.allowedLicenses.forEach { allow(it) }
-        allowUrl(Constants.XZING_LICENSE_URL)
-        allowUrl("https://rafaellins.mit-license.org/2021/")
+        allowedLicenses().forEach { allow(it) }
+        allowedLicenseUrls().forEach { allowUrl(it) }
     }
 
     applicationVariants.all {
@@ -147,19 +148,66 @@ dependencies {
     implementation(project(":logcatter"))
     implementation(project(":networkmonitor"))
 
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.lifecycle.runtime.ktx)
-    implementation(libs.androidx.lifecycle.service)
-    implementation(libs.androidx.activity.compose)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.ui)
-    implementation(libs.androidx.compose.ui.graphics)
-    implementation(libs.androidx.compose.ui.tooling.preview)
-    implementation(libs.androidx.material3)
-    implementation(libs.androidx.appcompat)
-    implementation(libs.material)
-    implementation(libs.androidx.storage)
+    // Core foundations
+    implementation(libs.bundles.androidx.core.full)
+    implementation(libs.bundles.androidx.lifecycle.core)
+    implementation(libs.bundles.androidx.appcompat)
+    implementation(libs.bundles.androidx.storage)
 
+    // Compose setup
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.bundles.androidx.compose.ui)
+    implementation(libs.bundles.androidx.compose.material)
+    implementation(libs.androidx.activity.compose)
+
+    // Navigation
+    implementation(libs.bundles.androidx.navigation3)
+    implementation(libs.bundles.navigation.lifecycle)
+    implementation(libs.bundles.androidx.hilt)
+
+    // Material and icons
+    implementation(libs.bundles.google.material)
+    implementation(libs.bundles.material.icons)
+
+    // Database
+    implementation(libs.bundles.androidx.room)
+    implementation(libs.bundles.androidx.datastore)
+    ksp(libs.androidx.room.compiler)
+
+    // DI and work
+    implementation(libs.bundles.hilt.android)
+    implementation(libs.bundles.androidx.work)
+    ksp(libs.hilt.android.compiler)
+    ksp(libs.androidx.hilt.compiler)
+
+    // Networking and serialization
+    implementation(libs.bundles.ktor.client)
+    implementation(libs.bundles.kotlinx.serialization)
+    implementation(libs.ipaddress)
+
+    // State management
+    implementation(libs.bundles.orbit.mvi)
+
+    // Tunnel
+    implementation(libs.bundles.wireguard.tunnel)
+
+    // Shizuku
+    implementation(libs.bundles.shizuku)
+
+    // UI utilities
+    implementation(libs.bundles.ui.utilities)
+
+    // Misc utilities
+    implementation(libs.bundles.misc.utilities)
+    coreLibraryDesugaring(libs.desugar.jdk.libs)
+
+    // Accompanist
+    implementation(libs.bundles.accompanist)
+
+    // Lifecycle Compose
+    implementation(libs.lifecycle.runtime.compose)
+
+    // Testing
     testImplementation(libs.junit)
     testImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.junit)
@@ -170,55 +218,10 @@ dependencies {
     debugImplementation(libs.androidx.compose.ui.tooling)
     debugImplementation(libs.androidx.compose.manifest)
 
-    implementation(libs.tunnel)
-    implementation(libs.amneziawg.android)
-    coreLibraryDesugaring(libs.desugar.jdk.libs)
-
-    implementation(libs.timber)
-
-    implementation(libs.androidx.navigation.compose)
-    implementation(libs.androidx.hilt.navigation.compose)
-
-    implementation(libs.hilt.android)
-    ksp(libs.hilt.android.compiler)
-    ksp(libs.androidx.hilt.compiler)
-
-    implementation(libs.accompanist.permissions)
-    implementation(libs.accompanist.drawablepainter)
-
-    implementation(libs.androidx.room.runtime)
-    ksp(libs.androidx.room.compiler)
-    implementation(libs.androidx.room.ktx)
-    implementation(libs.androidx.datastore.preferences)
-
-    implementation(libs.lifecycle.runtime.compose)
-    implementation(libs.androidx.lifecycle.runtime.ktx)
-    implementation(libs.androidx.lifecycle.process)
-
-    implementation(libs.kotlinx.serialization.json)
-
-    implementation(libs.zxing.android.embedded)
-    implementation(libs.material.icons.extended)
-
-    implementation(libs.androidx.biometric.ktx)
-    implementation(libs.pin.lock.compose)
-
-    implementation(libs.androidx.core)
-
-    implementation(libs.androidx.core.splashscreen)
-
-    implementation(libs.androidx.work.runtime)
-    implementation(libs.androidx.hilt.work)
-
-    implementation(libs.qrcode.kotlin)
-    implementation(libs.semver4j)
-
-    implementation(libs.ktor.client.core)
-    implementation(libs.ktor.client.okhttp)
-    implementation(libs.ktor.client.cio)
-    implementation(libs.ktor.client.content.negotiation)
-    implementation(libs.ktor.serialization.kotlinx.json)
-    implementation(libs.slf4j.android)
+    // Room database backup
+    implementation(libs.roomdatabasebackup) {
+        exclude(group = "org.reactivestreams", module = "reactive-streams")
+    }
 }
 
 tasks.register<Copy>("copyLicenseeJsonToAssets") {
@@ -231,3 +234,10 @@ tasks.register<Copy>("copyLicenseeJsonToAssets") {
 }
 
 tasks.named("preBuild") { dependsOn("copyLicenseeJsonToAssets") }
+
+// https://gist.github.com/obfusk/61046e09cee352ae6dd109911534b12e#fix-proposed-by-linsui-disable-baseline-profiles
+tasks.whenTaskAdded {
+    if (name.contains("ArtProfile")) {
+        enabled = false
+    }
+}

app/proguard-rules.pro

@@ -0,0 +1 @@
+-dontwarn javax.lang.model.**

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

@@ -0,0 +1,359 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 20,
+    "identityHash": "51f828868c0ea2f0f5c987410ff5c5a1",
+    "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_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_wildcards_enabled` INTEGER NOT NULL DEFAULT false, `is_stop_on_no_internet_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, `app_mode` INTEGER NOT NULL DEFAULT 0, `dns_protocol` INTEGER NOT NULL DEFAULT 0, `dns_endpoint` TEXT)",
+        "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": "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": "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": "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"
+          },
+          {
+            "fieldPath": "appMode",
+            "columnName": "app_mode",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "dnsProtocol",
+            "columnName": "dns_protocol",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "dnsEndpoint",
+            "columnName": "dns_endpoint",
+            "affinity": "TEXT"
+          }
+        ],
+        "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`)"
+          }
+        ]
+      },
+      {
+        "tableName": "proxy_settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `socks5_proxy_enabled` INTEGER NOT NULL DEFAULT false, `socks5_proxy_bind_address` TEXT, `http_proxy_enable` INTEGER NOT NULL DEFAULT false, `http_proxy_bind_address` TEXT, `proxy_username` TEXT, `proxy_password` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "socks5ProxyEnabled",
+            "columnName": "socks5_proxy_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "socks5ProxyBindAddress",
+            "columnName": "socks5_proxy_bind_address",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "httpProxyEnabled",
+            "columnName": "http_proxy_enable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "httpProxyBindAddress",
+            "columnName": "http_proxy_bind_address",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "proxyUsername",
+            "columnName": "proxy_username",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "proxyPassword",
+            "columnName": "proxy_password",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      }
+    ],
+    "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, '51f828868c0ea2f0f5c987410ff5c5a1')"
+    ]
+  }
+}

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

@@ -0,0 +1,359 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 21,
+    "identityHash": "51f828868c0ea2f0f5c987410ff5c5a1",
+    "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_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_wildcards_enabled` INTEGER NOT NULL DEFAULT false, `is_stop_on_no_internet_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, `app_mode` INTEGER NOT NULL DEFAULT 0, `dns_protocol` INTEGER NOT NULL DEFAULT 0, `dns_endpoint` TEXT)",
+        "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": "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": "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": "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"
+          },
+          {
+            "fieldPath": "appMode",
+            "columnName": "app_mode",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "dnsProtocol",
+            "columnName": "dns_protocol",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "dnsEndpoint",
+            "columnName": "dns_endpoint",
+            "affinity": "TEXT"
+          }
+        ],
+        "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`)"
+          }
+        ]
+      },
+      {
+        "tableName": "proxy_settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `socks5_proxy_enabled` INTEGER NOT NULL DEFAULT false, `socks5_proxy_bind_address` TEXT, `http_proxy_enable` INTEGER NOT NULL DEFAULT false, `http_proxy_bind_address` TEXT, `proxy_username` TEXT, `proxy_password` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "socks5ProxyEnabled",
+            "columnName": "socks5_proxy_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "socks5ProxyBindAddress",
+            "columnName": "socks5_proxy_bind_address",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "httpProxyEnabled",
+            "columnName": "http_proxy_enable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "httpProxyBindAddress",
+            "columnName": "http_proxy_bind_address",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "proxyUsername",
+            "columnName": "proxy_username",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "proxyPassword",
+            "columnName": "proxy_password",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      }
+    ],
+    "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, '51f828868c0ea2f0f5c987410ff5c5a1')"
+    ]
+  }
+}

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

@@ -0,0 +1,364 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 22,
+    "identityHash": "db93d0490401ccbef25ca39f27bafa29",
+    "entities": [
+      {
+        "tableName": "Settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_tunnel_enabled` INTEGER NOT NULL DEFAULT 0, `is_tunnel_on_mobile_data_enabled` INTEGER NOT NULL DEFAULT 0, `trusted_network_ssids` TEXT NOT NULL DEFAULT '', `is_always_on_vpn_enabled` INTEGER NOT NULL DEFAULT 0, `is_tunnel_on_ethernet_enabled` INTEGER NOT NULL DEFAULT 0, `is_shortcuts_enabled` INTEGER NOT NULL DEFAULT 0, `is_tunnel_on_wifi_enabled` INTEGER NOT NULL DEFAULT 0, `is_restore_on_boot_enabled` INTEGER NOT NULL DEFAULT 0, `is_multi_tunnel_enabled` INTEGER NOT NULL DEFAULT 0, `is_ping_enabled` INTEGER NOT NULL DEFAULT 0, `is_wildcards_enabled` INTEGER NOT NULL DEFAULT 0, `is_stop_on_no_internet_enabled` INTEGER NOT NULL DEFAULT 0, `is_lan_on_kill_switch_enabled` INTEGER NOT NULL DEFAULT 0, `debounce_delay_seconds` INTEGER NOT NULL DEFAULT 3, `is_disable_kill_switch_on_trusted_enabled` INTEGER NOT NULL DEFAULT 0, `is_tunnel_on_unsecure_enabled` INTEGER NOT NULL DEFAULT 0, `wifi_detection_method` INTEGER NOT NULL DEFAULT 0, `is_ping_monitoring_enabled` INTEGER NOT NULL DEFAULT 1, `tunnel_ping_interval_sec` INTEGER NOT NULL DEFAULT 30, `tunnel_ping_attempts` INTEGER NOT NULL DEFAULT 3, `tunnel_ping_timeout_sec` INTEGER, `app_mode` INTEGER NOT NULL DEFAULT 0, `dns_protocol` INTEGER NOT NULL DEFAULT 0, `dns_endpoint` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAutoTunnelEnabled",
+            "columnName": "is_tunnel_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isTunnelOnMobileDataEnabled",
+            "columnName": "is_tunnel_on_mobile_data_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "trustedNetworkSSIDs",
+            "columnName": "trusted_network_ssids",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isAlwaysOnVpnEnabled",
+            "columnName": "is_always_on_vpn_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isTunnelOnEthernetEnabled",
+            "columnName": "is_tunnel_on_ethernet_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isShortcutsEnabled",
+            "columnName": "is_shortcuts_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isTunnelOnWifiEnabled",
+            "columnName": "is_tunnel_on_wifi_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isRestoreOnBootEnabled",
+            "columnName": "is_restore_on_boot_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isMultiTunnelEnabled",
+            "columnName": "is_multi_tunnel_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isPingEnabled",
+            "columnName": "is_ping_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isWildcardsEnabled",
+            "columnName": "is_wildcards_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isStopOnNoInternetEnabled",
+            "columnName": "is_stop_on_no_internet_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isLanOnKillSwitchEnabled",
+            "columnName": "is_lan_on_kill_switch_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "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": "0"
+          },
+          {
+            "fieldPath": "isTunnelOnUnsecureEnabled",
+            "columnName": "is_tunnel_on_unsecure_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "wifiDetectionMethod",
+            "columnName": "wifi_detection_method",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isPingMonitoringEnabled",
+            "columnName": "is_ping_monitoring_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          },
+          {
+            "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"
+          },
+          {
+            "fieldPath": "appMode",
+            "columnName": "app_mode",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "dnsProtocol",
+            "columnName": "dns_protocol",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "dnsEndpoint",
+            "columnName": "dns_endpoint",
+            "affinity": "TEXT"
+          }
+        ],
+        "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`)"
+          }
+        ]
+      },
+      {
+        "tableName": "proxy_settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `socks5_proxy_enabled` INTEGER NOT NULL DEFAULT 0, `socks5_proxy_bind_address` TEXT, `http_proxy_enable` INTEGER NOT NULL DEFAULT 0, `http_proxy_bind_address` TEXT, `proxy_username` TEXT, `proxy_password` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "socks5ProxyEnabled",
+            "columnName": "socks5_proxy_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "socks5ProxyBindAddress",
+            "columnName": "socks5_proxy_bind_address",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "httpProxyEnabled",
+            "columnName": "http_proxy_enable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "httpProxyBindAddress",
+            "columnName": "http_proxy_bind_address",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "proxyUsername",
+            "columnName": "proxy_username",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "proxyPassword",
+            "columnName": "proxy_password",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      }
+    ],
+    "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, 'db93d0490401ccbef25ca39f27bafa29')"
+    ]
+  }
+}

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

@@ -0,0 +1,371 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 23,
+    "identityHash": "c94fe51e6c318edf8bda81ab854c85e5",
+    "entities": [
+      {
+        "tableName": "Settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_tunnel_enabled` INTEGER NOT NULL DEFAULT 0, `is_tunnel_on_mobile_data_enabled` INTEGER NOT NULL DEFAULT 0, `trusted_network_ssids` TEXT NOT NULL DEFAULT '', `is_always_on_vpn_enabled` INTEGER NOT NULL DEFAULT 0, `is_tunnel_on_ethernet_enabled` INTEGER NOT NULL DEFAULT 0, `is_shortcuts_enabled` INTEGER NOT NULL DEFAULT 0, `is_tunnel_on_wifi_enabled` INTEGER NOT NULL DEFAULT 0, `is_restore_on_boot_enabled` INTEGER NOT NULL DEFAULT 0, `is_multi_tunnel_enabled` INTEGER NOT NULL DEFAULT 0, `is_ping_enabled` INTEGER NOT NULL DEFAULT 0, `is_wildcards_enabled` INTEGER NOT NULL DEFAULT 0, `is_stop_on_no_internet_enabled` INTEGER NOT NULL DEFAULT 0, `is_lan_on_kill_switch_enabled` INTEGER NOT NULL DEFAULT 0, `debounce_delay_seconds` INTEGER NOT NULL DEFAULT 3, `is_disable_kill_switch_on_trusted_enabled` INTEGER NOT NULL DEFAULT 0, `is_tunnel_on_unsecure_enabled` INTEGER NOT NULL DEFAULT 0, `wifi_detection_method` INTEGER NOT NULL DEFAULT 0, `is_ping_monitoring_enabled` INTEGER NOT NULL DEFAULT 1, `tunnel_ping_interval_sec` INTEGER NOT NULL DEFAULT 30, `tunnel_ping_attempts` INTEGER NOT NULL DEFAULT 3, `tunnel_ping_timeout_sec` INTEGER, `app_mode` INTEGER NOT NULL DEFAULT 0, `dns_protocol` INTEGER NOT NULL DEFAULT 0, `dns_endpoint` TEXT, `is_tunnel_globals_enabled` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAutoTunnelEnabled",
+            "columnName": "is_tunnel_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isTunnelOnMobileDataEnabled",
+            "columnName": "is_tunnel_on_mobile_data_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "trustedNetworkSSIDs",
+            "columnName": "trusted_network_ssids",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isAlwaysOnVpnEnabled",
+            "columnName": "is_always_on_vpn_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isTunnelOnEthernetEnabled",
+            "columnName": "is_tunnel_on_ethernet_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isShortcutsEnabled",
+            "columnName": "is_shortcuts_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isTunnelOnWifiEnabled",
+            "columnName": "is_tunnel_on_wifi_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isRestoreOnBootEnabled",
+            "columnName": "is_restore_on_boot_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isMultiTunnelEnabled",
+            "columnName": "is_multi_tunnel_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isPingEnabled",
+            "columnName": "is_ping_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isWildcardsEnabled",
+            "columnName": "is_wildcards_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isStopOnNoInternetEnabled",
+            "columnName": "is_stop_on_no_internet_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isLanOnKillSwitchEnabled",
+            "columnName": "is_lan_on_kill_switch_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "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": "0"
+          },
+          {
+            "fieldPath": "isTunnelOnUnsecureEnabled",
+            "columnName": "is_tunnel_on_unsecure_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "wifiDetectionMethod",
+            "columnName": "wifi_detection_method",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isPingMonitoringEnabled",
+            "columnName": "is_ping_monitoring_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          },
+          {
+            "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"
+          },
+          {
+            "fieldPath": "appMode",
+            "columnName": "app_mode",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "dnsProtocol",
+            "columnName": "dns_protocol",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "dnsEndpoint",
+            "columnName": "dns_endpoint",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "isTunnelGlobalsEnabled",
+            "columnName": "is_tunnel_globals_enabled",
+            "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, `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`)"
+          }
+        ]
+      },
+      {
+        "tableName": "proxy_settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `socks5_proxy_enabled` INTEGER NOT NULL DEFAULT 0, `socks5_proxy_bind_address` TEXT, `http_proxy_enable` INTEGER NOT NULL DEFAULT 0, `http_proxy_bind_address` TEXT, `proxy_username` TEXT, `proxy_password` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "socks5ProxyEnabled",
+            "columnName": "socks5_proxy_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "socks5ProxyBindAddress",
+            "columnName": "socks5_proxy_bind_address",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "httpProxyEnabled",
+            "columnName": "http_proxy_enable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "httpProxyBindAddress",
+            "columnName": "http_proxy_bind_address",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "proxyUsername",
+            "columnName": "proxy_username",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "proxyPassword",
+            "columnName": "proxy_password",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      }
+    ],
+    "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, 'c94fe51e6c318edf8bda81ab854c85e5')"
+    ]
+  }
+}

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

@@ -0,0 +1,463 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 24,
+    "identityHash": "545fe5e4cfa7f19ec10911ab5c603339",
+    "entities": [
+      {
+        "tableName": "tunnel_config",
+        "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_tunnel_config_name",
+            "unique": true,
+            "columnNames": [
+              "name"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_tunnel_config_name` ON `${TABLE_NAME}` (`name`)"
+          }
+        ]
+      },
+      {
+        "tableName": "proxy_settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `socks5_proxy_enabled` INTEGER NOT NULL DEFAULT 0, `socks5_proxy_bind_address` TEXT, `http_proxy_enable` INTEGER NOT NULL DEFAULT 0, `http_proxy_bind_address` TEXT, `proxy_username` TEXT, `proxy_password` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "socks5ProxyEnabled",
+            "columnName": "socks5_proxy_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "socks5ProxyBindAddress",
+            "columnName": "socks5_proxy_bind_address",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "httpProxyEnabled",
+            "columnName": "http_proxy_enable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "httpProxyBindAddress",
+            "columnName": "http_proxy_bind_address",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "proxyUsername",
+            "columnName": "proxy_username",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "proxyPassword",
+            "columnName": "proxy_password",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "general_settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_shortcuts_enabled` INTEGER NOT NULL DEFAULT 0, `is_restore_on_boot_enabled` INTEGER NOT NULL DEFAULT 0, `is_multi_tunnel_enabled` INTEGER NOT NULL DEFAULT 0, `is_tunnel_globals_enabled` INTEGER NOT NULL DEFAULT 0, `app_mode` INTEGER NOT NULL DEFAULT 0, `theme` TEXT NOT NULL DEFAULT 'AUTOMATIC', `locale` TEXT, `remote_key` TEXT, `is_remote_control_enabled` INTEGER NOT NULL DEFAULT 0, `is_pin_lock_enabled` INTEGER NOT NULL DEFAULT 0, `is_always_on_vpn_enabled` INTEGER NOT NULL DEFAULT 0, `is_lan_on_kill_switch_enabled` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isShortcutsEnabled",
+            "columnName": "is_shortcuts_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isRestoreOnBootEnabled",
+            "columnName": "is_restore_on_boot_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isMultiTunnelEnabled",
+            "columnName": "is_multi_tunnel_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isTunnelGlobalsEnabled",
+            "columnName": "is_tunnel_globals_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "appMode",
+            "columnName": "app_mode",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "theme",
+            "columnName": "theme",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'AUTOMATIC'"
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "remoteKey",
+            "columnName": "remote_key",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "isRemoteControlEnabled",
+            "columnName": "is_remote_control_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isPinLockEnabled",
+            "columnName": "is_pin_lock_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isAlwaysOnVpnEnabled",
+            "columnName": "is_always_on_vpn_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isLanOnKillSwitchEnabled",
+            "columnName": "is_lan_on_kill_switch_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "auto_tunnel_settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_tunnel_enabled` INTEGER NOT NULL DEFAULT 0, `is_tunnel_on_mobile_data_enabled` INTEGER NOT NULL DEFAULT 0, `trusted_network_ssids` TEXT NOT NULL DEFAULT '', `is_tunnel_on_ethernet_enabled` INTEGER NOT NULL DEFAULT 0, `is_tunnel_on_wifi_enabled` INTEGER NOT NULL DEFAULT 0, `is_wildcards_enabled` INTEGER NOT NULL DEFAULT 0, `is_stop_on_no_internet_enabled` INTEGER NOT NULL DEFAULT 0, `debounce_delay_seconds` INTEGER NOT NULL DEFAULT 3, `is_tunnel_on_unsecure_enabled` INTEGER NOT NULL DEFAULT 0, `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,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isTunnelOnMobileDataEnabled",
+            "columnName": "is_tunnel_on_mobile_data_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "trustedNetworkSSIDs",
+            "columnName": "trusted_network_ssids",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isTunnelOnEthernetEnabled",
+            "columnName": "is_tunnel_on_ethernet_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isTunnelOnWifiEnabled",
+            "columnName": "is_tunnel_on_wifi_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isWildcardsEnabled",
+            "columnName": "is_wildcards_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isStopOnNoInternetEnabled",
+            "columnName": "is_stop_on_no_internet_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "debounceDelaySeconds",
+            "columnName": "debounce_delay_seconds",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "3"
+          },
+          {
+            "fieldPath": "isTunnelOnUnsecureEnabled",
+            "columnName": "is_tunnel_on_unsecure_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "wifiDetectionMethod",
+            "columnName": "wifi_detection_method",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "monitoring_settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_ping_enabled` INTEGER NOT NULL DEFAULT 0, `is_ping_monitoring_enabled` INTEGER NOT NULL DEFAULT 1, `tunnel_ping_interval_sec` INTEGER NOT NULL DEFAULT 30, `tunnel_ping_attempts` INTEGER NOT NULL DEFAULT 3, `tunnel_ping_timeout_sec` INTEGER, `show_detailed_ping_stats` INTEGER NOT NULL DEFAULT 0, `is_local_logs_enabled` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPingEnabled",
+            "columnName": "is_ping_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isPingMonitoringEnabled",
+            "columnName": "is_ping_monitoring_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          },
+          {
+            "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"
+          },
+          {
+            "fieldPath": "showDetailedPingStats",
+            "columnName": "show_detailed_ping_stats",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isLocalLogsEnabled",
+            "columnName": "is_local_logs_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "dns_settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `dns_protocol` INTEGER NOT NULL DEFAULT 0, `dns_endpoint` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dnsProtocol",
+            "columnName": "dns_protocol",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "dnsEndpoint",
+            "columnName": "dns_endpoint",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      }
+    ],
+    "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, '545fe5e4cfa7f19ec10911ab5c603339')"
+    ]
+  }
+}

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

@@ -0,0 +1,477 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 25,
+    "identityHash": "2ea437642cca24af74dc57904899909a",
+    "entities": [
+      {
+        "tableName": "tunnel_config",
+        "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_tunnel_config_name",
+            "unique": true,
+            "columnNames": [
+              "name"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_tunnel_config_name` ON `${TABLE_NAME}` (`name`)"
+          }
+        ]
+      },
+      {
+        "tableName": "proxy_settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `socks5_proxy_enabled` INTEGER NOT NULL DEFAULT 0, `socks5_proxy_bind_address` TEXT, `http_proxy_enable` INTEGER NOT NULL DEFAULT 0, `http_proxy_bind_address` TEXT, `proxy_username` TEXT, `proxy_password` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "socks5ProxyEnabled",
+            "columnName": "socks5_proxy_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "socks5ProxyBindAddress",
+            "columnName": "socks5_proxy_bind_address",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "httpProxyEnabled",
+            "columnName": "http_proxy_enable",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "httpProxyBindAddress",
+            "columnName": "http_proxy_bind_address",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "proxyUsername",
+            "columnName": "proxy_username",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "proxyPassword",
+            "columnName": "proxy_password",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "general_settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_shortcuts_enabled` INTEGER NOT NULL DEFAULT 0, `is_restore_on_boot_enabled` INTEGER NOT NULL DEFAULT 0, `is_multi_tunnel_enabled` INTEGER NOT NULL DEFAULT 0, `is_tunnel_globals_enabled` INTEGER NOT NULL DEFAULT 0, `app_mode` INTEGER NOT NULL DEFAULT 0, `theme` TEXT NOT NULL DEFAULT 'AUTOMATIC', `locale` TEXT, `remote_key` TEXT, `is_remote_control_enabled` INTEGER NOT NULL DEFAULT 0, `is_pin_lock_enabled` INTEGER NOT NULL DEFAULT 0, `is_always_on_vpn_enabled` INTEGER NOT NULL DEFAULT 0, `is_lan_on_kill_switch_enabled` INTEGER NOT NULL DEFAULT 0, `custom_split_packages` TEXT NOT NULL DEFAULT '{}')",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isShortcutsEnabled",
+            "columnName": "is_shortcuts_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isRestoreOnBootEnabled",
+            "columnName": "is_restore_on_boot_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isMultiTunnelEnabled",
+            "columnName": "is_multi_tunnel_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isTunnelGlobalsEnabled",
+            "columnName": "is_tunnel_globals_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "appMode",
+            "columnName": "app_mode",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "theme",
+            "columnName": "theme",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'AUTOMATIC'"
+          },
+          {
+            "fieldPath": "locale",
+            "columnName": "locale",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "remoteKey",
+            "columnName": "remote_key",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "isRemoteControlEnabled",
+            "columnName": "is_remote_control_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isPinLockEnabled",
+            "columnName": "is_pin_lock_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isAlwaysOnVpnEnabled",
+            "columnName": "is_always_on_vpn_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isLanOnKillSwitchEnabled",
+            "columnName": "is_lan_on_kill_switch_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "customSplitPackages",
+            "columnName": "custom_split_packages",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'{}'"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "auto_tunnel_settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_tunnel_enabled` INTEGER NOT NULL DEFAULT 0, `is_tunnel_on_mobile_data_enabled` INTEGER NOT NULL DEFAULT 0, `trusted_network_ssids` TEXT NOT NULL DEFAULT '', `is_tunnel_on_ethernet_enabled` INTEGER NOT NULL DEFAULT 0, `is_tunnel_on_wifi_enabled` INTEGER NOT NULL DEFAULT 0, `is_wildcards_enabled` INTEGER NOT NULL DEFAULT 0, `is_stop_on_no_internet_enabled` INTEGER NOT NULL DEFAULT 0, `debounce_delay_seconds` INTEGER NOT NULL DEFAULT 3, `is_tunnel_on_unsecure_enabled` INTEGER NOT NULL DEFAULT 0, `wifi_detection_method` INTEGER NOT NULL DEFAULT 0, `start_on_boot` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isAutoTunnelEnabled",
+            "columnName": "is_tunnel_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isTunnelOnMobileDataEnabled",
+            "columnName": "is_tunnel_on_mobile_data_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "trustedNetworkSSIDs",
+            "columnName": "trusted_network_ssids",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isTunnelOnEthernetEnabled",
+            "columnName": "is_tunnel_on_ethernet_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isTunnelOnWifiEnabled",
+            "columnName": "is_tunnel_on_wifi_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isWildcardsEnabled",
+            "columnName": "is_wildcards_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isStopOnNoInternetEnabled",
+            "columnName": "is_stop_on_no_internet_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "debounceDelaySeconds",
+            "columnName": "debounce_delay_seconds",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "3"
+          },
+          {
+            "fieldPath": "isTunnelOnUnsecureEnabled",
+            "columnName": "is_tunnel_on_unsecure_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "wifiDetectionMethod",
+            "columnName": "wifi_detection_method",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "startOnBoot",
+            "columnName": "start_on_boot",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "monitoring_settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_ping_enabled` INTEGER NOT NULL DEFAULT 0, `is_ping_monitoring_enabled` INTEGER NOT NULL DEFAULT 1, `tunnel_ping_interval_sec` INTEGER NOT NULL DEFAULT 30, `tunnel_ping_attempts` INTEGER NOT NULL DEFAULT 3, `tunnel_ping_timeout_sec` INTEGER, `show_detailed_ping_stats` INTEGER NOT NULL DEFAULT 0, `is_local_logs_enabled` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isPingEnabled",
+            "columnName": "is_ping_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isPingMonitoringEnabled",
+            "columnName": "is_ping_monitoring_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          },
+          {
+            "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"
+          },
+          {
+            "fieldPath": "showDetailedPingStats",
+            "columnName": "show_detailed_ping_stats",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "isLocalLogsEnabled",
+            "columnName": "is_local_logs_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "dns_settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `dns_protocol` INTEGER NOT NULL DEFAULT 0, `dns_endpoint` TEXT)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dnsProtocol",
+            "columnName": "dns_protocol",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "dnsEndpoint",
+            "columnName": "dns_endpoint",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      }
+    ],
+    "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, '2ea437642cca24af74dc57904899909a')"
+    ]
+  }
+}

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

@@ -4,7 +4,6 @@ import androidx.room.testing.MigrationTestHelper
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
-import com.zaneschepke.wireguardautotunnel.data.Queries
 import java.io.IOException
 import org.junit.Rule
 import org.junit.Test
@@ -24,8 +23,6 @@ class MigrationTest {
         helper.createDatabase(dbName, 6).apply {
             // Database has schema version 1. Insert some data using SQL queries.
             // You can't use DAO classes because they expect the latest schema.
-            execSQL(Queries.createDefaultSettings())
-            execSQL(Queries.createTunnelConfig())
             // Prepare for the next version.
             close()
         }

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

@@ -5,14 +5,14 @@
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
-    <!--foreground service exempt android 14-->
+    <!--foreground service special use for non VPN service tunnels, android 14-->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
+    <!--foreground service special use for VPN service tunnels, android 14-->
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
-    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"
-		tools:ignore="ProtectedPermissions" />
 
     <!--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" />
@@ -48,6 +48,10 @@
             <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"
@@ -62,13 +66,23 @@
         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="adjustNothing"
+			android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.WireguardAutoTunnel"
 			android:configChanges="orientation|screenSize|keyboardHidden"
 			>
+
+            <intent-filter>
+                <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 				<action android:name="android.intent.action.SHOW_APP_INFO" />
@@ -78,10 +92,6 @@
                 <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"
@@ -148,21 +158,45 @@
             android:name=".core.service.autotunnel.AutoTunnelService"
             android:enabled="true"
             android:exported="false"
-            android:foregroundServiceType="systemExempted"
+            android:foregroundServiceType="specialUse"
             android:persistent="true"
             android:stopWithTask="false"
-            tools:node="merge" />
+            tools:node="merge">
+            <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                      android:value="This service monitors network changes to automatically
+                      establish and maintain WireGuard VPN tunnels on demand, ensuring seamless connectivity.
+                      It requires persistent foreground execution to detect real-time events,
+                      which cannot be achieved with standard background APIs due to timing and reliability needs for
+                      network connectivity monitoring."/>
+        </service>
+
+        <service
+                android:name=".core.service.TunnelForegroundService"
+                android:enabled="true"
+                android:exported="false"
+                android:foregroundServiceType="specialUse"
+                android:persistent="true"
+                android:stopWithTask="false"
+                tools:node="merge">
+            <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
+                      android:value="This service sustains non-VpnService virtual tunnels (using gVisor/netstack for
+                      isolated networking), keeping connections alive for continuous secure data routing.
+                      Persistent foreground operation is essential to handle
+                      low-level tunnel maintenance and avoid interruptions, beyond the capabilities of other
+                      service types or background work."/>
+        </service>
 
 		<service
-			android:name=".core.service.TunnelForegroundService"
+			android:name=".core.service.VpnForegroundService"
 			android:exported="false"
 			android:persistent="true"
-			android:foregroundServiceType="systemExempted"
+            android:foregroundServiceType="systemExempted"
 			android:permission="android.permission.BIND_VPN_SERVICE">
 			<intent-filter>
 				<action android:name="android.net.VpnService" />
 			</intent-filter>
 		</service>
+
         <receiver
             android:name=".core.broadcast.RestartReceiver"
             android:enabled="true"

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

@@ -1,129 +1,162 @@
 package com.zaneschepke.wireguardautotunnel
 
-import android.Manifest
-import android.annotation.SuppressLint
+import ProxySettingsScreen
 import android.content.Intent
-import android.content.pm.PackageManager
 import android.graphics.Color
+import android.net.VpnService
 import android.os.Build
 import android.os.Bundle
-import android.provider.Settings
 import androidx.activity.SystemBarStyle
 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.AnimatedVisibility
-import androidx.compose.animation.slideInVertically
-import androidx.compose.animation.slideOutVertically
+import androidx.compose.animation.*
 import androidx.compose.foundation.background
-import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.*
-import androidx.compose.material.icons.rounded.Settings
 import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
-import androidx.core.net.toUri
+import androidx.compose.ui.zIndex
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-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 androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
+import androidx.navigation3.runtime.NavKey
+import androidx.navigation3.runtime.entryProvider
+import androidx.navigation3.runtime.rememberNavBackStack
+import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
+import androidx.navigation3.ui.NavDisplay
 import com.zaneschepke.networkmonitor.NetworkMonitor
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.data.AppDatabase
+import com.zaneschepke.wireguardautotunnel.data.model.AppMode
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.ui.Route
+import com.zaneschepke.wireguardautotunnel.domain.sideeffect.GlobalSideEffect
+import com.zaneschepke.wireguardautotunnel.ui.LocalIsAndroidTV
+import com.zaneschepke.wireguardautotunnel.ui.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.LocalSharedVm
+import com.zaneschepke.wireguardautotunnel.ui.common.banner.AppAlertBanner
 import com.zaneschepke.wireguardautotunnel.ui.common.dialog.VpnDeniedDialog
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.CustomSnackBar
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
-import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
+import com.zaneschepke.wireguardautotunnel.ui.navigation.Route
+import com.zaneschepke.wireguardautotunnel.ui.navigation.Tab
 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.navigation.components.currentRouteAsNavbarState
+import com.zaneschepke.wireguardautotunnel.ui.navigation.functions.rememberNavController
 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.autotunnel.TunnelAutoTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.ConfigScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.scanner.ScannerScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.SplitTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.tunneloptions.TunnelOptionsScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.preferred.PreferredTunnelScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.wifi.WifiSettingsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.pin.PinLockScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.SettingsScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.advanced.SettingsAdvancedScreen
 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.dns.DnsSettingsScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.globals.TunnelGlobalsScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.integrations.AndroidIntegrationsScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.monitoring.TunnelMonitoringScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.monitoring.logs.LogsScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.monitoring.ping.PingTargetScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.SupportScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.support.donate.DonateScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.support.donate.crypto.AddressesScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.license.LicenseScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.TunnelsScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.config.ConfigScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.sort.SortScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.splittunnel.SplitTunnelScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.tunneloptions.TunnelOptionsScreen
+import com.zaneschepke.wireguardautotunnel.ui.theme.AlertRed
+import com.zaneschepke.wireguardautotunnel.ui.theme.OffWhite
 import com.zaneschepke.wireguardautotunnel.ui.theme.WireguardAutoTunnelTheme
-import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
+import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
+import com.zaneschepke.wireguardautotunnel.util.extensions.*
+import com.zaneschepke.wireguardautotunnel.viewmodel.ConfigViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.SharedAppViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.SplitTunnelViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.TunnelViewModel
 import dagger.hilt.android.AndroidEntryPoint
+import de.raphaelebner.roomdatabasebackup.core.RoomBackup
+import java.util.*
 import javax.inject.Inject
-import kotlin.system.exitProcess
-import org.amnezia.awg.backend.GoBackend.VpnService
-import timber.log.Timber
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.launch
+import xyz.teamgravity.pin_lock_compose.PinManager
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
 
     @Inject lateinit var appStateRepository: AppStateRepository
-
     @Inject lateinit var tunnelManager: TunnelManager
-
     @Inject lateinit var networkMonitor: NetworkMonitor
+    @Inject lateinit var appDatabase: AppDatabase
 
-    private var lastLocationPermissionState: Boolean? = null
+    private lateinit var roomBackup: RoomBackup
 
-    @SuppressLint("BatteryLife")
+    @OptIn(ExperimentalMaterial3Api::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         enableEdgeToEdge(
-            statusBarStyle = SystemBarStyle.Companion.auto(Color.TRANSPARENT, Color.TRANSPARENT),
-            navigationBarStyle = SystemBarStyle.Companion.auto(Color.TRANSPARENT, Color.TRANSPARENT),
+            statusBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT),
+            navigationBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT),
         )
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             window.isNavigationBarContrastEnforced = false
         }
         super.onCreate(savedInstanceState)
 
-        val viewModel by viewModels<AppViewModel>()
+        roomBackup = RoomBackup(this)
+
+        val viewModel by viewModels<SharedAppViewModel>()
 
         installSplashScreen().apply {
-            setKeepOnScreenCondition { !viewModel.appViewState.value.isAppReady }
+            setKeepOnScreenCondition { !viewModel.container.stateFlow.value.isAppLoaded }
         }
 
         setContent {
+            val context = LocalContext.current
             val isTv = isRunningOnTv()
-            val appUiState by viewModel.uiState.collectAsStateWithLifecycle()
-            val appViewState by viewModel.appViewState.collectAsStateWithLifecycle()
-            val tunnelError by viewModel.tunnelManager.errorEvents.collectAsStateWithLifecycle(null)
+            val appState by viewModel.container.stateFlow.collectAsStateWithLifecycle()
+            val scope = rememberCoroutineScope()
+
+            LaunchedEffect(appState.isAppLoaded) {
+                if (appState.isAppLoaded) {
+                    appState.locale.let { LocaleUtil.changeLocale(it) }
+                }
+            }
 
-            val navController = rememberNavController()
-            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) }
+            var requestingAppMode by remember {
+                mutableStateOf<Pair<AppMode?, TunnelConfig?>>(Pair(null, null))
+            }
+
+            val startingStack = buildList {
+                add(Route.Tunnels)
+                if (intent?.action == Intent.ACTION_APPLICATION_PREFERENCES) add(Route.Settings)
+                if (appState.pinLockEnabled) add(Route.Lock)
+            }
+
+            val backStack = rememberNavBackStack(*startingStack.toTypedArray())
+            var previousRoute by remember { mutableStateOf<Route?>(null) }
+
+            val navController =
+                rememberNavController<NavKey>(backStack, appState.isLocationDisclosureShown) {
+                    previousKey ->
+                    previousRoute = previousKey as? Route
+                }
 
             val vpnActivity =
                 rememberLauncherForActivityResult(
@@ -135,191 +168,269 @@ class MainActivity : AppCompatActivity() {
                         } else {
                             vpnPermissionDenied = false
                             showVpnPermissionDialog = false
+                            val (appMode, config) = requestingAppMode
+                            when (appMode) {
+                                AppMode.VPN -> if (config != null) viewModel.startTunnel(config)
+                                AppMode.LOCK_DOWN -> viewModel.setAppMode(AppMode.LOCK_DOWN)
+                                else -> Unit
+                            }
                         }
+                        requestingAppMode = Pair(null, null)
                     },
                 )
 
-            LaunchedEffect(appUiState.tunnels) {
-                if (!appViewState.isAppReady) {
-                    viewModel.handleEvent(AppEvent.AppReadyCheck(appUiState.tunnels))
-                }
-            }
-
-            val batteryActivity =
-                rememberLauncherForActivityResult(
-                    ActivityResultContracts.StartActivityForResult()
-                ) { _: ActivityResult ->
-                    viewModel.handleEvent(AppEvent.SetBatteryOptimizeDisableShown)
-                }
-
-            LaunchedEffect(tunnelError) {
-                if (tunnelError == null) return@LaunchedEffect
-                val message = tunnelError!!.second.toStringRes()
-                val context = this@MainActivity
-                snackbar.showSnackbar(
-                    context.getString(R.string.tunnel_error_template, context.getString(message))
-                )
-            }
-
-            with(appViewState) {
-                LaunchedEffect(isConfigChanged) {
-                    if (isConfigChanged) {
-                        Intent(this@MainActivity, MainActivity::class.java).also {
-                            startActivity(it)
-                            exitProcess(0)
-                        }
-                    }
-                }
-                LaunchedEffect(errorMessage) {
-                    errorMessage?.let {
-                        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) {
+            LaunchedEffect(Unit) {
+                viewModel.globalSideEffect.collectLatest { sideEffect ->
+                    when (sideEffect) {
+                        GlobalSideEffect.ConfigChanged -> restartApp()
+                        GlobalSideEffect.PopBackStack -> navController.pop()
+                        is GlobalSideEffect.RequestVpnPermission -> {
+                            requestingAppMode = Pair(sideEffect.requestingMode, sideEffect.config)
                             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()
+
+                        is GlobalSideEffect.Snackbar ->
+                            scope.launch {
+                                snackbar.showSnackbar(sideEffect.message.asString(context))
                             }
-                        )
+
+                        is GlobalSideEffect.Toast ->
+                            scope.launch { context.showToast(sideEffect.message.asString(context)) }
+
+                        is GlobalSideEffect.LaunchUrl -> context.openWebUrl(sideEffect.url)
+                        is GlobalSideEffect.InstallApk -> context.installApk(sideEffect.apk)
                     }
                 }
             }
 
-            CompositionLocalProvider(LocalIsAndroidTV provides isTv) {
-                CompositionLocalProvider(LocalNavController provides navController) {
-                    WireguardAutoTunnelTheme(theme = appUiState.appState.theme) {
-                        VpnDeniedDialog(
-                            showVpnPermissionDialog,
-                            onDismiss = {
-                                showVpnPermissionDialog = false
-                                vpnPermissionDenied = false
-                            },
-                        )
+            if (!appState.isAppLoaded) return@setContent
 
-                        Scaffold(
-                            modifier =
-                                Modifier.pointerInput(Unit) {
-                                    detectTapGestures {
-                                        viewModel.handleEvent(AppEvent.ClearSelectedTunnels)
+            var showLock by remember {
+                mutableStateOf(appState.pinLockEnabled && !appState.isPinVerified)
+            }
+            LaunchedEffect(appState.isPinVerified) { if (appState.isPinVerified) showLock = false }
+
+            CompositionLocalProvider(
+                LocalIsAndroidTV provides isTv,
+                LocalSharedVm provides viewModel,
+                LocalNavController provides navController,
+            ) {
+                WireguardAutoTunnelTheme(theme = appState.theme) {
+                    VpnDeniedDialog(
+                        showVpnPermissionDialog,
+                        onDismiss = {
+                            showVpnPermissionDialog = false
+                            vpnPermissionDenied = false
+                        },
+                    )
+
+                    if (showLock) {
+                        PinManager.initialize(context = this@MainActivity)
+                        PinLockScreen()
+                    } else {
+                        val currentRoute by remember {
+                            derivedStateOf { backStack.lastOrNull() as? Route }
+                        }
+                        val currentTab by remember {
+                            derivedStateOf { Tab.fromRoute(currentRoute ?: Route.Tunnels) }
+                        }
+                        val navState by
+                            currentRouteAsNavbarState(
+                                appState,
+                                viewModel,
+                                currentRoute,
+                                navController,
+                            )
+
+                        Box(modifier = Modifier.fillMaxSize()) {
+                            if (appState.settings.appMode == AppMode.LOCK_DOWN) {
+                                AppAlertBanner(
+                                    stringResource(R.string.locked_down)
+                                        .uppercase(Locale.getDefault()),
+                                    OffWhite,
+                                    AlertRed,
+                                    modifier = Modifier.fillMaxWidth().zIndex(2f),
+                                )
+                            }
+                            Scaffold(
+                                snackbarHost = {
+                                    SnackbarHost(snackbar) { snackbarData ->
+                                        CustomSnackBar(
+                                            snackbarData.visuals.message,
+                                            isRtl = false,
+                                            containerColor =
+                                                MaterialTheme.colorScheme.surfaceColorAtElevation(
+                                                    2.dp
+                                                ),
+                                        )
                                     }
                                 },
-                            snackbarHost = {
-                                SnackbarHost(snackbar) { snackbarData: SnackbarData ->
-                                    CustomSnackBar(
-                                        snackbarData.visuals.message,
-                                        isRtl = false,
-                                        containerColor =
-                                            MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp),
+                                topBar = { DynamicTopAppBar(navState) },
+                                bottomBar = {
+                                    if (navState.showBottomItems) {
+                                        BottomNavbar(
+                                            appState.isAutoTunnelActive,
+                                            currentTab,
+                                            onTabSelected = { tab ->
+                                                navController.popUpTo(tab.startRoute)
+                                            },
+                                        )
+                                    }
+                                },
+                            ) { padding ->
+                                Column(
+                                    modifier =
+                                        Modifier.fillMaxSize()
+                                            .background(MaterialTheme.colorScheme.surface)
+                                            .padding(
+                                                top = padding.calculateTopPadding().plus(8.dp),
+                                                bottom = padding.calculateBottomPadding(),
+                                            )
+                                            .consumeWindowInsets(padding)
+                                            .imePadding()
+                                ) {
+                                    NavDisplay(
+                                        backStack = backStack,
+                                        modifier = Modifier.fillMaxSize(),
+                                        onBack = { navController.pop() },
+                                        transitionSpec = {
+                                            val initialIndex =
+                                                previousRoute?.let(Tab::fromRoute)?.index ?: 0
+                                            val targetIndex =
+                                                currentRoute?.let(Tab::fromRoute)?.index ?: 0
+                                            if (initialIndex != targetIndex) {
+                                                val dir = if (targetIndex > initialIndex) 1 else -1
+                                                (slideInHorizontally { dir * it } +
+                                                    fadeIn()) togetherWith
+                                                    (slideOutHorizontally { dir * -it } + fadeOut())
+                                            } else {
+                                                (slideInHorizontally { it } + fadeIn()) togetherWith
+                                                    (slideOutHorizontally { -it } + fadeOut())
+                                            }
+                                        },
+                                        popTransitionSpec = {
+                                            (slideInHorizontally { -it } + fadeIn()) togetherWith
+                                                (slideOutHorizontally { it } + fadeOut())
+                                        },
+                                        predictivePopTransitionSpec = {
+                                            (slideInHorizontally { -it } + fadeIn()) togetherWith
+                                                (slideOutHorizontally { it } + fadeOut())
+                                        },
+                                        entryDecorators =
+                                            listOf(
+                                                rememberSaveableStateHolderNavEntryDecorator(),
+                                                rememberViewModelStoreNavEntryDecorator(),
+                                            ),
+                                        entryProvider =
+                                            entryProvider {
+                                                entry<Route.Lock> {
+                                                    PinManager.initialize(
+                                                        context = this@MainActivity
+                                                    )
+                                                    PinLockScreen()
+                                                }
+                                                entry<Route.Tunnels> { TunnelsScreen() }
+                                                entry<Route.Sort> { SortScreen() }
+                                                entry<Route.TunnelOptions> { key ->
+                                                    val viewModel =
+                                                        hiltViewModel<
+                                                            TunnelViewModel,
+                                                            TunnelViewModel.Factory,
+                                                        >(
+                                                            creationCallback = { factory ->
+                                                                factory.create(key.id)
+                                                            }
+                                                        )
+                                                    TunnelOptionsScreen(viewModel)
+                                                }
+                                                entry<Route.SplitTunnel> { key ->
+                                                    val viewModel =
+                                                        hiltViewModel<
+                                                            SplitTunnelViewModel,
+                                                            SplitTunnelViewModel.Factory,
+                                                        >(
+                                                            creationCallback = { factory ->
+                                                                factory.create(key.id)
+                                                            }
+                                                        )
+                                                    SplitTunnelScreen(viewModel)
+                                                }
+                                                entry<Route.Config> { key ->
+                                                    val viewModel =
+                                                        hiltViewModel<
+                                                            ConfigViewModel,
+                                                            ConfigViewModel.Factory,
+                                                        >(
+                                                            creationCallback = { factory ->
+                                                                factory.create(key.id)
+                                                            }
+                                                        )
+                                                    ConfigScreen(viewModel)
+                                                }
+                                                entry<Route.LocationDisclosure> {
+                                                    LocationDisclosureScreen()
+                                                }
+                                                entry<Route.AutoTunnel> { AutoTunnelScreen() }
+                                                entry<Route.WifiPreferences> {
+                                                    WifiSettingsScreen()
+                                                }
+                                                entry<Route.AdvancedAutoTunnel> {
+                                                    AutoTunnelAdvancedScreen()
+                                                }
+                                                entry<Route.WifiDetectionMethod> {
+                                                    WifiDetectionMethodScreen()
+                                                }
+                                                entry<Route.Settings> { SettingsScreen() }
+                                                entry<Route.TunnelMonitoring> {
+                                                    TunnelMonitoringScreen()
+                                                }
+                                                entry<Route.AndroidIntegrations> {
+                                                    AndroidIntegrationsScreen()
+                                                }
+                                                entry<Route.Dns> { DnsSettingsScreen() }
+                                                entry<Route.TunnelGlobals> { key ->
+                                                    TunnelGlobalsScreen(key.id)
+                                                }
+                                                entry<Route.ConfigGlobal> { key ->
+                                                    val viewModel =
+                                                        hiltViewModel<
+                                                            ConfigViewModel,
+                                                            ConfigViewModel.Factory,
+                                                        >(
+                                                            creationCallback = { factory ->
+                                                                factory.create(key.id)
+                                                            }
+                                                        )
+                                                    ConfigScreen(viewModel)
+                                                }
+                                                entry<Route.SplitTunnelGlobal> { key ->
+                                                    val viewModel =
+                                                        hiltViewModel<
+                                                            SplitTunnelViewModel,
+                                                            SplitTunnelViewModel.Factory,
+                                                        >(
+                                                            creationCallback = { factory ->
+                                                                factory.create(key.id)
+                                                            }
+                                                        )
+                                                    SplitTunnelScreen(viewModel)
+                                                }
+                                                entry<Route.ProxySettings> { ProxySettingsScreen() }
+                                                entry<Route.Appearance> { AppearanceScreen() }
+                                                entry<Route.Language> { LanguageScreen() }
+                                                entry<Route.Display> { DisplayScreen() }
+                                                entry<Route.Logs> { LogsScreen() }
+                                                entry<Route.Support> { SupportScreen() }
+                                                entry<Route.License> { LicenseScreen() }
+                                                entry<Route.Donate> { DonateScreen() }
+                                                entry<Route.Addresses> { AddressesScreen() }
+                                                entry<Route.PreferredTunnel> { key ->
+                                                    PreferredTunnelScreen(key.tunnelNetwork)
+                                                }
+                                                entry<Route.PingTarget> { PingTargetScreen() }
+                                            },
                                     )
                                 }
-                            },
-                            topBar = { DynamicTopAppBar(navBarState) },
-                            bottomBar = {
-                                AnimatedVisibility(
-                                    visible = navBarState.showBottom,
-                                    enter = slideInVertically(initialOffsetY = { it }),
-                                    exit = slideOutVertically(targetOffsetY = { it }),
-                                ) {
-                                    BottomNavbar(appUiState = appUiState)
-                                }
-                            },
-                        ) { padding ->
-                            Box(
-                                modifier =
-                                    Modifier.fillMaxSize()
-                                        .background(MaterialTheme.colorScheme.surface)
-                                        .padding(padding)
-                                        .consumeWindowInsets(padding)
-                                        .imePadding()
-                            ) {
-                                NavHost(
-                                    navController,
-                                    startDestination =
-                                        (if (appUiState.appState.isPinLockEnabled) Route.Lock
-                                        else Route.Main),
-                                ) {
-                                    composable<Route.Main> {
-                                        MainScreen(appUiState, appViewState, viewModel)
-                                    }
-                                    composable<Route.Settings> {
-                                        SettingsScreen(appUiState, viewModel)
-                                    }
-                                    composable<Route.SettingsAdvanced> {
-                                        SettingsAdvancedScreen(appUiState, viewModel)
-                                    }
-                                    composable<Route.LocationDisclosure> {
-                                        LocationDisclosureScreen(appUiState, viewModel)
-                                    }
-                                    composable<Route.AutoTunnel> {
-                                        AutoTunnelScreen(appUiState, viewModel)
-                                    }
-                                    composable<Route.Appearance> { AppearanceScreen() }
-                                    composable<Route.Language> {
-                                        LanguageScreen(appUiState, viewModel)
-                                    }
-                                    composable<Route.Display> {
-                                        DisplayScreen(appUiState, viewModel)
-                                    }
-                                    composable<Route.Support> {
-                                        SupportScreen(appViewModel = viewModel)
-                                    }
-                                    composable<Route.License> { LicenseScreen() }
-                                    composable<Route.AutoTunnelAdvanced> {
-                                        AutoTunnelAdvancedScreen(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)
-                                    }
-                                    composable<Route.TunnelOptions> { backStack ->
-                                        val args = backStack.toRoute<Route.TunnelOptions>()
-                                        appUiState.tunnels
-                                            .firstOrNull { it.id == args.id }
-                                            ?.let { config ->
-                                                TunnelOptionsScreen(config, viewModel)
-                                            }
-                                    }
-                                    composable<Route.Lock> { PinLockScreen(viewModel) }
-                                    composable<Route.Scanner> { ScannerScreen(viewModel) }
-                                    composable<Route.KillSwitch> {
-                                        KillSwitchScreen(appUiState, viewModel)
-                                    }
-                                    composable<Route.SplitTunnel> { SplitTunnelScreen(viewModel) }
-                                    composable<Route.TunnelAutoTunnel> { backStack ->
-                                        val args = backStack.toRoute<Route.TunnelOptions>()
-                                        appUiState.tunnels
-                                            .firstOrNull { it.id == args.id }
-                                            ?.let {
-                                                TunnelAutoTunnelScreen(
-                                                    it,
-                                                    appUiState.appSettings,
-                                                    viewModel,
-                                                )
-                                            }
-                                    }
-                                }
                             }
                         }
                     }
@@ -330,19 +441,65 @@ class MainActivity : AppCompatActivity() {
 
     override fun onResume() {
         super.onResume()
-        checkPermissionAndNotify()
+        WireGuardAutoTunnel.setUiActive(true)
+        networkMonitor.checkPermissionsAndUpdateState()
     }
 
-    private fun checkPermissionAndNotify() {
-        val hasLocation =
-            ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) ==
-                PackageManager.PERMISSION_GRANTED
-        if (lastLocationPermissionState != hasLocation) {
-            Timber.d("Location permission changed to: $hasLocation")
-            if (hasLocation) {
-                networkMonitor.sendLocationPermissionsGrantedBroadcast()
-            }
-            lastLocationPermissionState = hasLocation
-        }
+    override fun onPause() {
+        super.onPause()
+        WireGuardAutoTunnel.setUiActive(false)
     }
+
+    fun performBackup() =
+        lifecycleScope.launch {
+            roomBackup
+                .database(appDatabase)
+                .backupLocation(RoomBackup.BACKUP_FILE_LOCATION_CUSTOM_DIALOG)
+                .enableLogDebug(true)
+                .maxFileCount(5)
+                .apply {
+                    onCompleteListener { success, _, _ ->
+                        lifecycleScope.launch {
+                            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, _, _ ->
+                        lifecycleScope.launch {
+                            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,27 +4,25 @@ 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.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
+import com.zaneschepke.wireguardautotunnel.domain.repository.MonitoringSettingsRepository
 import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
 import dagger.hilt.android.HiltAndroidApp
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import timber.log.Timber
 
 @HiltAndroidApp
@@ -39,18 +37,17 @@ class WireGuardAutoTunnel : Application(), Configuration.Provider {
 
     @Inject lateinit var logReader: LogReader
 
-    @Inject lateinit var appDataRepository: AppDataRepository
-
     @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
 
-    @Inject @MainDispatcher lateinit var mainDispatcher: CoroutineDispatcher
+    @Inject lateinit var monitoringRepository: MonitoringSettingsRepository
+
+    @Inject lateinit var notificationMonitor: NotificationMonitor
 
     @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(
@@ -65,55 +62,32 @@ class WireGuardAutoTunnel : Application(), Configuration.Provider {
             Timber.plant(ReleaseTree())
         }
 
-        GoBackend.setAlwaysOnCallback {
-            applicationScope.launch {
-                val settings = appDataRepository.settings.get()
-                if (settings.isAlwaysOnVpnEnabled) {
-                    val tunnel = appDataRepository.getPrimaryOrFirstTunnel()
-                    tunnel?.let { tunnelManager.startTunnel(it) }
-                } else {
-                    Timber.w("Always-on VPN is not enabled in app settings")
-                }
+        applicationScope.launch(ioDispatcher) {
+            launch {
+                val monitoringSettings = monitoringRepository.getMonitoringSettings()
+                if (monitoringSettings.isLocalLogsEnabled) logReader.start()
             }
+            launch { notificationMonitor.handleApplicationNotifications() }
         }
 
         ServiceWorker.start(this)
-
-        applicationScope.launch {
-            appDataRepository.appState.getLocale()?.let {
-                withContext(mainDispatcher) { LocaleUtil.changeLocale(it) }
-            }
-            appDataRepository.appState.isLocalLogsEnabled().let { enabled ->
-                if (enabled) logReader.start()
-            }
-        }
     }
 
     override fun onTerminate() {
-        applicationScope.launch {
-            tunnelManager.setBackendState(BackendState.INACTIVE, emptyList())
-        }
+        applicationScope.cancel()
+        tunnelManager.setBackendMode(BackendMode.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 {
-            return foreground
+        private val _uiActive = MutableStateFlow(false)
+
+        val uiActive: StateFlow<Boolean>
+            get() = _uiActive
+
+        fun setUiActive(active: Boolean) {
+            _uiActive.update { active }
         }
 
         @Volatile private var lastActiveTunnels: List<Int> = emptyList()

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

@@ -3,7 +3,6 @@ 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.TunnelRepository
@@ -19,8 +18,6 @@ class KernelReceiver : BroadcastReceiver() {
 
     @Inject lateinit var tunnelRepository: TunnelRepository
 
-    @Inject lateinit var serviceManager: ServiceManager
-
     @Inject lateinit var tunnelManager: TunnelManager
 
     override fun onReceive(context: Context, intent: Intent) {
@@ -31,7 +28,6 @@ class KernelReceiver : BroadcastReceiver() {
                     val tunnel = tunnelRepository.findByTunnelName(name)
                     tunnel?.let { tunnelRepository.save(it.copy(isActive = true)) }
                 }
-                serviceManager.updateTunnelTile()
             }
         }
     }

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

@@ -4,10 +4,10 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
-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.AutoTunnelSettingsRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
@@ -17,23 +17,24 @@ import kotlinx.coroutines.launch
 @AndroidEntryPoint
 class NotificationActionReceiver : BroadcastReceiver() {
 
-    @Inject lateinit var serviceManager: ServiceManager
-
     @Inject lateinit var tunnelManager: TunnelManager
 
     @Inject lateinit var tunnelRepository: TunnelRepository
 
+    @Inject lateinit var autoTunnelRepository: AutoTunnelSettingsRepository
+
     @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
 
     override fun onReceive(context: Context, intent: Intent) {
         applicationScope.launch {
             when (intent.action) {
-                NotificationAction.AUTO_TUNNEL_OFF.name -> serviceManager.stopAutoTunnel()
+                NotificationAction.AUTO_TUNNEL_OFF.name ->
+                    autoTunnelRepository.updateAutoTunnelEnabled(false)
                 NotificationAction.TUNNEL_OFF.name -> {
                     val tunnelId = intent.getIntExtra(NotificationManager.EXTRA_ID, 0)
-                    if (tunnelId == STOP_ALL_TUNNELS_ID) return@launch tunnelManager.stopTunnel()
-                    val tunnel = tunnelRepository.getById(tunnelId)
-                    tunnelManager.stopTunnel(tunnel)
+                    if (tunnelId == STOP_ALL_TUNNELS_ID)
+                        return@launch tunnelManager.stopActiveTunnels()
+                    tunnelManager.stopTunnel(tunnelId)
                 }
             }
         }

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

@@ -3,10 +3,11 @@ 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.domain.repository.AutoTunnelSettingsRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
@@ -19,9 +20,9 @@ class RemoteControlReceiver : BroadcastReceiver() {
 
     @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
 
-    @Inject lateinit var appDataRepository: AppDataRepository
-
-    @Inject lateinit var serviceManager: ServiceManager
+    @Inject lateinit var settingsRepository: GeneralSettingRepository
+    @Inject lateinit var tunnelsRepository: TunnelRepository
+    @Inject lateinit var autoTunnelSettingsRepository: AutoTunnelSettingsRepository
 
     @Inject lateinit var tunnelManager: TunnelManager
 
@@ -52,11 +53,9 @@ class RemoteControlReceiver : BroadcastReceiver() {
         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")
+            val settings = settingsRepository.getGeneralSettings()
+            if (!settings.isRemoteControlEnabled) return@launch Timber.w("Remote control disabled")
+            val key = settings.remoteKey ?: 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) {
@@ -64,29 +63,29 @@ class RemoteControlReceiver : BroadcastReceiver() {
                     val tunnelName =
                         intent.getStringExtra(EXTRA_TUN_NAME) ?: return@launch startDefaultTunnel()
                     val tunnel =
-                        appDataRepository.tunnels.findByTunnelName(tunnelName)
+                        tunnelsRepository.findByTunnelName(tunnelName)
                             ?: return@launch startDefaultTunnel()
                     tunnelManager.startTunnel(tunnel)
                 }
                 Action.STOP_TUNNEL -> {
                     val tunnelName =
                         intent.getStringExtra(EXTRA_TUN_NAME)
-                            ?: return@launch tunnelManager.stopTunnel()
+                            ?: return@launch tunnelManager.stopActiveTunnels()
                     val tunnel =
-                        appDataRepository.tunnels.findByTunnelName(tunnelName)
-                            ?: return@launch tunnelManager.stopTunnel()
-                    tunnelManager.stopTunnel(tunnel)
+                        tunnelsRepository.findByTunnelName(tunnelName)
+                            ?: return@launch tunnelManager.stopActiveTunnels()
+                    tunnelManager.stopTunnel(tunnel.id)
                 }
-                Action.START_AUTO_TUNNEL -> serviceManager.startAutoTunnel()
-                Action.STOP_AUTO_TUNNEL -> serviceManager.stopAutoTunnel()
+                Action.START_AUTO_TUNNEL ->
+                    autoTunnelSettingsRepository.updateAutoTunnelEnabled(true)
+                Action.STOP_AUTO_TUNNEL ->
+                    autoTunnelSettingsRepository.updateAutoTunnelEnabled(false)
             }
         }
     }
 
     private suspend fun startDefaultTunnel() {
-        appDataRepository.getPrimaryOrFirstTunnel()?.let { tunnel ->
-            tunnelManager.startTunnel(tunnel)
-        }
+        tunnelsRepository.getDefaultTunnel()?.let { tunnel -> tunnelManager.startTunnel(tunnel) }
     }
 
     companion object {

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

@@ -4,52 +4,37 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.zaneschepke.logcatter.LogReader
-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
 
 @AndroidEntryPoint
 class RestartReceiver : BroadcastReceiver() {
-    @Inject lateinit var appDataRepository: AppDataRepository
 
     @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
 
-    @Inject lateinit var serviceManager: ServiceManager
-
     @Inject lateinit var tunnelManager: TunnelManager
 
     @Inject lateinit var logReader: LogReader
 
-    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
-
     override fun onReceive(context: Context, intent: Intent) {
         Timber.d("RestartReceiver triggered with action: ${intent.action}")
-        serviceManager.updateTunnelTile()
-        serviceManager.updateAutoTunnelTile()
-        applicationScope.launch(ioDispatcher) {
-            val settings = appDataRepository.settings.get()
-            if (settings.isRestoreOnBootEnabled) {
-                if (
-                    settings.isAutoTunnelEnabled && serviceManager.autoTunnelService.value == null
-                ) {
-                    Timber.d("Starting auto-tunnel on boot/update")
-                    serviceManager.startAutoTunnel()
-                } else {
-                    Timber.d("Restoring previous tunnel state")
-                    tunnelManager.restorePreviousState()
+        applicationScope.launch {
+            when (intent.action) {
+                Intent.ACTION_BOOT_COMPLETED,
+                "android.intent.action.QUICKBOOT_POWERON",
+                "com.htc.intent.action.QUICKBOOT_POWERON" -> {
+                    tunnelManager.handleReboot()
+                }
+                Intent.ACTION_MY_PACKAGE_REPLACED -> {
+                    tunnelManager.handleRestore()
+                    logReader.deleteAndClearLogs()
                 }
-            } 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

@@ -16,10 +16,12 @@ interface NotificationManager {
         title: String = "",
         actions: Collection<NotificationCompat.Action> = emptyList(),
         description: String = "",
-        showTimestamp: Boolean = false,
-        importance: Int = NotificationManager.IMPORTANCE_HIGH,
-        onGoing: Boolean = true,
+        showTimestamp: Boolean = true,
+        importance: Int = NotificationManager.IMPORTANCE_LOW,
+        onGoing: Boolean = false,
         onlyAlertOnce: Boolean = true,
+        groupKey: String? = null,
+        isGroupSummary: Boolean = false,
     ): Notification
 
     fun createNotification(
@@ -27,10 +29,12 @@ interface NotificationManager {
         title: StringValue,
         actions: Collection<NotificationCompat.Action> = emptyList(),
         description: StringValue,
-        showTimestamp: Boolean = false,
-        importance: Int = NotificationManager.IMPORTANCE_HIGH,
-        onGoing: Boolean = true,
+        showTimestamp: Boolean = true,
+        importance: Int = NotificationManager.IMPORTANCE_LOW,
+        onGoing: Boolean = false,
         onlyAlertOnce: Boolean = true,
+        groupKey: String? = null,
+        isGroupSummary: Boolean = false,
     ): Notification
 
     fun createNotificationAction(
@@ -43,8 +47,16 @@ interface NotificationManager {
     fun show(notificationId: Int, notification: Notification)
 
     companion object {
+        const val VPN_GROUP_KEY = "VPN_GROUP"
+        const val AUTO_TUNNEL_GROUP_KEY = "AUTO_TUNNEL_GROUP"
+        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,64 @@
+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.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 { (tunName, error) ->
+            if (!WireGuardAutoTunnel.uiActive.value) {
+                val notification =
+                    notificationManager.createNotification(
+                        WireGuardNotification.NotificationChannels.VPN,
+                        title =
+                            tunName?.let { StringValue.DynamicString(it) }
+                                ?: StringValue.StringResource(R.string.tunnel),
+                        description =
+                            StringValue.StringResource(
+                                R.string.tunnel_error_template,
+                                error.toStringRes(),
+                            ),
+                        groupKey = NotificationManager.VPN_GROUP_KEY,
+                    )
+                notificationManager.show(
+                    NotificationManager.TUNNEL_ERROR_NOTIFICATION_ID,
+                    notification,
+                )
+            }
+        }
+
+    private suspend fun handleTunnelMessages() =
+        tunnelManager.messageEvents.collectLatest { (tunName, message) ->
+            if (!WireGuardAutoTunnel.uiActive.value) {
+                val notification =
+                    notificationManager.createNotification(
+                        WireGuardNotification.NotificationChannels.VPN,
+                        title =
+                            tunName?.let { StringValue.DynamicString(it) }
+                                ?: StringValue.StringResource(R.string.tunnel),
+                        description = message.toStringValue(),
+                        groupKey = NotificationManager.VPN_GROUP_KEY,
+                    )
+                notificationManager.show(
+                    NotificationManager.TUNNEL_MESSAGES_NOTIFICATION_ID,
+                    notification,
+                )
+            }
+        }
+}

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

@@ -3,12 +3,10 @@ package com.zaneschepke.wireguardautotunnel.core.notification
 import android.Manifest
 import android.app.Notification
 import android.app.NotificationChannel
-import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.graphics.Color
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -22,7 +20,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
 class WireGuardNotification @Inject constructor(@ApplicationContext override val context: Context) :
-    com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager {
+    NotificationManager {
 
     enum class NotificationChannels {
         VPN,
@@ -40,8 +38,10 @@ class WireGuardNotification @Inject constructor(@ApplicationContext override val
         importance: Int,
         onGoing: Boolean,
         onlyAlertOnce: Boolean,
+        groupKey: String?,
+        isGroupSummary: Boolean,
     ): Notification {
-        notificationManager.createNotificationChannel(channel.asChannel())
+        notificationManager.createNotificationChannel(channel.asChannel(importance))
         return channel
             .asBuilder()
             .apply {
@@ -51,16 +51,23 @@ class WireGuardNotification @Inject constructor(@ApplicationContext override val
                     PendingIntent.getActivity(
                         context,
                         0,
-                        Intent(context, MainActivity::class.java),
+                        Intent(context, MainActivity::class.java)
+                            .addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP),
                         PendingIntent.FLAG_IMMUTABLE,
                     )
                 )
                 setContentText(description)
                 setOnlyAlertOnce(onlyAlertOnce)
                 setOngoing(onGoing)
-                setPriority(NotificationCompat.PRIORITY_HIGH)
+                setPriority(NotificationCompat.PRIORITY_LOW)
                 setShowWhen(showTimestamp)
                 setSmallIcon(R.drawable.ic_notification)
+                if (groupKey != null) {
+                    setGroup(groupKey)
+                    if (isGroupSummary) {
+                        setGroupSummary(true)
+                    }
+                }
             }
             .build()
     }
@@ -74,6 +81,8 @@ class WireGuardNotification @Inject constructor(@ApplicationContext override val
         importance: Int,
         onGoing: Boolean,
         onlyAlertOnce: Boolean,
+        groupKey: String?,
+        isGroupSummary: Boolean,
     ): Notification {
         return createNotification(
             channel,
@@ -94,12 +103,12 @@ class WireGuardNotification @Inject constructor(@ApplicationContext override val
         val pendingIntent =
             PendingIntent.getBroadcast(
                 context,
-                0,
+                extraId ?: 0,
                 Intent(context, NotificationActionReceiver::class.java).apply {
                     action = notificationAction.name
                     if (extraId != null) putExtra(EXTRA_ID, extraId)
                 },
-                PendingIntent.FLAG_IMMUTABLE,
+                PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT,
             )
         return NotificationCompat.Action.Builder(
                 R.drawable.ic_notification,
@@ -141,34 +150,24 @@ class WireGuardNotification @Inject constructor(@ApplicationContext override val
         }
     }
 
-    private fun NotificationChannels.asChannel(): NotificationChannel {
+    private fun NotificationChannels.asChannel(importance: Int): NotificationChannel {
         return when (this) {
             NotificationChannels.VPN -> {
                 NotificationChannel(
                         context.getString(R.string.vpn_channel_id),
                         context.getString(R.string.vpn_channel_name),
-                        NotificationManager.IMPORTANCE_HIGH,
+                        importance,
                     )
-                    .apply {
-                        description = context.getString(R.string.vpn_channel_description)
-                        enableLights(true)
-                        lightColor = Color.WHITE
-                        enableVibration(false)
-                        vibrationPattern = longArrayOf(100, 200, 300)
-                    }
+                    .apply { description = context.getString(R.string.vpn_channel_description) }
             }
             NotificationChannels.AUTO_TUNNEL -> {
                 NotificationChannel(
                         context.getString(R.string.auto_tunnel_channel_id),
                         context.getString(R.string.auto_tunnel_channel_name),
-                        NotificationManager.IMPORTANCE_HIGH,
+                        importance,
                     )
                     .apply {
                         description = context.getString(R.string.auto_tunnel_channel_description)
-                        enableLights(true)
-                        lightColor = Color.WHITE
-                        enableVibration(false)
-                        vibrationPattern = longArrayOf(100, 200, 300)
                     }
             }
         }

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

@@ -0,0 +1,167 @@
+package com.zaneschepke.wireguardautotunnel.core.service
+
+import android.app.Notification
+import android.content.Intent
+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.core.notification.NotificationManager
+import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
+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.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import com.zaneschepke.wireguardautotunnel.util.extensions.distinctByKeys
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+@AndroidEntryPoint
+abstract class BaseTunnelForegroundService : LifecycleService(), TunnelService {
+
+    @Inject lateinit var notificationManager: NotificationManager
+
+    @Inject lateinit var serviceManager: ServiceManager
+
+    @Inject lateinit var tunnelManager: TunnelManager
+
+    @Inject lateinit var tunnelMonitor: TunnelMonitor
+
+    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
+
+    @Inject lateinit var settingsRepository: GeneralSettingRepository
+
+    @Inject lateinit var tunnelsRepository: TunnelRepository
+
+    protected abstract val fgsType: Int
+
+    override fun onBind(intent: Intent): IBinder {
+        super.onBind(intent)
+        return LocalBinder(this)
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        ServiceCompat.startForeground(
+            this,
+            NotificationManager.VPN_NOTIFICATION_ID,
+            onCreateNotification(),
+            fgsType,
+        )
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        super.onStartCommand(intent, flags, startId)
+        ServiceCompat.startForeground(
+            this,
+            NotificationManager.VPN_NOTIFICATION_ID,
+            onCreateNotification(),
+            fgsType,
+        )
+        if (
+            intent == null ||
+                intent.component == null ||
+                (intent.component?.packageName != this.packageName)
+        ) {
+            Timber.d("Service started by Always-on VPN feature")
+            lifecycleScope.launch {
+                val settings = settingsRepository.getGeneralSettings()
+                if (settings.isAlwaysOnVpnEnabled) {
+                    val tunnel = tunnelsRepository.getDefaultTunnel()
+                    tunnel?.let { tunnelManager.startTunnel(it) }
+                } else {
+                    Timber.w("Always-on VPN is not enabled in app settings")
+                }
+            }
+        } else {
+            start()
+        }
+        return START_STICKY
+    }
+
+    override fun start() {
+        lifecycleScope.launch(ioDispatcher) {
+            tunnelManager.activeTunnels.distinctByKeys().collect { activeTunnels ->
+                val activeTunConfigs = activeTunnels.keys
+                val tunnels = tunnelsRepository.getAll()
+                val activeConfigs = tunnels.filter { activeTunConfigs.contains(it.id) }
+                updateServiceNotification(activeConfigs)
+            }
+        }
+    }
+
+    // TODO Would be cool to have this include kill switch
+    private fun updateServiceNotification(activeConfigs: List<TunnelConfig>) {
+        val notification =
+            when (activeConfigs.size) {
+                0 -> onCreateNotification()
+                1 -> createTunnelNotification(activeConfigs.first())
+                else -> createTunnelsNotification()
+            }
+        ServiceCompat.startForeground(
+            this,
+            NotificationManager.VPN_NOTIFICATION_ID,
+            notification,
+            fgsType,
+        )
+    }
+
+    override fun stop() {
+        Timber.d("Stop called")
+        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
+        stopSelf()
+    }
+
+    override fun onDestroy() {
+        serviceManager.handleTunnelServiceDestroy()
+        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
+        Timber.d("onDestroy")
+        super.onDestroy()
+    }
+
+    private fun createTunnelNotification(tunnelConfig: TunnelConfig): Notification {
+        return notificationManager.createNotification(
+            WireGuardNotification.NotificationChannels.VPN,
+            title = "${getString(R.string.tunnel_running)} - ${tunnelConfig.name}",
+            actions =
+                listOf(
+                    notificationManager.createNotificationAction(
+                        NotificationAction.TUNNEL_OFF,
+                        tunnelConfig.id,
+                    )
+                ),
+            onGoing = true,
+            groupKey = NotificationManager.VPN_GROUP_KEY,
+            isGroupSummary = true,
+        )
+    }
+
+    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)
+                ),
+            groupKey = NotificationManager.VPN_GROUP_KEY,
+            isGroupSummary = true,
+        )
+    }
+
+    private fun onCreateNotification(): Notification {
+        return notificationManager.createNotification(
+            WireGuardNotification.NotificationChannels.VPN,
+            title = getString(R.string.tunnel_starting),
+            groupKey = NotificationManager.VPN_GROUP_KEY,
+            isGroupSummary = true,
+        )
+    }
+}

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

@@ -0,0 +1,5 @@
+package com.zaneschepke.wireguardautotunnel.core.service
+
+import android.os.Binder
+
+class LocalBinder(val service: TunnelService) : Binder()

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

@@ -7,18 +7,16 @@ import android.content.ServiceConnection
 import android.net.VpnService
 import android.os.IBinder
 import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelService
+import com.zaneschepke.wireguardautotunnel.data.model.AppMode
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.di.MainDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AutoTunnelSettingsRepository
 import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
 import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
 import jakarta.inject.Inject
 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.flow.*
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -29,29 +27,73 @@ class ServiceManager
 @Inject
 constructor(
     private val context: Context,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-    @ApplicationScope private val applicationScope: CoroutineScope,
-    @MainDispatcher private val mainDispatcher: CoroutineDispatcher,
-    private val appDataRepository: AppDataRepository,
+    @IoDispatcher ioDispatcher: CoroutineDispatcher,
+    @ApplicationScope applicationScope: CoroutineScope,
+    private val mainDispatcher: CoroutineDispatcher,
+    private val autoTunnelSettingsRepository: AutoTunnelSettingsRepository,
 ) {
 
     private val autoTunnelMutex = Mutex()
+    private val tunnelMutex = Mutex()
 
-    private val _tunnelService = MutableStateFlow<TunnelForegroundService?>(null)
+    private val _tunnelService = MutableStateFlow<TunnelService?>(null)
     private val _autoTunnelService = MutableStateFlow<AutoTunnelService?>(null)
     val autoTunnelService = _autoTunnelService.asStateFlow()
+    val tunnelService = _tunnelService.asStateFlow()
+
+    init {
+        applicationScope.launch(ioDispatcher) {
+            _autoTunnelService
+                .onEach { _ -> withContext(mainDispatcher) { updateAutoTunnelTile() } }
+                .launchIn(this)
+        }
+        applicationScope.launch(ioDispatcher) {
+            combine(
+                    autoTunnelSettingsRepository.flow
+                        .map { it.isAutoTunnelEnabled }
+                        .distinctUntilChanged(),
+                    _autoTunnelService,
+                ) { enabled, service ->
+                    enabled to (service != null)
+                }
+                .collect { (enabled, isRunning) ->
+                    when {
+                        enabled && !isRunning -> {
+                            autoTunnelMutex.withLock { startServiceInternal() }
+                        }
+                        !enabled && isRunning -> {
+                            autoTunnelMutex.withLock { stopServiceInternal() }
+                        }
+                    }
+                }
+        }
+    }
 
     private val tunnelServiceConnection =
         object : ServiceConnection {
             override fun onServiceConnected(name: ComponentName, service: IBinder) {
-                val binder = service as? TunnelForegroundService.LocalBinder
-                _tunnelService.value = binder?.service
-                Timber.d("TunnelForegroundService connected")
+                val binder = service as? LocalBinder
+                _tunnelService.update { binder?.service }
+                val serviceClass =
+                    when {
+                        name.className.contains("VpnForegroundService") -> "VpnForegroundService"
+                        name.className.contains("TunnelForegroundService") ->
+                            "TunnelForegroundService"
+                        else -> "Unknown"
+                    }
+                Timber.d("$serviceClass connected")
             }
 
             override fun onServiceDisconnected(name: ComponentName) {
-                _tunnelService.value = null
-                Timber.d("TunnelForegroundService disconnected")
+                _tunnelService.update { null }
+                val serviceClass =
+                    when {
+                        name.className.contains("VpnForegroundService") -> "VpnForegroundService"
+                        name.className.contains("TunnelForegroundService") ->
+                            "TunnelForegroundService"
+                        else -> "Unknown"
+                    }
+                Timber.d("$serviceClass disconnected")
             }
         }
 
@@ -59,12 +101,12 @@ constructor(
         object : ServiceConnection {
             override fun onServiceConnected(name: ComponentName, service: IBinder) {
                 val binder = service as? AutoTunnelService.LocalBinder
-                _autoTunnelService.value = binder?.service
+                _autoTunnelService.update { binder?.service }
                 Timber.d("AutoTunnelService connected")
             }
 
             override fun onServiceDisconnected(name: ComponentName) {
-                _autoTunnelService.value = null
+                _autoTunnelService.update { null }
                 Timber.d("AutoTunnelService disconnected")
             }
         }
@@ -73,64 +115,52 @@ constructor(
         return VpnService.prepare(context) == null
     }
 
-    suspend fun startAutoTunnel() {
-        autoTunnelMutex.withLock {
-            val settings = appDataRepository.settings.get()
-            appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = true))
-            if (_autoTunnelService.value != null) return
-            withContext(ioDispatcher) {
-                val intent = Intent(context, AutoTunnelService::class.java)
-                context.startForegroundService(intent)
-                context.bindService(intent, autoTunnelServiceConnection, Context.BIND_AUTO_CREATE)
-                withContext(mainDispatcher) { updateAutoTunnelTile() }
-            }
+    private fun startServiceInternal() {
+        if (autoTunnelService.value == null) {
+            val intent = Intent(context, AutoTunnelService::class.java)
+            context.startForegroundService(intent)
+            context.bindService(intent, autoTunnelServiceConnection, Context.BIND_AUTO_CREATE)
         }
     }
 
-    suspend fun stopAutoTunnel() {
-        autoTunnelMutex.withLock {
-            val settings = appDataRepository.settings.get()
-            appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = false))
-            if (_autoTunnelService.value == null) return
-            _autoTunnelService.value?.let { service ->
+    suspend fun startAutoTunnelService() = autoTunnelMutex.withLock { startServiceInternal() }
+
+    private fun stopServiceInternal() {
+        _autoTunnelService.value?.stop()
+        try {
+            context.unbindService(autoTunnelServiceConnection)
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to unbind AutoTunnelService")
+        }
+        _autoTunnelService.update { null }
+    }
+
+    suspend fun startTunnelService(appMode: AppMode) =
+        tunnelMutex.withLock {
+            if (_tunnelService.value != null) return@withLock
+            val serviceClass =
+                when (appMode) {
+                    AppMode.VPN,
+                    AppMode.LOCK_DOWN -> VpnForegroundService::class.java
+                    AppMode.KERNEL,
+                    AppMode.PROXY -> TunnelForegroundService::class.java
+                }
+            val intent = Intent(context, serviceClass)
+            context.startForegroundService(intent)
+            context.bindService(intent, tunnelServiceConnection, Context.BIND_AUTO_CREATE)
+        }
+
+    suspend fun stopTunnelService() =
+        tunnelMutex.withLock {
+            _tunnelService.value?.let { service ->
                 service.stop()
                 try {
-                    context.unbindService(autoTunnelServiceConnection)
-                } finally {
-                    _tunnelService.value = null
+                    context.unbindService(tunnelServiceConnection)
+                } catch (e: Exception) {
+                    Timber.e(e, "Failed to stop Tunnel Service")
                 }
             }
-            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)
-            }
-        }
-    }
-
-    fun stopTunnelForegroundService() {
-        _tunnelService.value?.let { service ->
-            service.stop()
-            try {
-                context.unbindService(tunnelServiceConnection)
-            } finally {
-                _tunnelService.value = null
-            }
-        }
-    }
-
-    fun toggleAutoTunnel() {
-        applicationScope.launch(ioDispatcher) {
-            if (_autoTunnelService.value != null) stopAutoTunnel() else startAutoTunnel()
-        }
-    }
 
     fun updateAutoTunnelTile() {
         context.requestAutoTunnelTileServiceUpdate()

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

@@ -1,328 +1,8 @@
 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.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.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
-import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-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 java.util.concurrent.ConcurrentHashMap
-import javax.inject.Inject
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.NonCancellable
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.isActive
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withContext
-import timber.log.Timber
 
 @AndroidEntryPoint
-class TunnelForegroundService : LifecycleService() {
-
-    @Inject lateinit var notificationManager: NotificationManager
-
-    @Inject lateinit var serviceManager: ServiceManager
-
-    @Inject lateinit var networkMonitor: NetworkMonitor
-
-    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
-
-    @Inject lateinit var tunnelRepo: TunnelRepository
-
-    @Inject lateinit var tunnelManager: TunnelManager
-
-    private val isNetworkConnected = MutableStateFlow(true)
-
-    private val tunnelJobs = ConcurrentHashMap<TunnelConf, Job>()
-    private val pingJobs = ConcurrentHashMap<TunnelConf, Job>()
-
-    private val jobsMutex = Mutex()
-
-    class LocalBinder(val service: TunnelForegroundService) : Binder()
-
-    private val binder = LocalBinder(this)
-
-    override fun onCreate() {
-        super.onCreate()
-        ServiceCompat.startForeground(
-            this@TunnelForegroundService,
-            NotificationManager.VPN_NOTIFICATION_ID,
-            onCreateNotification(),
-            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
-        )
-    }
-
-    override fun onBind(intent: Intent): IBinder {
-        super.onBind(intent)
-        return binder
-    }
-
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        super.onStartCommand(intent, flags, startId)
-        ServiceCompat.startForeground(
-            this@TunnelForegroundService,
-            NotificationManager.VPN_NOTIFICATION_ID,
-            onCreateNotification(),
-            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
-        )
-        start()
-        return START_STICKY
-    }
-
-    fun start() =
-        lifecycleScope.launch(ioDispatcher) {
-            tunnelManager.activeTunnels.distinctByKeys().collect { activeTunnels ->
-                // No active tunnels and no jobs: nothing to do
-                if (activeTunnels.isEmpty() && tunnelJobs.isEmpty()) return@collect
-
-                // Synchronize jobs with active tunnels
-                synchronizeJobs(activeTunnels)
-                updateServiceNotification()
-            }
-        }
-
-    private suspend fun synchronizeJobs(activeTunnels: Map<TunnelConf, TunnelState>) {
-        jobsMutex.withLock {
-            // Stop jobs for tunnels that are no longer active
-            stopInactiveJobs(activeTunnels)
-            // Start jobs for new tunnels
-            startNewJobs(activeTunnels)
-        }
-    }
-
-    private fun stopInactiveJobs(activeTunnels: Map<TunnelConf, TunnelState>) {
-        // If no active tunnels, clear all jobs
-        if (activeTunnels.isEmpty()) {
-            clearAllJobs()
-            return
-        }
-        // Stop jobs for tunnels not in activeTunnels
-        val tunnelsToStop = tunnelJobs.keys - activeTunnels.keys
-        tunnelsToStop.forEach { tun -> stopTunnelJobs(tun) }
-    }
-
-    private fun clearAllJobs() {
-        tunnelJobs.forEach { (tun, job) ->
-            Timber.d("Stopping tunnel job for ${tun.tunName}")
-            job.cancel()
-        }
-        tunnelJobs.clear()
-
-        pingJobs.forEach { (tun, job) ->
-            if (isPingBounce(tun)) {
-                Timber.d("Preserving ping job for ${tun.tunName} due to PING bounce")
-                return@forEach
-            }
-            Timber.d("Stopping ping job for ${tun.tunName}")
-            job.cancel()
-        }
-        pingJobs.entries.removeIf { (tun, _) -> !isPingBounce(tun) }
-    }
-
-    private fun stopTunnelJobs(tun: TunnelConf) {
-        tunnelJobs.remove(tun)?.cancel()
-        Timber.d("Stopped tunnel job for ${tun.tunName}")
-        if (isPingBounce(tun))
-            return Timber.d("Preserving ${tun.tunName} ping job due to ping bounce")
-        pingJobs.remove(tun)?.cancel()
-        Timber.d("Stopped ping job for ${tun.tunName}")
-    }
-
-    private fun startNewJobs(activeTunnels: Map<TunnelConf, TunnelState>) {
-        val tunnelsToStart = activeTunnels.keys - tunnelJobs.keys
-        tunnelsToStart.forEach { tun ->
-            tunnelJobs[tun] = startTunnelJobs(tun)
-            Timber.d("Started tunnel job for ${tun.tunName}")
-
-            if (pingJobs[tun]?.isActive == true) {
-                Timber.d("Reusing active ping job for ${tun.tunName}")
-            } else {
-                pingJobs[tun]?.cancel() // Cancel any stale job
-                if (tun.isPingEnabled) {
-                    if (tun.isStaticallyConfigured()) {
-                        Timber.d("Skipping ping for statically configured tunnel")
-                    } else {
-                        pingJobs[tun] = startPingJob(tun)
-                        Timber.d("Started ping job for ${tun.tunName}")
-                    }
-                }
-            }
-        }
-    }
-
-    private fun isPingBounce(tun: TunnelConf): Boolean =
-        tunnelManager.bouncingTunnelIds[tun.id] == TunnelStatus.StopReason.PING
-
-    // TODO Would be cool to have this include kill switch
-    // TODO also we need to include errors
-    private fun updateServiceNotification() {
-        val notification =
-            when (tunnelJobs.size) {
-                0 -> onCreateNotification()
-                1 -> createTunnelNotification(tunnelJobs.keys.first())
-                else -> createTunnelsNotification()
-            }
-        ServiceCompat.startForeground(
-            this@TunnelForegroundService,
-            NotificationManager.VPN_NOTIFICATION_ID,
-            notification,
-            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
-        )
-    }
-
-    // use same scope so we can cancel all of these
-    private fun startTunnelJobs(tunnelConf: TunnelConf) =
-        lifecycleScope.launch(ioDispatcher) {
-            // monitor if we have internet connectivity
-            launch { startNetworkMonitorJob() }
-            // job to trigger stats emit on interval
-            launch { startTunnelStatsJob(tunnelConf) }
-            // monitor changes to the tunnel config
-            launch { startTunnelConfChangesJob(tunnelConf) }
-        }
-
-    private suspend fun startTunnelConfChangesJob(tunnelConf: TunnelConf) {
-        tunnelRepo.flow
-            .flowOn(ioDispatcher)
-            .map { storedTunnels -> storedTunnels.firstOrNull { it.id == tunnelConf.id } }
-            .filterNotNull()
-            // only emit when one of these 3 values change
-            .distinctUntilChanged { old, new -> old == new }
-            .collect { storedTunnel ->
-                if (tunnelConf != storedTunnel) {
-                    Timber.d("Config changed for ${storedTunnel.tunName}, bouncing")
-                    // let this complete, even after cancel
-                    withContext(NonCancellable) {
-                        tunnelManager.bounceTunnel(
-                            storedTunnel,
-                            TunnelStatus.StopReason.CONFIG_CHANGED,
-                        )
-                    }
-                }
-            }
-    }
-
-    private suspend fun startNetworkMonitorJob() {
-        networkMonitor.networkStatusFlow.flowOn(ioDispatcher).collectLatest { status ->
-            val isAvailable = status !is NetworkStatus.Disconnected
-            isNetworkConnected.value = isAvailable
-            Timber.d("Network available: $status")
-        }
-    }
-
-    private suspend fun startTunnelStatsJob(tunnel: TunnelConf) = coroutineScope {
-        while (isActive) {
-            tunnelManager.updateTunnelStatistics(tunnel)
-            delay(STATS_DELAY)
-        }
-    }
-
-    private fun startPingJob(tunnel: TunnelConf) =
-        lifecycleScope.launch(ioDispatcher) {
-            // delay for initial duration
-            delay(tunnel.pingInterval ?: Constants.PING_INTERVAL)
-            while (isActive) {
-                val shouldBounce = shouldBounceTunnel(tunnel)
-                val delayMs =
-                    if (shouldBounce) {
-                        // let this complete, even after cancel
-                        withContext(NonCancellable) {
-                            tunnelManager.bounceTunnel(tunnel, TunnelStatus.StopReason.PING)
-                        }
-                        tunnel.pingCooldown ?: Constants.PING_COOLDOWN
-                    } else {
-                        tunnel.pingInterval ?: Constants.PING_INTERVAL
-                    }
-                delay(delayMs)
-            }
-        }
-
-    private suspend fun shouldBounceTunnel(tunnel: TunnelConf): Boolean {
-        if (!isNetworkConnected.value) {
-            Timber.d("Network disconnected, skipping ping for ${tunnel.tunName}")
-            return false
-        }
-        return runCatching { !tunnel.isTunnelPingable(ioDispatcher) }
-            .onFailure { e -> Timber.e(e, "Ping check failed for ${tunnel.tunName}") }
-            .getOrDefault(true)
-    }
-
-    fun stop() {
-        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
-        stopSelf()
-    }
-
-    override fun onDestroy() {
-        serviceManager.handleTunnelServiceDestroy()
-        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
-        super.onDestroy()
-    }
-
-    private fun createTunnelNotification(tunnelConf: TunnelConf): Notification {
-        return notificationManager.createNotification(
-            WireGuardNotification.NotificationChannels.VPN,
-            title = "${getString(R.string.tunnel_running)} - ${tunnelConf.tunName}",
-            actions =
-                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),
-        )
-    }
-
-    // TODO add notification handling and optional log reading for restart on handshake failures
-    companion object {
-        const val STATS_DELAY = 1_000L
-        // ipv6 disabled or block on network
-        // Failed to send handshake initiation: write udp [::]"
-        // Failed to send data packets: write udp [::]
-        // Failed to send data packets: write udp 0.0.0.0:51820
-        // Handshake did not complete after 5 seconds, retrying
-    }
-}
+class TunnelForegroundService(override val fgsType: Int = Constants.SPECIAL_USE_SERVICE_TYPE_ID) :
+    BaseTunnelForegroundService()

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

@@ -0,0 +1,7 @@
+package com.zaneschepke.wireguardautotunnel.core.service
+
+interface TunnelService {
+    fun start()
+
+    fun stop()
+}

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

@@ -0,0 +1,8 @@
+package com.zaneschepke.wireguardautotunnel.core.service
+
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class VpnForegroundService(override val fgsType: Int = Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID) :
+    BaseTunnelForegroundService()

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

@@ -3,46 +3,38 @@ 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.data.model.AppMode
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
-import com.zaneschepke.wireguardautotunnel.domain.events.KillSwitchEvent
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.domain.model.AutoTunnelSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.domain.repository.AutoTunnelSettingsRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 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.to
+import com.zaneschepke.wireguardautotunnel.util.extensions.toMillis
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import javax.inject.Provider
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.Job
-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 kotlinx.coroutines.*
+import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 import timber.log.Timber
 
 @AndroidEntryPoint
@@ -50,8 +42,6 @@ class AutoTunnelService : LifecycleService() {
 
     @Inject lateinit var networkMonitor: NetworkMonitor
 
-    @Inject lateinit var appDataRepository: Provider<AppDataRepository>
-
     @Inject lateinit var notificationManager: NotificationManager
 
     @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
@@ -60,14 +50,16 @@ class AutoTunnelService : LifecycleService() {
 
     @Inject lateinit var tunnelManager: TunnelManager
 
+    @Inject lateinit var autoTunnelRepository: Provider<AutoTunnelSettingsRepository>
+    @Inject lateinit var settingsRepository: GeneralSettingRepository
+    @Inject lateinit var tunnelsRepository: TunnelRepository
+
     private val defaultState = AutoTunnelState()
 
+    private val autoTunMutex = Mutex()
+
     private val autoTunnelStateFlow = MutableStateFlow(defaultState)
 
-    private var wakeLock: PowerManager.WakeLock? = null
-
-    private var killSwitchJob: Job? = null
-
     class LocalBinder(val service: AutoTunnelService) : Binder()
 
     private val binder = LocalBinder(this)
@@ -90,43 +82,21 @@ class AutoTunnelService : LifecycleService() {
     }
 
     fun start() {
-        kotlin
-            .runCatching {
-                launchWatcherNotification()
-                initWakeLock()
-                startAutoTunnelJob()
-                startAutoTunnelStateJob()
-                killSwitchJob = startKillSwitchJob()
-            }
-            .onFailure { Timber.e(it) }
+        launchWatcherNotification()
+        startAutoTunnelStateJob()
+        startLocationPermissionsNotificationJob()
     }
 
     fun stop() {
-        wakeLock?.let { if (it.isHeld) it.release() }
         stopSelf()
     }
 
     override fun onDestroy() {
         serviceManager.handleAutoTunnelServiceDestroy()
-        restoreVpnKillSwitch()
+        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
         super.onDestroy()
     }
 
-    private fun restoreVpnKillSwitch() {
-        with(autoTunnelStateFlow.value) {
-            if (
-                settings.isVpnKillSwitchEnabled &&
-                    tunnelManager.getBackendState() != BackendState.KILL_SWITCH_ACTIVE
-            ) {
-                killSwitchJob?.cancel()
-                val allowedIps =
-                    if (settings.isLanOnKillSwitchEnabled) TunnelConf.LAN_BYPASS_ALLOWED_IPS
-                    else emptyList()
-                tunnelManager.setBackendState(BackendState.KILL_SWITCH_ACTIVE, allowedIps)
-            }
-        }
-    }
-
     private fun launchWatcherNotification(
         description: String = getString(R.string.monitoring_state_changes)
     ) {
@@ -141,138 +111,255 @@ class AutoTunnelService : LifecycleService() {
                             NotificationAction.AUTO_TUNNEL_OFF
                         )
                     ),
+                onGoing = true,
+                groupKey = NotificationManager.AUTO_TUNNEL_GROUP_KEY,
+                isGroupSummary = true,
             )
         ServiceCompat.startForeground(
             this,
             NotificationManager.AUTO_TUNNEL_NOTIFICATION_ID,
             notification,
-            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+            Constants.SPECIAL_USE_SERVICE_TYPE_ID,
         )
     }
 
-    private fun initWakeLock() {
-        wakeLock =
-            (getSystemService(POWER_SERVICE) as PowerManager).run {
-                val tag = this.javaClass.name
-                newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "$tag::lock").apply {
-                    try {
-                        Timber.i("Initiating wakelock with 10 min timeout")
-                        acquire(Constants.BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT)
-                    } finally {
-                        release()
-                    }
-                }
-            }
-    }
-
-    private fun 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 {
-                            networkMonitor.networkStatusFlow.flowOn(ioDispatcher).map {
-                                buildNetworkState(it)
-                            }
-                        }
-                        .distinctUntilChanged(),
-                ) { double, networkState ->
-                    AutoTunnelState(
-                        tunnelManager.activeTunnels.value,
-                        networkState,
-                        double.first,
-                        double.second,
-                    )
+            val networkFlow =
+                debouncedConnectivityStateFlow
+                    .flowOn(ioDispatcher)
+                    .map(NetworkState::from)
+                    .map(::NetworkChange)
+                    .distinctUntilChanged()
+
+            val settingsFlow =
+                combineSettings().map { (appMode, settings, tunnels) ->
+                    SettingsChange(appMode, settings, tunnels)
                 }
-                .collect { state ->
+
+            val tunnelsFlow = tunnelManager.activeTunnels.map(::ActiveTunnelsChange)
+
+            var reevaluationJob: Job? = null
+
+            // get everything in sync before we use merge
+            combine(networkFlow, settingsFlow, tunnelsFlow) { network, settings, tunnels ->
                     autoTunnelStateFlow.update {
                         it.copy(
-                            activeTunnels = state.activeTunnels,
-                            networkState = state.networkState,
-                            settings = state.settings,
-                            tunnels = state.tunnels,
+                            activeTunnels = tunnels.activeTunnels,
+                            networkState = network.networkState,
+                            settings = settings.settings,
+                            tunnels = settings.tunnels,
                         )
                     }
                 }
+                .first()
+
+            val initialState = autoTunnelStateFlow.value
+            if (initialState != defaultState) {
+                handleAutoTunnelEvent(
+                    initialState.determineAutoTunnelEvent(NetworkChange(initialState.networkState))
+                )
+            }
+
+            // use merge to limit the noise of a combine and also increase the scalability of auto
+            // tunnel handling new states
+            merge(networkFlow, settingsFlow, tunnelsFlow).collect { change ->
+                if (change !is ActiveTunnelsChange) {
+                    Timber.d("New state changed to ${change.javaClass.simpleName}")
+                }
+
+                val previousState = autoTunnelStateFlow.value
+
+                when (change) {
+                    is NetworkChange -> {
+                        Timber.d("Network change: ${change.networkState}")
+                        reevaluationJob?.cancel()
+                        autoTunnelStateFlow.update { it.copy(networkState = change.networkState) }
+                        if (previousState.networkState == change.networkState) {
+                            Timber.d("Duplicate network state change detected, ignoring")
+                            return@collect
+                        }
+                    }
+                    is SettingsChange -> {
+                        reevaluationJob?.cancel()
+                        autoTunnelStateFlow.update {
+                            it.copy(settings = change.settings, tunnels = change.tunnels)
+                        }
+                        if (
+                            previousState.settings == change.settings &&
+                                previousState.tunnels == change.tunnels
+                        ) {
+                            Timber.d("Duplicate settings change detected, ignoring")
+                            return@collect
+                        }
+                    }
+                    is ActiveTunnelsChange -> {
+                        autoTunnelStateFlow.update { it.copy(activeTunnels = change.activeTunnels) }
+                        return@collect
+                    }
+                }
+
+                handleAutoTunnelEvent(autoTunnelStateFlow.value.determineAutoTunnelEvent(change))
+
+                reevaluationJob = launch {
+                    val snapshotNetwork = autoTunnelStateFlow.value.networkState
+                    delay(REEVALUATE_CHECK_DELAY)
+                    val currentState = autoTunnelStateFlow.value
+                    if (
+                        currentState != defaultState && currentState.networkState != snapshotNetwork
+                    ) {
+                        Timber.d(
+                            "Re-evaluating auto-tunnel state.. (network changed since snapshot)"
+                        )
+                        handleAutoTunnelEvent(currentState.determineAutoTunnelEvent(change))
+                    } else {
+                        Timber.d("Skipping re-eval: network unchanged or default state")
+                    }
+                }
+            }
         }
 
-    private fun combineSettings(): Flow<Pair<AppSettings, Tunnels>> {
+    private fun combineSettings(): Flow<Triple<AppMode, AutoTunnelSettings, List<TunnelConfig>>> {
         return combine(
-                appDataRepository.get().settings.flow,
-                appDataRepository.get().tunnels.flow.map { tunnels ->
+                settingsRepository.flow.map { it.appMode }.distinctUntilChanged(),
+                autoTunnelRepository.get().flow,
+                tunnelsRepository.flow.map { tunnels ->
                     // isActive is ignored for equality checks so user can manually toggle off
                     // tunnel with auto-tunnel
                     tunnels.map { it.copy(isActive = false) }
                 },
-            ) { settings, tunnels ->
-                Pair(settings, tunnels)
+            ) { appMode, autoTunnel, tunnels ->
+                Triple(appMode, autoTunnel, tunnels)
             }
             .distinctUntilChanged()
     }
 
-    private fun startKillSwitchJob() =
+    private fun areAutoTunnelPermissionsRequiredTheSame(
+        old: AutoTunnelState,
+        new: AutoTunnelState,
+    ): Boolean {
+        return (old.settings.wifiDetectionMethod == new.settings.wifiDetectionMethod &&
+            old.networkState.locationPermissionGranted ==
+                new.networkState.locationPermissionGranted &&
+            old.networkState.locationServicesEnabled == new.networkState.locationServicesEnabled &&
+            old.tunnels == new.tunnels &&
+            old.settings.trustedNetworkSSIDs == new.settings.trustedNetworkSSIDs)
+    }
+
+    //     watch for changes to location permission and notify user it will impact auto-tunneling
+    //     TODO or a recheck button for location permission so we dont have to poll it
+    private fun startLocationPermissionsNotificationJob(): Job =
         lifecycleScope.launch(ioDispatcher) {
-            autoTunnelStateFlow.collect {
-                if (it == defaultState) return@collect
-                when (val event = it.asKillSwitchEvent()) {
-                    KillSwitchEvent.DoNothing -> Unit
-                    is KillSwitchEvent.Start -> {
-                        Timber.d("Starting kill switch")
-                        tunnelManager.setBackendState(
-                            BackendState.KILL_SWITCH_ACTIVE,
-                            event.allowedIps,
-                        )
-                    }
-                    KillSwitchEvent.Stop -> {
-                        Timber.d("Stopping kill switch")
-                        tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, emptySet())
+            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.to(),
+                        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 fun startAutoTunnelJob() =
-        lifecycleScope.launch(ioDispatcher) {
-            Timber.i("Starting auto-tunnel network event watcher")
-            val settings = appDataRepository.get().settings.get()
-            Timber.d("Starting with debounce delay of: ${settings.debounceDelaySeconds} seconds")
-            autoTunnelStateFlow.debounce(settings.debounceDelayMillis()).collect { watcherState ->
-                if (watcherState == defaultState) return@collect
-                Timber.d("New auto tunnel state emitted ${watcherState.networkState}")
-                when (val event = watcherState.asAutoTunnelEvent()) {
-                    is AutoTunnelEvent.Start ->
-                        (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")
-                }
+    private suspend fun handleAutoTunnelEvent(autoTunnelEvent: AutoTunnelEvent) {
+        autoTunMutex.withLock {
+            when (
+                val event =
+                    autoTunnelEvent.also {
+                        Timber.i("Auto tunnel event: ${it.javaClass.simpleName}")
+                    }
+            ) {
+                is AutoTunnelEvent.Start ->
+                    (event.tunnelConfig ?: tunnelsRepository.getDefaultTunnel())?.let {
+                        tunnelManager.startTunnel(it)
+                    }
+                is AutoTunnelEvent.Stop -> tunnelManager.stopActiveTunnels()
+                AutoTunnelEvent.DoNothing -> Timber.i("Auto-tunneling: nothing to do")
             }
         }
+    }
+
+    @OptIn(FlowPreview::class, ExperimentalCoroutinesApi::class)
+    private val debouncedConnectivityStateFlow: Flow<ConnectivityState> by lazy {
+        autoTunnelRepository
+            .get()
+            .flow
+            .map { it.debounceDelaySeconds.toMillis() }
+            .distinctUntilChanged()
+            .flatMapLatest { debounceMillis ->
+                networkMonitor.connectivityStateFlow.debounce(debounceMillis)
+            }
+    }
+
+    companion object {
+        const val REEVALUATE_CHECK_DELAY = 3_000L
+    }
 }

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

@@ -0,0 +1,19 @@
+package com.zaneschepke.wireguardautotunnel.core.service.autotunnel
+
+import com.zaneschepke.wireguardautotunnel.data.model.AppMode
+import com.zaneschepke.wireguardautotunnel.domain.model.AutoTunnelSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.domain.state.NetworkState
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
+
+sealed interface StateChange
+
+data class NetworkChange(val networkState: NetworkState) : StateChange
+
+data class SettingsChange(
+    val appMode: AppMode,
+    val settings: AutoTunnelSettings,
+    val tunnels: List<TunnelConfig>,
+) : StateChange
+
+data class ActiveTunnelsChange(val activeTunnels: Map<Int, TunnelState>) : StateChange

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

@@ -9,7 +9,8 @@ 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 com.zaneschepke.wireguardautotunnel.domain.repository.AutoTunnelSettingsRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlinx.coroutines.launch
@@ -17,7 +18,9 @@ import timber.log.Timber
 
 @AndroidEntryPoint
 class AutoTunnelControlTile : TileService(), LifecycleOwner {
-    @Inject lateinit var appDataRepository: AppDataRepository
+
+    @Inject lateinit var autoTunnelSettingsRepository: AutoTunnelSettingsRepository
+    @Inject lateinit var tunnelsRepository: TunnelRepository
 
     @Inject lateinit var serviceManager: ServiceManager
 
@@ -44,7 +47,7 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
             }
         }
         lifecycleScope.launch {
-            appDataRepository.tunnels.flow.collect {
+            tunnelsRepository.flow.collect {
                 if (it.isEmpty()) {
                     setUnavailable()
                 }
@@ -57,10 +60,10 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
         unlockAndRun {
             lifecycleScope.launch {
                 if (serviceManager.autoTunnelService.value != null) {
-                    serviceManager.stopAutoTunnel()
+                    autoTunnelSettingsRepository.updateAutoTunnelEnabled(false)
                     setInactive()
                 } else {
-                    serviceManager.startAutoTunnel()
+                    autoTunnelSettingsRepository.updateAutoTunnelEnabled(true)
                     setActive()
                 }
             }
@@ -81,17 +84,6 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
         }
     }
 
-    /* This works around an annoying unsolved frameworks bug some people are hitting. */
-    override fun onBind(intent: Intent): IBinder? {
-        var ret: IBinder? = null
-        try {
-            ret = super.onBind(intent)
-        } catch (_: Throwable) {
-            Timber.e("Failed to bind to TunnelControlTile")
-        }
-        return ret
-    }
-
     private fun setUnavailable() {
         runCatching {
             qsTile.state = Tile.STATE_UNAVAILABLE
@@ -99,6 +91,17 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
         }
     }
 
+    /* This works around an annoying unsolved frameworks bug some people are hitting. */
+    override fun onBind(intent: Intent): IBinder? {
+        var ret: IBinder? = null
+        try {
+            ret = super.onBind(intent)
+        } catch (_: Throwable) {
+            Timber.e("Failed to bind to AutoTunnelControlTile")
+        }
+        return ret
+    }
+
     override val lifecycle: Lifecycle
         get() = lifecycleRegistry
 }

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

@@ -13,9 +13,7 @@ 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.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlinx.coroutines.launch
@@ -23,7 +21,8 @@ import timber.log.Timber
 
 @AndroidEntryPoint
 class TunnelControlTile : TileService(), LifecycleOwner {
-    @Inject lateinit var appDataRepository: AppDataRepository
+
+    @Inject lateinit var tunnelsRepository: TunnelRepository
 
     @Inject lateinit var serviceManager: ServiceManager
 
@@ -54,7 +53,7 @@ class TunnelControlTile : TileService(), LifecycleOwner {
 
     private suspend fun updateTileState() {
         try {
-            val tunnels = appDataRepository.tunnels.getAll()
+            val tunnels = tunnelsRepository.getAll()
             if (tunnels.isEmpty()) {
                 setUnavailable()
                 return
@@ -65,12 +64,14 @@ class TunnelControlTile : TileService(), LifecycleOwner {
 
             when {
                 activeTunnels.isNotEmpty() -> {
-                    val activeIds = activeTunnels.map { it.key.id }
+                    val activeIds = activeTunnels.map { it.key }
                     // 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)
+                    val activeTunNames =
+                        tunnels.filter { activeTunnels.keys.contains(it.id) }.map { it.name }
+                    updateTileForActiveTunnels(activeTunNames)
                 }
                 else -> updateTileForLastActiveTunnels()
             }
@@ -79,10 +80,10 @@ class TunnelControlTile : TileService(), LifecycleOwner {
         }
     }
 
-    private fun updateTileForActiveTunnels(activeTunnels: Map<TunnelConf, TunnelState>) {
+    private fun updateTileForActiveTunnels(activeTunnelNames: List<String>) {
         val tileName =
-            when (activeTunnels.size) {
-                1 -> activeTunnels.keys.first().tunName
+            when (activeTunnelNames.size) {
+                1 -> activeTunnelNames[0]
                 else -> getString(R.string.multiple)
             }
         updateTile(tileName, true)
@@ -92,15 +93,14 @@ class TunnelControlTile : TileService(), LifecycleOwner {
         val lastActiveIds = WireGuardAutoTunnel.getLastActiveTunnels()
         when {
             lastActiveIds.isEmpty() -> {
-                appDataRepository.getStartTunnelConfig()?.let { config ->
-                    updateTile(config.tunName, false)
-                } ?: setUnavailable()
+                tunnelsRepository.getStartTunnel()?.let { config -> updateTile(config.name, 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)
+                tunnelsRepository.getById(tunnelId)?.let { tunnel ->
+                    updateTile(tunnel.name, false)
                 } ?: setUnavailable()
             }
         }
@@ -111,13 +111,13 @@ class TunnelControlTile : TileService(), LifecycleOwner {
         unlockAndRun {
             lifecycleScope.launch {
                 if (tunnelManager.activeTunnels.value.isNotEmpty())
-                    return@launch tunnelManager.stopTunnel()
+                    return@launch tunnelManager.stopActiveTunnels()
                 val lastActive = WireGuardAutoTunnel.getLastActiveTunnels()
                 if (lastActive.isEmpty()) {
-                    appDataRepository.getStartTunnelConfig()?.let { tunnelManager.startTunnel(it) }
+                    tunnelsRepository.getStartTunnel()?.let { tunnelManager.startTunnel(it) }
                 } else {
                     lastActive.forEach { id ->
-                        appDataRepository.tunnels.getById(id)?.let { tunnelManager.startTunnel(it) }
+                        tunnelsRepository.getById(id)?.let { tunnelManager.startTunnel(it) }
                     }
                 }
             }
@@ -159,6 +159,15 @@ class TunnelControlTile : TileService(), LifecycleOwner {
         }
     }
 
+    private fun updateTile(name: String, active: Boolean) {
+        runCatching {
+                setTileDescription(name)
+                if (active) return setActive()
+                setInactive()
+            }
+            .onFailure { Timber.e(it) }
+    }
+
     /* This works around an annoying unsolved frameworks bug some people are hitting. */
     override fun onBind(intent: Intent): IBinder? {
         var ret: IBinder? = null
@@ -170,15 +179,6 @@ class TunnelControlTile : TileService(), LifecycleOwner {
         return ret
     }
 
-    private fun updateTile(name: String, active: Boolean) {
-        runCatching {
-                setTileDescription(name)
-                if (active) return setActive()
-                setInactive()
-            }
-            .onFailure { Timber.e(it) }
-    }
-
     override val lifecycle: Lifecycle
         get() = lifecycleRegistry
 }

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

@@ -2,12 +2,13 @@ package com.zaneschepke.wireguardautotunnel.core.shortcut
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
-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 com.zaneschepke.wireguardautotunnel.domain.repository.AutoTunnelSettingsRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
@@ -16,9 +17,10 @@ import timber.log.Timber
 
 @AndroidEntryPoint
 class ShortcutsActivity : ComponentActivity() {
-    @Inject lateinit var appDataRepository: AppDataRepository
 
-    @Inject lateinit var serviceManager: ServiceManager
+    @Inject lateinit var settingsRepository: GeneralSettingRepository
+    @Inject lateinit var autoTunnelSettingsRepository: AutoTunnelSettingsRepository
+    @Inject lateinit var tunnelsRepository: TunnelRepository
 
     @Inject lateinit var tunnelManager: TunnelManager
 
@@ -27,7 +29,7 @@ class ShortcutsActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         applicationScope.launch {
-            val settings = appDataRepository.settings.get()
+            val settings = settingsRepository.getGeneralSettings()
             if (settings.isShortcutsEnabled) {
                 when (intent.getStringExtra(CLASS_NAME_EXTRA_KEY)) {
                     LEGACY_TUNNEL_SERVICE_NAME,
@@ -35,16 +37,13 @@ class ShortcutsActivity : ComponentActivity() {
                         val tunnelName = intent.getStringExtra(TUNNEL_NAME_EXTRA_KEY)
                         Timber.d("Tunnel name extra: $tunnelName")
                         val tunnelConfig =
-                            tunnelName?.let {
-                                appDataRepository.tunnels.getAll().firstOrNull {
-                                    it.tunName == tunnelName
-                                }
-                            } ?: appDataRepository.getStartTunnelConfig()
-                        Timber.d("Shortcut action on name: ${tunnelConfig?.tunName}")
+                            tunnelName?.let { tunnelsRepository.findByTunnelName(it) }
+                                ?: tunnelsRepository.getDefaultTunnel()
+                        Timber.d("Shortcut action on name: ${tunnelConfig?.name}")
                         tunnelConfig?.let {
                             when (intent.action) {
                                 Action.START.name -> tunnelManager.startTunnel(it)
-                                Action.STOP.name -> tunnelManager.stopTunnel()
+                                Action.STOP.name -> tunnelManager.stopActiveTunnels()
                                 else -> Unit
                             }
                         }
@@ -52,8 +51,10 @@ class ShortcutsActivity : ComponentActivity() {
                     AutoTunnelService::class.java.simpleName,
                     LEGACY_AUTO_TUNNEL_SERVICE_NAME -> {
                         when (intent.action) {
-                            Action.START.name -> serviceManager.startAutoTunnel()
-                            Action.STOP.name -> serviceManager.stopAutoTunnel()
+                            Action.START.name ->
+                                autoTunnelSettingsRepository.updateAutoTunnelEnabled(true)
+                            Action.STOP.name ->
+                                autoTunnelSettingsRepository.updateAutoTunnelEnabled(false)
                         }
                     }
                 }

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

@@ -1,84 +1,96 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
-import com.wireguard.android.backend.Tunnel
-import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendError
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.domain.events.BackendCoreException
+import com.zaneschepke.wireguardautotunnel.domain.events.BackendMessage
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.domain.state.LogHealthState
+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.util.extensions.asTunnelState
 import java.util.concurrent.ConcurrentHashMap
-import kotlin.concurrent.thread
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.delay
+import kotlin.coroutines.cancellation.CancellationException
+import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import timber.log.Timber
 
 abstract class BaseTunnel(
-    @ApplicationScope private val applicationScope: CoroutineScope,
-    private val appDataRepository: AppDataRepository,
-    private val serviceManager: ServiceManager,
+    @ApplicationScope protected val applicationScope: CoroutineScope,
+    @IoDispatcher protected val ioDispatcher: CoroutineDispatcher,
 ) : TunnelProvider {
 
-    private val _errorEvents =
-        MutableSharedFlow<Pair<TunnelConf, BackendError>>(replay = 0, extraBufferCapacity = 1)
-    override val errorEvents = _errorEvents.asSharedFlow()
+    protected val errors = MutableSharedFlow<Pair<String, BackendCoreException>>()
+    override val errorEvents = errors.asSharedFlow()
 
-    private val activeTuns = MutableStateFlow<Map<TunnelConf, TunnelState>>(emptyMap())
-    private val tunThreads = ConcurrentHashMap<Int, Thread>()
+    private val _messageEvents = MutableSharedFlow<Pair<String, BackendMessage>>()
+    override val messageEvents = _messageEvents.asSharedFlow()
+
+    protected val activeTuns = MutableStateFlow<Map<Int, TunnelState>>(emptyMap())
     override val activeTunnels = activeTuns.asStateFlow()
 
+    protected val tunJobs = ConcurrentHashMap<Int, Job>()
     private val tunMutex = Mutex()
     private val tunStatusMutex = Mutex()
-    private val bounceTunnelMutex = Mutex()
 
-    override val bouncingTunnelIds = ConcurrentHashMap<Int, TunnelStatus.StopReason>()
+    abstract fun tunnelStateFlow(tunnelConfig: TunnelConfig): Flow<TunnelStatus>
 
-    abstract suspend fun startBackend(tunnel: TunnelConf)
+    abstract override fun setBackendMode(backendMode: BackendMode)
 
-    abstract fun stopBackend(tunnel: TunnelConf)
+    abstract override fun getBackendMode(): BackendMode
 
-    override fun hasVpnPermission(): Boolean {
-        return serviceManager.hasVpnPermission()
-    }
+    abstract override suspend fun forceStopTunnel(tunnelId: Int)
 
-    protected suspend fun updateTunnelStatus(
-        tunnelConf: TunnelConf,
-        status: TunnelStatus? = null,
-        stats: TunnelStatistics? = null,
+    abstract override fun handleDnsReresolve(tunnelConfig: TunnelConfig): Boolean
+
+    abstract override fun getStatistics(tunnelId: Int): TunnelStatistics?
+
+    override suspend fun updateTunnelStatus(
+        tunnelId: Int,
+        status: TunnelStatus?,
+        stats: TunnelStatistics?,
+        pingStates: Map<String, PingState>?,
+        logHealthState: LogHealthState?,
     ) {
         tunStatusMutex.withLock {
             activeTuns.update { currentTuns ->
-                val originalConf = currentTuns.getKeyById(tunnelConf.id) ?: tunnelConf
-                val existingState = currentTuns.getValueById(tunnelConf.id) ?: TunnelState()
-                val newState = status ?: existingState.status
-                if (newState == TunnelStatus.Down) {
-                    Timber.d("Removing tunnel ${tunnelConf.id} from activeTunnels as state is DOWN")
-                    cleanUpTunThread(tunnelConf)
-                    currentTuns - originalConf
-                } else if (existingState.status == newState && stats == null) {
-                    Timber.d("Skipping redundant state update for ${tunnelConf.id}: $newState")
+                if (!currentTuns.containsKey(tunnelId) && status != TunnelStatus.Starting) {
+                    Timber.d("Ignoring update for inactive tunnel $tunnelId")
+                    return@update currentTuns
+                }
+                val existingState = currentTuns[tunnelId] ?: TunnelState()
+                val newStatus = status ?: existingState.status
+                if (newStatus == TunnelStatus.Down) {
+                    Timber.d("Removing tunnel $tunnelId from activeTunnels as state is DOWN")
+                    cleanUpTunJob(tunnelId)
+                    currentTuns - tunnelId
+                } else if (
+                    existingState.status == newStatus &&
+                        stats == null &&
+                        pingStates == null &&
+                        logHealthState == null
+                ) {
+                    Timber.d("Skipping redundant state update for ${tunnelId}: $newStatus")
                     currentTuns
                 } else {
                     val updated =
                         existingState.copy(
-                            status = newState,
+                            status = newStatus,
                             statistics = stats ?: existingState.statistics,
+                            pingStates = pingStates ?: existingState.pingStates,
+                            logHealthState = logHealthState ?: existingState.logHealthState,
                         )
-                    currentTuns + (originalConf to updated)
+                    currentTuns + (tunnelId to updated)
                 }
             }
         }
     }
 
-    private suspend fun stopActiveTunnels() {
+    override suspend fun stopActiveTunnels() {
         activeTunnels.value.forEach { (config, state) ->
             if (state.status.isUpOrStarting()) {
                 stopTunnel(config)
@@ -86,148 +98,61 @@ abstract class BaseTunnel(
         }
     }
 
-    private fun configureTunnelCallbacks(tunnelConf: TunnelConf) {
-        Timber.d("Configuring TunnelConf instance: ${tunnelConf.hashCode()}")
-        tunnelConf.setStateChangeCallback { 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 -> updateTunnelStatus(tunnelConf, state.asTunnelState())
-                    is org.amnezia.awg.backend.Tunnel.State ->
-                        updateTunnelStatus(tunnelConf, state.asTunnelState())
-                }
-                handleServiceStateOnChange()
-            }
-            serviceManager.updateTunnelTile()
-        }
-    }
-
-    override suspend fun updateTunnelStatistics(tunnel: TunnelConf) {
-        val stats = getStatistics(tunnel)
-        updateTunnelStatus(tunnel, null, stats)
-    }
-
-    override suspend fun startTunnel(tunnelConf: TunnelConf) {
-        if (activeTuns.exists(tunnelConf.id) || tunThreads.containsKey(tunnelConf.id)) return
-        if (this@BaseTunnel is UserspaceTunnel) stopActiveTunnels()
+    override suspend fun startTunnel(tunnelConfig: TunnelConfig) {
         tunMutex.withLock {
-            tunThreads[tunnelConf.id] = thread {
-                runBlocking {
+            if (
+                activeTuns.value.containsKey(tunnelConfig.id) ||
+                    tunJobs.containsKey(tunnelConfig.id)
+            ) {
+                return Timber.w("Tunnel is already running: ${tunnelConfig.name}")
+            }
+
+            updateTunnelStatus(tunnelConfig.id, TunnelStatus.Starting)
+
+            val job =
+                applicationScope.launch(ioDispatcher) {
                     try {
-                        Timber.d("Starting tunnel ${tunnelConf.id}...")
-                        startTunnelInner(tunnelConf)
-                        Timber.d("Started complete for tunnel ${tunnelConf.name}...")
-                    } catch (e: InterruptedException) {
-                        Timber.w(
-                            "Tunnel start has been interrupted as ${tunnelConf.name} failed to start"
-                        )
-                    }
+                        tunnelStateFlow(tunnelConfig).collect { status ->
+                            updateTunnelStatus(tunnelConfig.id, status)
+                        }
+                    } catch (e: BackendCoreException) {
+                        errors.emit(tunnelConfig.name to e)
+                        updateTunnelStatus(tunnelConfig.id, TunnelStatus.Down)
+                    } catch (_: CancellationException) {}
                 }
+            tunJobs[tunnelConfig.id] = job
+            job.invokeOnCompletion {
+                tunJobs.remove(tunnelConfig.id)
+                activeTuns.update { it - tunnelConfig.id }
             }
         }
     }
 
-    private suspend fun startTunnelInner(tunnelConf: TunnelConf) {
-        configureTunnelCallbacks(tunnelConf)
-        Timber.d("Starting  backend for tunnel ${tunnelConf.id}...")
-        try {
-            startBackend(tunnelConf)
-            updateTunnelStatus(tunnelConf, TunnelStatus.Up)
-            Timber.d("Started for tun ${tunnelConf.id}...")
-            saveTunnelActiveState(tunnelConf, true)
-            serviceManager.startTunnelForegroundService()
-        } catch (e: BackendError) {
-            Timber.e(e, "Failed to start backend for ${tunnelConf.name}")
-            _errorEvents.emit(tunnelConf to e)
-            updateTunnelStatus(tunnelConf, TunnelStatus.Down)
-        }
-    }
-
-    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()
+    override suspend fun stopTunnel(tunnelId: Int) {
         tunMutex.withLock {
-            if (activeTuns.isStarting(tunnelConf.id))
-                return handleStuckStartingTunnelShutdown(tunnelConf)
-            updateTunnelStatus(tunnelConf, TunnelStatus.Stopping(reason))
-            stopTunnelInner(tunnelConf)
-        }
-    }
+            val currentState = activeTuns.value[tunnelId]?.status ?: return@withLock
+            updateTunnelStatus(tunnelId, TunnelStatus.Stopping)
+            tunJobs[tunnelId]?.cancel()
 
-    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() && bouncingTunnelIds.isEmpty())
-            serviceManager.stopTunnelForegroundService()
-    }
-
-    private suspend fun handleStuckStartingTunnelShutdown(tunnel: TunnelConf) {
-        Timber.d("Stuck in starting state so shutting down tunnel thread for tunnel ${tunnel.name}")
-        try {
-            tunThreads[tunnel.id]?.let {
-                if (it.state != Thread.State.TERMINATED) {
-                    it.interrupt()
-                } else {
-                    Timber.d("Thread already terminated")
+            withTimeoutOrNull(STOP_TIMEOUT_MS) {
+                activeTunnels.first {
+                    !it.containsKey(tunnelId) || it[tunnelId]!!.status == TunnelStatus.Down
                 }
             }
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to stop tunnel thread for ${tunnel.name}")
-        } finally {
-            updateTunnelStatus(tunnel, TunnelStatus.Down)
+                ?: run {
+                    Timber.w("Stop timeout for $tunnelId (was $currentState); forcing kill")
+                    forceStopTunnel(tunnelId)
+                }
         }
     }
 
-    private fun cleanUpTunThread(tunnel: TunnelConf) {
-        Timber.d("Removing thread for ${tunnel.name}")
-        tunThreads -= tunnel.id
+    private fun cleanUpTunJob(tunnelId: Int) {
+        Timber.d("Removing job for $tunnelId")
+        tunJobs -= tunnelId
     }
 
-    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
-            try {
-                stopTunnel(tunnelConf, reason)
-                delay(BOUNCE_DELAY)
-                startTunnel(tunnelConf)
-            } finally {
-                bouncingTunnelIds.remove(tunnelConf.id)
-                handleServiceStateOnChange()
-                Timber.d(
-                    "Cleared bounce state for ${tunnelConf.name}, remaining: ${bouncingTunnelIds.size}"
-                )
-            }
-        }
-    }
-
-    override suspend fun runningTunnelNames(): Set<String> =
-        activeTuns.value.keys.map { it.tunName }.toSet()
-
     companion object {
-        const val BOUNCE_DELAY = 300L
+        const val STARTUP_TIMEOUT_MS: Long = 15_000L
+        const val STOP_TIMEOUT_MS: Long = 5_000L
     }
 }

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

@@ -1,44 +1,44 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import kotlinx.coroutines.flow.MutableStateFlow
 
-fun Map<TunnelConf, TunnelState>.allDown(): Boolean {
+fun Map<TunnelConfig, TunnelState>.allDown(): Boolean {
     return this.all { it.value.status.isDown() }
 }
 
-fun Map<TunnelConf, TunnelState>.hasActive(): Boolean {
+fun Map<TunnelConfig, TunnelState>.hasActive(): Boolean {
     return this.any { it.value.status.isUp() }
 }
 
-fun Map<TunnelConf, TunnelState>.getValueById(id: Int): TunnelState? {
+fun Map<TunnelConfig, 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? {
+fun Map<TunnelConfig, TunnelState>.getKeyById(id: Int): TunnelConfig? {
     return this.keys.find { it.id == id }
 }
 
-fun Map<TunnelConf, TunnelState>.isUp(tunnelConf: TunnelConf): Boolean {
-    return this.getValueById(tunnelConf.id)?.status?.isUp() ?: false
+fun Map<TunnelConfig, TunnelState>.isUp(tunnelConfig: TunnelConfig): Boolean {
+    return this.getValueById(tunnelConfig.id)?.status?.isUp() ?: false
 }
 
-fun MutableStateFlow<Map<TunnelConf, TunnelState>>.exists(id: Int): Boolean {
+fun MutableStateFlow<Map<TunnelConfig, TunnelState>>.exists(id: Int): Boolean {
     return this.value.any { it.key.id == id }
 }
 
-fun MutableStateFlow<Map<TunnelConf, TunnelState>>.isUp(id: Int): Boolean {
+fun MutableStateFlow<Map<TunnelConfig, 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 {
+fun MutableStateFlow<Map<TunnelConfig, 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? {
+fun MutableStateFlow<Map<TunnelConfig, TunnelState>>.findTunnel(id: Int): TunnelConfig? {
     return this.value.keys.find { it.id == id }
 }
 

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

@@ -2,65 +2,125 @@ 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.wireguardautotunnel.core.service.ServiceManager
+import com.wireguard.android.backend.Tunnel as WgTunnel
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.di.Kernel
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.domain.events.BackendCoreException
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import com.zaneschepke.wireguardautotunnel.domain.state.WireGuardStatistics
-import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
+import com.zaneschepke.wireguardautotunnel.util.extensions.asTunnelState
+import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendCoreException
+import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.*
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.consumeAsFlow
+import kotlinx.coroutines.flow.update
 import timber.log.Timber
 
 class KernelTunnel
 @Inject
 constructor(
-    @ApplicationScope private val applicationScope: CoroutineScope,
-    serviceManager: ServiceManager,
-    appDataRepository: AppDataRepository,
-    private val backend: Backend,
-) : BaseTunnel(applicationScope, appDataRepository, serviceManager) {
+    @ApplicationScope applicationScope: CoroutineScope,
+    @IoDispatcher ioDispatcher: CoroutineDispatcher,
+    @Kernel private val backend: Backend,
+) : BaseTunnel(applicationScope, ioDispatcher) {
 
-    override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
-        return try {
-            WireGuardStatistics(backend.getStatistics(tunnelConf))
+    private val runtimeTunnels = ConcurrentHashMap<Int, WgTunnel>()
+
+    // TODO Add DNS settings
+    override fun tunnelStateFlow(tunnelConfig: TunnelConfig): Flow<TunnelStatus> = callbackFlow {
+        if (!tunnelConfig.isNameKernelCompatible) close(BackendCoreException.TunnelNameTooLong)
+
+        val stateChannel = Channel<WgTunnel.State>()
+
+        val runtimeTunnel = RuntimeWgTunnel(tunnelConfig, stateChannel)
+        runtimeTunnels[tunnelConfig.id] = runtimeTunnel
+
+        val consumerJob = launch {
+            stateChannel.consumeAsFlow().collect { state -> trySend(state.asTunnelState()) }
+        }
+
+        try {
+            withTimeout(STARTUP_TIMEOUT_MS) {
+                updateTunnelStatus(tunnelConfig.id, TunnelStatus.Starting)
+                backend.setState(runtimeTunnel, WgTunnel.State.UP, tunnelConfig.toWgConfig())
+            }
+        } catch (e: TimeoutCancellationException) {
+            Timber.e("Startup timed out for ${tunnelConfig.name}")
+            errors.emit(tunnelConfig.name to BackendCoreException.DNS)
+            forceStopTunnel(tunnelConfig.id)
+            close()
+        } catch (e: BackendException) {
+            close(e.toBackendCoreException())
+        } catch (e: IllegalArgumentException) {
+            Timber.e(e, "Invalid backend arguments")
+            close(BackendCoreException.Config)
         } catch (e: Exception) {
-            Timber.e(e)
+            Timber.e(e, "Error while setting tunnel state")
+            close(BackendCoreException.Unknown)
+        }
+
+        awaitClose {
+            try {
+                backend.setState(runtimeTunnel, WgTunnel.State.DOWN, null)
+            } catch (e: BackendException) {
+                errors.tryEmit(tunnelConfig.name to e.toBackendCoreException())
+            } finally {
+                consumerJob.cancel()
+                stateChannel.close()
+                runtimeTunnels.remove(tunnelConfig.id)
+                trySend(TunnelStatus.Down)
+                close()
+            }
+        }
+    }
+
+    override fun getStatistics(tunnelId: Int): TunnelStatistics? {
+        return try {
+            val runtimeTunnel = runtimeTunnels[tunnelId] ?: return null
+            WireGuardStatistics(backend.getStatistics(runtimeTunnel))
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to get stats for $tunnelId")
             null
         }
     }
 
-    override suspend fun startBackend(tunnel: TunnelConf) {
-        try {
-            updateTunnelStatus(tunnel, TunnelStatus.Starting)
-            backend.setState(tunnel, Tunnel.State.UP, tunnel.toWgConfig())
-        } catch (e: BackendException) {
-            throw e.toBackendError()
-        }
-    }
-
-    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 setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
+    override fun setBackendMode(backendMode: BackendMode) {
         Timber.w("Not yet implemented for kernel")
     }
 
-    override fun getBackendState(): BackendState {
-        return BackendState.INACTIVE
+    override fun getBackendMode(): BackendMode {
+        return BackendMode.Inactive
+    }
+
+    override fun handleDnsReresolve(tunnelConfig: TunnelConfig): Boolean {
+        throw NotImplementedError()
     }
 
     override suspend fun runningTunnelNames(): Set<String> {
         return backend.runningTunnelNames
     }
+
+    override suspend fun forceStopTunnel(tunnelId: Int) {
+        val runtimeTunnel = runtimeTunnels[tunnelId] ?: return
+        try {
+            backend.setState(runtimeTunnel, WgTunnel.State.DOWN, null)
+        } catch (e: BackendException) {
+            Timber.e(e, "Force stop failed for $tunnelId")
+        } finally {
+            tunJobs[tunnelId]?.cancel()
+            runtimeTunnels.remove(tunnelId)
+            tunJobs.remove(tunnelId)
+            activeTuns.update { it - tunnelId }
+            updateTunnelStatus(tunnelId, TunnelStatus.Down)
+        }
+    }
 }

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

@@ -0,0 +1,19 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel
+
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
+import kotlinx.coroutines.channels.Channel
+import org.amnezia.awg.backend.Tunnel
+
+class RuntimeAwgTunnel(
+    private val tunnelConfig: TunnelConfig,
+    private val stateChannel: Channel<Tunnel.State>,
+) : Tunnel {
+
+    override fun getName() = tunnelConfig.name
+
+    override fun onStateChange(newState: Tunnel.State) {
+        stateChannel.trySend(newState)
+    }
+
+    override fun isIpv4ResolutionPreferred() = tunnelConfig.isIpv4Preferred
+}

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

@@ -0,0 +1,19 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel
+
+import com.wireguard.android.backend.Tunnel
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
+import kotlinx.coroutines.channels.Channel
+
+class RuntimeWgTunnel(
+    private val config: TunnelConfig,
+    private val stateChannel: Channel<Tunnel.State>,
+) : Tunnel {
+
+    override fun getName() = config.name
+
+    override fun onStateChange(newState: Tunnel.State) {
+        stateChannel.trySend(newState)
+    }
+
+    override fun isIpv4ResolutionPreferred() = config.isIpv4Preferred
+}

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

@@ -1,125 +1,540 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.di.Kernel
-import com.zaneschepke.wireguardautotunnel.di.Userspace
-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.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.data.entity.TunnelConfig as Entity
+import com.zaneschepke.wireguardautotunnel.data.model.AppMode
+import com.zaneschepke.wireguardautotunnel.di.*
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.domain.events.BackendCoreException
+import com.zaneschepke.wireguardautotunnel.domain.events.BackendMessage
+import com.zaneschepke.wireguardautotunnel.domain.model.AutoTunnelSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.domain.repository.AutoTunnelSettingsRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import com.zaneschepke.wireguardautotunnel.domain.state.LogHealthState
+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.SharedFlow
-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 kotlin.concurrent.atomics.AtomicBoolean
+import kotlin.concurrent.atomics.AtomicReference
+import kotlin.concurrent.atomics.ExperimentalAtomicApi
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import timber.log.Timber
 
+@OptIn(ExperimentalCoroutinesApi::class, ExperimentalAtomicApi::class)
 class TunnelManager
 @Inject
 constructor(
     @Kernel private val kernelTunnel: TunnelProvider,
     @Userspace private val userspaceTunnel: TunnelProvider,
-    private val appDataRepository: AppDataRepository,
+    @ProxyUserspace private val proxyUserspaceTunnel: TunnelProvider,
+    private val serviceManager: ServiceManager,
+    private val settingsRepository: GeneralSettingRepository,
+    private val autoTunnelSettingsRepository: AutoTunnelSettingsRepository,
+    private val tunnelsRepository: TunnelRepository,
+    private val tunnelMonitor: TunnelMonitor,
     @ApplicationScope private val applicationScope: CoroutineScope,
     @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : TunnelProvider {
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    private val tunnelProviderFlow =
-        appDataRepository.settings.flow
+    private val localErrorEvents = MutableSharedFlow<Pair<String?, BackendCoreException>>()
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    private val localMessageEvents = MutableSharedFlow<Pair<String?, BackendMessage>>()
+
+    private val monitoringMutex = Mutex()
+    private val monitoringJobs = ConcurrentHashMap<Int, Job>()
+
+    private val ddnsMutex = Mutex()
+    private val ddnsJobs = ConcurrentHashMap<Int, Job>()
+
+    private data class SideEffectState(
+        val activeTuns: Map<Int, TunnelState>,
+        val tuns: List<TunnelConfig>,
+        val settings: GeneralSettings,
+        val previouslyActive: Map<Int, TunnelState>,
+    )
+
+    private data class SideEffectWithCondition(
+        val effect: suspend (SideEffectState) -> Unit,
+        val condition: (SideEffectState) -> Boolean,
+    )
+
+    private suspend fun getSettings(): GeneralSettings =
+        settingsRepository.flow.filterNotNull().first { it != GeneralSettings() }
+
+    private suspend fun getTunnels(): List<TunnelConfig> =
+        tunnelsRepository.flow.first { it.isNotEmpty() }
+
+    private val tunnelProviderFlow: StateFlow<TunnelProvider> = run {
+        val currentBackend = AtomicReference(userspaceTunnel)
+        val currentSettings = AtomicReference(GeneralSettings())
+        val initialEmit = AtomicBoolean(true)
+
+        settingsRepository.flow
             .filterNotNull()
-            .flatMapLatest { settings ->
-                MutableStateFlow(if (settings.isKernelEnabled) kernelTunnel else userspaceTunnel)
+            // ignore default state
+            .filterNot { it == GeneralSettings() }
+            .distinctUntilChanged { old, new ->
+                old.appMode == new.appMode &&
+                    old.isLanOnKillSwitchEnabled == new.isLanOnKillSwitchEnabled
             }
+            .map { settings ->
+                Timber.d("App mode changes with ${settings.appMode}")
+                val backend =
+                    when (settings.appMode) {
+                        AppMode.VPN -> userspaceTunnel
+                        AppMode.PROXY -> proxyUserspaceTunnel
+                        AppMode.LOCK_DOWN -> proxyUserspaceTunnel
+                        AppMode.KERNEL -> kernelTunnel
+                    }
+                settings to backend
+            }
+            .onEach { (settings, newBackend) ->
+                val isInitialEmit = initialEmit.exchange(false)
+                val previousBackend = currentBackend.exchange(newBackend)
+                val previousSettings = currentSettings.exchange(settings)
+
+                if ((previousSettings.appMode != settings.appMode) && !isInitialEmit) {
+                    handleModeChangeCleanup(previousBackend, previousSettings.appMode)
+                }
+                if (settings.appMode == AppMode.LOCK_DOWN) {
+                    handleLockDownModeInit(settings.isLanOnKillSwitchEnabled)
+                }
+            }
+            .map { (_, backend) -> backend }
             .stateIn(
                 scope = applicationScope.plus(ioDispatcher),
                 started = SharingStarted.Eagerly,
                 initialValue = userspaceTunnel,
             )
+    }
 
-    @OptIn(ExperimentalCoroutinesApi::class)
-    override val activeTunnels =
-        appDataRepository.settings.flow
-            .filterNotNull()
-            .flatMapLatest { settings ->
-                if (settings.isKernelEnabled) {
-                    kernelTunnel.activeTunnels
-                } else {
-                    userspaceTunnel.activeTunnels
+    override val activeTunnels: StateFlow<Map<Int, TunnelState>> = run {
+        val activeTunsReference: AtomicReference<Map<Int, TunnelState>> =
+            AtomicReference(emptyMap())
+
+        tunnelProviderFlow
+            .flatMapLatest { backend ->
+                combine(
+                    backend.activeTunnels,
+                    tunnelsRepository.flow,
+                    settingsRepository.flow.filterNotNull(),
+                ) { activeTuns, tuns, settings ->
+                    Triple(activeTuns, tuns, settings)
                 }
             }
+            .onStart { handleRestore() }
+            .onEach { (activeTuns, tuns, settings) ->
+                val previouslyActive = activeTunsReference.exchange(activeTuns)
+                val state = SideEffectState(activeTuns, tuns, settings, previouslyActive)
+
+                applicationScope.launch(ioDispatcher) {
+                    supervisorScope {
+                        val sideEffects =
+                            listOf(
+                                SideEffectWithCondition(
+                                    effect = { s ->
+                                        handleTunnelServiceChange(s.settings.appMode, s.activeTuns)
+                                    },
+                                    condition = { s ->
+                                        s.activeTuns.size != s.previouslyActive.size
+                                    },
+                                ),
+                                SideEffectWithCondition(
+                                    effect = { s ->
+                                        handleTunnelsActiveChange(
+                                            s.previouslyActive,
+                                            s.activeTuns,
+                                            s.tuns,
+                                        )
+                                    },
+                                    condition = { s ->
+                                        s.activeTuns.size != s.previouslyActive.size
+                                    },
+                                ),
+                                SideEffectWithCondition(
+                                    effect = { s ->
+                                        handleDynamicDnsMonitoring(s.activeTuns, s.tuns, s.settings)
+                                    },
+                                    condition = { s ->
+                                        s.activeTuns.keys != s.previouslyActive.keys
+                                    },
+                                ),
+                                SideEffectWithCondition(
+                                    effect = { s ->
+                                        handleFullTunnelMonitoring(s.activeTuns, s.tuns, s.settings)
+                                    },
+                                    condition = { s ->
+                                        s.activeTuns.keys != s.previouslyActive.keys
+                                    },
+                                ),
+                            )
+
+                        sideEffects
+                            .filter { it.condition(state) }
+                            .forEach { sideEffect ->
+                                launch {
+                                    try {
+                                        sideEffect.effect(state)
+                                    } catch (e: Exception) {
+                                        Timber.e(e, "Side effect failed")
+                                    }
+                                }
+                            }
+                    }
+                }
+            }
+            .map { (activeTuns, _, _) -> activeTuns }
             .stateIn(
-                scope = applicationScope.plus(ioDispatcher),
+                scope = applicationScope,
                 started = SharingStarted.Eagerly,
                 initialValue = emptyMap(),
             )
-
-    override val errorEvents: SharedFlow<Pair<TunnelConf, BackendError>>
-        get() = tunnelProviderFlow.value.errorEvents
-
-    override val bouncingTunnelIds: ConcurrentHashMap<Int, TunnelStatus.StopReason> =
-        tunnelProviderFlow.value.bouncingTunnelIds
-
-    override fun hasVpnPermission(): Boolean {
-        return userspaceTunnel.hasVpnPermission()
     }
 
-    override suspend fun updateTunnelStatistics(tunnel: TunnelConf) {
-        tunnelProviderFlow.value.updateTunnelStatistics(tunnel)
+    @OptIn(ExperimentalCoroutinesApi::class)
+    override val errorEvents: SharedFlow<Pair<String?, BackendCoreException>> =
+        merge(localErrorEvents, tunnelProviderFlow.flatMapLatest { it.errorEvents })
+            .shareIn(
+                scope = applicationScope + ioDispatcher,
+                started = SharingStarted.Eagerly,
+                replay = 0,
+            )
+
+    @OptIn(ExperimentalCoroutinesApi::class)
+    override val messageEvents: SharedFlow<Pair<String?, BackendMessage>> =
+        merge(localMessageEvents, tunnelProviderFlow.flatMapLatest { it.messageEvents })
+            .shareIn(
+                scope = applicationScope.plus(ioDispatcher),
+                started = SharingStarted.Eagerly,
+                replay = 0,
+            )
+
+    override fun getStatistics(tunnelId: Int): TunnelStatistics? {
+        return tunnelProviderFlow.value.getStatistics(tunnelId)
     }
 
-    override suspend fun startTunnel(tunnelConf: TunnelConf) {
-        tunnelProviderFlow.value.startTunnel(tunnelConf)
+    override suspend fun startTunnel(tunnelConfig: TunnelConfig) {
+        if (activeTunnels.value.containsKey(tunnelConfig.id)) return
+        val provider = tunnelProviderFlow.value
+        val isKernel = provider is KernelTunnel
+
+        if (!isKernel && activeTunnels.value.isNotEmpty()) {
+            stopActiveTunnels()
+            withTimeoutOrNull(BaseTunnel.STARTUP_TIMEOUT_MS) {
+                activeTunnels.first { it.isEmpty() }
+            } ?: run { activeTunnels.value.keys.forEach { id -> provider.forceStopTunnel(id) } }
+        }
+        val runConfig =
+            tunnelConfig.run {
+                if (getSettings().isTunnelGlobalsEnabled) {
+                    val globalTunnel =
+                        getTunnels().firstOrNull { it.name == Entity.GLOBAL_CONFIG_NAME }
+                            ?: return@run this
+                    return@run copyWithGlobalValues(globalTunnel)
+                }
+                this
+            }
+        tunnelProviderFlow.value.startTunnel(runConfig)
     }
 
-    override suspend fun stopTunnel(tunnelConf: TunnelConf?, reason: TunnelStatus.StopReason) {
-        tunnelProviderFlow.value.stopTunnel(tunnelConf, reason)
+    override suspend fun stopTunnel(tunnelId: Int) {
+        tunnelProviderFlow.value.stopTunnel(tunnelId)
     }
 
-    override suspend fun bounceTunnel(tunnelConf: TunnelConf, reason: TunnelStatus.StopReason) {
-        tunnelProviderFlow.value.bounceTunnel(tunnelConf, reason)
+    override suspend fun forceStopTunnel(tunnelId: Int) {
+        tunnelProviderFlow.value.forceStopTunnel(tunnelId)
     }
 
-    override fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
-        tunnelProviderFlow.value.setBackendState(backendState, allowedIps)
+    override suspend fun stopActiveTunnels() {
+        tunnelProviderFlow.value.stopActiveTunnels()
     }
 
-    override fun getBackendState(): BackendState {
-        return tunnelProviderFlow.value.getBackendState()
+    override fun setBackendMode(backendMode: BackendMode) {
+        tunnelProviderFlow.value.setBackendMode(backendMode)
+    }
+
+    override fun getBackendMode(): BackendMode {
+        return tunnelProviderFlow.value.getBackendMode()
     }
 
     override suspend fun runningTunnelNames(): Set<String> {
         return tunnelProviderFlow.value.runningTunnelNames()
     }
 
-    override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
-        return tunnelProviderFlow.value.getStatistics(tunnelConf)
+    override fun handleDnsReresolve(tunnelConfig: TunnelConfig): Boolean {
+        return tunnelProviderFlow.value.handleDnsReresolve(tunnelConfig)
     }
 
-    fun restorePreviousState() =
-        applicationScope.launch(ioDispatcher) {
-            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.id }
+    override suspend fun updateTunnelStatus(
+        tunnelId: Int,
+        status: TunnelStatus?,
+        stats: TunnelStatistics?,
+        pingStates: Map<String, PingState>?,
+        logHealthState: LogHealthState?,
+    ) {
+        tunnelProviderFlow.value.updateTunnelStatus(
+            tunnelId,
+            status,
+            stats,
+            pingStates,
+            logHealthState,
+        )
+    }
+
+    private suspend fun handleTunnelServiceChange(
+        appMode: AppMode,
+        activeTuns: Map<Int, TunnelState>,
+    ) {
+        if (activeTuns.isEmpty()) serviceManager.stopTunnelService()
+        if (activeTuns.isNotEmpty() && serviceManager.tunnelService.value == null)
+            serviceManager.startTunnelService(appMode)
+        serviceManager.updateTunnelTile()
+    }
+
+    private fun handleLockDownModeInit(withLanBypass: Boolean) {
+        val allowedIps = if (withLanBypass) TunnelConfig.IPV4_PUBLIC_NETWORKS else emptySet()
+        try {
+            if (serviceManager.hasVpnPermission()) {
+                proxyUserspaceTunnel.setBackendMode(BackendMode.KillSwitch(allowedIps))
+            } else {
+                throw BackendCoreException.NotAuthorized
+            }
+        } catch (e: BackendCoreException) {
+            localErrorEvents.tryEmit(null to e)
+        }
+    }
+
+    private suspend fun handleModeChangeCleanup(
+        previousBackend: TunnelProvider,
+        previousAppMode: AppMode,
+    ) {
+        previousBackend.stopActiveTunnels()
+        // stop lockdown if we switch from that mode
+        if (previousAppMode == AppMode.LOCK_DOWN)
+            proxyUserspaceTunnel.setBackendMode(BackendMode.Inactive)
+    }
+
+    private fun isVpnAuthorized(
+        mode: AppMode,
+        hasVpnPermission: () -> Boolean = { serviceManager.hasVpnPermission() },
+    ): Boolean {
+        return when (mode) {
+            AppMode.VPN,
+            AppMode.LOCK_DOWN -> hasVpnPermission()
+            AppMode.KERNEL,
+            AppMode.PROXY -> true
+        }
+    }
+
+    suspend fun handleRestore() =
+        withContext(ioDispatcher) {
+            val settings = settingsRepository.getGeneralSettings()
+            val autoTunnelSettings = autoTunnelSettingsRepository.getAutoTunnelSettings()
+            val tunnels = tunnelsRepository.getAll()
+            if (autoTunnelSettings.isAutoTunnelEnabled)
+                return@withContext restoreAutoTunnel(autoTunnelSettings)
+            if (isVpnAuthorized(settings.appMode)) {
+                when (val mode = settings.appMode) {
+                    AppMode.VPN,
+                    AppMode.PROXY,
+                    AppMode.LOCK_DOWN -> {
+                        if (mode == AppMode.LOCK_DOWN)
+                            handleLockDownModeInit(settings.isLanOnKillSwitchEnabled)
+                        tunnels.firstOrNull { it.isActive }?.let { startTunnel(it) }
                     }
-                if (settings.isKernelEnabled) {
-                    return@launch tunsToStart.forEach { startTunnel(it) }
+                    AppMode.KERNEL ->
+                        tunnels.filter { it.isActive }.forEach { conf -> startTunnel(conf) }
+                }
+            } else {
+                localErrorEvents.emit(null to BackendCoreException.NotAuthorized)
+            }
+        }
+
+    private suspend fun restoreAutoTunnel(autoTunnelSettings: AutoTunnelSettings) {
+        autoTunnelSettingsRepository.upsert(autoTunnelSettings.copy(isAutoTunnelEnabled = true))
+        serviceManager.startAutoTunnelService()
+    }
+
+    suspend fun handleReboot() =
+        withContext(ioDispatcher) {
+            val settings = settingsRepository.getGeneralSettings()
+            val autoTunnelSettings = autoTunnelSettingsRepository.getAutoTunnelSettings()
+            val defaultTunnel = tunnelsRepository.getStartTunnel()
+            if (autoTunnelSettings.startOnBoot)
+                return@withContext restoreAutoTunnel(autoTunnelSettings)
+            if (settings.isRestoreOnBootEnabled) {
+                tunnelsRepository.resetActiveTunnels()
+                if (isVpnAuthorized(settings.appMode)) {
+                    when (val mode = settings.appMode) {
+                        AppMode.LOCK_DOWN ->
+                            handleLockDownModeInit(settings.isLanOnKillSwitchEnabled)
+                        AppMode.KERNEL,
+                        AppMode.VPN,
+                        AppMode.PROXY -> Unit
+                    }
+                    defaultTunnel?.let { startTunnel(it) }
                 } else {
-                    tunsToStart.firstOrNull()?.let { startTunnel(it) }
+                    localErrorEvents.emit(null to BackendCoreException.NotAuthorized)
                 }
             }
         }
+
+    private suspend fun handleTunnelsActiveChange(
+        previousActiveTuns: Map<Int, TunnelState>,
+        activeTuns: Map<Int, TunnelState>,
+        tuns: List<TunnelConfig>,
+    ) {
+        val relevantTunnels = previousActiveTuns.keys + activeTuns.keys
+
+        relevantTunnels.forEach { tunnelId ->
+            val wasActive = previousActiveTuns.containsKey(tunnelId)
+            val isActiveNow = activeTuns.containsKey(tunnelId)
+
+            when {
+                !wasActive && isActiveNow -> {
+                    tuns
+                        .find { it.id == tunnelId }
+                        ?.let { dbTunnelConf ->
+                            tunnelsRepository.save(dbTunnelConf.copy(isActive = true))
+                        }
+                }
+                wasActive && !isActiveNow -> {
+                    tuns
+                        .find { it.id == tunnelId }
+                        ?.let { dbTunnelConf ->
+                            tunnelsRepository.save(dbTunnelConf.copy(isActive = false))
+                        }
+                }
+            }
+        }
+    }
+
+    private suspend fun handleDynamicDnsMonitoring(
+        activeTuns: Map<Int, TunnelState>,
+        configs: List<TunnelConfig>,
+        settings: GeneralSettings,
+    ) =
+        ddnsMutex.withLock {
+            val activeIds =
+                activeTuns.keys
+                    .filter { id ->
+                        configs.find { it.id == id }?.restartOnPingFailure == true &&
+                            settings.appMode != AppMode.KERNEL
+                    }
+                    .toSet()
+
+            val currentJobs = ddnsJobs.keys.toSet()
+            val obsoleteIds = currentJobs - activeIds
+
+            Timber.d(
+                "DDNS Monitoring: Active IDs: $activeIds, Obsolete IDs: $obsoleteIds, Total jobs before: ${ddnsJobs.size}"
+            )
+
+            obsoleteIds.forEach { id ->
+                ddnsJobs[id]?.cancel()
+                ddnsJobs.remove(id)
+            }
+
+            activeIds.forEach { id ->
+                if (ddnsJobs.containsKey(id)) return@forEach // Skip if already monitored
+                val conf = configs.find { it.id == id } ?: return@forEach
+                val tunStateFlow =
+                    activeTunnels.map { it[id] }.stateIn(applicationScope + ioDispatcher)
+
+                val newJob =
+                    applicationScope.launch(ioDispatcher) {
+                        var backoff = 30_000L
+                        while (isActive) {
+                            val state = tunStateFlow.value ?: break
+                            if (state.health() != TunnelState.Health.UNHEALTHY) {
+                                backoff = BASE_BACKOFF
+                                tunStateFlow.first {
+                                    it?.health() == TunnelState.Health.UNHEALTHY || it == null
+                                }
+                                continue
+                            }
+
+                            runCatching {
+                                    val updated = handleDnsReresolve(conf)
+                                    if (updated) {
+                                        localMessageEvents.emit(
+                                            conf.name to BackendMessage.DynamicDnsSuccess
+                                        )
+                                        backoff = BASE_BACKOFF
+                                    } else {
+                                        Timber.i(
+                                            "Dynamic DNS check completed, current endpoint address is already up to date."
+                                        )
+                                    }
+                                }
+                                .onFailure {
+                                    Timber.e(
+                                        it,
+                                        "Failed to handle dns re-resolution for ${conf.name}",
+                                    )
+                                }
+
+                            delay(backoff)
+                            backoff = (backoff * 1.5).toLong().coerceAtMost(MAX_BACKOFF_TIME)
+                        }
+                    }
+                ddnsJobs[id] = newJob
+            }
+        }
+
+    private suspend fun handleFullTunnelMonitoring(
+        activeTuns: Map<Int, TunnelState>,
+        configs: List<TunnelConfig>,
+        settings: GeneralSettings,
+    ) =
+        monitoringMutex.withLock {
+            val activeIds = activeTuns.keys.toSet()
+            val currentJobs = monitoringJobs.keys.toSet()
+            val obsoleteIds = currentJobs - activeIds
+
+            Timber.d(
+                "Monitoring: Active IDs: $activeIds, Obsolete IDs: $obsoleteIds, Total jobs before: ${monitoringJobs.size}"
+            )
+
+            obsoleteIds.forEach { id ->
+                monitoringJobs[id]?.cancel()
+                monitoringJobs.remove(id)
+            }
+
+            activeIds.forEach { id ->
+                if (monitoringJobs.containsKey(id)) return@forEach // Skip if already monitored
+                configs.find { it.id == id } ?: return@forEach
+                val tunStateFlow =
+                    activeTunnels.map { it[id] }.stateIn(applicationScope + ioDispatcher)
+                val newJob =
+                    applicationScope.launch(ioDispatcher) {
+                        tunnelMonitor.startMonitoring(
+                            id,
+                            withLogs = settings.appMode != AppMode.KERNEL,
+                            tunStateFlow = tunStateFlow,
+                            getStatistics = { tunnelId -> getStatistics(tunnelId) },
+                            updateTunnelStatus = { tid, _, stats, pings, logHealth ->
+                                updateTunnelStatus(tid, null, stats, pings, logHealth)
+                            },
+                        )
+                    }
+                monitoringJobs[id] = newJob
+            }
+        }
+
+    companion object {
+        const val BASE_BACKOFF = 30_000L
+        const val MAX_BACKOFF_TIME = 300_000L
+    }
 }

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

@@ -0,0 +1,327 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel
+
+import com.zaneschepke.logcatter.LogReader
+import com.zaneschepke.networkmonitor.NetworkMonitor
+import com.zaneschepke.wireguardautotunnel.data.model.AppMode
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.MonitoringSettingsRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import com.zaneschepke.wireguardautotunnel.domain.state.*
+import com.zaneschepke.wireguardautotunnel.util.extensions.toMillis
+import com.zaneschepke.wireguardautotunnel.util.network.NetworkUtils
+import dagger.hilt.android.scopes.ServiceScoped
+import inet.ipaddr.AddressValueException
+import inet.ipaddr.IPAddress
+import inet.ipaddr.IPAddressString
+import io.ktor.util.collections.*
+import javax.inject.Inject
+import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.*
+import timber.log.Timber
+
+@ServiceScoped
+class TunnelMonitor
+@Inject
+constructor(
+    private val settingsRepository: GeneralSettingRepository,
+    private val tunnelsRepository: TunnelRepository,
+    private val monitoringSettingsRepository: MonitoringSettingsRepository,
+    private val networkMonitor: NetworkMonitor,
+    private val networkUtils: NetworkUtils,
+    private val logReader: LogReader,
+) {
+
+    @OptIn(FlowPreview::class)
+    suspend fun startMonitoring(
+        tunnelId: Int,
+        withLogs: Boolean,
+        tunStateFlow: StateFlow<TunnelState?>,
+        getStatistics: suspend (Int) -> TunnelStatistics?,
+        updateTunnelStatus:
+            suspend (
+                Int, TunnelStatus?, TunnelStatistics?, Map<String, PingState>?, LogHealthState?,
+            ) -> Unit,
+    ): Job = coroutineScope {
+        launch {
+            val config = tunnelsRepository.getById(tunnelId) ?: return@launch
+            launch { startPingMonitor(config, tunStateFlow, updateTunnelStatus) }
+            launch { startWgStatsPoll(tunnelId, getStatistics, updateTunnelStatus) }
+            if (withLogs) launch { startLogsMonitor(config, updateTunnelStatus) }
+        }
+    }
+
+    private suspend fun startLogsMonitor(
+        tunnelConfig: TunnelConfig,
+        updateTunnelStatus:
+            suspend (
+                Int, TunnelStatus?, TunnelStatistics?, Map<String, PingState>?, LogHealthState?,
+            ) -> Unit,
+    ) {
+        logReader.liveLogs
+            .filter { log -> log.tag.contains(tunnelConfig.name) }
+            .mapNotNull { log ->
+                val now = System.currentTimeMillis()
+
+                when {
+                    successLogRegex.containsMatchIn(log.message) ->
+                        LogHealthState(isHealthy = true, timestamp = now)
+
+                    failureLogRegex.containsMatchIn(log.message) ->
+                        LogHealthState(isHealthy = false, timestamp = now)
+
+                    else -> null
+                }
+            }
+            .distinctUntilChangedBy { it.isHealthy } // Only emit when health changes
+            .collect { logHealthState ->
+                Timber.d("Tunnel log health updated for ${tunnelConfig.name}: $logHealthState")
+                updateTunnelStatus(tunnelConfig.id, null, null, null, logHealthState)
+            }
+    }
+
+    private suspend fun startPingMonitor(
+        tunnelConfig: TunnelConfig,
+        tunStateFlow: StateFlow<TunnelState?>,
+        updateTunnelStatus:
+            suspend (
+                Int, TunnelStatus?, TunnelStatistics?, Map<String, PingState>?, LogHealthState?,
+            ) -> Unit,
+    ) = coroutineScope {
+        val pingStatsFlow = MutableStateFlow<Map<String, PingState>>(emptyMap())
+
+        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)
+
+        combine(
+                settingsRepository.flow.distinctUntilChangedBy { it.appMode },
+                monitoringSettingsRepository.flow,
+            ) { settings, monitorSettings ->
+                Pair(settings.appMode, monitorSettings)
+            }
+            .collectLatest { (appMode, settings) ->
+                if (!settings.isPingEnabled) return@collectLatest
+                // TODO for now until we get monitoring for these modes
+                if (appMode == AppMode.LOCK_DOWN || appMode == AppMode.PROXY) return@collectLatest
+
+                Timber.d("Starting pinger for ${tunnelConfig.name} with settings")
+
+                val config = tunnelConfig.toAmConfig()
+
+                val pingablePeers = config.peers.filter { it.allowedIps.isNotEmpty() }
+                if (pingablePeers.isEmpty()) return@collectLatest
+
+                suspend fun performPing() {
+                    val updates = ConcurrentMap<String, PingState>()
+
+                    pingablePeers
+                        .map { it.publicKey.toBase64() to it }
+                        .forEach { (key, peer) ->
+                            ensureActive()
+                            val previousState = pingStatsFlow.value[key] ?: PingState()
+
+                            val allowedIpStr = peer.allowedIps.firstOrNull()?.toString()
+                            if (allowedIpStr == null) {
+                                updates[key] =
+                                    previousState.copy(
+                                        isReachable = false,
+                                        failureReason = FailureReason.NoResolvedEndpoint,
+                                        lastPingAttemptMillis = System.currentTimeMillis(),
+                                    )
+                                return@forEach
+                            }
+
+                            val host =
+                                tunnelConfig.pingTarget
+                                    ?: run {
+                                        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
+                                        val cleanedIp = internalIp.removeSurrounding("[", "]")
+                                        val defaultCloudflare =
+                                            if (cleanedIp.contains(":")) CLOUDFLARE_IPV6_IP
+                                            else CLOUDFLARE_IPV4_IP
+
+                                        if (prefix <= 1) {
+                                            defaultCloudflare
+                                        } else {
+                                            try {
+                                                val addrStr = IPAddressString(cleanedIp)
+                                                val addr: IPAddress =
+                                                    addrStr.address
+                                                        ?: throw AddressValueException(
+                                                            "Invalid IP: $cleanedIp"
+                                                        )
+                                                val isIpv6 = addr.isIPv6
+                                                val cloudflareIp =
+                                                    if (isIpv6) CLOUDFLARE_IPV6_IP
+                                                    else CLOUDFLARE_IPV4_IP
+                                                val max = if (isIpv6) 128 else 32
+
+                                                if (prefix == max) {
+                                                    addr.toCanonicalString()
+                                                } else {
+                                                    val nextAddr: IPAddress? = addr.increment(1)
+                                                    nextAddr?.toCanonicalString() ?: cloudflareIp
+                                                }
+                                            } catch (e: AddressValueException) {
+                                                Timber.e(
+                                                    e,
+                                                    "Failed to parse or increment IP: $cleanedIp",
+                                                )
+                                                defaultCloudflare
+                                            }
+                                        }
+                                    }
+
+                            val attemptTime = System.currentTimeMillis()
+                            runCatching {
+                                    withTimeout(
+                                        settings.tunnelPingTimeoutSeconds?.toMillis() ?: 5000L
+                                    ) {
+                                        val pingStats =
+                                            settings.tunnelPingTimeoutSeconds?.let {
+                                                networkUtils.pingWithStats(
+                                                    host,
+                                                    settings.tunnelPingAttempts,
+                                                    it.toMillis(),
+                                                )
+                                            }
+                                                ?: networkUtils.pingWithStats(
+                                                    host,
+                                                    settings.tunnelPingAttempts,
+                                                )
+
+                                        updates[key] =
+                                            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 ${tunnelConfig.name} to host $host",
+                                    )
+                                    updates[key] =
+                                        previousState.copy(
+                                            isReachable = false,
+                                            failureReason = FailureReason.PingFailed,
+                                            pingTarget = host,
+                                            lastPingAttemptMillis = attemptTime,
+                                        )
+                                }
+                        }
+
+                    if (updates.isNotEmpty()) {
+                        ensureActive()
+                        pingStatsFlow.update { updates }
+                        updateTunnelStatus(tunnelConfig.id, null, null, updates, null)
+                    }
+                }
+
+                // 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) {
+                    ensureActive()
+                    if (isNetworkConnected.value) {
+                        performPing()
+                    } else {
+                        pingStatsFlow.update { current ->
+                            current.mapValues { entry ->
+                                entry.value.copy(
+                                    isReachable = false,
+                                    failureReason = FailureReason.NoConnectivity,
+                                    lastPingAttemptMillis = System.currentTimeMillis(),
+                                )
+                            }
+                        }
+                        ensureActive()
+                        updateTunnelStatus(tunnelConfig.id, null, null, pingStatsFlow.value, null)
+                    }
+                    delay(settings.tunnelPingIntervalSeconds.toMillis())
+                }
+            }
+    }
+
+    private suspend fun startWgStatsPoll(
+        tunnelId: Int,
+        getStatistics: suspend (Int) -> TunnelStatistics?,
+        updateTunnelStatus:
+            suspend (
+                Int, TunnelStatus?, TunnelStatistics?, Map<String, PingState>?, LogHealthState?,
+            ) -> Unit,
+    ) = coroutineScope {
+        while (isActive) {
+            ensureActive()
+            val stats = getStatistics(tunnelId)
+            ensureActive()
+            updateTunnelStatus(tunnelId, null, stats, null, null)
+            delay(STATS_DELAY)
+        }
+    }
+
+    companion object {
+
+        private val successLogRegex =
+            Regex("Received handshake response|Receiving keepalive packet", RegexOption.IGNORE_CASE)
+
+        private val failureLogRegex =
+            Regex(
+                "Failed to send handshake initiation: write udp|" +
+                    "Handshake did not complete after 5 seconds, retrying|" +
+                    "Failed to send data packets",
+                RegexOption.IGNORE_CASE,
+            )
+
+        const val CLOUDFLARE_IPV6_IP = "2606:4700:4700::1111"
+        const val CLOUDFLARE_IPV4_IP = "1.1.1.1"
+        const val STATS_DELAY = 1_000L
+    }
+}

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

@@ -1,58 +1,54 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
-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.BackendMode
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
+import com.zaneschepke.wireguardautotunnel.domain.events.BackendCoreException
+import com.zaneschepke.wireguardautotunnel.domain.events.BackendMessage
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.domain.state.LogHealthState
+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
 
 interface TunnelProvider {
     /** Starts the specified tunnel configuration. */
-    suspend fun startTunnel(tunnelConf: TunnelConf)
+    suspend fun startTunnel(tunnelConfig: TunnelConfig)
 
     /**
-     * Stops the specified tunnel, or all tunnels if none is provided.
+     * Stops the specified tunnel.
      *
-     * @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.
+     * @param tunnelId The tunnelConf to stop.
      */
-    suspend fun stopTunnel(
-        tunnelConf: TunnelConf? = null,
-        reason: TunnelStatus.StopReason = TunnelStatus.StopReason.USER,
-    )
+    suspend fun stopTunnel(tunnelId: Int)
 
-    /**
-     * 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, CONFIG_CHANGED) when applicable.
-     */
-    suspend fun bounceTunnel(
-        tunnelConf: TunnelConf,
-        reason: TunnelStatus.StopReason = TunnelStatus.StopReason.USER,
-    )
+    suspend fun forceStopTunnel(tunnelId: Int)
 
-    fun setBackendState(backendState: BackendState, allowedIps: Collection<String>)
+    /** Stops all active tunnels. */
+    suspend fun stopActiveTunnels()
 
-    fun getBackendState(): BackendState
+    fun setBackendMode(backendMode: BackendMode)
+
+    fun getBackendMode(): BackendMode
 
     suspend fun runningTunnelNames(): Set<String>
 
-    fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics?
+    fun handleDnsReresolve(tunnelConfig: TunnelConfig): Boolean
 
-    val activeTunnels: StateFlow<Map<TunnelConf, TunnelState>>
+    fun getStatistics(tunnelId: Int): TunnelStatistics?
 
-    val errorEvents: SharedFlow<Pair<TunnelConf, BackendError>>
+    val activeTunnels: StateFlow<Map<Int, TunnelState>>
 
-    val bouncingTunnelIds: ConcurrentHashMap<Int, TunnelStatus.StopReason>
+    val errorEvents: SharedFlow<Pair<String?, BackendCoreException>>
 
-    fun hasVpnPermission(): Boolean
+    val messageEvents: SharedFlow<Pair<String?, BackendMessage>>
 
-    suspend fun updateTunnelStatistics(tunnel: TunnelConf)
+    suspend fun updateTunnelStatus(
+        tunnelId: Int,
+        status: TunnelStatus? = null,
+        stats: TunnelStatistics? = null,
+        pingStates: Map<String, PingState>? = null,
+        logHealthState: LogHealthState? = null,
+    )
 }

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

@@ -1,108 +1,193 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
-import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.data.model.DnsProtocol
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.domain.events.BackendCoreException
+import com.zaneschepke.wireguardautotunnel.domain.model.ProxySettings
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.domain.repository.DnsSettingsRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.ProxySettingsRepository
 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.asBackendState
-import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
+import com.zaneschepke.wireguardautotunnel.util.extensions.asAmBackendMode
+import com.zaneschepke.wireguardautotunnel.util.extensions.asBackendMode
+import com.zaneschepke.wireguardautotunnel.util.extensions.asTunnelState
+import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendCoreException
+import java.io.IOException
+import java.util.*
+import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject
-import kotlin.jvm.optionals.getOrNull
-import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.*
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.consumeAsFlow
+import kotlinx.coroutines.flow.update
 import org.amnezia.awg.backend.Backend
 import org.amnezia.awg.backend.BackendException
-import org.amnezia.awg.backend.Tunnel
+import org.amnezia.awg.backend.ProxyGoBackend
+import org.amnezia.awg.backend.Tunnel as AwgTunnel
 import org.amnezia.awg.config.Config
+import org.amnezia.awg.config.DnsSettings
+import org.amnezia.awg.config.proxy.HttpProxy
+import org.amnezia.awg.config.proxy.Proxy
+import org.amnezia.awg.config.proxy.Socks5Proxy
 import timber.log.Timber
 
 class UserspaceTunnel
 @Inject
 constructor(
-    @ApplicationScope private val applicationScope: CoroutineScope,
-    val serviceManager: ServiceManager,
-    val appDataRepository: AppDataRepository,
+    @ApplicationScope applicationScope: CoroutineScope,
+    @IoDispatcher ioDispatcher: CoroutineDispatcher,
+    private val proxySettingsRepository: ProxySettingsRepository,
+    private val dnsSettingsRepository: DnsSettingsRepository,
     private val backend: Backend,
-) : BaseTunnel(applicationScope, appDataRepository, serviceManager) {
+) : BaseTunnel(applicationScope, ioDispatcher) {
 
-    private var previousBackendState: Pair<BackendState, Boolean>? = null
+    private val runtimeTunnels = ConcurrentHashMap<Int, AwgTunnel>()
+
+    override fun tunnelStateFlow(tunnelConfig: TunnelConfig): Flow<TunnelStatus> = callbackFlow {
+        val stateChannel = Channel<AwgTunnel.State>()
+
+        val runtimeTunnel = RuntimeAwgTunnel(tunnelConfig, stateChannel)
+        runtimeTunnels[tunnelConfig.id] = runtimeTunnel
+
+        val consumerJob = launch {
+            stateChannel.consumeAsFlow().collect { awgState -> trySend(awgState.asTunnelState()) }
+        }
 
-    override suspend fun startBackend(tunnel: TunnelConf) {
         try {
-            updateTunnelStatus(tunnel, TunnelStatus.Starting)
-            val amConfig = tunnel.toAmConfig()
-            handleVpnKillSwitchWithDomainEndpoints(amConfig)
-            backend.setState(tunnel, Tunnel.State.UP, amConfig)
+            withTimeout(STARTUP_TIMEOUT_MS) {
+                updateTunnelStatus(tunnelConfig.id, TunnelStatus.Starting)
+
+                val proxies: List<Proxy> =
+                    when (backend) {
+                        is ProxyGoBackend -> {
+                            val proxySettings = proxySettingsRepository.getProxySettings()
+                            Timber.d("Adding proxy configs")
+                            buildList {
+                                if (proxySettings.socks5ProxyEnabled) {
+                                    add(
+                                        Socks5Proxy(
+                                            proxySettings.socks5ProxyBindAddress
+                                                ?: ProxySettings.DEFAULT_SOCKS_BIND_ADDRESS,
+                                            proxySettings.proxyUsername,
+                                            proxySettings.proxyPassword,
+                                        )
+                                    )
+                                }
+                                if (proxySettings.httpProxyEnabled) {
+                                    add(
+                                        HttpProxy(
+                                            proxySettings.httpProxyBindAddress
+                                                ?: ProxySettings.DEFAULT_HTTP_BIND_ADDRESS,
+                                            proxySettings.proxyUsername,
+                                            proxySettings.proxyPassword,
+                                        )
+                                    )
+                                }
+                            }
+                        }
+                        else -> emptyList()
+                    }
+                val setting = dnsSettingsRepository.getDnsSettings()
+                val config = tunnelConfig.toAmConfig()
+                val updatedConfig =
+                    Config.Builder()
+                        .apply {
+                            setInterface(config.`interface`)
+                            addPeers(config.peers)
+                            addProxies(proxies)
+                            setDnsSettings(
+                                DnsSettings(
+                                    setting.dnsProtocol == DnsProtocol.DOH,
+                                    Optional.ofNullable(setting.dnsEndpoint),
+                                )
+                            )
+                        }
+                        .build()
+                backend.setState(runtimeTunnel, AwgTunnel.State.UP, updatedConfig)
+            }
+        } catch (e: TimeoutCancellationException) {
+            Timber.e("Startup timed out for ${tunnelConfig.name} (likely DNS hang)")
+            errors.emit(tunnelConfig.name to BackendCoreException.DNS)
+            forceStopTunnel(tunnelConfig.id)
+            close()
         } catch (e: BackendException) {
-            Timber.e(e, "Failed to start up backend for tunnel ${tunnel.name}")
-            throw e.toBackendError()
+            close(e.toBackendCoreException())
+        } catch (e: IllegalArgumentException) {
+            close(BackendCoreException.Config)
+        } catch (e: Exception) {
+            Timber.e(e, "Error while setting tunnel state")
+            close(BackendCoreException.Unknown)
         }
-    }
 
-    override fun stopBackend(tunnel: TunnelConf) {
-        Timber.i("Stopping tunnel ${tunnel.name} userspace")
-        try {
-            backend.setState(tunnel, Tunnel.State.DOWN, tunnel.toAmConfig())
-        } catch (e: BackendException) {
-            Timber.e(e, "Failed to stop tunnel ${tunnel.id}")
-            throw e.toBackendError()
-        } finally {
-            handlePreviouslyEnabledVpnKillSwitch()
-        }
-    }
-
-    // stop vpn kill switch if we need to resolve DNS for peer endpoints
-    private suspend fun handleVpnKillSwitchWithDomainEndpoints(config: Config) {
-        if (
-            config.peers.any { it.endpoint.getOrNull()?.toString()?.isUrl() == true } &&
-                backend.backendState.asBackendState() == BackendState.KILL_SWITCH_ACTIVE
-        ) {
-            val bypassLan = appDataRepository.settings.get().isLanOnKillSwitchEnabled
-            previousBackendState = Pair(BackendState.KILL_SWITCH_ACTIVE, bypassLan)
-            setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
-        }
-    }
-
-    // restore vpn kill switch if needed
-    private fun handlePreviouslyEnabledVpnKillSwitch() {
-        // let auto tunnel handle this if it is active
-        if (serviceManager.autoTunnelService.value == null) {
-            previousBackendState?.let { (state, lanEnabled) ->
-                Timber.d("Restoring kill switch configuration")
-                val lan = if (lanEnabled) TunnelConf.LAN_BYPASS_ALLOWED_IPS else emptyList()
-                backend.setBackendState(state.asAmBackendState(), lan)
+        awaitClose {
+            try {
+                backend.setState(runtimeTunnel, AwgTunnel.State.DOWN, null)
+            } catch (e: BackendException) {
+                errors.tryEmit(tunnelConfig.name to e.toBackendCoreException())
+            } finally {
+                consumerJob.cancel()
+                stateChannel.close()
+                runtimeTunnels.remove(tunnelConfig.id)
+                trySend(TunnelStatus.Down)
+                close()
             }
         }
-        previousBackendState = null
     }
 
-    override fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
-        Timber.d("Setting backend state: $backendState with allowedIps: $allowedIps")
+    override fun setBackendMode(backendMode: BackendMode) {
+        Timber.d("Setting backend mode: $backendMode")
         try {
-            backend.setBackendState(backendState.asAmBackendState(), allowedIps)
+            backend.backendMode = backendMode.asAmBackendMode()
         } catch (e: BackendException) {
-            throw e.toBackendError()
+            throw e.toBackendCoreException()
+            // TODO this should be mapped to BackendException in the lib
+        } catch (e: IOException) {
+            throw BackendCoreException.NotAuthorized
         }
     }
 
-    override fun getBackendState(): BackendState {
-        return backend.backendState.asBackendState()
+    override fun getBackendMode(): BackendMode {
+        return backend.backendMode.asBackendMode()
+    }
+
+    override fun handleDnsReresolve(tunnelConfig: TunnelConfig): Boolean {
+        val tunnel = runtimeTunnels[tunnelConfig.id] ?: throw BackendCoreException.ServiceNotRunning
+        return backend.resolveDDNS(tunnelConfig.toAmConfig(), tunnel.isIpv4ResolutionPreferred)
     }
 
     override suspend fun runningTunnelNames(): Set<String> {
         return backend.runningTunnelNames
     }
 
-    override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
+    override fun getStatistics(tunnelId: Int): TunnelStatistics? {
         return try {
-            AmneziaStatistics(backend.getStatistics(tunnelConf))
+            val runtimeTunnel = runtimeTunnels[tunnelId] ?: return null
+            AmneziaStatistics(backend.getStatistics(runtimeTunnel))
         } catch (e: Exception) {
-            Timber.e(e, "Failed to get stats for ${tunnelConf.tunName}")
+            Timber.e(e, "Failed to get stats for $tunnelId")
             null
         }
     }
+
+    override suspend fun forceStopTunnel(tunnelId: Int) {
+        val runtimeTunnel = runtimeTunnels[tunnelId] ?: return
+        try {
+            backend.setState(runtimeTunnel, AwgTunnel.State.DOWN, null)
+        } catch (e: BackendException) {
+            Timber.e(e, "Force stop failed for $tunnelId")
+        } finally {
+            tunJobs[tunnelId]?.cancel()
+            runtimeTunnels.remove(tunnelId)
+            tunJobs.remove(tunnelId)
+            activeTuns.update { it - tunnelId }
+            updateTunnelStatus(tunnelId, TunnelStatus.Down)
+        }
+    }
 }

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

@@ -2,15 +2,10 @@ package com.zaneschepke.wireguardautotunnel.core.worker
 
 import android.content.Context
 import androidx.hilt.work.HiltWorker
-import androidx.work.CoroutineWorker
-import androidx.work.ExistingPeriodicWorkPolicy
-import androidx.work.PeriodicWorkRequestBuilder
-import androidx.work.WorkManager
-import androidx.work.WorkerParameters
+import androidx.work.*
 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 com.zaneschepke.wireguardautotunnel.domain.repository.AutoTunnelSettingsRepository
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import java.util.concurrent.TimeUnit
@@ -25,9 +20,8 @@ constructor(
     @Assisted private val context: Context,
     @Assisted private val params: WorkerParameters,
     private val serviceManager: ServiceManager,
-    private val appDataRepository: AppDataRepository,
+    private val autoTunnelSettingsRepository: AutoTunnelSettingsRepository,
     @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-    private val tunnelManager: TunnelManager,
 ) : CoroutineWorker(context, params) {
 
     companion object {
@@ -56,11 +50,12 @@ constructor(
     override suspend fun doWork(): Result =
         withContext(ioDispatcher) {
             Timber.i("Service worker started")
-            with(appDataRepository.settings.get()) {
-                if (isAutoTunnelEnabled && serviceManager.autoTunnelService.value == null)
-                    return@with serviceManager.startAutoTunnel()
-                if (tunnelManager.activeTunnels.value.isEmpty())
-                    tunnelManager.restorePreviousState()
+            with(autoTunnelSettingsRepository.getAutoTunnelSettings()) {
+                Timber.i("Checking to see if auto-tunnel has been killed by system")
+                if (isAutoTunnelEnabled && serviceManager.autoTunnelService.value == null) {
+                    Timber.i("Service has been killed by system, restoring.")
+                    serviceManager.startAutoTunnelService()
+                }
             }
             Result.success()
         }

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

@@ -1,19 +1,22 @@
 package com.zaneschepke.wireguardautotunnel.data
 
-import androidx.room.AutoMigration
-import androidx.room.Database
-import androidx.room.DeleteColumn
-import androidx.room.RoomDatabase
-import androidx.room.TypeConverters
+import androidx.room.*
 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.model.TunnelConfig
+import androidx.sqlite.db.SupportSQLiteDatabase
+import com.zaneschepke.wireguardautotunnel.data.dao.*
+import com.zaneschepke.wireguardautotunnel.data.entity.*
 
 @Database(
-    entities = [Settings::class, TunnelConfig::class],
-    version = 16,
+    entities =
+        [
+            TunnelConfig::class,
+            ProxySettings::class,
+            GeneralSettings::class,
+            AutoTunnelSettings::class,
+            MonitoringSettings::class,
+            DnsSettings::class,
+        ],
+    version = 25,
     autoMigrations =
         [
             AutoMigration(from = 1, to = 2),
@@ -31,14 +34,30 @@ import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
             AutoMigration(from = 13, to = 14),
             AutoMigration(from = 14, to = 15),
             AutoMigration(from = 15, to = 16),
+            AutoMigration(from = 16, to = 17, spec = WifiDetectionMigration::class),
+            AutoMigration(from = 17, to = 18),
+            AutoMigration(from = 18, to = 19, spec = PingMigration::class),
+            AutoMigration(from = 19, to = 20, spec = ProxyMigration::class),
+            AutoMigration(from = 20, to = 21, spec = FixProxySettingsMigration::class),
+            AutoMigration(from = 21, to = 22),
+            AutoMigration(from = 22, to = 23),
+            AutoMigration(from = 24, to = 25),
         ],
     exportSchema = true,
 )
-@TypeConverters(DatabaseListConverters::class)
+@TypeConverters(DatabaseConverters::class)
 abstract class AppDatabase : RoomDatabase() {
-    abstract fun settingDao(): SettingsDao
-
     abstract fun tunnelConfigDoa(): TunnelConfigDao
+
+    abstract fun proxySettingsDoa(): ProxySettingsDao
+
+    abstract fun generalSettingsDao(): GeneralSettingsDao
+
+    abstract fun autoTunnelSettingsDao(): AutoTunnelSettingsDao
+
+    abstract fun monitoringSettingsDao(): MonitoringSettingsDao
+
+    abstract fun dnsSettingsDao(): DnsSettingsDao
 }
 
 @DeleteColumn(tableName = "Settings", columnName = "default_tunnel")
@@ -47,3 +66,49 @@ class RemoveLegacySettingColumnsMigration : AutoMigrationSpec
 
 @DeleteColumn(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
+
+@DeleteColumn.Entries(
+    DeleteColumn(tableName = "Settings", columnName = "is_amnezia_enabled"),
+    DeleteColumn(tableName = "Settings", columnName = "is_vpn_kill_switch_enabled"),
+    DeleteColumn(tableName = "Settings", columnName = "is_kernel_kill_switch_enabled"),
+    DeleteColumn(tableName = "Settings", columnName = "is_kernel_enabled"),
+)
+class ProxyMigration : AutoMigrationSpec {
+    override fun onPostMigrate(db: SupportSQLiteDatabase) {
+        db.execSQL("INSERT INTO proxy_settings DEFAULT VALUES")
+    }
+}
+
+class FixProxySettingsMigration : AutoMigrationSpec {
+    override fun onPostMigrate(db: SupportSQLiteDatabase) {
+        val cursor = db.query("SELECT COUNT(*) FROM proxy_settings")
+        val count = if (cursor.moveToFirst()) cursor.getInt(0) else 0
+        cursor.close()
+
+        if (count == 0) {
+            db.execSQL("INSERT INTO proxy_settings DEFAULT VALUES")
+        }
+    }
+}

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

@@ -4,7 +4,6 @@ import android.content.Context
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.booleanPreferencesKey
 import androidx.datastore.preferences.core.edit
-import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import java.io.IOException
@@ -13,7 +12,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 
@@ -21,28 +19,21 @@ class DataStoreManager(
     private val context: Context,
     @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) {
+    private val preferencesKey = "preferences"
+    val Context.dataStore by preferencesDataStore(name = preferencesKey)
+    val dataStore = context.dataStore
+
     companion object {
         val locationDisclosureShown = booleanPreferencesKey("LOCATION_DISCLOSURE_SHOWN")
         val batteryDisableShown = booleanPreferencesKey("BATTERY_OPTIMIZE_DISABLE_SHOWN")
-        val pinLockEnabled = booleanPreferencesKey("PIN_LOCK_ENABLED")
-        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")
     }
 
-    // preferences
-    private val preferencesKey = "preferences"
-    private val Context.dataStore by preferencesDataStore(name = preferencesKey)
-
     suspend fun init() {
         withContext(ioDispatcher) {
             try {
-                context.dataStore.data.first()
+                dataStore.data.first()
             } catch (e: IOException) {
-                Timber.Forest.e(e)
+                Timber.e(e)
             }
         }
     }
@@ -50,11 +41,11 @@ class DataStoreManager(
     suspend fun <T> saveToDataStore(key: Preferences.Key<T>, value: T) {
         withContext(ioDispatcher) {
             try {
-                context.dataStore.edit { it[key] = value }
+                dataStore.edit { it[key] = value }
             } catch (e: IOException) {
-                Timber.Forest.e(e)
+                Timber.e(e)
             } catch (e: Exception) {
-                Timber.Forest.e(e)
+                Timber.e(e)
             }
         }
     }
@@ -62,11 +53,11 @@ class DataStoreManager(
     suspend fun <T> removeFromDataStore(key: Preferences.Key<T>) {
         withContext(ioDispatcher) {
             try {
-                context.dataStore.edit { it.remove(key) }
+                dataStore.edit { it.remove(key) }
             } catch (e: IOException) {
-                Timber.Forest.e(e)
+                Timber.e(e)
             } catch (e: Exception) {
-                Timber.Forest.e(e)
+                Timber.e(e)
             }
         }
     }
@@ -76,17 +67,13 @@ class DataStoreManager(
     suspend fun <T> getFromStore(key: Preferences.Key<T>): T? {
         return withContext(ioDispatcher) {
             try {
-                context.dataStore.data.map { it[key] }.first()
+                dataStore.data.map { it[key] }.first()
             } catch (e: IOException) {
-                Timber.Forest.e(e)
+                Timber.e(e)
                 null
             }
         }
     }
 
-    fun <T> getFromStoreBlocking(key: Preferences.Key<T>) = runBlocking {
-        context.dataStore.data.map { it[key] }.first()
-    }
-
-    val preferencesFlow: Flow<Preferences?> = context.dataStore.data.flowOn(ioDispatcher)
+    val preferencesFlow: Flow<Preferences?> = dataStore.data.flowOn(ioDispatcher)
 }

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

@@ -2,20 +2,19 @@ package com.zaneschepke.wireguardautotunnel.data
 
 import androidx.room.RoomDatabase
 import androidx.sqlite.db.SupportSQLiteDatabase
+import javax.inject.Inject
+import javax.inject.Provider
 import timber.log.Timber
 
-class DatabaseCallback : RoomDatabase.Callback() {
-    override fun onCreate(db: SupportSQLiteDatabase) =
-        db.run {
-            beginTransaction()
-            try {
-                execSQL(Queries.createDefaultSettings())
-                Timber.i("Bootstrapping settings data")
-                setTransactionSuccessful()
-            } catch (e: Exception) {
-                Timber.e(e)
-            } finally {
-                endTransaction()
-            }
-        }
+class DatabaseCallback @Inject constructor(private val databaseProvider: Provider<AppDatabase>) :
+    RoomDatabase.Callback() {
+    override fun onCreate(db: SupportSQLiteDatabase) {
+        super.onCreate(db)
+        Timber.d("Database created, inserting default rows")
+        db.execSQL("INSERT INTO proxy_settings DEFAULT VALUES")
+        db.execSQL("INSERT INTO general_settings DEFAULT VALUES")
+        db.execSQL("INSERT INTO auto_tunnel_settings DEFAULT VALUES")
+        db.execSQL("INSERT INTO monitoring_settings DEFAULT VALUES")
+        db.execSQL("INSERT INTO dns_settings DEFAULT VALUES")
+    }
 }

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

@@ -0,0 +1,67 @@
+package com.zaneschepke.wireguardautotunnel.data
+
+import androidx.room.TypeConverter
+import com.zaneschepke.wireguardautotunnel.data.model.AppMode
+import com.zaneschepke.wireguardautotunnel.data.model.DnsProtocol
+import com.zaneschepke.wireguardautotunnel.data.model.WifiDetectionMethod
+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 mapToString(map: Map<String, String>): String {
+        return Json.encodeToString(map)
+    }
+
+    @TypeConverter
+    fun stringToMap(json: String): Map<String, String> {
+        return if (json.isEmpty() || json == "{}") {
+            emptyMap()
+        } else {
+            try {
+                Json.decodeFromString<Map<String, String>>(json)
+            } catch (_: Exception) {
+                emptyMap()
+            }
+        }
+    }
+
+    @TypeConverter
+    fun setToString(value: Set<String>): String {
+        return listToString(value.toList())
+    }
+
+    @TypeConverter
+    fun stringToSet(value: String): Set<String> {
+        return stringToList(value).toSet()
+    }
+
+    @TypeConverter fun fromStatus(status: WifiDetectionMethod): Int = status.value
+
+    @TypeConverter
+    fun toStatus(value: Int): WifiDetectionMethod = WifiDetectionMethod.fromValue(value)
+
+    @TypeConverter fun toMode(value: Int): AppMode = AppMode.fromValue(value)
+
+    @TypeConverter fun fromMode(mode: AppMode): Int = mode.value
+
+    @TypeConverter fun toDnsProtocol(value: Int): DnsProtocol = DnsProtocol.fromValue(value)
+
+    @TypeConverter fun fromDnsProtocol(mode: DnsProtocol): Int = mode.value
+}

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

@@ -1,23 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data
-
-import androidx.room.TypeConverter
-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

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

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

@@ -0,0 +1,21 @@
+package com.zaneschepke.wireguardautotunnel.data.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import androidx.room.Upsert
+import com.zaneschepke.wireguardautotunnel.data.entity.AutoTunnelSettings
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface AutoTunnelSettingsDao {
+    @Query("SELECT * FROM auto_tunnel_settings LIMIT 1")
+    suspend fun getAutoTunnelSettings(): AutoTunnelSettings?
+
+    @Upsert suspend fun upsert(autoTunnelSettings: AutoTunnelSettings)
+
+    @Query("SELECT * FROM auto_tunnel_settings LIMIT 1")
+    fun getAutoTunnelSettingsFlow(): Flow<AutoTunnelSettings?>
+
+    @Query("UPDATE auto_tunnel_settings SET is_tunnel_enabled = :enabled")
+    suspend fun updateAutoTunnelEnabled(enabled: Boolean)
+}

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

@@ -0,0 +1,16 @@
+package com.zaneschepke.wireguardautotunnel.data.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import androidx.room.Upsert
+import com.zaneschepke.wireguardautotunnel.data.entity.DnsSettings
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface DnsSettingsDao {
+    @Query("SELECT * FROM dns_settings LIMIT 1") suspend fun getDnsSettings(): DnsSettings?
+
+    @Upsert suspend fun upsert(dnsSettings: DnsSettings)
+
+    @Query("SELECT * FROM dns_settings LIMIT 1") fun getDnsSettingsFlow(): Flow<DnsSettings?>
+}

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

@@ -0,0 +1,18 @@
+package com.zaneschepke.wireguardautotunnel.data.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import androidx.room.Upsert
+import com.zaneschepke.wireguardautotunnel.data.entity.GeneralSettings
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface GeneralSettingsDao {
+    @Query("SELECT * FROM general_settings LIMIT 1")
+    suspend fun getGeneralSettings(): GeneralSettings?
+
+    @Upsert suspend fun upsert(generalSettings: GeneralSettings)
+
+    @Query("SELECT * FROM general_settings LIMIT 1")
+    fun getGeneralSettingsFlow(): Flow<GeneralSettings?>
+}

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

@@ -0,0 +1,18 @@
+package com.zaneschepke.wireguardautotunnel.data.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import androidx.room.Upsert
+import com.zaneschepke.wireguardautotunnel.data.entity.MonitoringSettings
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface MonitoringSettingsDao {
+    @Query("SELECT * FROM monitoring_settings LIMIT 1")
+    suspend fun getMonitoringSettings(): MonitoringSettings?
+
+    @Upsert suspend fun upsert(monitoringSettings: MonitoringSettings)
+
+    @Query("SELECT * FROM monitoring_settings LIMIT 1")
+    fun getMonitoringSettingsFlow(): Flow<MonitoringSettings?>
+}

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

@@ -0,0 +1,16 @@
+package com.zaneschepke.wireguardautotunnel.data.dao
+
+import androidx.room.Dao
+import androidx.room.Query
+import androidx.room.Upsert
+import com.zaneschepke.wireguardautotunnel.data.entity.ProxySettings
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface ProxySettingsDao {
+    @Upsert suspend fun upsert(proxySettings: ProxySettings)
+
+    @Query("SELECT * FROM proxy_settings LIMIT 1") suspend fun getProxySettings(): ProxySettings?
+
+    @Query("SELECT * FROM proxy_settings LIMIT 1") fun getProxySettingsFlow(): Flow<ProxySettings?>
+}

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

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

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

@@ -1,50 +1,83 @@
 package com.zaneschepke.wireguardautotunnel.data.dao
 
-import androidx.room.Dao
-import androidx.room.Delete
-import androidx.room.Insert
-import androidx.room.OnConflictStrategy
-import androidx.room.Query
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
+import androidx.room.*
+import com.zaneschepke.wireguardautotunnel.data.entity.TunnelConfig
 import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface TunnelConfigDao {
-    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun save(t: TunnelConfig)
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun saveAll(t: TunnelConfigs)
+    @Upsert suspend fun upsert(t: TunnelConfig)
 
-    @Query("SELECT * FROM TunnelConfig WHERE id=:id") suspend fun getById(id: Long): TunnelConfig?
+    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun saveAll(t: List<TunnelConfig>)
 
-    @Query("SELECT * FROM TunnelConfig WHERE name=:name")
+    @Query("SELECT * FROM tunnel_config WHERE id=:id") suspend fun getById(id: Long): TunnelConfig?
+
+    @Query("UPDATE tunnel_config SET is_Active = 0 WHERE is_Active = 1")
+    suspend fun resetActiveTunnels()
+
+    @Query("SELECT * FROM tunnel_config WHERE name=:name")
     suspend fun getByName(name: String): TunnelConfig?
 
-    @Query("SELECT * FROM TunnelConfig WHERE is_Active=1") suspend fun getActive(): TunnelConfigs
+    @Query("SELECT * FROM tunnel_config WHERE is_Active=1")
+    suspend fun getActive(): List<TunnelConfig>
 
-    @Query("SELECT * FROM TunnelConfig") suspend fun getAll(): TunnelConfigs
+    @Query("SELECT * FROM tunnel_config") suspend fun getAll(): List<TunnelConfig>
 
     @Delete suspend fun delete(t: TunnelConfig)
 
-    @Query("SELECT COUNT('id') FROM TunnelConfig") suspend fun count(): Long
+    @Delete suspend fun delete(t: List<TunnelConfig>)
 
-    @Query("SELECT * FROM TunnelConfig WHERE tunnel_networks LIKE '%' || :name || '%'")
-    suspend fun findByTunnelNetworkName(name: String): TunnelConfigs
+    @Query("SELECT COUNT('id') FROM tunnel_config") suspend fun count(): Long
 
-    @Query("UPDATE TunnelConfig SET is_primary_tunnel = 0 WHERE is_primary_tunnel =1")
+    @Query("SELECT * FROM tunnel_config WHERE tunnel_networks LIKE '%' || :name || '%'")
+    suspend fun findByTunnelNetworkName(name: String): List<TunnelConfig>
+
+    @Query("UPDATE tunnel_config SET is_primary_tunnel = 0 WHERE is_primary_tunnel =1")
     suspend fun resetPrimaryTunnel()
 
-    @Query("UPDATE TunnelConfig SET is_mobile_data_tunnel = 0 WHERE is_mobile_data_tunnel =1")
+    @Query("UPDATE tunnel_config SET is_mobile_data_tunnel = 0 WHERE is_mobile_data_tunnel =1")
     suspend fun resetMobileDataTunnel()
 
-    @Query("UPDATE TunnelConfig SET is_ethernet_tunnel = 0 WHERE is_ethernet_tunnel =1")
+    @Query("UPDATE tunnel_config SET is_ethernet_tunnel = 0 WHERE is_ethernet_tunnel =1")
     suspend fun resetEthernetTunnel()
 
-    @Query("SELECT * FROM TUNNELCONFIG WHERE is_primary_tunnel=1")
-    suspend fun findByPrimary(): TunnelConfigs
+    @Query("SELECT * FROM tunnel_config WHERE is_primary_tunnel=1")
+    suspend fun findByPrimary(): List<TunnelConfig>
 
-    @Query("SELECT * FROM TUNNELCONFIG WHERE is_mobile_data_tunnel=1")
-    suspend fun findByMobileDataTunnel(): TunnelConfigs
+    @Query("SELECT * FROM tunnel_config WHERE is_mobile_data_tunnel=1")
+    suspend fun findByMobileDataTunnel(): List<TunnelConfig>
 
-    @Query("SELECT * FROM tunnelconfig") fun getAllFlow(): Flow<MutableList<TunnelConfig>>
+    @Query(
+        """
+    SELECT * FROM tunnel_config 
+    ORDER BY 
+        CASE WHEN is_primary_tunnel = 1 THEN 0 ELSE 1 END, 
+        position ASC 
+    LIMIT 1"""
+    )
+    suspend fun getDefaultTunnel(): TunnelConfig?
+
+    @Query(
+        """
+    SELECT * FROM tunnel_config
+    ORDER BY 
+        CASE WHEN is_Active = 1 THEN 0 
+             WHEN is_primary_tunnel = 1 THEN 1 
+             ELSE 2 END, 
+        position ASC 
+    LIMIT 1"""
+    )
+    suspend fun getStartTunnel(): TunnelConfig?
+
+    @Query("SELECT * FROM tunnel_config ORDER BY position")
+    fun getAllFlow(): Flow<List<TunnelConfig>>
+
+    @Query("SELECT * FROM tunnel_config WHERE name != :globalName ORDER BY position")
+    fun getAllTunnelsExceptGlobal(
+        globalName: String = TunnelConfig.GLOBAL_CONFIG_NAME
+    ): Flow<List<TunnelConfig>>
+
+    @Query("SELECT * FROM tunnel_config WHERE name = :globalName LIMIT 1")
+    fun getGlobalTunnel(globalName: String = TunnelConfig.GLOBAL_CONFIG_NAME): Flow<TunnelConfig?>
 }

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

@@ -0,0 +1,6 @@
+package com.zaneschepke.wireguardautotunnel.data.entity
+
+data class AppState(
+    val isLocationDisclosureShown: Boolean = false,
+    val isBatteryOptimizationDisableShown: Boolean = false,
+)

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.data.model
+package com.zaneschepke.wireguardautotunnel.data.entity
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

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

@@ -0,0 +1,32 @@
+package com.zaneschepke.wireguardautotunnel.data.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.zaneschepke.wireguardautotunnel.data.model.WifiDetectionMethod
+
+@Entity(tableName = "auto_tunnel_settings")
+data class AutoTunnelSettings(
+    @PrimaryKey(autoGenerate = true) val id: Int = 0,
+    @ColumnInfo(name = "is_tunnel_enabled", defaultValue = "0")
+    val isAutoTunnelEnabled: Boolean = false,
+    @ColumnInfo(name = "is_tunnel_on_mobile_data_enabled", defaultValue = "0")
+    val isTunnelOnMobileDataEnabled: Boolean = false,
+    @ColumnInfo(name = "trusted_network_ssids", defaultValue = "")
+    val trustedNetworkSSIDs: Set<String> = emptySet(),
+    @ColumnInfo(name = "is_tunnel_on_ethernet_enabled", defaultValue = "0")
+    val isTunnelOnEthernetEnabled: Boolean = false,
+    @ColumnInfo(name = "is_tunnel_on_wifi_enabled", defaultValue = "0")
+    val isTunnelOnWifiEnabled: Boolean = false,
+    @ColumnInfo(name = "is_wildcards_enabled", defaultValue = "0")
+    val isWildcardsEnabled: Boolean = false,
+    @ColumnInfo(name = "is_stop_on_no_internet_enabled", defaultValue = "0")
+    val isStopOnNoInternetEnabled: Boolean = false,
+    @ColumnInfo(name = "debounce_delay_seconds", defaultValue = "3")
+    val debounceDelaySeconds: Int = 3,
+    @ColumnInfo(name = "is_tunnel_on_unsecure_enabled", defaultValue = "0")
+    val isTunnelOnUnsecureEnabled: Boolean = false,
+    @ColumnInfo(name = "wifi_detection_method", defaultValue = "0")
+    val wifiDetectionMethod: WifiDetectionMethod = WifiDetectionMethod.fromValue(0),
+    @ColumnInfo(name = "start_on_boot", defaultValue = "0") val startOnBoot: Boolean = false,
+)

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

@@ -0,0 +1,14 @@
+package com.zaneschepke.wireguardautotunnel.data.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.zaneschepke.wireguardautotunnel.data.model.DnsProtocol
+
+@Entity(tableName = "dns_settings")
+data class DnsSettings(
+    @PrimaryKey(autoGenerate = true) val id: Int = 0,
+    @ColumnInfo(name = "dns_protocol", defaultValue = "0")
+    val dnsProtocol: DnsProtocol = DnsProtocol.fromValue(0),
+    @ColumnInfo(name = "dns_endpoint") val dnsEndpoint: String? = null,
+)

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

@@ -0,0 +1,33 @@
+package com.zaneschepke.wireguardautotunnel.data.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.zaneschepke.wireguardautotunnel.data.model.AppMode
+
+@Entity(tableName = "general_settings")
+data class GeneralSettings(
+    @PrimaryKey(autoGenerate = true) val id: Int = 0,
+    @ColumnInfo(name = "is_shortcuts_enabled", defaultValue = "0")
+    val isShortcutsEnabled: Boolean = false,
+    @ColumnInfo(name = "is_restore_on_boot_enabled", defaultValue = "0")
+    val isRestoreOnBootEnabled: Boolean = false,
+    @ColumnInfo(name = "is_multi_tunnel_enabled", defaultValue = "0")
+    val isMultiTunnelEnabled: Boolean = false,
+    @ColumnInfo(name = "is_tunnel_globals_enabled", defaultValue = "0")
+    val isTunnelGlobalsEnabled: Boolean = false,
+    @ColumnInfo(name = "app_mode", defaultValue = "0") val appMode: AppMode = AppMode.fromValue(0),
+    @ColumnInfo(name = "theme", defaultValue = "AUTOMATIC") val theme: String = "AUTOMATIC",
+    @ColumnInfo(name = "locale") val locale: String? = null,
+    @ColumnInfo(name = "remote_key") val remoteKey: String? = null,
+    @ColumnInfo(name = "is_remote_control_enabled", defaultValue = "0")
+    val isRemoteControlEnabled: Boolean = false,
+    @ColumnInfo(name = "is_pin_lock_enabled", defaultValue = "0")
+    val isPinLockEnabled: Boolean = false,
+    @ColumnInfo(name = "is_always_on_vpn_enabled", defaultValue = "0")
+    val isAlwaysOnVpnEnabled: Boolean = false,
+    @ColumnInfo(name = "is_lan_on_kill_switch_enabled", defaultValue = "0")
+    val isLanOnKillSwitchEnabled: Boolean = false,
+    @ColumnInfo(name = "custom_split_packages", defaultValue = "{}")
+    val customSplitPackages: Map<String, String> = emptyMap(),
+)

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/MonitoringSettings.kt

@@ -0,0 +1,21 @@
+package com.zaneschepke.wireguardautotunnel.data.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "monitoring_settings")
+data class MonitoringSettings(
+    @PrimaryKey(autoGenerate = true) val id: Int = 0,
+    @ColumnInfo(name = "is_ping_enabled", defaultValue = "0") val isPingEnabled: Boolean = false,
+    @ColumnInfo(name = "is_ping_monitoring_enabled", defaultValue = "1")
+    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,
+    @ColumnInfo(name = "show_detailed_ping_stats", defaultValue = "0")
+    val showDetailedPingStats: Boolean = false,
+    @ColumnInfo(name = "is_local_logs_enabled", defaultValue = "0")
+    val isLocalLogsEnabled: Boolean = false,
+)

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

@@ -0,0 +1,18 @@
+package com.zaneschepke.wireguardautotunnel.data.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "proxy_settings")
+data class ProxySettings(
+    @PrimaryKey(autoGenerate = true) val id: Long = 0,
+    @ColumnInfo(name = "socks5_proxy_enabled", defaultValue = "0")
+    val socks5ProxyEnabled: Boolean = false,
+    @ColumnInfo(name = "socks5_proxy_bind_address") val socks5ProxyBindAddress: String? = null,
+    @ColumnInfo(name = "http_proxy_enable", defaultValue = "0")
+    val httpProxyEnabled: Boolean = false,
+    @ColumnInfo(name = "http_proxy_bind_address") val httpProxyBindAddress: String? = null,
+    @ColumnInfo(name = "proxy_username") val proxyUsername: String? = null,
+    @ColumnInfo(name = "proxy_password") val proxyPassword: String? = null,
+)

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(tableName = "tunnel_config", 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: Set<String> = setOf(),
+    @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 = "",
+    @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: Set<String> = emptySet(),
+) {
+
+    companion object {
+        const val GLOBAL_CONFIG_NAME = "4675ab06-903a-438b-8485-6ea4187a9512"
+    }
+}

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

@@ -0,0 +1,36 @@
+package com.zaneschepke.wireguardautotunnel.data.mapper
+
+import com.zaneschepke.wireguardautotunnel.data.entity.AutoTunnelSettings as Entity
+import com.zaneschepke.wireguardautotunnel.domain.model.AutoTunnelSettings as Domain
+
+fun Entity.toDomain(): Domain =
+    Domain(
+        id = id,
+        isAutoTunnelEnabled = isAutoTunnelEnabled,
+        isTunnelOnMobileDataEnabled = isTunnelOnMobileDataEnabled,
+        trustedNetworkSSIDs = trustedNetworkSSIDs,
+        isTunnelOnEthernetEnabled = isTunnelOnEthernetEnabled,
+        isTunnelOnWifiEnabled = isTunnelOnWifiEnabled,
+        isWildcardsEnabled = isWildcardsEnabled,
+        isStopOnNoInternetEnabled = isStopOnNoInternetEnabled,
+        debounceDelaySeconds = debounceDelaySeconds,
+        isTunnelOnUnsecureEnabled = isTunnelOnUnsecureEnabled,
+        wifiDetectionMethod = wifiDetectionMethod,
+        startOnBoot = startOnBoot,
+    )
+
+fun Domain.toEntity(): Entity =
+    Entity(
+        id = id,
+        isAutoTunnelEnabled = isAutoTunnelEnabled,
+        isTunnelOnMobileDataEnabled = isTunnelOnMobileDataEnabled,
+        trustedNetworkSSIDs = trustedNetworkSSIDs,
+        isTunnelOnEthernetEnabled = isTunnelOnEthernetEnabled,
+        isTunnelOnWifiEnabled = isTunnelOnWifiEnabled,
+        isWildcardsEnabled = isWildcardsEnabled,
+        isStopOnNoInternetEnabled = isStopOnNoInternetEnabled,
+        debounceDelaySeconds = debounceDelaySeconds,
+        isTunnelOnUnsecureEnabled = isTunnelOnUnsecureEnabled,
+        wifiDetectionMethod = wifiDetectionMethod,
+        startOnBoot = startOnBoot,
+    )

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

@@ -0,0 +1,10 @@
+package com.zaneschepke.wireguardautotunnel.data.mapper
+
+import com.zaneschepke.wireguardautotunnel.data.entity.DnsSettings as Entity
+import com.zaneschepke.wireguardautotunnel.domain.model.DnsSettings as Domain
+
+fun Entity.toDomain(): Domain =
+    Domain(id = id, dnsProtocol = dnsProtocol, dnsEndpoint = dnsEndpoint)
+
+fun Domain.toEntity(): Entity =
+    Entity(id = id, dnsProtocol = dnsProtocol, dnsEndpoint = dnsEndpoint)

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

@@ -0,0 +1,10 @@
+package com.zaneschepke.wireguardautotunnel.data.mapper
+
+import com.zaneschepke.wireguardautotunnel.data.entity.AppState as Entity
+import com.zaneschepke.wireguardautotunnel.domain.model.AppState as Domain
+
+fun Entity.toDomain(): Domain =
+    Domain(
+        isLocationDisclosureShown = isLocationDisclosureShown,
+        isBatteryOptimizationDisableShown = isBatteryOptimizationDisableShown,
+    )

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/MonitoringSettingsMapper.kt

@@ -0,0 +1,28 @@
+package com.zaneschepke.wireguardautotunnel.data.mapper
+
+import com.zaneschepke.wireguardautotunnel.data.entity.MonitoringSettings as Entity
+import com.zaneschepke.wireguardautotunnel.domain.model.MonitoringSettings as Domain
+
+fun Entity.toDomain(): Domain =
+    Domain(
+        id = id,
+        isPingEnabled = isPingEnabled,
+        isPingMonitoringEnabled = isPingMonitoringEnabled,
+        tunnelPingIntervalSeconds = tunnelPingIntervalSeconds,
+        tunnelPingAttempts = tunnelPingAttempts,
+        tunnelPingTimeoutSeconds = tunnelPingTimeoutSeconds,
+        showDetailedPingStats = showDetailedPingStats,
+        isLocalLogsEnabled = isLocalLogsEnabled,
+    )
+
+fun Domain.toEntity(): Entity =
+    Entity(
+        id = id,
+        isPingEnabled = isPingEnabled,
+        isPingMonitoringEnabled = isPingMonitoringEnabled,
+        tunnelPingIntervalSeconds = tunnelPingIntervalSeconds,
+        tunnelPingAttempts = tunnelPingAttempts,
+        tunnelPingTimeoutSeconds = tunnelPingTimeoutSeconds,
+        showDetailedPingStats = showDetailedPingStats,
+        isLocalLogsEnabled = isLocalLogsEnabled,
+    )

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

@@ -0,0 +1,26 @@
+package com.zaneschepke.wireguardautotunnel.data.mapper
+
+import com.zaneschepke.wireguardautotunnel.data.entity.ProxySettings as Entity
+import com.zaneschepke.wireguardautotunnel.domain.model.ProxySettings as Domain
+
+fun Entity.toDomain(): Domain =
+    Domain(
+        id = id,
+        socks5ProxyEnabled = socks5ProxyEnabled,
+        socks5ProxyBindAddress = socks5ProxyBindAddress,
+        httpProxyEnabled = httpProxyEnabled,
+        httpProxyBindAddress = httpProxyBindAddress,
+        proxyUsername = proxyUsername,
+        proxyPassword = proxyPassword,
+    )
+
+fun Domain.toEntity(): Entity =
+    Entity(
+        id = id,
+        socks5ProxyEnabled = socks5ProxyEnabled,
+        socks5ProxyBindAddress = socks5ProxyBindAddress,
+        httpProxyEnabled = httpProxyEnabled,
+        httpProxyBindAddress = httpProxyBindAddress,
+        proxyUsername = proxyUsername,
+        proxyPassword = proxyPassword,
+    )

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

@@ -0,0 +1,41 @@
+package com.zaneschepke.wireguardautotunnel.data.mapper
+
+import com.zaneschepke.wireguardautotunnel.data.entity.GeneralSettings as Entity
+import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings as Domain
+import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
+
+fun Entity.toDomain(): Domain =
+    Domain(
+        id = id,
+        isShortcutsEnabled = isShortcutsEnabled,
+        isRestoreOnBootEnabled = isRestoreOnBootEnabled,
+        isMultiTunnelEnabled = isMultiTunnelEnabled,
+        isTunnelGlobalsEnabled = isTunnelGlobalsEnabled,
+        appMode = appMode,
+        theme = Theme.valueOf(theme.uppercase()),
+        locale = locale,
+        remoteKey = remoteKey,
+        isRemoteControlEnabled = isRemoteControlEnabled,
+        isPinLockEnabled = isPinLockEnabled,
+        isAlwaysOnVpnEnabled = isAlwaysOnVpnEnabled,
+        isLanOnKillSwitchEnabled = isLanOnKillSwitchEnabled,
+        customSplitPackages = customSplitPackages,
+    )
+
+fun Domain.toEntity(): Entity =
+    Entity(
+        id = id,
+        isShortcutsEnabled = isShortcutsEnabled,
+        isRestoreOnBootEnabled = isRestoreOnBootEnabled,
+        isMultiTunnelEnabled = isMultiTunnelEnabled,
+        isTunnelGlobalsEnabled = isTunnelGlobalsEnabled,
+        appMode = appMode,
+        theme = theme.name,
+        locale = locale,
+        remoteKey = remoteKey,
+        isRemoteControlEnabled = isRemoteControlEnabled,
+        isPinLockEnabled = isPinLockEnabled,
+        isAlwaysOnVpnEnabled = isAlwaysOnVpnEnabled,
+        isLanOnKillSwitchEnabled = isLanOnKillSwitchEnabled,
+        customSplitPackages = customSplitPackages,
+    )

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

@@ -0,0 +1,40 @@
+package com.zaneschepke.wireguardautotunnel.data.mapper
+
+import com.zaneschepke.wireguardautotunnel.data.entity.TunnelConfig as Entity
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig as Domain
+
+fun Entity.toDomain(): Domain =
+    Domain(
+        id = id,
+        name = name,
+        wgQuick = wgQuick,
+        tunnelNetworks = tunnelNetworks,
+        isMobileDataTunnel = isMobileDataTunnel,
+        isPrimaryTunnel = isPrimaryTunnel,
+        amQuick = amQuick,
+        isActive = isActive,
+        restartOnPingFailure = restartOnPingFailure,
+        pingTarget = pingTarget,
+        isEthernetTunnel = isEthernetTunnel,
+        isIpv4Preferred = isIpv4Preferred,
+        position = position,
+        autoTunnelApps = autoTunnelApps,
+    )
+
+fun Domain.toEntity(): Entity =
+    Entity(
+        id = id,
+        name = name,
+        wgQuick = wgQuick,
+        tunnelNetworks = tunnelNetworks,
+        isMobileDataTunnel = isMobileDataTunnel,
+        isPrimaryTunnel = isPrimaryTunnel,
+        amQuick = amQuick,
+        isActive = isActive,
+        restartOnPingFailure = restartOnPingFailure,
+        pingTarget = pingTarget,
+        isEthernetTunnel = isEthernetTunnel,
+        isIpv4Preferred = isIpv4Preferred,
+        position = position,
+        autoTunnelApps = autoTunnelApps,
+    )

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/migrations/Migrations.kt

@@ -0,0 +1,318 @@
+package com.zaneschepke.wireguardautotunnel.data.migrations
+
+import android.content.ContentValues
+import android.database.sqlite.SQLiteDatabase
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.stringPreferencesKey
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
+import timber.log.Timber
+
+val MIGRATION_23_24 =
+    fun(dataStore: DataStore<Preferences>): Migration {
+        return object : Migration(23, 24) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                Timber.d("Starting migration from 23 to 24")
+                db.execSQL(
+                    """
+            CREATE TABLE IF NOT EXISTS `general_settings` (
+                `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                `is_shortcuts_enabled` INTEGER NOT NULL DEFAULT 0,
+                `is_restore_on_boot_enabled` INTEGER NOT NULL DEFAULT 0,
+                `is_multi_tunnel_enabled` INTEGER NOT NULL DEFAULT 0,
+                `is_tunnel_globals_enabled` INTEGER NOT NULL DEFAULT 0,
+                `app_mode` INTEGER NOT NULL DEFAULT 0,
+                `theme` TEXT NOT NULL DEFAULT 'AUTOMATIC',
+                `locale` TEXT,
+                `remote_key` TEXT,
+                `is_remote_control_enabled` INTEGER NOT NULL DEFAULT 0,
+                `is_pin_lock_enabled` INTEGER NOT NULL DEFAULT 0,
+                `is_always_on_vpn_enabled` INTEGER NOT NULL DEFAULT 0,
+                `is_lan_on_kill_switch_enabled` INTEGER NOT NULL DEFAULT 0
+            )
+            """
+                )
+
+                db.execSQL(
+                    """
+            CREATE TABLE IF NOT EXISTS `auto_tunnel_settings` (
+                `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                `is_tunnel_enabled` INTEGER NOT NULL DEFAULT 0,
+                `is_tunnel_on_mobile_data_enabled` INTEGER NOT NULL DEFAULT 0,
+                `trusted_network_ssids` TEXT NOT NULL DEFAULT '',
+                `is_tunnel_on_ethernet_enabled` INTEGER NOT NULL DEFAULT 0,
+                `is_tunnel_on_wifi_enabled` INTEGER NOT NULL DEFAULT 0,
+                `is_wildcards_enabled` INTEGER NOT NULL DEFAULT 0,
+                `is_stop_on_no_internet_enabled` INTEGER NOT NULL DEFAULT 0,
+                `debounce_delay_seconds` INTEGER NOT NULL DEFAULT 3,
+                `is_tunnel_on_unsecure_enabled` INTEGER NOT NULL DEFAULT 0,
+                `wifi_detection_method` INTEGER NOT NULL DEFAULT 0
+            )
+            """
+                )
+
+                db.execSQL(
+                    """
+            CREATE TABLE IF NOT EXISTS `monitoring_settings` (
+                `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                `is_ping_enabled` INTEGER NOT NULL DEFAULT 0,
+                `is_ping_monitoring_enabled` INTEGER NOT NULL DEFAULT 1,
+                `tunnel_ping_interval_sec` INTEGER NOT NULL DEFAULT 30,
+                `tunnel_ping_attempts` INTEGER NOT NULL DEFAULT 3,
+                `tunnel_ping_timeout_sec` INTEGER,
+                `show_detailed_ping_stats` INTEGER NOT NULL DEFAULT 0,
+                `is_local_logs_enabled` INTEGER NOT NULL DEFAULT 0
+            )
+            """
+                )
+
+                db.execSQL(
+                    """
+            CREATE TABLE IF NOT EXISTS `dns_settings` (
+                `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                `dns_protocol` INTEGER NOT NULL DEFAULT 0,
+                `dns_endpoint` TEXT
+            )
+            """
+                )
+
+                db.execSQL(
+                    """
+            CREATE TABLE IF NOT EXISTS `tunnel_config` (
+                `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 '[]'
+            )
+            """
+                )
+
+                db.execSQL(
+                    """
+            CREATE UNIQUE INDEX `index_tunnel_config_name` ON `tunnel_config` (`name`)
+            """
+                )
+
+                try {
+                    db.execSQL(
+                        """
+                INSERT INTO `general_settings` (
+                    `id`, `is_shortcuts_enabled`, `is_restore_on_boot_enabled`,
+                    `is_multi_tunnel_enabled`, `is_tunnel_globals_enabled`, `app_mode`,
+                    `is_always_on_vpn_enabled`, `is_lan_on_kill_switch_enabled`
+                )
+                SELECT 
+                    `id`, 
+                    COALESCE(`is_shortcuts_enabled`, 0),
+                    COALESCE(`is_restore_on_boot_enabled`, 0),
+                    COALESCE(`is_multi_tunnel_enabled`, 0),
+                    COALESCE(`is_tunnel_globals_enabled`, 0),
+                    COALESCE(`app_mode`, 0),
+                    COALESCE(`is_always_on_vpn_enabled`, 0),
+                    COALESCE(`is_lan_on_kill_switch_enabled`, 0)
+                FROM `Settings`
+                """
+                    )
+                    Timber.d("Migrated data to general_settings")
+                } catch (e: Exception) {
+                    Timber.e(e, "Failed to migrate data to general_settings, inserting default row")
+                    db.execSQL("INSERT INTO `general_settings` DEFAULT VALUES")
+                }
+
+                try {
+                    db.execSQL(
+                        """
+                INSERT INTO `auto_tunnel_settings` (
+                    `id`, `is_tunnel_enabled`, `is_tunnel_on_mobile_data_enabled`,
+                    `trusted_network_ssids`, `is_tunnel_on_ethernet_enabled`,
+                    `is_tunnel_on_wifi_enabled`, `is_wildcards_enabled`, `is_stop_on_no_internet_enabled`,
+                    `debounce_delay_seconds`, `is_tunnel_on_unsecure_enabled`,
+                    `wifi_detection_method`
+                )
+                SELECT 
+                    `id`, 
+                    COALESCE(`is_tunnel_enabled`, 0),
+                    COALESCE(`is_tunnel_on_mobile_data_enabled`, 0),
+                    COALESCE(`trusted_network_ssids`, ''),
+                    COALESCE(`is_tunnel_on_ethernet_enabled`, 0),
+                    COALESCE(`is_tunnel_on_wifi_enabled`, 0),
+                    COALESCE(`is_wildcards_enabled`, 0),
+                    COALESCE(`is_stop_on_no_internet_enabled`, 0),
+                    COALESCE(`debounce_delay_seconds`, 3),
+                    COALESCE(`is_tunnel_on_unsecure_enabled`, 0),
+                    COALESCE(`wifi_detection_method`, 0)
+                FROM `Settings`
+                """
+                    )
+                    Timber.d("Migrated data to auto_tunnel_settings")
+                } catch (e: Exception) {
+                    Timber.e(
+                        e,
+                        "Failed to migrate data to auto_tunnel_settings, inserting default row",
+                    )
+                    db.execSQL("INSERT INTO `auto_tunnel_settings` DEFAULT VALUES")
+                }
+
+                try {
+                    db.execSQL(
+                        """
+                INSERT INTO `monitoring_settings` (
+                    `id`, `is_ping_enabled`, `is_ping_monitoring_enabled`,
+                    `tunnel_ping_interval_sec`, `tunnel_ping_attempts`, `tunnel_ping_timeout_sec`
+                )
+                SELECT 
+                    `id`, 
+                    COALESCE(`is_ping_enabled`, 0),
+                    COALESCE(`is_ping_monitoring_enabled`, 1),
+                    COALESCE(`tunnel_ping_interval_sec`, 30),
+                    COALESCE(`tunnel_ping_attempts`, 3),
+                    COALESCE(`tunnel_ping_timeout_sec`, NULL)
+                FROM `Settings`
+                """
+                    )
+                    Timber.d("Migrated data to monitoring_settings")
+                } catch (e: Exception) {
+                    Timber.e(
+                        e,
+                        "Failed to migrate data to monitoring_settings, inserting default row",
+                    )
+                    db.execSQL("INSERT INTO `monitoring_settings` DEFAULT VALUES")
+                }
+
+                try {
+                    db.execSQL(
+                        """
+                INSERT INTO `dns_settings` (
+                    `id`, `dns_protocol`, `dns_endpoint`
+                )
+                SELECT 
+                    `id`, 
+                    COALESCE(`dns_protocol`, 0),
+                    COALESCE(`dns_endpoint`, NULL)
+                FROM `Settings`
+                """
+                    )
+                    Timber.d("Migrated data to dns_settings")
+                } catch (e: Exception) {
+                    Timber.e(e, "Failed to migrate data to dns_settings, inserting default row")
+                    db.execSQL("INSERT INTO `dns_settings` DEFAULT VALUES")
+                }
+
+                try {
+                    db.execSQL(
+                        """
+                INSERT INTO `tunnel_config` (
+                    `id`, `name`, `wg_quick`, `tunnel_networks`, `is_mobile_data_tunnel`,
+                    `is_primary_tunnel`, `am_quick`, `is_Active`, `restart_on_ping_failure`,
+                    `ping_target`, `is_ethernet_tunnel`, `is_ipv4_preferred`, `position`,
+                    `auto_tunnel_apps`
+                )
+                SELECT 
+                    `id`, `name`, `wg_quick`, `tunnel_networks`, `is_mobile_data_tunnel`,
+                    `is_primary_tunnel`, `am_quick`, `is_Active`, `restart_on_ping_failure`,
+                    `ping_target`, `is_ethernet_tunnel`, `is_ipv4_preferred`, `position`,
+                    `auto_tunnel_apps`
+                FROM `TunnelConfig`
+                """
+                    )
+                } catch (e: Exception) {
+                    Timber.e(e, "Failed to migrate data to tunnel_config")
+                }
+
+                try {
+                    runBlocking {
+                        val preferences = dataStore.data.first()
+                        val pinLockEnabled = booleanPreferencesKey("PIN_LOCK_ENABLED")
+                        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")
+
+                        val currentTheme = preferences[theme] ?: "AUTOMATIC"
+                        val currentLocale = preferences[locale]
+                        val currentRemoteKey = preferences[remoteKey]
+                        val isRemoteEnabled = preferences[isRemoteControlEnabled] ?: false
+                        val isPinLockEnabled = preferences[pinLockEnabled] ?: false
+                        val detailedPingStats = preferences[showDetailedPingStats] ?: false
+                        val localLogs = preferences[isLocalLogsEnabled] ?: false
+
+                        val generalValues =
+                            ContentValues().apply {
+                                put("id", 1)
+                                put("theme", currentTheme)
+                                put("locale", currentLocale)
+                                put("remote_key", currentRemoteKey)
+                                put("is_remote_control_enabled", if (isRemoteEnabled) 1 else 0)
+                                put("is_pin_lock_enabled", if (isPinLockEnabled) 1 else 0)
+                            }
+                        // Try updating first
+                        val rowsAffected =
+                            db.update(
+                                table = "general_settings",
+                                conflictAlgorithm = SQLiteDatabase.CONFLICT_REPLACE,
+                                values = generalValues,
+                                whereClause = "id = ?",
+                                whereArgs = arrayOf("1"),
+                            )
+
+                        if (rowsAffected == 0) {
+                            db.insert(
+                                "general_settings",
+                                SQLiteDatabase.CONFLICT_REPLACE,
+                                generalValues,
+                            )
+                        }
+                        Timber.d("Updated or inserted DataStore values in general_settings")
+
+                        val monitoringValues =
+                            ContentValues().apply {
+                                put("id", 1)
+                                put("show_detailed_ping_stats", if (detailedPingStats) 1 else 0)
+                                put("is_local_logs_enabled", if (localLogs) 1 else 0)
+                            }
+                        val monitoringRowsAffected =
+                            db.update(
+                                table = "monitoring_settings",
+                                conflictAlgorithm = SQLiteDatabase.CONFLICT_REPLACE,
+                                values = monitoringValues,
+                                whereClause = "id = ?",
+                                whereArgs = arrayOf("1"),
+                            )
+                        if (monitoringRowsAffected == 0) {
+                            db.insert(
+                                "monitoring_settings",
+                                SQLiteDatabase.CONFLICT_REPLACE,
+                                monitoringValues,
+                            )
+                        }
+                        Timber.d("Updated or inserted DataStore values in monitoring_settings")
+                    }
+                } catch (e: Exception) {
+                    Timber.e(e, "Failed to migrate datastore data")
+                }
+
+                db.execSQL("DROP TABLE IF EXISTS `Settings`")
+                db.execSQL("DROP TABLE IF EXISTS `TunnelConfig`")
+
+                Timber.d("Migration 23 to 24 completed")
+            }
+        }
+    }

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

@@ -0,0 +1,12 @@
+package com.zaneschepke.wireguardautotunnel.data.model
+
+enum class AppMode(val value: Int) {
+    VPN(0),
+    PROXY(1),
+    LOCK_DOWN(2),
+    KERNEL(3);
+
+    companion object {
+        fun fromValue(value: Int): AppMode = entries.find { it.value == value } ?: VPN
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.zaneschepke.wireguardautotunnel.data.model
+
+import android.content.Context
+import com.zaneschepke.wireguardautotunnel.R
+
+enum class DnsProtocol(val value: Int) {
+    SYSTEM(0),
+    DOH(1);
+
+    fun asString(context: Context): String {
+        return when (this) {
+            SYSTEM -> context.getString(R.string.system)
+            DOH -> context.getString(R.string.doh)
+        }
+    }
+
+    companion object {
+        fun fromValue(value: Int): DnsProtocol =
+            DnsProtocol.entries.find { it.value == value } ?: SYSTEM
+    }
+}
+
+data class DnsSettings(
+    val protocol: DnsProtocol = DnsProtocol.SYSTEM,
+    val endpoint: String? = null,
+)
+
+enum class DnsProvider(private val systemAddress: String, private val dohAddress: String) {
+    CLOUDFLARE("1.1.1.1", "https://1.1.1.1/dns-query"),
+    ADGUARD("94.140.14.14", "https://94.140.14.14/dns-query");
+
+    fun asAddress(protocol: DnsProtocol): String {
+        return when (protocol) {
+            DnsProtocol.SYSTEM -> systemAddress
+            DnsProtocol.DOH -> dohAddress
+        }
+    }
+
+    companion object {
+        fun fromAddress(address: String): DnsProvider {
+            return entries.find { it.systemAddress == address || it.dohAddress == address }
+                ?: CLOUDFLARE
+        }
+    }
+}

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

@@ -1,54 +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 expandedTunnelIds: List<Int> = emptyList(),
-    val isLocalLogsEnabled: Boolean = IS_LOGS_ENABLED_DEFAULT,
-    val isRemoteControlEnabled: Boolean = IS_REMOTE_CONTROL_ENABLED,
-    val remoteKey: String? = null,
-    val locale: String? = null,
-    val theme: Theme = Theme.AUTOMATIC,
-) {
-
-    fun toAppState(): AppState =
-        AppState(
-            isLocationDisclosureShown,
-            isBatteryOptimizationDisableShown,
-            isPinLockEnabled,
-            expandedTunnelIds,
-            isLocalLogsEnabled,
-            isRemoteControlEnabled,
-            remoteKey,
-            locale,
-            theme,
-        )
-
-    companion object {
-        fun from(appState: AppState): GeneralState {
-            return with(appState) {
-                GeneralState(
-                    isLocationDisclosureShown,
-                    isBatteryOptimizationDisableShown,
-                    isPinLockEnabled,
-                    expandedTunnelIds,
-                    isLocalLogsEnabled,
-                    isRemoteControlEnabled,
-                    remoteKey,
-                    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_LOGS_ENABLED_DEFAULT = false
-        const val IS_REMOTE_CONTROL_ENABLED = false
-    }
-}

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

@@ -1,24 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.model
-
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppUpdate
-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>,
-) {
-    fun toAppUpdate(): AppUpdate {
-        val apkAsset = assets.firstOrNull { it.name.endsWith(".apk") }
-        return AppUpdate(
-            version = tagName.removePrefix("v"),
-            title = name ?: "Update $tagName",
-            releaseNotes = body ?: "No release notes provided",
-            apkUrl = apkAsset?.browserDownloadUrl,
-            apkFileName = apkAsset?.name,
-        )
-    }
-}

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

@@ -1,106 +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,77 +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/model/WifiDetectionMethod.kt

@@ -0,0 +1,17 @@
+package com.zaneschepke.wireguardautotunnel.data.model
+
+enum class WifiDetectionMethod(val value: Int) {
+    DEFAULT(0),
+    LEGACY(1),
+    ROOT(2),
+    SHIZUKU(3);
+
+    fun needsLocationPermissions(): Boolean {
+        return this == LEGACY || this == DEFAULT
+    }
+
+    companion object {
+        fun fromValue(value: Int): WifiDetectionMethod =
+            entries.find { it.value == value } ?: DEFAULT
+    }
+}

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

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

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

@@ -1,10 +1,10 @@
 package com.zaneschepke.wireguardautotunnel.data.network
 
-import io.ktor.client.HttpClient
-import io.ktor.client.engine.okhttp.OkHttp
-import io.ktor.client.plugins.HttpTimeout
-import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
-import io.ktor.serialization.kotlinx.json.json
+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 {

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

@@ -1,11 +1,11 @@
 package com.zaneschepke.wireguardautotunnel.data.network
 
-import com.zaneschepke.wireguardautotunnel.data.model.GitHubRelease
-import io.ktor.client.HttpClient
-import io.ktor.client.call.body
-import io.ktor.client.plugins.ClientRequestException
-import io.ktor.client.request.get
-import io.ktor.http.HttpStatusCode
+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> {

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

@@ -1,28 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.repository
-
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import javax.inject.Inject
-
-class AppDataRoomRepository
-@Inject
-constructor(
-    override val settings: AppSettingRepository,
-    override val tunnels: TunnelRepository,
-    override val appState: AppStateRepository,
-) : AppDataRepository {
-
-    override suspend fun getPrimaryOrFirstTunnel(): TunnelConf? {
-        return tunnels.findPrimary().firstOrNull() ?: tunnels.getAll().firstOrNull()
-    }
-
-    override suspend fun getStartTunnelConfig(): TunnelConf? {
-        tunnels.getActive().let {
-            if (it.isNotEmpty()) return it.first()
-            return getPrimaryOrFirstTunnel()
-        }
-    }
-}

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

@@ -1,157 +1,63 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.DataStoreManager
-import com.zaneschepke.wireguardautotunnel.data.model.GeneralState
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppState
+import com.zaneschepke.wireguardautotunnel.data.entity.AppState as Entity
+import com.zaneschepke.wireguardautotunnel.data.mapper.toDomain
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.model.AppState as Domain
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.plus
 import timber.log.Timber
 
-class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager) :
-    AppStateRepository {
+class DataStoreAppStateRepository(
+    private val dataStoreManager: DataStoreManager,
+    @ApplicationScope private val applicationScope: CoroutineScope,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) : AppStateRepository {
     override suspend fun isLocationDisclosureShown(): Boolean {
-        return dataStoreManager.getFromStore(DataStoreManager.locationDisclosureShown)
-            ?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT
+        return dataStoreManager.getFromStore(DataStoreManager.locationDisclosureShown) ?: false
     }
 
     override suspend fun setLocationDisclosureShown(shown: Boolean) {
         dataStoreManager.saveToDataStore(DataStoreManager.locationDisclosureShown, shown)
     }
 
-    override suspend fun isPinLockEnabled(): Boolean {
-        return dataStoreManager.getFromStore(DataStoreManager.pinLockEnabled)
-            ?: GeneralState.PIN_LOCK_ENABLED_DEFAULT
-    }
-
-    override suspend fun setPinLockEnabled(enabled: Boolean) {
-        dataStoreManager.saveToDataStore(DataStoreManager.pinLockEnabled, enabled)
-    }
-
     override suspend fun isBatteryOptimizationDisableShown(): Boolean {
-        return dataStoreManager.getFromStore(DataStoreManager.batteryDisableShown)
-            ?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT
+        return dataStoreManager.getFromStore(DataStoreManager.batteryDisableShown) ?: false
     }
 
     override suspend fun setBatteryOptimizationDisableShown(shown: Boolean) {
         dataStoreManager.saveToDataStore(DataStoreManager.batteryDisableShown, shown)
     }
 
-    override suspend fun setTunnelExpanded(id: Int) {
-        val ids =
-            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 removeTunnelExpanded(id: Int) {
-        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) {
-        dataStoreManager.saveToDataStore(DataStoreManager.theme, theme.name)
-    }
-
-    override suspend fun getTheme(): Theme {
-        return dataStoreManager.getFromStore(DataStoreManager.theme)?.let {
-            try {
-                Theme.valueOf(it)
-            } catch (_: IllegalArgumentException) {
-                Theme.AUTOMATIC
-            }
-        } ?: Theme.AUTOMATIC
-    }
-
-    override suspend fun isLocalLogsEnabled(): Boolean {
-        return dataStoreManager.getFromStore(DataStoreManager.isLocalLogsEnabled)
-            ?: GeneralState.IS_LOGS_ENABLED_DEFAULT
-    }
-
-    override suspend fun setLocalLogsEnabled(enabled: Boolean) {
-        dataStoreManager.saveToDataStore(DataStoreManager.isLocalLogsEnabled, enabled)
-    }
-
-    override suspend fun setLocale(localeTag: String) {
-        dataStoreManager.saveToDataStore(DataStoreManager.locale, localeTag)
-    }
-
-    override suspend fun getLocale(): String? {
-        return dataStoreManager.getFromStore(DataStoreManager.locale)
-    }
-
-    override suspend fun setIsRemoteControlEnabled(enabled: Boolean) {
-        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 val flow: Flow<AppState> =
+    override val flow: Flow<Domain> =
         dataStoreManager.preferencesFlow
             .map { prefs ->
                 prefs?.let { pref ->
                     try {
-                        GeneralState(
+                        Entity(
                             isLocationDisclosureShown =
-                                pref[DataStoreManager.locationDisclosureShown]
-                                    ?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT,
+                                pref[DataStoreManager.locationDisclosureShown] ?: false,
                             isBatteryOptimizationDisableShown =
-                                pref[DataStoreManager.batteryDisableShown]
-                                    ?: GeneralState.BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
-                            isPinLockEnabled =
-                                pref[DataStoreManager.pinLockEnabled]
-                                    ?: GeneralState.PIN_LOCK_ENABLED_DEFAULT,
-                            expandedTunnelIds =
-                                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,
-                            remoteKey = pref[DataStoreManager.remoteKey],
-                            locale = pref[DataStoreManager.locale],
-                            theme = getTheme(),
+                                pref[DataStoreManager.batteryDisableShown] ?: false,
                         )
                     } catch (e: IllegalArgumentException) {
                         Timber.e(e)
-                        GeneralState()
+                        Entity()
                     }
-                } ?: GeneralState()
+                } ?: Entity()
             }
-            .map { it.toAppState() }
+            .map { it.toDomain() }
+            .stateIn(
+                scope = applicationScope + ioDispatcher,
+                started = SharingStarted.Eagerly,
+                initialValue = com.zaneschepke.wireguardautotunnel.domain.model.AppState(),
+            )
 }

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

@@ -2,18 +2,18 @@ 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.entity.AppUpdate
+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.HttpClient
-import io.ktor.client.request.get
-import io.ktor.client.statement.HttpResponse
-import io.ktor.client.statement.bodyAsChannel
-import io.ktor.http.contentLength
-import io.ktor.utils.io.ByteReadChannel
-import io.ktor.utils.io.readAvailable
+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
@@ -30,24 +30,33 @@ class GitHubUpdateRepository(
     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 (BuildConfig.VERSION_NAME.contains("nightly")) {
-                    gitHubApi.getNightlyRelease(githubOwner, githubRepo)
+                if (isNightly) {
+                    gitHubApi.getNightlyRelease(githubOwner, githubRepo).onFailure(Timber::e)
                 } else {
-                    gitHubApi.getLatestRelease(githubOwner, githubRepo)
+                    gitHubApi.getLatestRelease(githubOwner, githubRepo).onFailure(Timber::e)
                 }
             release.map { release ->
-                val apkAsset =
+                val standaloneApkAsset =
                     release.assets.find { asset ->
-                        asset.name.startsWith("wgtunnel-full-v") && asset.name.endsWith(".apk")
+                        asset.name.startsWith("wgtunnel-${Constants.STANDALONE_FLAVOR}-v") &&
+                            asset.name.endsWith(".apk")
                     }
                 val newVersion =
-                    apkAsset?.name?.removePrefix("wgtunnel-full-v")?.removeSuffix(".apk")
-                        ?: return@map null
+                    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) {
-                    release.toAppUpdate()
+                    GitHubReleaseMapper.toAppUpdate(
+                        release.copy(assets = listOf(standaloneApkAsset)),
+                        newVersion,
+                    )
                 } else {
                     null
                 }
@@ -57,7 +66,7 @@ class GitHubUpdateRepository(
     override suspend fun downloadApk(
         apkUrl: String,
         fileName: String,
-        onProgress: (Float) -> Unit,
+        onProgress: suspend (Float) -> Unit,
     ): Result<File> =
         withContext(ioDispatcher) {
             try {

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

@@ -0,0 +1,92 @@
+package com.zaneschepke.wireguardautotunnel.data.repository
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.pm.PackageManager
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.model.InstalledPackage
+import com.zaneschepke.wireguardautotunnel.domain.repository.InstalledPackageRepository
+import com.zaneschepke.wireguardautotunnel.util.extensions.getAllInternetCapablePackages
+import com.zaneschepke.wireguardautotunnel.util.extensions.getFriendlyAppName
+import javax.inject.Singleton
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+
+@Singleton
+class InstalledAndroidPackageRepository(
+    private val context: Context,
+    @ApplicationScope val applicationScope: CoroutineScope,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) : InstalledPackageRepository {
+
+    private var cachedPackages: List<InstalledPackage>? = null
+
+    init {
+        val receiver =
+            object : BroadcastReceiver() {
+                override fun onReceive(context: Context, intent: Intent) {
+                    when (intent.action) {
+                        Intent.ACTION_PACKAGE_ADDED,
+                        Intent.ACTION_PACKAGE_REMOVED,
+                        Intent.ACTION_PACKAGE_CHANGED -> {
+                            // don't update if we have nothing cached
+                            if (cachedPackages == null) return
+                            Timber.d("Updating installed packages cache")
+                            applicationScope.launch { refreshInstalledPackages() }
+                        }
+                    }
+                }
+            }
+        val filter =
+            IntentFilter().apply {
+                addAction(Intent.ACTION_PACKAGE_ADDED)
+                addAction(Intent.ACTION_PACKAGE_REMOVED)
+                addAction(Intent.ACTION_PACKAGE_CHANGED)
+                addDataScheme("package")
+            }
+        context.registerReceiver(receiver, filter)
+    }
+
+    override suspend fun getInstalledPackages(): List<InstalledPackage> =
+        withContext(ioDispatcher) {
+            cachedPackages?.let {
+                return@withContext it
+            }
+            refreshInstalledPackages()
+        }
+
+    override suspend fun refreshInstalledPackages(): List<InstalledPackage> =
+        withContext(ioDispatcher) {
+            val packages = context.getAllInternetCapablePackages()
+
+            val installedPackages =
+                packages.mapNotNull { packageInfo ->
+                    try {
+                        val appInfo =
+                            context.packageManager.getApplicationInfo(packageInfo.packageName, 0)
+                        InstalledPackage(
+                            name =
+                                context.packageManager.getFriendlyAppName(
+                                    packageInfo.packageName,
+                                    appInfo,
+                                ),
+                            packageName = packageInfo.packageName,
+                            uId = appInfo.uid,
+                        )
+                    } catch (e: PackageManager.NameNotFoundException) {
+                        Timber.e(e)
+                        null
+                    }
+                }
+
+            cachedPackages = installedPackages
+
+            installedPackages
+        }
+}

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

@@ -0,0 +1,37 @@
+package com.zaneschepke.wireguardautotunnel.data.repository
+
+import com.zaneschepke.wireguardautotunnel.data.dao.AutoTunnelSettingsDao
+import com.zaneschepke.wireguardautotunnel.data.entity.AutoTunnelSettings as Entity
+import com.zaneschepke.wireguardautotunnel.data.mapper.toDomain
+import com.zaneschepke.wireguardautotunnel.data.mapper.toEntity
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.model.AutoTunnelSettings as Domain
+import com.zaneschepke.wireguardautotunnel.domain.repository.AutoTunnelSettingsRepository
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+
+class RoomAutoTunnelSettingsRepository(
+    private val autoTunnelSettingsDao: AutoTunnelSettingsDao,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) : AutoTunnelSettingsRepository {
+    override suspend fun upsert(autoTunnelSettings: Domain) {
+        autoTunnelSettingsDao.upsert(autoTunnelSettings.toEntity())
+    }
+
+    override val flow: Flow<Domain>
+        get() =
+            autoTunnelSettingsDao
+                .getAutoTunnelSettingsFlow()
+                .map { (it ?: Entity()).toDomain() }
+                .flowOn(ioDispatcher)
+
+    override suspend fun getAutoTunnelSettings(): Domain {
+        return (autoTunnelSettingsDao.getAutoTunnelSettings() ?: Entity()).toDomain()
+    }
+
+    override suspend fun updateAutoTunnelEnabled(enabled: Boolean) {
+        autoTunnelSettingsDao.updateAutoTunnelEnabled(enabled)
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.zaneschepke.wireguardautotunnel.data.repository
+
+import com.zaneschepke.wireguardautotunnel.data.dao.DnsSettingsDao
+import com.zaneschepke.wireguardautotunnel.data.entity.DnsSettings as Entity
+import com.zaneschepke.wireguardautotunnel.data.mapper.toDomain
+import com.zaneschepke.wireguardautotunnel.data.mapper.toEntity
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.model.DnsSettings as Domain
+import com.zaneschepke.wireguardautotunnel.domain.repository.DnsSettingsRepository
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+
+class RoomDnsSettingsRepository(
+    private val dnsSettingsDao: DnsSettingsDao,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) : DnsSettingsRepository {
+    override suspend fun upsert(dnsSettings: Domain) {
+        dnsSettingsDao.upsert(dnsSettings.toEntity())
+    }
+
+    override val flow: Flow<Domain>
+        get() =
+            dnsSettingsDao
+                .getDnsSettingsFlow()
+                .map { (it ?: Entity()).toDomain() }
+                .flowOn(ioDispatcher)
+
+    override suspend fun getDnsSettings(): Domain {
+        return (dnsSettingsDao.getDnsSettings() ?: Entity()).toDomain()
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.zaneschepke.wireguardautotunnel.data.repository
+
+import com.zaneschepke.wireguardautotunnel.data.dao.MonitoringSettingsDao
+import com.zaneschepke.wireguardautotunnel.data.entity.MonitoringSettings as Entity
+import com.zaneschepke.wireguardautotunnel.data.mapper.toDomain
+import com.zaneschepke.wireguardautotunnel.data.mapper.toEntity
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.model.MonitoringSettings as Domain
+import com.zaneschepke.wireguardautotunnel.domain.repository.MonitoringSettingsRepository
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+
+class RoomMonitoringSettingsRepository(
+    private val monitoringSettingsDao: MonitoringSettingsDao,
+    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) : MonitoringSettingsRepository {
+    override suspend fun upsert(monitoringSettings: Domain) {
+        monitoringSettingsDao.upsert(monitoringSettings.toEntity())
+    }
+
+    override val flow: Flow<Domain>
+        get() =
+            monitoringSettingsDao
+                .getMonitoringSettingsFlow()
+                .map { (it ?: Entity()).toDomain() }
+                .flowOn(ioDispatcher)
+
+    override suspend fun getMonitoringSettings(): Domain {
+        return (monitoringSettingsDao.getMonitoringSettings() ?: Entity()).toDomain()
+    }
+}