chore: release 5.0.6

closes #1299

.github/CODE_OF_CONDUCT.md

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

.github/FUNDING.yml

@@ -1,3 +1,4 @@
 ko_fi: zaneschepke
 liberapay: zaneschepke
 github: zaneschepke
+custom: ["https://wgtunnel.com/donate/"]

.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-aab.yml

@@ -0,0 +1,131 @@
+name: build-aab
+
+permissions:
+  contents: read
+
+on:
+  workflow_dispatch:
+    inputs:
+      build_type:
+        type: choice
+        description: "Build type"
+        required: true
+        default: release
+        options:
+          - release
+      flavor:
+        type: choice
+        description: "Product flavor"
+        required: true
+        default: google
+        options:
+          - google
+    secrets:
+      SIGNING_KEY_ALIAS:
+        required: false
+      SIGNING_KEY_PASSWORD:
+        required: false
+      SIGNING_STORE_PASSWORD:
+        required: false
+      SERVICE_ACCOUNT_JSON:
+        required: false
+      KEYSTORE:
+        required: false
+  workflow_call:
+    inputs:
+      build_type:
+        type: string
+        description: "Build type"
+        required: true
+        default: release
+      flavor:
+        type: string
+        description: "Product flavor"
+        required: false
+        default: google
+    secrets:
+      SIGNING_KEY_ALIAS:
+        required: false
+      SIGNING_KEY_PASSWORD:
+        required: false
+      SIGNING_STORE_PASSWORD:
+        required: false
+      SERVICE_ACCOUNT_JSON:
+        required: false
+      KEYSTORE:
+        required: false
+
+env:
+  UPLOAD_DIR_ANDROID: android_artifacts
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    env:
+      SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
+      SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
+      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
+      KEY_STORE_FILE: 'android_keystore.jks'
+      KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
+    outputs:
+      UPLOAD_DIR_ANDROID: ${{ env.UPLOAD_DIR_ANDROID }}
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          fetch-depth: 0
+          submodules: recursive
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+          cache: gradle
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Decode Keystore
+        id: decode_keystore
+        uses: timheuer/base64-to-file@v2.0
+        with:
+          fileName: ${{ env.KEY_STORE_FILE }}
+          fileDir: ${{ env.KEY_STORE_LOCATION }}
+          encodedString: ${{ secrets.KEYSTORE }}
+
+      - name: Create keystore path env var
+        if: ${{ inputs.build_type != 'debug' }}
+        run: |
+          store_path=${{ env.KEY_STORE_LOCATION }}${{ env.KEY_STORE_FILE }}
+          echo "KEY_STORE_PATH=$store_path" >> $GITHUB_ENV
+
+      - name: Build AAB (noSplits=true)
+        run: |
+          flavor=${{ inputs.flavor }}
+          build_type=${{ inputs.build_type }}
+          case $build_type in
+            "release")
+              ./gradlew :app:bundle${flavor^}Release \
+                -PnoSplits=true \
+                --info
+              ;;
+          esac
+
+      - name: Get release AAB path
+        id: aab-path
+        run: |
+          AAB_PATH=$(find app/build/outputs/bundle -iname "*google*release*.aab" -type f | head -1)
+          if [ -z "$AAB_PATH" ]; then
+            echo "Error: AAB not found!" >&2
+            exit 1
+          fi
+          echo "Found AAB: $AAB_PATH"
+          echo "path=$AAB_PATH" >> $GITHUB_OUTPUT
+
+      - name: Upload AAB Artifact
+        uses: actions/upload-artifact@v7
+        with:
+          name: google-play-aab
+          path: ${{ steps.aab-path.outputs.path }}
+          retention-days: 7
+          if-no-files-found: error

.github/workflows/build.yml

@@ -72,20 +72,21 @@ jobs:
     outputs:
       UPLOAD_DIR_ANDROID: ${{ env.UPLOAD_DIR_ANDROID }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         with:
           fetch-depth: 0
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
+          submodules: recursive
+      - name: Set up JDK 21
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: gradle
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Decode Keystore
         id: decode_keystore
-        uses: timheuer/base64-to-file@v1.2
+        uses: timheuer/base64-to-file@v2.0
         with:
           fileName: ${{ env.KEY_STORE_FILE }}
           fileDir: ${{ env.KEY_STORE_LOCATION }}
@@ -111,18 +112,17 @@ jobs:
               ./gradlew :app:assemble${flavor^}Debug --stacktrace
               ;;
           esac
+        env:
+          GITHUB_SHA: ${{ github.sha }}
+          GITHUB_RUN_NUMBER: ${{ github.run_number }}
       - name: Get release apk path
         id: apk-path
         run: echo "path=$(find . -regex '^.*/build/outputs/apk/${{ inputs.flavor }}/${{ inputs.build_type }}/.*\.apk$' -type f | head -1 | tail -c+2)" >> $GITHUB_OUTPUT
-      - name: Upload APK
-        uses: actions/upload-artifact@v4
+      - name: Upload All APK Artifacts
+        uses: actions/upload-artifact@v7
         with:
           name: android_artifacts_${{ inputs.flavor }}
           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)
-            }}
+            app/build/outputs/apk/${{ inputs.flavor }}/${{ inputs.build_type }}/*.apk
           retention-days: 1
           if-no-files-found: warn

.github/workflows/nightly.yml

@@ -16,16 +16,19 @@ jobs:
       has_new_commits: ${{ steps.check.outputs.new_commits }}
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v7
       - name: Check for new commits
         id: check
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          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:
+    needs:
+      - check_commits
+    if: ${{ needs.check_commits.outputs.has_new_commits > 0 && inputs.release_type != 'none' }}
     uses: ./.github/workflows/build.yml
     secrets: inherit
     with:
@@ -34,14 +37,15 @@ jobs:
 
   publish:
     needs:
-      - check_commits
       - build-standalone-nightly
     if: ${{ needs.check_commits.outputs.has_new_commits > 0 && inputs.release_type != 'none' }}
     name: publish-nightly
     runs-on: ubuntu-latest
     steps:
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
+        with:
+          submodules: recursive
 
       - name: Install system dependencies
         run: |
@@ -53,14 +57,14 @@ 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: Generate Changelog
         id: changelog
         uses: requarks/changelog-action@v1
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ github.token }}
           toTag: "nightly"
           fromTag: "latest"
           writeToFile: false
@@ -69,7 +73,7 @@ jobs:
         run: mkdir ${{ github.workspace }}/temp
 
       - name: Download artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v8
         with:
           pattern: android_artifacts_*
           path: ${{ github.workspace }}/temp
@@ -84,7 +88,7 @@ jobs:
           tag_name: "nightly"
           delete_release: true
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ github.token }}
 
       - name: Get checksum
         id: checksum
@@ -99,7 +103,7 @@ jobs:
 
       - name: Create nightly release
         id: create_release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
         with:
           body: |
             ${{ env.RELEASE_NOTES }}
@@ -124,4 +128,4 @@ jobs:
           files: |
             ${{ github.workspace }}/temp/**/*.apk
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.PAT }}

.github/workflows/notifications.yml

@@ -0,0 +1,152 @@
+name: notifications
+
+permissions:
+  contents: write
+  packages: write
+
+on:
+  issues:
+    types: [opened, closed]
+  release:
+    types: [published, prereleased]
+
+jobs:
+  notify:
+    runs-on: ubuntu-latest
+    env:
+      PROJECT_NAME: Android
+
+    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}"
+          TEXT=$(echo -e "🆕 **${PROJECT_NAME}** — 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 "✅ **${PROJECT_NAME}** — 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' && !github.event.release.prerelease) || (github.event.action == 'prereleased' && github.event.release.prerelease && github.event.release.name == 'nightly'))
+        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 }}
+          ACTION: ${{ github.event.action }}
+        run: |
+          BODY_TRUNC="${BODY:0:200}"
+          if [ "$ACTION" == "prereleased" ]; then
+            ICON="🌙"
+            PREFIX="New Nightly Release"
+          else
+            ICON="🚀"
+            PREFIX="New Release"
+          fi
+          TEXT=$(echo -e "$ICON **${PROJECT_NAME}** — $PREFIX *$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 "🆕 **${PROJECT_NAME}** — New Issue #$NUMBER: $TITLE by $USER\n\n$BODY\n\nView Issue: $URL")
+          HTML_MESSAGE=$(echo -e "<p>🆕 <strong>${PROJECT_NAME}</strong> — 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 "✅ **${PROJECT_NAME}** — Issue Closed #$NUMBER: $TITLE by $USER\n\nView Issue: $URL")
+          HTML_MESSAGE=$(echo -e "<p>✅ <strong>${PROJECT_NAME}</strong> — 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' && !github.event.release.prerelease) || (github.event.action == 'prereleased' && github.event.release.prerelease && github.event.release.name == 'nightly'))
+        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 }}
+          ACTION: ${{ github.event.action }}
+        run: |
+          if [ "$ACTION" == "prereleased" ]; then
+            ICON="🌙"
+            PREFIX="New Nightly Release"
+          else
+            ICON="🚀"
+            PREFIX="New Release"
+          fi
+          PLAIN_MESSAGE=$(echo -e "$ICON **${PROJECT_NAME}** — $PREFIX $NAME ($TAG)\n\n$BODY\n\nView Release: $URL")
+          HTML_MESSAGE=$(echo -e "<p>$ICON <strong>${PROJECT_NAME}</strong> — $PREFIX <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,25 +1,30 @@
 name: on-pr
+
 permissions:
   contents: read
 
 on:
-    workflow_dispatch:
-    pull_request:
+  workflow_dispatch:
+  pull_request:
 
 jobs:
   format_check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
+      - uses: actions/checkout@v7
+
+      - name: Verify Gradle Wrapper
+        uses: gradle/actions/wrapper-validation@v6
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: '21'
           cache: gradle
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
       - name: Run ktfmt
-        run: ./gradlew ktfmtCheck
+        run: ./gradlew ktfmtCheck

.github/workflows/publish.yml

@@ -32,14 +32,6 @@ on:
         description: "Tag name for release"
         required: false
         default: 1.1.1
-      flavor:
-        type: choice
-        description: "Product flavor"
-        required: true
-        default: standalone
-        options:
-          - fdroid
-          - standalone
   workflow_call:
     inputs:
       flavor:
@@ -51,7 +43,11 @@ on:
 jobs:
 
   build-fdroid:
-    if: ${{ github.event_name == 'push' || inputs.release_type == 'release' || inputs.flavor == 'fdroid' }}
+    if: >-
+      ${{ 
+        github.event_name == 'push' || 
+        inputs.release_type != 'none' 
+      }}
     uses: ./.github/workflows/build.yml
     secrets: inherit
     with:
@@ -59,22 +55,32 @@ jobs:
       flavor: fdroid
 
   build-standalone:
-    if: ${{ github.event_name == 'push' || inputs.release_type == 'release' || inputs.release_type == 'debug' || inputs.flavor == 'standalone' }}
+    if: >-
+      ${{ 
+        github.event_name == 'push' || 
+        inputs.release_type != 'none' 
+      }}
     uses: ./.github/workflows/build.yml
     secrets: inherit
     with:
       build_type: ${{ github.event_name == 'push' && 'release' || inputs.release_type }}
       flavor: standalone
 
-  publish:
+  publish-github:
+    if: >-
+      ${{ 
+        github.event_name == 'push' || 
+        inputs.release_type != 'none' 
+      }}
     needs:
-      - build-standalone
+    - build-fdroid
+    - build-standalone
     name: publish-github
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
         with:
-          ref: ${{ github.event_name == 'push' && github.ref || 'main' }}
+          ref: ${{ github.event_name == 'push' && github.ref || 'master' }}
       - name: Install system dependencies
         run: |
           sudo apt update && sudo apt install -y gh apksigner
@@ -86,20 +92,21 @@ 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 }}
+          token: ${{ github.token }}
           toTag: ${{ steps.latest_release.outputs.tag_name }}
           fromTag: "latest"
           writeToFile: false
@@ -108,7 +115,7 @@ jobs:
         run: mkdir ${{ github.workspace }}/temp
 
       - name: Download artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v8
         with:
           pattern: android_artifacts_*
           path: ${{ github.workspace }}/temp
@@ -117,8 +124,8 @@ jobs:
       - name: Set version release notes
         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}")"
+          VERSION_CODE=$(sed -nE 's/.*const val VERSION_CODE[[:space:]]*=[[:space:]]*([0-9]+).*/\1/p' buildSrc/src/main/kotlin/Constants.kt)
+          RELEASE_NOTES="$(cat ${{ github.workspace }}/fastlane/metadata/android/en-US/changelogs/${VERSION_CODE}.txt || echo "No changelog found for ${VERSION_CODE}")"
           echo "RELEASE_NOTES<<EOF" >> $GITHUB_ENV
           echo "$RELEASE_NOTES" >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
@@ -136,7 +143,7 @@ jobs:
 
       - name: Create Release
         id: create_release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
         with:
           body: |
             ${{ env.RELEASE_NOTES }}
@@ -161,72 +168,80 @@ jobs:
           files: |
             ${{ github.workspace }}/temp/**/*.apk
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.PAT }}
 
   publish-fdroid-public:
     runs-on: ubuntu-latest
+    if: >-
+      ${{ 
+        github.event_name == 'push' || 
+        inputs.release_type != 'none' 
+      }}
     needs:
-      - build-fdroid
-    if: ${{ github.event_name == 'push' || inputs.release_type == 'release' }}
+      - publish-github
     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
 
+  build-google-aab:
+    if: >-
+      ${{
+        github.event_name == 'push' ||
+        inputs.track != 'none'
+      }}
+    uses: ./.github/workflows/build-aab.yml
+    secrets: inherit
+    with:
+      build_type: release
+      flavor: google
+
   publish-play:
     if: ${{ github.event_name == 'push' || inputs.track != 'none' }}
     name: Publish to Google Play
     runs-on: ubuntu-latest
-
-    env:
-      SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
-      SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
-      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
-      KEY_STORE_FILE: 'android_keystore.jks'
-      KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
-
+    needs: build-google-aab
     steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
+      - uses: actions/checkout@v7
         with:
-          distribution: 'temurin'
-          java-version: '17'
-          cache: gradle
+          ref: ${{ github.event_name == 'push' && github.ref || 'master' }}
 
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      # Here we need to decode keystore.jks from base64 string and place it
-      # in the folder specified in the release signing configuration
-      - name: Decode Keystore
-        id: decode_keystore
-        uses: timheuer/base64-to-file@v1.2
+      - name: Download AAB artifact
+        uses: actions/download-artifact@v8
         with:
-          fileName: ${{ env.KEY_STORE_FILE }}
-          fileDir: ${{ env.KEY_STORE_LOCATION }}
-          encodedString: ${{ secrets.KEYSTORE }}
+          name: google-play-aab
+          path: ${{ github.workspace }}/aab
 
-      # create keystore path for gradle to read
-      - name: Create keystore path env var
+      - name: Find exact AAB file path
+        id: find-aab
         run: |
-          store_path=${{ env.KEY_STORE_LOCATION }}${{ env.KEY_STORE_FILE }}
-          echo "KEY_STORE_PATH=$store_path" >> $GITHUB_ENV
+          AAB_PATH=$(find "${{ github.workspace }}/aab" -name "*.aab" -type f | head -1)
+          if [ -z "$AAB_PATH" ]; then
+            echo "ERROR: No .aab file found after download!"
+            find "${{ github.workspace }}/aab" -type f
+            exit 1
+          fi
+          echo "Found AAB: $AAB_PATH"
+          echo "aab_path=$AAB_PATH" >> $GITHUB_OUTPUT
 
       - name: Create service_account.json
-        id: createServiceAccount
         run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
 
-      - name: Deploy with fastlane
+      - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.2' # Not needed with a .ruby-version file
+          ruby-version: '3.4'
           bundler-cache: true
 
-      - name: Distribute app to Prod track 🚀
+      - name: Upload to Google Play
         run: |
           track=${{ github.event_name == 'push' && 'production' || inputs.track }}
-          (cd ${{ github.workspace }} && bundle install && bundle exec fastlane $track)
+          bundle exec fastlane run upload_to_play_store \
+            track:"$track" \
+            aab:"${{ steps.find-aab.outputs.aab_path }}" \
+            json_key:"service_account.json" \
+            package_name:"com.zaneschepke.wireguardautotunnel" \
+            skip_upload_apk:true

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "hevtunnel/src/main/jni/hev-socks5-tunnel"]
+	path = hevtunnel/src/main/jni/hev-socks5-tunnel
+	url = https://github.com/heiher/hev-socks5-tunnel
+[submodule "tunnel/tools/amneziawg-tools"]
+	path = tunnel/tools/amneziawg-tools
+	url = https://github.com/amnezia-vpn/amneziawg-tools

Gemfile

@@ -1,3 +1,4 @@
 source "https://rubygems.org"
 
-gem "fastlane"
+gem "fastlane"
+gem "multi_json"

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 />
@@ -21,8 +21,7 @@ and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/)
 <div align="center">
 
 [![Google Play](https://img.shields.io/badge/Google_Play-414141?style=for-the-badge&logo=google-play&logoColor=white)](https://play.google.com/store/apps/details?id=com.zaneschepke.wireguardautotunnel)
-[![F-Droid](https://img.shields.io/static/v1?style=for-the-badge&message=F-Droid&color=1976D2&logo=F-Droid&logoColor=FFFFFF&label=)](https://f-droid.org/packages/com.zaneschepke.wireguardautotunnel/)
-[![Personal](https://img.shields.io/static/v1?style=for-the-badge&message=Personal&color=1976D2&logo=F-Droid&logoColor=FFFFFF&label=)](https://github.com/zaneschepke/fdroid)
+[![IzzyOnDroid](https://img.shields.io/static/v1?style=for-the-badge&message=IzzyOnDroid&color=1976D2&logo=F-Droid&logoColor=FFFFFF&label=)](https://apt.izzysoft.de/fdroid/index/apk/com.zaneschepke.wireguardautotunnel)
 [![Obtainium](https://img.shields.io/badge/Obtainium-414141?style=for-the-badge&logo=Obtainium&logoColor=white)](https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22com.zaneschepke.wireguardautotunnel%22%2C%22url%22%3A%22https%3A%2F%2Fgithub.com%2Fzaneschepke%2Fwgtunnel%22%2C%22author%22%3A%22zaneschepke%22%2C%22name%22%3A%22WG%20Tunnel%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22includePrereleases%5C%22%3Afalse%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22filterReleaseNotesByRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22verifyLatestTag%5C%22%3Atrue%2C%5C%22sortMethodChoice%5C%22%3A%5C%22date%5C%22%2C%5C%22useLatestAssetDateAsReleaseDate%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%2C%5C%22trackOnly%5C%22%3Afalse%2C%5C%22versionExtractionRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22matchGroupToUse%5C%22%3A%5C%22%5C%22%2C%5C%22versionDetection%5C%22%3Atrue%2C%5C%22releaseDateAsVersion%5C%22%3Afalse%2C%5C%22useVersionCodeAsOSVersion%5C%22%3Afalse%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22invertAPKFilter%5C%22%3Afalse%2C%5C%22autoApkFilterByArch%5C%22%3Atrue%2C%5C%22appName%5C%22%3A%5C%22WG%20Tunnel%5C%22%2C%5C%22appAuthor%5C%22%3A%5C%22Zane%20Schepke%5C%22%2C%5C%22shizukuPretendToBeGooglePlay%5C%22%3Afalse%2C%5C%22allowInsecure%5C%22%3Afalse%2C%5C%22exemptFromBackgroundUpdates%5C%22%3Afalse%2C%5C%22skipUpdateNotifications%5C%22%3Afalse%2C%5C%22about%5C%22%3A%5C%22%5C%22%2C%5C%22refreshBeforeDownload%5C%22%3Afalse%7D%22%2C%22overrideSource%22%3Anull%7D)
 
 </div>
@@ -37,11 +36,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,56 +48,42 @@ 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, AmneziaWG support, different app modes like **Lockdown** (a custom kill switch for leak prevention), and **Local Proxy** (expose a tunnel over a local SOCKS5/HTTP proxy server) 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>
 <div style="display: flex; flex-wrap: wrap; justify-content: left; gap: 10px;">
- <img label="Main" src="fastlane/metadata/android/en-US/images/phoneScreenshots/main_screen.png" width="200" />
- <img label="Settings" src="fastlane/metadata/android/en-US/images/phoneScreenshots/settings_screen.png" width="200" />
-  <img label="Auto" src="fastlane/metadata/android/en-US/images/phoneScreenshots/auto_screen.png" width="200" />
-  <img label="Config" src="fastlane/metadata/android/en-US/images/phoneScreenshots/config_screen.png" width="200" />
+    <img label="Main" src="fastlane/metadata/android/en-US/images/phoneScreenshots/main_screen.png" width="200"  alt="Main"/>
+    <img label="Config" src="fastlane/metadata/android/en-US/images/phoneScreenshots/config_screen.png" width="200"  alt="Config"/>
+    <img label="Settings" src="fastlane/metadata/android/en-US/images/phoneScreenshots/settings_screen.png" width="200"  alt="Settings"/>
+    <img label="Auto-tunnel" src="fastlane/metadata/android/en-US/images/phoneScreenshots/auto_screen.png" width="200"  alt="Auto-tunnel"/>
 </div>
 
-<div style="text-align: left;">
-
 ## 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
+- **Auto-Tunneling:** Automatically activate tunnels based on your device's active network details.
+- **Deferred Endpoint Bootstrapping:** Safely resolves endpoints and updates peers after the tunnel is up for better reliability and leak protection on startup.
+- **Handshake Monitoring:** Real-time handshake monitoring for instant tunnel health feedback.
+- **AmneziaWG Support:** Full support for AmneziaWG 2.0, providing robust censorship protection.
+- **Split Tunneling:** Flexible support for routing specific apps or traffic through the VPN.
+- **Local Proxy Mode:** Expose WireGuard tunnels over a local SOCKS5 or HTTP proxy to browsers or firewall apps (like AdGuard).
+- **Lockdown Mode:** Advanced in-app kill switch that blocks all traffic while the tunnel is down.
+- **Quick Controls:** Quick Settings tile and home screen shortcuts for easy toggling.
+- **Remote Control Support:** Intent-based automation for controlling tunnels and auto-tunneling from automation apps (like Tasker).
+- **Dynamic DNS Handling:** Automatically detect and update endpoints on server IP changes without requiring a restart.
+- **IPv6 Endpoints:** Automatically upgrade to IPv6 endpoints or fall back to IPv4 based on network conditions without requiring a restart.
+- **Android TV Support:** Full support for nearly all features on Android TV.
 
 ## Building
 
 ```sh
-git clone https://github.com/zaneschepke/wgtunnel
+git clone https://github.com/wgtunnel/wgtunnel
 cd wgtunnel
 ```
 
@@ -114,6 +99,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,9 +1,8 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import com.android.build.api.dsl.ApplicationExtension
+import com.android.build.api.variant.FilterConfiguration
 
 plugins {
     alias(libs.plugins.android.application)
-    alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.hilt.android)
     alias(libs.plugins.kotlinxSerialization)
     alias(libs.plugins.ksp)
     alias(libs.plugins.compose.compiler)
@@ -11,7 +10,19 @@ plugins {
     alias(libs.plugins.licensee)
 }
 
-android {
+ksp {
+    arg("room.schemaLocation", "$projectDir/schemas")
+}
+
+licensee {
+    allowedLicenses().forEach { allow(it) }
+    allowedLicenseUrls().forEach { allowUrl(it) }
+    // foss, but missing licenses
+    ignoreDependencies("com.github.T8RIN.QuickieExtended")
+    ignoreDependencies("com.github.topjohnwu.libsu")
+}
+
+configure<ApplicationExtension> {
     namespace = Constants.APP_ID
     compileSdk = Constants.TARGET_SDK
 
@@ -22,18 +33,34 @@ android {
         includeInBundle = false
     }
 
-    ksp { arg("room.schemaLocation", "$projectDir/schemas") }
+    // fix okhttp proguard issue
+    packaging { resources { pickFirsts.add("okhttp3/internal/publicsuffix/publicsuffixes.gz") } }
+
+    splits {
+        abi {
+            val noSplits = providers.gradleProperty("noSplits").isPresent
+            isEnable = !noSplits
+            reset()
+            include("armeabi-v7a", "arm64-v8a")
+            isUniversalApk = !noSplits
+        }
+    }
 
     defaultConfig {
         applicationId = Constants.APP_ID
         minSdk = Constants.MIN_SDK
         targetSdk = Constants.TARGET_SDK
-        versionCode = computeVersionCode()
-        versionName = computeVersionName()
+        versionCode = Constants.VERSION_CODE
+        versionName = Constants.VERSION_NAME
 
-        sourceSets { getByName("debug").assets.srcDirs(files("$projectDir/schemas")) }
+        experimentalProperties["android.experimental.disableGitVersion"] = true
 
-        val languagesArray = buildLanguagesArray(languageList())
+        sourceSets {
+            getByName("debug").assets.directories += "$projectDir/schemas"
+        }
+
+        val languagesProvider = project.languageListProvider()
+        val languagesArray = buildLanguagesArray(languagesProvider.get())
         buildConfigField("String[]", "LANGUAGES", "new String[]{ $languagesArray }")
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -103,61 +130,119 @@ android {
 
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
-    }
-
-    kotlin {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_17
-            freeCompilerArgs = listOf("-XXLanguage:+PropertyParamAnnotationDefaultTargetMode")
-        }
     }
 
     buildFeatures {
         compose = true
         buildConfig = true
+        resValues = true
     }
     packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
+}
 
-    licensee {
-        allowedLicenses().forEach { allow(it) }
-        allowedLicenseUrls().forEach { allowUrl(it) }
-    }
+androidComponents {
+    onVariants { variant ->
+        val isNightly = project.isNightlyBuild()
 
-    applicationVariants.all {
-        val variant = this
-        variant.outputs
-            .map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
-            .forEach { output ->
-                val outputFileName =
-                    if (variant.flavorName == "fdroid" && variant.buildType.name == "release") {
-                        "${Constants.APP_NAME}-fdroid-release-${variant.versionName}.apk"
-                    } else {
-                        "${Constants.APP_NAME}-${variant.flavorName}-v${variant.versionName}.apk"
-                    }
-                output.outputFileName = outputFileName
+        if (isNightly) {
+            variant.outputs.forEach { output ->
+
+                output.versionCode.set(
+                    output.versionCode.get() + project.getVersionCodeIncrement()
+                )
+
+                val currentVersion = output.versionName.get()
+                val nextVersion = bumpToNextPatchVersion(currentVersion)
+                val gitHash = project.getGitCommitHash()
+
+                output.versionName.set("$nextVersion-nightly+git.$gitHash")
             }
+        }
+
+        val abiNameMap = mapOf(
+            "armeabi-v7a" to "armv7",
+            "arm64-v8a" to "arm64",
+            "x86" to "x86",
+            "x86_64" to "x64",
+        )
+
+        variant.outputs.forEach { output ->
+            val abi = output.filters.find { it.filterType == FilterConfiguration.FilterType.ABI }?.identifier
+            val flavorName = variant.productFlavors.joinToString("-") { it.second }
+            val versionName = output.versionName.get()
+            val baseFileName = "${Constants.APP_NAME}-${flavorName}-v${versionName}"
+
+            val outputFileName = if (!abi.isNullOrEmpty()) {
+                val shortAbiName = abiNameMap.getOrDefault(abi, abi)
+                "${baseFileName}-${shortAbiName}.apk"
+            } else {
+                "${baseFileName}.apk"
+            }
+
+            output.outputFileName.set(outputFileName)
+        }
     }
 }
 
 dependencies {
     implementation(project(":logcatter"))
     implementation(project(":networkmonitor"))
+    implementation(project(":tunnel"))
 
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.lifecycle.runtime.ktx)
-    implementation(libs.androidx.lifecycle.service)
-    implementation(libs.androidx.activity.compose)
+    // 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.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)
+    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)
+
+    // 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)
+
+    implementation(libs.bundles.androidx.work)
+
+    // Networking and serialization
+    implementation(libs.bundles.ktor.client)
+    implementation(libs.bundles.kotlinx.serialization)
+    implementation(libs.ipaddress)
+
+    // State management
+    implementation(libs.bundles.orbit.mvi)
+
+    // Shizuku
+    implementation(libs.bundles.shizuku)
+
+    // UI utilities
+    implementation(libs.bundles.ui.utilities)
+    implementation(libs.lottie.compose)
+    implementation(libs.sonner)
+
+    // 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)
@@ -168,67 +253,22 @@ dependencies {
     debugImplementation(libs.androidx.compose.ui.tooling)
     debugImplementation(libs.androidx.compose.manifest)
 
-    implementation(libs.tunnel)
-    implementation(libs.amneziawg.android)
-    coreLibraryDesugaring(libs.desugar.jdk.libs)
+    debugImplementation(libs.leakcanary.android)
 
-    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.core)
-    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.qrose)
-    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)
-    implementation(libs.icmp4a)
-
-    // shizuku
-    implementation(libs.shizuku.api)
-    implementation(libs.shizuku.provider)
-
-    implementation(libs.reorderable)
+    // Room database backup
     implementation(libs.roomdatabasebackup) {
         exclude(group = "org.reactivestreams", module = "reactive-streams")
     }
+
+    // DI
+    implementation(platform(libs.koin.bom))
+    implementation(libs.koin.core)
+    implementation(libs.koin.android)
+    implementation(libs.koin.compose.viewmodel)
+    implementation(libs.koin.androidx.compose)
+    implementation(libs.koin.androidx.navigation)
+    implementation(libs.koin.lazy)
+    implementation(libs.koin.worker)
 }
 
 tasks.register<Copy>("copyLicenseeJsonToAssets") {
@@ -243,7 +283,7 @@ tasks.register<Copy>("copyLicenseeJsonToAssets") {
 tasks.named("preBuild") { dependsOn("copyLicenseeJsonToAssets") }
 
 // https://gist.github.com/obfusk/61046e09cee352ae6dd109911534b12e#fix-proposed-by-linsui-disable-baseline-profiles
-tasks.whenTaskAdded {
+tasks.configureEach {
     if (name.contains("ArtProfile")) {
         enabled = false
     }

app/proguard-rules.pro

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

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

@@ -0,0 +1,509 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 26,
+    "identityHash": "a420594a08fff58ecda3e0424fb43e47",
+    "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, `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": "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"
+          ]
+        }
+      },
+      {
+        "tableName": "lockdown_settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `bypass_lan` INTEGER NOT NULL DEFAULT 0, `metered` INTEGER NOT NULL DEFAULT 0, `dual_stack` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bypassLan",
+            "columnName": "bypass_lan",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "metered",
+            "columnName": "metered",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "dualStack",
+            "columnName": "dual_stack",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "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, 'a420594a08fff58ecda3e0424fb43e47')"
+    ]
+  }
+}

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

@@ -0,0 +1,523 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 27,
+    "identityHash": "98452d8160a1ae66c852ec8cd739e675",
+    "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 '[]', `is_metered` 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": "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": "'[]'"
+          },
+          {
+            "fieldPath": "isMetered",
+            "columnName": "is_metered",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "true"
+          }
+        ],
+        "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, `global_split_tunnel_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, `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": "isGlobalSplitTunnelEnabled",
+            "columnName": "global_split_tunnel_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": "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, `global_tunnel_dns_enabled` INTEGER NOT NULL DEFAULT 0)",
+        "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"
+          },
+          {
+            "fieldPath": "isGlobalTunnelDnsEnabled",
+            "columnName": "global_tunnel_dns_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "lockdown_settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `bypass_lan` INTEGER NOT NULL DEFAULT 0, `metered` INTEGER NOT NULL DEFAULT 0, `dual_stack` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bypassLan",
+            "columnName": "bypass_lan",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "metered",
+            "columnName": "metered",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "dualStack",
+            "columnName": "dual_stack",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "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, '98452d8160a1ae66c852ec8cd739e675')"
+    ]
+  }
+}

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

@@ -0,0 +1,523 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 28,
+    "identityHash": "4792d0cc61a527c69962b5e58463e6da",
+    "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 '[]', `is_metered` 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": "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": "'[]'"
+          },
+          {
+            "fieldPath": "isMetered",
+            "columnName": "is_metered",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "true"
+          }
+        ],
+        "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, `global_split_tunnel_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, `already_donated` 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": "isGlobalSplitTunnelEnabled",
+            "columnName": "global_split_tunnel_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": "alreadyDonated",
+            "columnName": "already_donated",
+            "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, `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, `global_tunnel_dns_enabled` INTEGER NOT NULL DEFAULT 0)",
+        "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"
+          },
+          {
+            "fieldPath": "isGlobalTunnelDnsEnabled",
+            "columnName": "global_tunnel_dns_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "lockdown_settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `bypass_lan` INTEGER NOT NULL DEFAULT 0, `metered` INTEGER NOT NULL DEFAULT 0, `dual_stack` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bypassLan",
+            "columnName": "bypass_lan",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "metered",
+            "columnName": "metered",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "dualStack",
+            "columnName": "dual_stack",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "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, '4792d0cc61a527c69962b5e58463e6da')"
+    ]
+  }
+}

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

@@ -0,0 +1,523 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 29,
+    "identityHash": "345471c118dee1b7688afa81d835e62c",
+    "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 '[]', `is_metered` INTEGER NOT NULL DEFAULT false)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "wgQuick",
+            "columnName": "wg_quick",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tunnelNetworks",
+            "columnName": "tunnel_networks",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isMobileDataTunnel",
+            "columnName": "is_mobile_data_tunnel",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isPrimaryTunnel",
+            "columnName": "is_primary_tunnel",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "amQuick",
+            "columnName": "am_quick",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "isActive",
+            "columnName": "is_Active",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "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": "'[]'"
+          },
+          {
+            "fieldPath": "isMetered",
+            "columnName": "is_metered",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          }
+        ],
+        "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, `global_split_tunnel_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, `already_donated` 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": "isGlobalSplitTunnelEnabled",
+            "columnName": "global_split_tunnel_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": "alreadyDonated",
+            "columnName": "already_donated",
+            "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, `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, `global_tunnel_dns_enabled` INTEGER NOT NULL DEFAULT 0)",
+        "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"
+          },
+          {
+            "fieldPath": "isGlobalTunnelDnsEnabled",
+            "columnName": "global_tunnel_dns_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "lockdown_settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `bypass_lan` INTEGER NOT NULL DEFAULT 0, `metered` INTEGER NOT NULL DEFAULT 0, `dual_stack` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bypassLan",
+            "columnName": "bypass_lan",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "metered",
+            "columnName": "metered",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "dualStack",
+            "columnName": "dual_stack",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "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, '345471c118dee1b7688afa81d835e62c')"
+    ]
+  }
+}

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

@@ -0,0 +1,506 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 30,
+    "identityHash": "28560c6b408d8f5ef28844723e940395",
+    "entities": [
+      {
+        "tableName": "tunnel_config",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` 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, `quick_config` TEXT NOT NULL DEFAULT '', `dynamic_dns` INTEGER NOT NULL DEFAULT false, `is_ethernet_tunnel` INTEGER NOT NULL DEFAULT false, `prefer_ipv6` INTEGER NOT NULL DEFAULT false, `position` INTEGER NOT NULL DEFAULT 0, `auto_tunnel_apps` TEXT NOT NULL DEFAULT '[]', `is_metered` INTEGER NOT NULL DEFAULT false, `ipv4_fallback` INTEGER NOT NULL DEFAULT false, `ipv6_restore` INTEGER NOT NULL DEFAULT false)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "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": "quickConfig",
+            "columnName": "quick_config",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "''"
+          },
+          {
+            "fieldPath": "dynamicDnsEnabled",
+            "columnName": "dynamic_dns",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isEthernetTunnel",
+            "columnName": "is_ethernet_tunnel",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "isIpv6Preferred",
+            "columnName": "prefer_ipv6",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "position",
+            "columnName": "position",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "autoTunnelApps",
+            "columnName": "auto_tunnel_apps",
+            "affinity": "TEXT",
+            "notNull": true,
+            "defaultValue": "'[]'"
+          },
+          {
+            "fieldPath": "isMetered",
+            "columnName": "is_metered",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "ipv4FallbackEnabled",
+            "columnName": "ipv4_fallback",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          },
+          {
+            "fieldPath": "ipv6RestoreEnabled",
+            "columnName": "ipv6_restore",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "false"
+          }
+        ],
+        "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, `global_split_tunnel_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, `already_donated` INTEGER NOT NULL DEFAULT 0, `screen_recording_security` INTEGER NOT NULL DEFAULT 1, `global_amnezia_enabled` INTEGER NOT NULL DEFAULT 0, `tunnel_scripting_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": "isGlobalSplitTunnelEnabled",
+            "columnName": "global_split_tunnel_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "tunnelMode",
+            "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": "alreadyDonated",
+            "columnName": "already_donated",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "screenRecordingSecurityEnabled",
+            "columnName": "screen_recording_security",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          },
+          {
+            "fieldPath": "isGlobalAmneziaEnabled",
+            "columnName": "global_amnezia_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "tunnelScriptingEnabled",
+            "columnName": "tunnel_scripting_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, `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": "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_local_logs_enabled` INTEGER NOT NULL DEFAULT 0, `tunnel_statistics_enabled` INTEGER NOT NULL DEFAULT 1, `tunnel_statistics_poll_interval` INTEGER NOT NULL DEFAULT 3)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isLocalLogsEnabled",
+            "columnName": "is_local_logs_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "tunnelStatisticsEnabled",
+            "columnName": "tunnel_statistics_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "1"
+          },
+          {
+            "fieldPath": "tunnelStatisticsPollInterval",
+            "columnName": "tunnel_statistics_poll_interval",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "3"
+          }
+        ],
+        "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, `global_tunnel_dns_enabled` INTEGER NOT NULL DEFAULT 0)",
+        "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"
+          },
+          {
+            "fieldPath": "isGlobalTunnelDnsEnabled",
+            "columnName": "global_tunnel_dns_enabled",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "lockdown_settings",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `bypass_lan` INTEGER NOT NULL DEFAULT 0, `metered` INTEGER NOT NULL DEFAULT 0, `dual_stack` INTEGER NOT NULL DEFAULT 0)",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bypassLan",
+            "columnName": "bypass_lan",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "metered",
+            "columnName": "metered",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          },
+          {
+            "fieldPath": "dualStack",
+            "columnName": "dual_stack",
+            "affinity": "INTEGER",
+            "notNull": true,
+            "defaultValue": "0"
+          }
+        ],
+        "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, '28560c6b408d8f5ef28844723e940395')"
+    ]
+  }
+}

app/src/main/AndroidManifest.xml

@@ -5,14 +5,17 @@
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
-    <!--foreground service exempt android 14-->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
-    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"
-		tools:ignore="ProtectedPermissions" />
+    <!--for split tunneling-->
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
+
+    <!--foreground service special use for non VPN service tunnels, android 14-->
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
 
     <!--foreground service permissions-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+
     <!--start service on boot permission-->
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
@@ -41,17 +44,6 @@
 
 	<uses-feature android:name="android.hardware.wifi"
 		android:required="false"/>
-
-    <queries>
-        <intent>
-            <action android:name="android.intent.action.MAIN" />
-			<category android:name="android.intent.category.LAUNCHER" />
-        </intent>
-        <intent>
-            <action android:name="android.intent.action.MAIN" />
-            <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
-        </intent>
-    </queries>
     <application
         android:name=".WireGuardAutoTunnel"
         android:allowBackup="false"
@@ -61,21 +53,33 @@
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
         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" />
+
+        <meta-data android:name="android.telephony.PROPERTY_SATELLITE_DATA_OPTIMIZED"
+                   android:value="${applicationId}" />
+
         <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.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="wg" />
+            </intent-filter>
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 				<action android:name="android.intent.action.SHOW_APP_INFO" />
@@ -84,6 +88,60 @@
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
                 <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
             </intent-filter>
+
+            <!-- .zip files -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.EDIT" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="content" />
+                <data android:host="*" />
+                <data android:mimeType="application/zip" />
+
+                <data android:scheme="content" />
+                <data android:host="*" />
+                <data android:mimeType="application/x-zip-compressed" />
+
+                <data android:scheme="file" />
+                <data android:host="*" />
+                <data android:mimeType="application/zip" />
+
+                <data android:scheme="file" />
+                <data android:host="*" />
+                <data android:mimeType="application/x-zip-compressed" />
+            </intent-filter>
+
+            <!-- Share sheet for .zip -->
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="application/zip" />
+                <data android:mimeType="application/x-zip-compressed" />
+            </intent-filter>
+
+            <!-- .conf files  -->
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.EDIT" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="content" />
+                <data android:host="*" />
+                <data android:mimeType="*/*" />
+
+                <data android:scheme="file" />
+                <data android:host="*" />
+                <data android:mimeType="*/*" />
+
+                <!-- Path patterns for .conf extension matching -->
+                <data android:pathPattern=".*\\.conf" />
+                <data android:pathPattern=".*\\..*\\.conf" />
+                <data android:pathPattern=".*\\..*\\..*\\.conf" />
+                <data android:pathPattern=".*\\..*\\..*\\..*\\.conf" />
+            </intent-filter>
         </activity>
 
         <activity
@@ -106,17 +164,20 @@
 				android:resource="@xml/file_paths" />
 		</provider>
 
-		<provider
-			android:name="androidx.startup.InitializationProvider"
-			android:authorities="${applicationId}.androidx-startup"
-			android:multiprocess="true"
-			tools:node="remove">
-		</provider>
-
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            android:exported="false"
+            tools:node="merge">
+            <meta-data
+                android:name="androidx.work.WorkManagerInitializer"
+                android:value="androidx.startup"
+                tools:node="remove" />
+        </provider>
         <service
-            android:name=".core.service.tile.TunnelControlTile"
+            android:name=".service.tile.TunnelControlTile"
             android:exported="true"
-            android:icon="@drawable/ic_notification"
+            android:icon="@drawable/ic_qs_logo"
             android:label="@string/tunnel_control"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <meta-data
@@ -131,9 +192,9 @@
             </intent-filter>
         </service>
         <service
-            android:name=".core.service.tile.AutoTunnelControlTile"
+            android:name=".service.tile.AutoTunnelControlTile"
             android:exported="true"
-            android:icon="@drawable/ic_notification"
+            android:icon="@drawable/ic_qs_logo"
             android:label="@string/auto_tunnel"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <meta-data
@@ -148,24 +209,21 @@
             </intent-filter>
         </service>
         <service
-            android:name=".core.service.autotunnel.AutoTunnelService"
+            android:name=".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:exported="false"
-			android:persistent="true"
-			android:foregroundServiceType="systemExempted"
-			android:permission="android.permission.BIND_VPN_SERVICE">
-			<intent-filter>
-				<action android:name="android.net.VpnService" />
-			</intent-filter>
-		</service>
         <receiver
             android:name=".core.broadcast.RestartReceiver"
             android:enabled="true"
@@ -174,17 +232,12 @@
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
                 <action android:name="com.htc.intent.action.QUICKBOOT_POWERON" />
-				<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
             </intent-filter>
         </receiver>
-		<receiver
-			android:name=".core.broadcast.KernelReceiver"
-			android:exported="false"
-			android:permission="${applicationId}.permission.CONTROL_TUNNELS">
-			<intent-filter>
-				<action android:name="com.wireguard.android.action.REFRESH_TUNNEL_STATES" />
-			</intent-filter>
-		</receiver>
 		<!--custom security solution for easier user integration-->
 		<receiver
 			android:name=".core.broadcast.RemoteControlReceiver"

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

@@ -2,122 +2,121 @@ package com.zaneschepke.wireguardautotunnel
 
 import android.app.Application
 import android.os.StrictMode
-import android.os.StrictMode.ThreadPolicy
-import androidx.hilt.work.HiltWorkerFactory
-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.BackendMode
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
+import com.zaneschepke.tunnel.backend.Backend
+import com.zaneschepke.tunnel.di.tunnelModule
+import com.zaneschepke.tunnel.service.VpnService
+import com.zaneschepke.wireguardautotunnel.core.event.TunnelEventDispatcher
+import com.zaneschepke.wireguardautotunnel.core.orchestration.AppBoostrapCoordinator
+import com.zaneschepke.wireguardautotunnel.core.orchestration.TunnelCoordinator
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider
+import com.zaneschepke.wireguardautotunnel.di.Dispatcher
+import com.zaneschepke.wireguardautotunnel.di.Scope
+import com.zaneschepke.wireguardautotunnel.di.appModule
+import com.zaneschepke.wireguardautotunnel.di.coordinatorModule
+import com.zaneschepke.wireguardautotunnel.di.databaseModule
+import com.zaneschepke.wireguardautotunnel.di.dispatchersModule
+import com.zaneschepke.wireguardautotunnel.di.networkModule
+import com.zaneschepke.wireguardautotunnel.di.tunnelBackendProviderModule
+import com.zaneschepke.wireguardautotunnel.di.workerModule
+import com.zaneschepke.wireguardautotunnel.notification.NotificationService
+import com.zaneschepke.wireguardautotunnel.service.tile.AutoTunnelTileRefresher
+import com.zaneschepke.wireguardautotunnel.service.tile.TunnelTileRefresher
 import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
-import dagger.hilt.android.HiltAndroidApp
-import javax.inject.Inject
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import org.koin.android.ext.android.get
+import org.koin.android.ext.android.inject
+import org.koin.android.ext.koin.androidContext
+import org.koin.android.ext.koin.androidLogger
+import org.koin.androidx.workmanager.koin.workManagerFactory
+import org.koin.core.annotation.KoinViewModelScopeApi
+import org.koin.core.component.KoinComponent
+import org.koin.core.context.GlobalContext.startKoin
+import org.koin.core.lazyModules
+import org.koin.core.option.viewModelScopeFactory
+import org.koin.core.qualifier.named
 import timber.log.Timber
 
-@HiltAndroidApp
-class WireGuardAutoTunnel : Application(), Configuration.Provider {
+class WireGuardAutoTunnel : Application(), KoinComponent {
 
-    @Inject lateinit var workerFactory: HiltWorkerFactory
+    private val applicationScope: CoroutineScope by inject(named(Scope.APPLICATION))
+    private val ioDispatcher: CoroutineDispatcher by inject(named(Dispatcher.IO))
 
-    override val workManagerConfiguration: Configuration
-        get() = Configuration.Builder().setWorkerFactory(workerFactory).build()
+    private val boostrapCoordinator: AppBoostrapCoordinator by inject()
 
-    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
+    private val notificationService: NotificationService by inject()
 
-    @Inject lateinit var logReader: LogReader
+    private val tunnelCoordinator: TunnelCoordinator by inject()
 
-    @Inject lateinit var appDataRepository: AppDataRepository
+    private val backend: Backend by inject()
 
-    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
-
-    @Inject @MainDispatcher lateinit var mainDispatcher: CoroutineDispatcher
-
-    @Inject lateinit var notificationMonitor: NotificationMonitor
-
-    @Inject lateinit var tunnelManager: TunnelManager
+    private val alwaysOnCallback =
+        object : VpnService.AlwaysOnCallback {
+            override fun alwaysOnTriggered() {
+                applicationScope.launch { tunnelCoordinator.startDefault() }
+            }
+        }
 
+    @OptIn(KoinViewModelScopeApi::class)
     override fun onCreate() {
         super.onCreate()
+        startKoin {
+            androidContext(this@WireGuardAutoTunnel)
+            if (BuildConfig.DEBUG) androidLogger()
+            workManagerFactory()
+            modules(
+                dispatchersModule,
+                appModule,
+                databaseModule,
+                tunnelBackendProviderModule,
+                tunnelModule,
+                workerModule,
+                coordinatorModule,
+            )
+            options(viewModelScopeFactory())
+            lazyModules(networkModule)
+        }
         instance = this
+
+        notificationService.createAllChannels()
+
+        syncTiles()
+
         if (BuildConfig.DEBUG) {
             Timber.plant(Timber.DebugTree())
             StrictMode.setThreadPolicy(
-                ThreadPolicy.Builder()
-                    .detectDiskReads()
-                    .detectDiskWrites()
-                    .detectNetwork()
-                    .penaltyLog()
-                    .build()
+                StrictMode.ThreadPolicy.Builder().detectAll().penaltyLog().build()
             )
+            StrictMode.setVmPolicy(StrictMode.VmPolicy.Builder().detectAll().penaltyLog().build())
         } else {
             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")
-                }
-            }
-        }
+        backend.setAlwaysOnCallback(alwaysOnCallback)
 
-        ServiceWorker.start(this)
+        val dispatcher = get<TunnelEventDispatcher>()
+        val coordinator = get<TunnelCoordinator>()
+        val provider = get<TunnelProvider>()
 
-        applicationScope.launch {
-            launch { notificationMonitor.handleApplicationNotifications() }
-            appDataRepository.appState.getLocale()?.let {
-                withContext(mainDispatcher) { LocaleUtil.changeLocale(it) }
-            }
-            appDataRepository.appState.isLocalLogsEnabled().let { enabled ->
-                if (enabled) logReader.start()
-            }
-        }
+        // for notifications
+        dispatcher.bind(
+            applicationScope,
+            provider.events,
+            provider.backendStatus,
+            coordinator.errors,
+            tunnelCoordinator.tunnelDisplayStates,
+        )
+
+        applicationScope.launch(ioDispatcher) { boostrapCoordinator.bootstrap() }
     }
 
-    override fun onTerminate() {
-        applicationScope.cancel()
-        tunnelManager.setBackendMode(BackendMode.Inactive)
-        super.onTerminate()
+    private fun syncTiles() {
+        AutoTunnelTileRefresher.refresh(this)
+        TunnelTileRefresher.refresh(this)
     }
 
     companion object {
-
-        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()
-
-        @Synchronized
-        fun getLastActiveTunnels(): List<Int> {
-            return lastActiveTunnels
-        }
-
-        @Synchronized
-        fun setLastActiveTunnels(newTunnels: List<Int>) {
-            lastActiveTunnels = newTunnels
-        }
-
         lateinit var instance: WireGuardAutoTunnel
             private set
     }

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

@@ -1,42 +0,0 @@
-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
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-
-@AndroidEntryPoint
-class KernelReceiver : BroadcastReceiver() {
-
-    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
-
-    @Inject lateinit var tunnelRepository: TunnelRepository
-
-    @Inject lateinit var serviceManager: ServiceManager
-
-    @Inject lateinit var tunnelManager: TunnelManager
-
-    override fun onReceive(context: Context, intent: Intent) {
-        val action = intent.action ?: return
-        applicationScope.launch {
-            if (action == REFRESH_TUNNELS_ACTION) {
-                tunnelManager.runningTunnelNames().forEach { name ->
-                    val tunnel = tunnelRepository.findByTunnelName(name)
-                    tunnel?.let { tunnelRepository.save(it.copy(isActive = true)) }
-                }
-                serviceManager.updateTunnelTile()
-            }
-        }
-    }
-
-    companion object {
-        const val REFRESH_TUNNELS_ACTION = "com.wireguard.android.action.REFRESH_TUNNEL_STATES"
-    }
-}

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

@@ -3,37 +3,48 @@ package com.zaneschepke.wireguardautotunnel.core.broadcast
 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.core.orchestration.AutoTunnelCoordinator
+import com.zaneschepke.wireguardautotunnel.core.orchestration.TunnelCoordinator
+import com.zaneschepke.wireguardautotunnel.di.Scope
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
+import com.zaneschepke.wireguardautotunnel.notification.NotificationService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.get
+import org.koin.core.component.inject
+import org.koin.core.qualifier.named
 
-@AndroidEntryPoint
-class NotificationActionReceiver : BroadcastReceiver() {
+class NotificationActionReceiver : BroadcastReceiver(), KoinComponent {
 
-    @Inject lateinit var serviceManager: ServiceManager
+    private val tunnelCoordinator: TunnelCoordinator by inject()
 
-    @Inject lateinit var tunnelManager: TunnelManager
+    private val autoTunnelCoordinator: AutoTunnelCoordinator by inject()
 
-    @Inject lateinit var tunnelRepository: TunnelRepository
-
-    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
+    private val applicationScope: CoroutineScope = get(named(Scope.APPLICATION))
 
     override fun onReceive(context: Context, intent: Intent) {
+
         applicationScope.launch {
             when (intent.action) {
-                NotificationAction.AUTO_TUNNEL_OFF.name -> serviceManager.stopAutoTunnel()
+                NotificationAction.AUTO_TUNNEL_OFF.name -> {
+                    autoTunnelCoordinator.disable()
+                }
+
                 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)
+
+                    val tunnelId =
+                        intent.getIntExtra(NotificationService.EXTRA_ID, STOP_ALL_TUNNELS_ID)
+
+                    if (tunnelId == STOP_ALL_TUNNELS_ID) {
+                        tunnelCoordinator.stopActiveTunnels()
+                        return@launch
+                    }
+                    tunnelCoordinator.stopTunnel(tunnelId)
+                }
+
+                NotificationAction.STOP_ALL.name -> {
+                    tunnelCoordinator.stopActiveTunnels()
                 }
             }
         }

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

@@ -3,27 +3,27 @@ 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.core.orchestration.AutoTunnelCoordinator
+import com.zaneschepke.wireguardautotunnel.core.orchestration.TunnelCoordinator
+import com.zaneschepke.wireguardautotunnel.di.Scope
+import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings
+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
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import timber.log.Timber
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+import org.koin.core.qualifier.named
 
-@AndroidEntryPoint
-class RemoteControlReceiver : BroadcastReceiver() {
+class RemoteControlReceiver : BroadcastReceiver(), KoinComponent {
 
-    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
+    private val applicationScope: CoroutineScope by inject(named(Scope.APPLICATION))
 
-    @Inject lateinit var appDataRepository: AppDataRepository
-
-    @Inject lateinit var serviceManager: ServiceManager
-
-    @Inject lateinit var tunnelManager: TunnelManager
+    private val settingsRepository: GeneralSettingRepository by inject()
+    private val tunnelsRepository: TunnelRepository by inject()
+    private val tunnelCoordinator: TunnelCoordinator by inject()
+    private val autoTunnelCoordinator: AutoTunnelCoordinator by inject()
 
     enum class Action(private val suffix: String) {
         START_TUNNEL("START_TUNNEL"),
@@ -48,47 +48,63 @@ class RemoteControlReceiver : BroadcastReceiver() {
     }
 
     override fun onReceive(context: Context, intent: Intent) {
-        Timber.i("onReceive")
+
         val action = intent.action ?: return
-        val appAction = Action.fromAction(action) ?: return Timber.w("Unknown action $action")
+        val appAction = Action.fromAction(action) ?: return
+
         applicationScope.launch {
-            if (!appDataRepository.appState.isRemoteControlEnabled())
-                return@launch Timber.w("Remote control disabled")
-            val key =
-                appDataRepository.appState.getRemoteKey()
-                    ?: return@launch Timber.w("Remote control key missing")
-            if (key != intent.getStringExtra(EXTRA_KEY)?.trim())
-                return@launch Timber.w("Invalid remote control key")
+            val settings = settingsRepository.getGeneralSettings()
+
+            if (!settings.isRemoteControlEnabled) return@launch
+
+            if (!validateKey(settings, intent)) return@launch
+
             when (appAction) {
                 Action.START_TUNNEL -> {
-                    val tunnelName =
-                        intent.getStringExtra(EXTRA_TUN_NAME) ?: return@launch startDefaultTunnel()
                     val tunnel =
-                        appDataRepository.tunnels.findByTunnelName(tunnelName)
-                            ?: return@launch startDefaultTunnel()
-                    tunnelManager.startTunnel(tunnel)
+                        resolveTunnel(intent)
+                            ?: tunnelsRepository.getDefaultTunnel()
+                            ?: return@launch
+
+                    tunnelCoordinator.startTunnel(tunnel)
                 }
+
                 Action.STOP_TUNNEL -> {
-                    val tunnelName =
-                        intent.getStringExtra(EXTRA_TUN_NAME)
-                            ?: return@launch tunnelManager.stopTunnel()
-                    val tunnel =
-                        appDataRepository.tunnels.findByTunnelName(tunnelName)
-                            ?: return@launch tunnelManager.stopTunnel()
-                    tunnelManager.stopTunnel(tunnel)
+                    val tunnelName = intent.getStringExtra(EXTRA_TUN_NAME)
+
+                    if (tunnelName == null) {
+                        tunnelCoordinator.stopActiveTunnels()
+                        return@launch
+                    }
+
+                    val tunnel = tunnelsRepository.findByTunnelName(tunnelName) ?: return@launch
+
+                    tunnelCoordinator.stopTunnel(tunnel.id)
+                }
+
+                Action.START_AUTO_TUNNEL -> {
+                    autoTunnelCoordinator.enable()
+                }
+
+                Action.STOP_AUTO_TUNNEL -> {
+                    autoTunnelCoordinator.disable()
                 }
-                Action.START_AUTO_TUNNEL -> serviceManager.startAutoTunnel()
-                Action.STOP_AUTO_TUNNEL -> serviceManager.stopAutoTunnel()
             }
         }
     }
 
-    private suspend fun startDefaultTunnel() {
-        appDataRepository.getPrimaryOrFirstTunnel()?.let { tunnel ->
-            tunnelManager.startTunnel(tunnel)
-        }
+    private fun validateKey(settings: GeneralSettings, intent: Intent): Boolean {
+
+        val expected = settings.remoteKey?.trim() ?: return false
+
+        val actual = intent.getStringExtra(EXTRA_KEY)?.trim()
+
+        return expected == actual
     }
 
+    private suspend fun resolveTunnel(intent: Intent) =
+        intent.getStringExtra(EXTRA_TUN_NAME)?.let { tunnelsRepository.findByTunnelName(it) }
+
     companion object {
         const val EXTRA_TUN_NAME = "tunnelName"
         const val EXTRA_KEY = "key"

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

@@ -4,38 +4,43 @@ 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 com.zaneschepke.wireguardautotunnel.core.orchestration.StartupCoordinator
+import com.zaneschepke.wireguardautotunnel.di.Scope
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.get
+import org.koin.core.component.inject
+import org.koin.core.qualifier.named
 import timber.log.Timber
 
-@AndroidEntryPoint
-class RestartReceiver : BroadcastReceiver() {
-    @Inject lateinit var appDataRepository: AppDataRepository
+class RestartReceiver : BroadcastReceiver(), KoinComponent {
 
-    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
+    private val applicationScope: CoroutineScope = get(named(Scope.APPLICATION))
 
-    @Inject lateinit var serviceManager: ServiceManager
+    private val startupCoordinator: StartupCoordinator by inject()
 
-    // injecting this should let tunnelManger handle clean startup
-    @Inject lateinit var tunnelManager: TunnelManager
+    private val appStateRepository: AppStateRepository by inject()
 
-    @Inject lateinit var logReader: LogReader
-
-    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
+    private val logReader: LogReader by inject()
 
     override fun onReceive(context: Context, intent: Intent) {
         Timber.d("RestartReceiver triggered with action: ${intent.action}")
-        serviceManager.updateTunnelTile()
-        serviceManager.updateAutoTunnelTile()
-        if (intent.action == Intent.ACTION_MY_PACKAGE_REPLACED)
-            applicationScope.launch(ioDispatcher) { logReader.deleteAndClearLogs() }
+        applicationScope.launch {
+            when (intent.action) {
+                Intent.ACTION_BOOT_COMPLETED,
+                "android.intent.action.QUICKBOOT_POWERON",
+                "com.htc.intent.action.QUICKBOOT_POWERON" -> {
+                    startupCoordinator.applyStartupPolicy()
+                }
+                Intent.ACTION_MY_PACKAGE_REPLACED -> {
+                    Timber.i("Restoring state on package upgrade")
+                    startupCoordinator.applyStartupPolicy()
+                    logReader.deleteAndClearLogs()
+                    appStateRepository.setShouldShowDonationSnackbar(true)
+                }
+            }
+        }
     }
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/event/TunnelErrorEvent.kt

@@ -0,0 +1,33 @@
+package com.zaneschepke.wireguardautotunnel.core.event
+
+import com.zaneschepke.tunnel.util.BackendException
+
+sealed interface TunnelErrorEvent {
+    data class VpnPermissionDenied(val tunnelId: Int) : TunnelErrorEvent
+
+    data class InternalFailure(val tunnelId: Int, val message: String) : TunnelErrorEvent
+
+    data class Socks5PortUnavailable(val tunnelId: Int, val port: Int) : TunnelErrorEvent
+
+    data class HttpPortUnavailable(val tunnelId: Int, val port: Int) : TunnelErrorEvent
+
+    companion object {
+        fun from(throwable: Throwable, id: Int): TunnelErrorEvent {
+            return when (throwable) {
+                is BackendException.Unauthorized -> {
+                    VpnPermissionDenied(id)
+                }
+                is BackendException.InternalError -> {
+                    InternalFailure(id, throwable.message)
+                }
+                is BackendException.Socks5PortUnavailable -> {
+                    Socks5PortUnavailable(id, throwable.port)
+                }
+                is BackendException.HttpPortUnavailable -> {
+                    HttpPortUnavailable(id, throwable.port)
+                }
+                else -> InternalFailure(id, throwable.message ?: "Unknown")
+            }
+        }
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/event/TunnelEventDispatcher.kt

@@ -0,0 +1,298 @@
+package com.zaneschepke.wireguardautotunnel.core.event
+
+import android.content.Context
+import com.dokar.sonner.ToastType
+import com.zaneschepke.tunnel.event.TunnelEvent
+import com.zaneschepke.tunnel.model.BackendMode
+import com.zaneschepke.tunnel.state.BackendStatus
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.domain.repository.GlobalEffectRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import com.zaneschepke.wireguardautotunnel.domain.sideeffect.GlobalSideEffect
+import com.zaneschepke.wireguardautotunnel.lifecyle.AppVisibilityObserver
+import com.zaneschepke.wireguardautotunnel.notification.TunnelNotificationLine
+import com.zaneschepke.wireguardautotunnel.notification.TunnelNotificationService
+import com.zaneschepke.wireguardautotunnel.ui.state.DisplayTunnelState
+import com.zaneschepke.wireguardautotunnel.util.StringValue
+import kotlin.time.Duration.Companion.milliseconds
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+
+class TunnelEventDispatcher(
+    private val notificationManager: TunnelNotificationService,
+    private val tunnelRepository: TunnelRepository,
+    private val context: Context,
+    private val appVisibilityObserver: AppVisibilityObserver,
+    private val globalEffectRepository: GlobalEffectRepository,
+) {
+
+    @OptIn(FlowPreview::class)
+    fun bind(
+        scope: CoroutineScope,
+        providerEvents: Flow<TunnelEvent>,
+        providerStatus: StateFlow<BackendStatus>,
+        coordinatorErrors: Flow<TunnelErrorEvent>,
+        tunnelDisplayStates: StateFlow<Map<Int, DisplayTunnelState>>,
+    ) {
+
+        // Informational events from tunnel backend
+        providerEvents
+            .onEach { event ->
+                when (event) {
+                    is TunnelEvent.FallbackToIpv4 -> {
+                        val name = getTunnelName(event.tunnelId)
+                        showOrNotify(
+                            scope = scope,
+                            foregroundAction = {
+                                globalEffectRepository.post(
+                                    GlobalSideEffect.Snackbar(
+                                        message =
+                                            StringValue.DynamicString(
+                                                context.getString(
+                                                    R.string.notification_ipv4_fallback_message,
+                                                    name,
+                                                )
+                                            ),
+                                        type = ToastType.Info,
+                                    )
+                                )
+                            },
+                            backgroundAction = { notificationManager.showIpv4Fallback(name) },
+                        )
+                    }
+
+                    is TunnelEvent.RecoveredToIpv6 -> {
+                        val name = getTunnelName(event.tunnelId)
+                        showOrNotify(
+                            scope = scope,
+                            foregroundAction = {
+                                globalEffectRepository.post(
+                                    GlobalSideEffect.Snackbar(
+                                        message =
+                                            StringValue.DynamicString(
+                                                context.getString(
+                                                    R.string.notification_ipv6_recovery_message,
+                                                    name,
+                                                )
+                                            ),
+                                        type = ToastType.Success,
+                                    )
+                                )
+                            },
+                            backgroundAction = { notificationManager.showIpv6Recovery(name) },
+                        )
+                    }
+
+                    is TunnelEvent.DynamicDnsUpdate -> {
+                        val name = getTunnelName(event.tunnelId)
+                        showOrNotify(
+                            scope = scope,
+                            foregroundAction = {
+                                globalEffectRepository.post(
+                                    GlobalSideEffect.Snackbar(
+                                        message =
+                                            StringValue.DynamicString(
+                                                context.getString(
+                                                    R.string.notification_dynamic_dns_message,
+                                                    name,
+                                                )
+                                            ),
+                                        type = ToastType.Info,
+                                    )
+                                )
+                            },
+                            backgroundAction = { notificationManager.showDynamicDnsUpdate(name) },
+                        )
+                    }
+
+                    is TunnelEvent.NoRootShellAccess -> {
+                        showOrNotify(
+                            scope = scope,
+                            foregroundAction = {
+                                globalEffectRepository.post(
+                                    GlobalSideEffect.Snackbar(
+                                        message =
+                                            StringValue.DynamicString(
+                                                context.getString(R.string.error_root_denied)
+                                            ),
+                                        type = ToastType.Error,
+                                    )
+                                )
+                            },
+                            backgroundAction = { notificationManager.showRootShellAccess() },
+                        )
+                    }
+                }
+            }
+            .launchIn(scope)
+
+        // Errors from our tunnel coordinator
+        coordinatorErrors
+            .onEach { error ->
+                when (error) {
+                    is TunnelErrorEvent.VpnPermissionDenied -> {
+                        showOrNotify(
+                            scope = scope,
+                            foregroundAction = {
+                                globalEffectRepository.post(
+                                    GlobalSideEffect.Snackbar(
+                                        message =
+                                            StringValue.DynamicString(
+                                                context.getString(R.string.vpn_permission_required)
+                                            ),
+                                        type = ToastType.Error,
+                                    )
+                                )
+                            },
+                            backgroundAction = { notificationManager.showVpnRequired() },
+                        )
+                    }
+
+                    is TunnelErrorEvent.InternalFailure -> {
+                        showOrNotify(
+                            scope = scope,
+                            foregroundAction = {
+                                globalEffectRepository.post(
+                                    GlobalSideEffect.Snackbar(
+                                        message = StringValue.DynamicString(error.message),
+                                        type = ToastType.Error,
+                                    )
+                                )
+                            },
+                            backgroundAction = { notificationManager.showError(error.message) },
+                        )
+                    }
+
+                    is TunnelErrorEvent.Socks5PortUnavailable -> {
+                        val name = getTunnelName(error.tunnelId)
+                        val message =
+                            context.getString(R.string.error_socks5_port_unavailable, error.port)
+
+                        showOrNotify(
+                            scope = scope,
+                            foregroundAction = {
+                                globalEffectRepository.post(
+                                    GlobalSideEffect.Snackbar(
+                                        message = StringValue.DynamicString(message),
+                                        type = ToastType.Error,
+                                    )
+                                )
+                            },
+                            backgroundAction = {
+                                notificationManager.showSocks5PortUnavailable(error.port, name)
+                            },
+                        )
+                    }
+
+                    is TunnelErrorEvent.HttpPortUnavailable -> {
+                        val name = getTunnelName(error.tunnelId)
+                        val message =
+                            context.getString(R.string.error_http_port_unavailable, error.port)
+
+                        showOrNotify(
+                            scope = scope,
+                            foregroundAction = {
+                                globalEffectRepository.post(
+                                    GlobalSideEffect.Snackbar(
+                                        message = StringValue.DynamicString(message),
+                                        type = ToastType.Error,
+                                    )
+                                )
+                            },
+                            backgroundAction = {
+                                notificationManager.showHttpPortUnavailable(error.port, name)
+                            },
+                        )
+                    }
+                }
+            }
+            .launchIn(scope)
+
+        // vpn
+        combine(
+                providerStatus.map { it.activeTunnels },
+                tunnelRepository.userTunnelsFlow,
+                tunnelDisplayStates,
+            ) { activeTunnels, allTunnels, displayStates ->
+                activeTunnels
+                    .mapNotNull { (id, activeTunnel) ->
+                        val mode = activeTunnel.mode ?: return@mapNotNull null
+                        if (
+                            mode !is BackendMode.Vpn && mode !is BackendMode.Proxy.KillSwitchPrimary
+                        ) {
+                            return@mapNotNull null
+                        }
+                        val tunnel = allTunnels.find { it.id == id } ?: return@mapNotNull null
+
+                        val displayState =
+                            displayStates[id] ?: DisplayTunnelState.from(activeTunnel)
+
+                        TunnelNotificationLine(
+                            id = id,
+                            name = tunnel.name,
+                            displayState = displayState,
+                        )
+                    }
+                    .associateBy { it.id }
+            }
+            .distinctUntilChanged()
+            .debounce(500.milliseconds) // give the service notification time to display
+            .onEach { vpnLines -> notificationManager.updateVpnPersistentNotification(vpnLines) }
+            .launchIn(scope)
+
+        // proxy
+        combine(
+                providerStatus.map { it.activeTunnels },
+                tunnelRepository.userTunnelsFlow,
+                tunnelDisplayStates,
+            ) { activeTunnels, allTunnels, displayStates ->
+                activeTunnels
+                    .mapNotNull { (id, activeTunnel) ->
+                        val mode = activeTunnel.mode ?: return@mapNotNull null
+                        if (mode !is BackendMode.Proxy.Standard) return@mapNotNull null
+
+                        val tunnel = allTunnels.find { it.id == id } ?: return@mapNotNull null
+                        val displayState =
+                            displayStates[id] ?: DisplayTunnelState.from(activeTunnel)
+
+                        TunnelNotificationLine(
+                            id = id,
+                            name = tunnel.name,
+                            displayState = displayState,
+                        )
+                    }
+                    .associateBy { it.id }
+            }
+            .distinctUntilChanged()
+            .debounce(500.milliseconds) // give the service notification time to display
+            .onEach { proxyLines ->
+                notificationManager.updateProxyPersistentNotification(proxyLines)
+            }
+            .launchIn(scope)
+    }
+
+    private fun showOrNotify(
+        scope: CoroutineScope,
+        foregroundAction: suspend () -> Unit,
+        backgroundAction: () -> Unit,
+    ) {
+        if (appVisibilityObserver.isForeground.value) {
+            scope.launch { foregroundAction() }
+        } else {
+            backgroundAction()
+        }
+    }
+
+    private suspend fun getTunnelName(tunnelId: Int): String {
+        return tunnelRepository.getById(tunnelId)?.name ?: context.getString(R.string.unknown)
+    }
+}

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

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

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

@@ -1,176 +0,0 @@
-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
-import com.zaneschepke.wireguardautotunnel.MainActivity
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.core.broadcast.NotificationActionReceiver
-import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager.Companion.EXTRA_ID
-import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
-import com.zaneschepke.wireguardautotunnel.util.StringValue
-import dagger.hilt.android.qualifiers.ApplicationContext
-import javax.inject.Inject
-
-class WireGuardNotification @Inject constructor(@ApplicationContext override val context: Context) :
-    com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager {
-
-    enum class NotificationChannels {
-        VPN,
-        AUTO_TUNNEL,
-    }
-
-    private val notificationManager = NotificationManagerCompat.from(context)
-
-    override fun createNotification(
-        channel: NotificationChannels,
-        title: String,
-        actions: Collection<NotificationCompat.Action>,
-        description: String,
-        showTimestamp: Boolean,
-        importance: Int,
-        onGoing: Boolean,
-        onlyAlertOnce: Boolean,
-    ): Notification {
-        notificationManager.createNotificationChannel(channel.asChannel())
-        return channel
-            .asBuilder()
-            .apply {
-                actions.forEach { addAction(it) }
-                setContentTitle(title)
-                setContentIntent(
-                    PendingIntent.getActivity(
-                        context,
-                        0,
-                        Intent(context, MainActivity::class.java),
-                        PendingIntent.FLAG_IMMUTABLE,
-                    )
-                )
-                setContentText(description)
-                setOnlyAlertOnce(onlyAlertOnce)
-                setOngoing(onGoing)
-                setPriority(NotificationCompat.PRIORITY_HIGH)
-                setShowWhen(showTimestamp)
-                setSmallIcon(R.drawable.ic_notification)
-            }
-            .build()
-    }
-
-    override fun createNotification(
-        channel: NotificationChannels,
-        title: StringValue,
-        actions: Collection<NotificationCompat.Action>,
-        description: StringValue,
-        showTimestamp: Boolean,
-        importance: Int,
-        onGoing: Boolean,
-        onlyAlertOnce: Boolean,
-    ): Notification {
-        return createNotification(
-            channel,
-            title.asString(context),
-            actions,
-            description.asString(context),
-            showTimestamp,
-            importance,
-            onGoing,
-            onlyAlertOnce,
-        )
-    }
-
-    override fun createNotificationAction(
-        notificationAction: NotificationAction,
-        extraId: Int?,
-    ): NotificationCompat.Action {
-        val pendingIntent =
-            PendingIntent.getBroadcast(
-                context,
-                0,
-                Intent(context, NotificationActionReceiver::class.java).apply {
-                    action = notificationAction.name
-                    if (extraId != null) putExtra(EXTRA_ID, extraId)
-                },
-                PendingIntent.FLAG_IMMUTABLE,
-            )
-        return NotificationCompat.Action.Builder(
-                R.drawable.ic_notification,
-                notificationAction.title(context).uppercase(),
-                pendingIntent,
-            )
-            .build()
-    }
-
-    override fun remove(notificationId: Int) {
-        notificationManager.cancel(notificationId)
-    }
-
-    override fun show(notificationId: Int, notification: Notification) {
-        with(notificationManager) {
-            if (
-                ActivityCompat.checkSelfPermission(
-                    context,
-                    Manifest.permission.POST_NOTIFICATIONS,
-                ) != PackageManager.PERMISSION_GRANTED
-            ) {
-                return
-            }
-            notify(notificationId, notification)
-        }
-    }
-
-    private fun NotificationChannels.asBuilder(): NotificationCompat.Builder {
-        return when (this) {
-            NotificationChannels.AUTO_TUNNEL -> {
-                NotificationCompat.Builder(
-                    context,
-                    context.getString(R.string.auto_tunnel_channel_id),
-                )
-            }
-            NotificationChannels.VPN -> {
-                NotificationCompat.Builder(context, context.getString(R.string.vpn_channel_id))
-            }
-        }
-    }
-
-    private fun NotificationChannels.asChannel(): NotificationChannel {
-        return when (this) {
-            NotificationChannels.VPN -> {
-                NotificationChannel(
-                        context.getString(R.string.vpn_channel_id),
-                        context.getString(R.string.vpn_channel_name),
-                        NotificationManager.IMPORTANCE_HIGH,
-                    )
-                    .apply {
-                        description = context.getString(R.string.vpn_channel_description)
-                        enableLights(true)
-                        lightColor = Color.WHITE
-                        enableVibration(false)
-                        vibrationPattern = longArrayOf(100, 200, 300)
-                    }
-            }
-            NotificationChannels.AUTO_TUNNEL -> {
-                NotificationChannel(
-                        context.getString(R.string.auto_tunnel_channel_id),
-                        context.getString(R.string.auto_tunnel_channel_name),
-                        NotificationManager.IMPORTANCE_HIGH,
-                    )
-                    .apply {
-                        description = context.getString(R.string.auto_tunnel_channel_description)
-                        enableLights(true)
-                        lightColor = Color.WHITE
-                        enableVibration(false)
-                        vibrationPattern = longArrayOf(100, 200, 300)
-                    }
-            }
-        }
-    }
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/orchestration/AppBoostrapCoordinator.kt

@@ -0,0 +1,89 @@
+package com.zaneschepke.wireguardautotunnel.core.orchestration
+
+import com.zaneschepke.logcatter.LogReader
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelMode
+import com.zaneschepke.wireguardautotunnel.domain.repository.DnsSettingsRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.LockdownSettingsRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.MonitoringSettingsRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.distinctUntilChangedBy
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+class AppBoostrapCoordinator(
+    private val monitoringRepository: MonitoringSettingsRepository,
+    private val settingsRepository: GeneralSettingRepository,
+    private val dnsRepository: DnsSettingsRepository,
+    private val tunnelRepository: TunnelRepository,
+    private val lockdownRepository: LockdownSettingsRepository,
+    private val tunnelProvider: TunnelProvider,
+    private val dnsSettingsCoordinator: DnsSettingsCoordinator,
+    private val logReader: LogReader,
+) {
+
+    private val _isReady = MutableStateFlow(false)
+    val isReady: StateFlow<Boolean> = _isReady.asStateFlow()
+
+    suspend fun bootstrap() = coroutineScope {
+        launch { bootstrapLogging() }
+
+        val criticalTasks =
+            listOf(
+                async { bootstrapDns() },
+                async { ensureGlobalConfig() },
+                async { restoreLockdown() },
+            )
+
+        try {
+            criticalTasks.awaitAll()
+            _isReady.value = true
+            Timber.d("App bootstrap completed successfully")
+        } catch (e: Exception) {
+            Timber.e(e, "One or more critical bootstrap tasks failed")
+            _isReady.value = true
+        }
+    }
+
+    private suspend fun bootstrapDns() {
+        val dnsSettings = dnsRepository.getDnsSettings()
+        dnsSettingsCoordinator.appyDnsSettings(dnsSettings)
+    }
+
+    private suspend fun bootstrapLogging() {
+        monitoringRepository.flow
+            .distinctUntilChangedBy { it.isLocalLogsEnabled }
+            .collect { settings ->
+                if (settings.isLocalLogsEnabled) {
+                    logReader.start()
+                } else {
+                    logReader.stop()
+                }
+            }
+    }
+
+    private suspend fun ensureGlobalConfig() {
+        tunnelRepository.ensureGlobalConfigExists()
+    }
+
+    private suspend fun restoreLockdown() {
+        val settings = settingsRepository.getGeneralSettings()
+
+        when (settings.tunnelMode) {
+            TunnelMode.LOCK_DOWN -> {
+                val lockdownSettings = lockdownRepository.getLockdownSettings()
+                tunnelProvider.setLockDown(lockdownSettings).onFailure {
+                    Timber.w(it, "Failed to restore lockdown/kill-switch on startup")
+                }
+            }
+            else -> Unit
+        }
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/orchestration/AutoTunnelCoordinator.kt

@@ -0,0 +1,38 @@
+package com.zaneschepke.wireguardautotunnel.core.orchestration
+
+import com.zaneschepke.wireguardautotunnel.domain.repository.AutoTunnelSettingsRepository
+import com.zaneschepke.wireguardautotunnel.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.service.autotunnel.AutoTunnelStateHolder
+
+class AutoTunnelCoordinator(
+    private val repository: AutoTunnelSettingsRepository,
+    private val serviceManager: ServiceManager,
+    private val autoTunnelStateHolder: AutoTunnelStateHolder,
+) {
+
+    suspend fun shouldRestore(): Boolean {
+        val settings = repository.getAutoTunnelSettings()
+        return settings.startOnBoot && settings.isAutoTunnelEnabled
+    }
+
+    fun start() {
+        serviceManager.startAutoTunnelService()
+    }
+
+    suspend fun enable() {
+        repository.updateAutoTunnelEnabled(true)
+        serviceManager.startAutoTunnelService()
+    }
+
+    suspend fun toggle() {
+        val running = autoTunnelStateHolder.active.value
+        if (running) {
+            disable()
+        } else enable()
+    }
+
+    suspend fun disable() {
+        repository.updateAutoTunnelEnabled(false)
+        serviceManager.stopAutoTunnelService()
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/orchestration/ConfigReconciler.kt

@@ -0,0 +1,52 @@
+package com.zaneschepke.wireguardautotunnel.core.orchestration
+
+import com.zaneschepke.wireguardautotunnel.parser.Config
+import com.zaneschepke.wireguardautotunnel.parser.InterfaceSection
+
+object ConfigReconciler {
+    private fun mergeInterface(
+        base: InterfaceSection,
+        global: InterfaceSection,
+        policy: ConfigReconcilePolicy,
+    ): InterfaceSection {
+        return base.copy(
+            dns = if (policy.dns) global.dns else base.dns,
+            includedApplications =
+                if (policy.splitTunnel) global.includedApplications else base.includedApplications,
+            excludedApplications =
+                if (policy.splitTunnel) global.excludedApplications else base.excludedApplications,
+            jC = if (policy.amnezia) global.jC else base.jC,
+            jMin = if (policy.amnezia) global.jMin else base.jMin,
+            jMax = if (policy.amnezia) global.jMax else base.jMax,
+            s1 = if (policy.amnezia) global.s1 else base.s1,
+            s2 = if (policy.amnezia) global.s2 else base.s2,
+            s3 = if (policy.amnezia) global.s3 else base.s3,
+            s4 = if (policy.amnezia) global.s4 else base.s4,
+            h1 = if (policy.amnezia) global.h1 else base.h1,
+            h2 = if (policy.amnezia) global.h2 else base.h2,
+            h3 = if (policy.amnezia) global.h3 else base.h3,
+            h4 = if (policy.amnezia) global.h4 else base.h4,
+            i1 = if (policy.amnezia) global.i1 else base.i1,
+            i2 = if (policy.amnezia) global.i2 else base.i2,
+            i3 = if (policy.amnezia) global.i3 else base.i3,
+            i4 = if (policy.amnezia) global.i4 else base.i4,
+            i5 = if (policy.amnezia) global.i5 else base.i5,
+        )
+    }
+
+    fun reconcileConfig(base: Config, global: Config?, policy: ConfigReconcilePolicy): Config {
+        if (global == null) return base
+        if (!policy.hasAnyOverrides) return base
+
+        return base.copy(`interface` = mergeInterface(base.`interface`, global.`interface`, policy))
+    }
+
+    data class ConfigReconcilePolicy(
+        val dns: Boolean,
+        val splitTunnel: Boolean,
+        val amnezia: Boolean,
+    ) {
+        val hasAnyOverrides
+            get() = dns || splitTunnel || amnezia
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/orchestration/DnsSettingsCoordinator.kt

@@ -0,0 +1,25 @@
+package com.zaneschepke.wireguardautotunnel.core.orchestration
+
+import com.zaneschepke.tunnel.backend.Backend
+import com.zaneschepke.tunnel.model.DnsBoostrapConfig
+import com.zaneschepke.tunnel.model.DnsBoostrapMode
+import com.zaneschepke.wireguardautotunnel.domain.enums.DnsProtocol
+import com.zaneschepke.wireguardautotunnel.domain.model.DnsSettings
+
+class DnsSettingsCoordinator(private val backend: Backend) {
+
+    suspend fun appyDnsSettings(dnsSettings: DnsSettings) {
+        val mode =
+            when (dnsSettings.dnsProtocol) {
+                DnsProtocol.SYSTEM -> DnsBoostrapMode.System
+                DnsProtocol.DOH ->
+                    DnsBoostrapMode.Custom(DnsBoostrapConfig.DoH(dnsSettings.dnsEndpoint))
+                DnsProtocol.DOT ->
+                    DnsBoostrapMode.Custom(DnsBoostrapConfig.DoT(dnsSettings.dnsEndpoint))
+                DnsProtocol.UDP ->
+                    DnsBoostrapMode.Custom(DnsBoostrapConfig.Plain(dnsSettings.dnsEndpoint))
+            }
+
+        backend.setBootstrapDnsMode(mode)
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/orchestration/ShortcutCoordinator.kt

@@ -0,0 +1,84 @@
+package com.zaneschepke.wireguardautotunnel.core.orchestration
+
+import android.content.Intent
+import com.zaneschepke.wireguardautotunnel.core.shortcut.ShortcutContract
+import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+
+class ShortcutCoordinator(
+    private val settingsRepository: GeneralSettingRepository,
+    private val tunnelsRepository: TunnelRepository,
+    private val tunnelCoordinator: TunnelCoordinator,
+    private val autoTunnelCoordinator: AutoTunnelCoordinator,
+) {
+
+    suspend fun handle(intent: Intent) {
+
+        val settings = settingsRepository.getGeneralSettings()
+
+        if (!settings.isShortcutsEnabled) return
+
+        val shortcutType =
+            intent.getStringExtra(ShortcutContract.EXTRA_SHORTCUT_TYPE)
+                ?: legacyShortcutType(intent)
+
+        when (shortcutType) {
+            ShortcutContract.ShortcutType.TUNNEL.value -> {
+                handleTunnelShortcut(intent)
+            }
+
+            ShortcutContract.ShortcutType.AUTO_TUNNEL.value -> {
+                handleAutoTunnelShortcut(intent)
+            }
+        }
+    }
+
+    private suspend fun handleAutoTunnelShortcut(intent: Intent) {
+
+        when (intent.action) {
+            ShortcutContract.Action.START.name -> {
+                autoTunnelCoordinator.enable()
+            }
+
+            ShortcutContract.Action.STOP.name -> {
+                autoTunnelCoordinator.disable()
+            }
+        }
+    }
+
+    private fun legacyShortcutType(intent: Intent): String? {
+
+        return when (intent.getStringExtra(ShortcutContract.EXTRA_CLASS_NAME)) {
+            ShortcutContract.Legacy.AUTO_TUNNEL_SERVICE_CLASS_NAME,
+            ShortcutContract.Legacy.AUTO_TUNNEL_SERVICE_NAME ->
+                ShortcutContract.ShortcutType.AUTO_TUNNEL.value
+
+            ShortcutContract.Legacy.TUNNEL_PROVIDER_NAME,
+            ShortcutContract.Legacy.TUNNEL_SERVICE_NAME ->
+                ShortcutContract.ShortcutType.TUNNEL.value
+
+            else -> null
+        }
+    }
+
+    private suspend fun handleTunnelShortcut(intent: Intent) {
+
+        val tunnelName = intent.getStringExtra(ShortcutContract.EXTRA_TUNNEL_NAME)
+
+        val tunnel =
+            tunnelName?.let { tunnelsRepository.findByTunnelName(it) }
+                ?: tunnelsRepository.getDefaultTunnel()
+
+        tunnel ?: return
+
+        when (intent.action) {
+            ShortcutContract.Action.START.name -> {
+                tunnelCoordinator.startTunnel(config = tunnel)
+            }
+
+            ShortcutContract.Action.STOP.name -> {
+                tunnelCoordinator.stopActiveTunnels()
+            }
+        }
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/orchestration/StartupCoordinator.kt

@@ -0,0 +1,36 @@
+package com.zaneschepke.wireguardautotunnel.core.orchestration
+
+import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import kotlinx.coroutines.flow.first
+
+class StartupCoordinator(
+    private val tunnelCoordinator: TunnelCoordinator,
+    private val settingsRepository: GeneralSettingRepository,
+    private val autoTunnelCoordinator: AutoTunnelCoordinator,
+    private val tunnelRepository: TunnelRepository,
+    private val bootstrapCoordinator: AppBoostrapCoordinator,
+) {
+
+    suspend fun applyStartupPolicy(): Result<Unit> = runCatching {
+        val shouldRestoreAutoTunnel = autoTunnelCoordinator.shouldRestore()
+        val settings = settingsRepository.getGeneralSettings()
+        val shouldRestoreDefaultTunnel = settings.isRestoreOnBootEnabled
+
+        if (shouldRestoreAutoTunnel || shouldRestoreDefaultTunnel) {
+            // Wait for app critical bootstrap to finish
+            bootstrapCoordinator.isReady.first { it }
+        } else {
+            return Result.success(Unit)
+        }
+
+        if (shouldRestoreAutoTunnel) {
+            autoTunnelCoordinator.start()
+            return Result.success(Unit)
+        }
+
+        val defaultTunnel = tunnelRepository.getDefaultTunnel() ?: return Result.success(Unit)
+        tunnelCoordinator.startTunnel(defaultTunnel)
+        return Result.success(Unit)
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/orchestration/TunnelCoordinator.kt

@@ -0,0 +1,263 @@
+package com.zaneschepke.wireguardautotunnel.core.orchestration
+
+import com.zaneschepke.tunnel.model.BackendMode
+import com.zaneschepke.wireguardautotunnel.core.event.TunnelErrorEvent
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider
+import com.zaneschepke.wireguardautotunnel.data.repository.RoomDnsSettingsRepository
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelActionSource
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelMode
+import com.zaneschepke.wireguardautotunnel.domain.events.TunnelActionEvent
+import com.zaneschepke.wireguardautotunnel.domain.model.DnsSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.MonitoringSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.ProxySettings
+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.ProxySettingsRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import com.zaneschepke.wireguardautotunnel.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.ui.state.DisplayTunnelState
+import kotlin.time.Duration.Companion.milliseconds
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+
+class TunnelCoordinator(
+    private val tunnelProvider: TunnelProvider,
+    private val serviceManager: ServiceManager,
+    private val bootstrapCoordinator: AppBoostrapCoordinator,
+    settingsRepository: GeneralSettingRepository,
+    private val tunnelRepository: TunnelRepository,
+    dnsSettingsRepository: RoomDnsSettingsRepository,
+    monitoringSettingsRepository: MonitoringSettingsRepository,
+    proxyRepository: ProxySettingsRepository,
+    scope: CoroutineScope,
+) {
+
+    private val _userOverrideFlow = MutableSharedFlow<Unit>(extraBufferCapacity = 1)
+    val userOverrideFlow = _userOverrideFlow.asSharedFlow()
+
+    @OptIn(FlowPreview::class)
+    val tunnelDisplayStates: StateFlow<Map<Int, DisplayTunnelState>> =
+        tunnelProvider.backendStatus
+            .map { status ->
+                status.activeTunnels.mapValues { (_, activeTunnel) ->
+                    DisplayTunnelState.from(activeTunnel)
+                }
+            }
+            .debounce(400L.milliseconds)
+            .stateIn(scope = scope, started = SharingStarted.Eagerly, initialValue = emptyMap())
+
+    data class RuntimeSettingsSnapshot(
+        val general: GeneralSettings,
+        val dns: DnsSettings,
+        val monitoring: MonitoringSettings,
+        val proxy: ProxySettings,
+    )
+
+    private val runtimeSettingsSnapshot =
+        combine(
+            settingsRepository.flow,
+            dnsSettingsRepository.flow,
+            monitoringSettingsRepository.flow,
+            proxyRepository.flow,
+        ) { general, dns, monitoring, proxy ->
+            RuntimeSettingsSnapshot(
+                general = general,
+                dns = dns,
+                monitoring = monitoring,
+                proxy = proxy,
+            )
+        }
+
+    private val _actions = MutableSharedFlow<TunnelActionEvent>()
+    val actions = _actions.asSharedFlow()
+
+    private val runtimeSettingsSnapshotState =
+        runtimeSettingsSnapshot.stateIn(
+            scope = scope,
+            started = SharingStarted.Eagerly,
+            initialValue = null,
+        )
+
+    private suspend fun getSnapshot(): RuntimeSettingsSnapshot {
+        return runtimeSettingsSnapshotState.filterNotNull().first()
+    }
+
+    private var lastActiveTunnels: List<Int> = emptyList()
+    private val tunnelMutex = Mutex()
+    private val _errors = MutableSharedFlow<TunnelErrorEvent>()
+    val errors = _errors.asSharedFlow()
+
+    val backendStatus = tunnelProvider.backendStatus
+
+    suspend fun startTunnel(
+        config: TunnelConfig,
+        source: TunnelActionSource = TunnelActionSource.USER,
+    ) = tunnelMutex.withLock {
+        // wait for app to be bootstrapped
+        bootstrapCoordinator.isReady.first { it }
+
+        if (source == TunnelActionSource.USER) {
+            _userOverrideFlow.tryEmit(Unit)
+        }
+
+        // enforce single tunnel, for now
+        if (backendStatus.value.activeTunnels.isNotEmpty()) {
+            stopActiveTunnelsInternal(source)
+        }
+
+        startTunnelInternal(config, source)
+    }
+
+    suspend fun stopTunnel(id: Int, source: TunnelActionSource = TunnelActionSource.USER) =
+        tunnelMutex.withLock {
+            if (source == TunnelActionSource.USER) {
+                _userOverrideFlow.tryEmit(Unit)
+            }
+            stopTunnelInternal(id, source)
+        }
+
+    suspend fun stopActiveTunnels(source: TunnelActionSource = TunnelActionSource.USER) =
+        tunnelMutex.withLock {
+            if (source == TunnelActionSource.USER) {
+                _userOverrideFlow.tryEmit(Unit)
+            }
+            stopActiveTunnelsInternal(source)
+        }
+
+    private suspend fun startTunnelInternal(
+        tunnelConfig: TunnelConfig,
+        source: TunnelActionSource,
+    ) {
+
+        val snapshot = getSnapshot()
+        val settings = snapshot.general
+        val dnsSettings = snapshot.dns
+        val proxySettings = snapshot.proxy
+        val monitoringSettings = snapshot.monitoring
+
+        val config = tunnelConfig.getConfig()
+        val policy =
+            ConfigReconciler.ConfigReconcilePolicy(
+                dnsSettings.isGlobalTunnelDnsEnabled,
+                settings.isGlobalSplitTunnelEnabled,
+                settings.isGlobalAmneziaEnabled,
+            )
+
+        val runConfig =
+            if (policy.hasAnyOverrides) {
+                val globalConfig = tunnelRepository.globalTunnelFlow.firstOrNull()?.getConfig()
+                ConfigReconciler.reconcileConfig(config, globalConfig, policy)
+            } else config
+
+        val backendMode =
+            when (settings.tunnelMode) {
+                TunnelMode.VPN -> {
+
+                    if (!serviceManager.hasVpnPermission()) {
+                        _errors.emit(TunnelErrorEvent.VpnPermissionDenied(tunnelConfig.id))
+                        return
+                    }
+
+                    BackendMode.Vpn(runConfig)
+                }
+
+                TunnelMode.PROXY -> {
+                    BackendMode.Proxy.Standard(
+                        config = runConfig,
+                        proxyConfig = proxySettings.toProxyConfig(),
+                    )
+                }
+
+                TunnelMode.LOCK_DOWN -> {
+
+                    BackendMode.Proxy.KillSwitchPrimary(runConfig)
+                }
+            }
+
+        tunnelProvider
+            .startTunnel(
+                tunnel =
+                    tunnelConfig.toBackendTunnel(
+                        monitoringSettings,
+                        settings.tunnelScriptingEnabled,
+                    ),
+                mode = backendMode,
+            )
+            .onSuccess {
+                _actions.emit(
+                    TunnelActionEvent.Started(tunnelId = tunnelConfig.id, source = source)
+                )
+            }
+            .onFailure { _errors.emit(TunnelErrorEvent.from(it, tunnelConfig.id)) }
+    }
+
+    suspend fun startDefault() {
+        tunnelRepository.getDefaultTunnel()?.let { tunnel -> startTunnel(tunnel) }
+    }
+
+    suspend fun toggleTunnels(source: TunnelActionSource = TunnelActionSource.USER) =
+        tunnelMutex.withLock {
+            if (source == TunnelActionSource.USER) {
+                _userOverrideFlow.tryEmit(Unit)
+            }
+
+            val active = tunnelProvider.backendStatus.value.activeTunnels
+            if (active.isNotEmpty()) {
+                lastActiveTunnels = active.keys.toList()
+
+                active.keys.forEach { id ->
+                    _actions.emit(TunnelActionEvent.Stopped(tunnelId = id, source = source))
+                }
+
+                stopActiveTunnelsInternal(source)
+                return@withLock
+            }
+
+            val tunnelsToStart =
+                when {
+                    lastActiveTunnels.isNotEmpty() -> {
+                        lastActiveTunnels.mapNotNull { tunnelRepository.getById(it) }
+                    }
+
+                    else -> {
+                        tunnelRepository.getDefaultTunnel()?.let(::listOf) ?: emptyList()
+                    }
+                }
+
+            tunnelsToStart.forEach { startTunnelInternal(it, source) }
+        }
+
+    private suspend fun stopTunnelInternal(id: Int, source: TunnelActionSource) {
+        tunnelProvider
+            .stopTunnel(id)
+            .onSuccess { _actions.emit(TunnelActionEvent.Stopped(tunnelId = id, source = source)) }
+            .onFailure { _errors.emit(TunnelErrorEvent.from(it, id)) }
+    }
+
+    private suspend fun stopActiveTunnelsInternal(
+        source: TunnelActionSource = TunnelActionSource.USER
+    ) {
+        val active = tunnelProvider.backendStatus.value.activeTunnels
+
+        active.keys.forEach { id ->
+            _actions.emit(TunnelActionEvent.Stopped(tunnelId = id, source = source))
+        }
+
+        tunnelProvider.stopActiveTunnels()
+    }
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/orchestration/TunnelModeCoordinator.kt

@@ -0,0 +1,53 @@
+package com.zaneschepke.wireguardautotunnel.core.orchestration
+
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelMode
+import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.LockdownSettingsRepository
+
+class TunnelModeCoordinator(
+    private val tunnelProvider: TunnelProvider,
+    private val settingsRepository: GeneralSettingRepository,
+    private val lockdownRepository: LockdownSettingsRepository,
+) {
+
+    suspend fun changeMode(newMode: TunnelMode): Result<Unit> {
+
+        val settings = settingsRepository.getGeneralSettings()
+        val oldMode = settings.tunnelMode
+
+        if (oldMode == newMode) {
+            return Result.success(Unit)
+        }
+
+        return runCatching {
+            tunnelProvider.stopActiveTunnels().getOrThrow()
+            exitMode(oldMode)
+            enterMode(newMode)
+
+            settingsRepository.upsert(settings.copy(tunnelMode = newMode))
+        }
+    }
+
+    private suspend fun exitMode(oldMode: TunnelMode) {
+        when (oldMode) {
+            TunnelMode.LOCK_DOWN -> {
+                tunnelProvider.disableLockDown().getOrThrow()
+            }
+            else -> Unit
+        }
+    }
+
+    private suspend fun enterMode(newMode: TunnelMode) {
+        when (newMode) {
+            TunnelMode.LOCK_DOWN -> {
+                val lockdownSettings = lockdownRepository.getLockdownSettings()
+
+                tunnelProvider.setLockDown(lockdownSettings).getOrThrow()
+            }
+
+            TunnelMode.VPN,
+            TunnelMode.PROXY -> Unit
+        }
+    }
+}

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

@@ -1,151 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.service
-
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.content.ServiceConnection
-import android.net.VpnService
-import android.os.IBinder
-import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelService
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-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.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-
-class ServiceManager
-@Inject
-constructor(
-    private val context: Context,
-    private val ioDispatcher: CoroutineDispatcher,
-    private val applicationScope: CoroutineScope,
-    private val mainDispatcher: CoroutineDispatcher,
-    private val appDataRepository: AppDataRepository,
-) {
-
-    private val autoTunnelMutex = Mutex()
-
-    private val _tunnelService = MutableStateFlow<TunnelForegroundService?>(null)
-    private val _autoTunnelService = MutableStateFlow<AutoTunnelService?>(null)
-    val autoTunnelService = _autoTunnelService.asStateFlow()
-
-    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")
-            }
-
-            override fun onServiceDisconnected(name: ComponentName) {
-                _tunnelService.value = null
-                Timber.d("TunnelForegroundService disconnected")
-            }
-        }
-
-    private val autoTunnelServiceConnection =
-        object : ServiceConnection {
-            override fun onServiceConnected(name: ComponentName, service: IBinder) {
-                val binder = service as? AutoTunnelService.LocalBinder
-                _autoTunnelService.value = binder?.service
-                Timber.d("AutoTunnelService connected")
-            }
-
-            override fun onServiceDisconnected(name: ComponentName) {
-                _autoTunnelService.value = null
-                Timber.d("AutoTunnelService disconnected")
-            }
-        }
-
-    fun hasVpnPermission(): Boolean {
-        return VpnService.prepare(context) == null
-    }
-
-    suspend fun startAutoTunnel() {
-        autoTunnelMutex.withLock {
-            val settings = appDataRepository.settings.get()
-            appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = true))
-            if (_autoTunnelService.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() }
-            }
-        }
-    }
-
-    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 ->
-                service.stop()
-                try {
-                    context.unbindService(autoTunnelServiceConnection)
-                } catch (e: Exception) {
-                    Timber.e(e, "Failed to unbind AutoTunnelService")
-                } finally {
-                    _tunnelService.value = null
-                }
-            }
-            withContext(mainDispatcher) { updateAutoTunnelTile() }
-        }
-    }
-
-    suspend fun startTunnelForegroundService() {
-        if (_tunnelService.value != null) return
-        withContext(ioDispatcher) {
-            applicationScope.launch(ioDispatcher) {
-                val intent = Intent(context, TunnelForegroundService::class.java)
-                context.startForegroundService(intent)
-                context.bindService(intent, tunnelServiceConnection, Context.BIND_AUTO_CREATE)
-            }
-        }
-    }
-
-    fun stopTunnelForegroundService() {
-        _tunnelService.value?.let { service ->
-            service.stop()
-            try {
-                context.unbindService(tunnelServiceConnection)
-            } catch (e: Exception) {
-                Timber.e(e, "Failed to stop TunnelForegroundService")
-            } finally {
-                _tunnelService.value = null
-            }
-        }
-    }
-
-    fun toggleAutoTunnel() {
-        applicationScope.launch(ioDispatcher) {
-            if (_autoTunnelService.value != null) stopAutoTunnel() else startAutoTunnel()
-        }
-    }
-
-    fun updateAutoTunnelTile() {
-        context.requestAutoTunnelTileServiceUpdate()
-    }
-
-    fun updateTunnelTile() {
-        context.requestTunnelTileServiceStateUpdate()
-    }
-
-    fun handleTunnelServiceDestroy() {
-        _tunnelService.update { null }
-    }
-
-    fun handleAutoTunnelServiceDestroy() {
-        _autoTunnelService.update { null }
-    }
-}

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

@@ -1,154 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.service
-
-import android.app.Notification
-import android.content.Intent
-import android.os.Binder
-import android.os.IBinder
-import androidx.core.app.ServiceCompat
-import androidx.lifecycle.LifecycleService
-import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.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.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.distinctByKeys
-import dagger.hilt.android.AndroidEntryPoint
-import io.ktor.util.collections.*
-import javax.inject.Inject
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
-import timber.log.Timber
-
-@AndroidEntryPoint
-class TunnelForegroundService : LifecycleService() {
-
-    @Inject 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 appDataRepository: AppDataRepository
-
-    class LocalBinder(val service: TunnelForegroundService) : Binder()
-
-    private val tunnelJobs = ConcurrentMap<TunnelConf, Job>()
-
-    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 ->
-                val activeTunConfigs = activeTunnels.keys
-                val obsoleteJobs = tunnelJobs.keys - activeTunConfigs
-                obsoleteJobs.forEach { tunnelConf -> tunnelJobs[tunnelConf]?.cancel() }
-                activeTunConfigs.forEach { tun ->
-                    if (tunnelJobs.containsKey(tun)) return@forEach
-                    tunnelJobs[tun] = launch { tunnelMonitor.startMonitoring(tun, true) }
-                }
-                updateServiceNotification(activeTunnels)
-            }
-        }
-
-    // TODO Would be cool to have this include kill switch
-    private fun updateServiceNotification(activeTunnels: Map<TunnelConf, TunnelState>) {
-        val notification =
-            when (activeTunnels.size) {
-                0 -> onCreateNotification()
-                1 -> createTunnelNotification(activeTunnels.keys.first())
-                else -> createTunnelsNotification()
-            }
-        ServiceCompat.startForeground(
-            this@TunnelForegroundService,
-            NotificationManager.VPN_NOTIFICATION_ID,
-            notification,
-            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
-        )
-    }
-
-    fun stop() {
-        Timber.d("Stop called")
-        tunnelJobs.forEach { it.value.cancel() }
-        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
-        stopSelf()
-    }
-
-    override fun onDestroy() {
-        tunnelJobs.forEach { it.value.cancel() }
-        serviceManager.handleTunnelServiceDestroy()
-        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
-        Timber.d("onDestroy")
-        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),
-        )
-    }
-}

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

@@ -1,437 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.service.autotunnel
-
-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.AndroidNetworkMonitor
-import com.zaneschepke.networkmonitor.ConnectivityState
-import com.zaneschepke.networkmonitor.NetworkMonitor
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
-import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
-import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelMonitor
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
-import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus.StopReason.Ping
-import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
-import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
-import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.state.AutoTunnelState
-import com.zaneschepke.wireguardautotunnel.domain.state.NetworkState
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.Tunnels
-import com.zaneschepke.wireguardautotunnel.util.extensions.toMillis
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
-import javax.inject.Provider
-import kotlin.math.pow
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import timber.log.Timber
-
-@AndroidEntryPoint
-class AutoTunnelService : LifecycleService() {
-
-    @Inject lateinit var networkMonitor: NetworkMonitor
-
-    @Inject lateinit var appDataRepository: Provider<AppDataRepository>
-
-    @Inject lateinit var notificationManager: NotificationManager
-
-    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
-
-    @Inject lateinit var serviceManager: ServiceManager
-
-    @Inject lateinit var tunnelManager: TunnelManager
-
-    @Inject lateinit var tunnelMonitor: TunnelMonitor
-
-    private val defaultState = AutoTunnelState()
-
-    private val autoTunMutex = Mutex()
-
-    private val autoTunnelStateFlow = MutableStateFlow(defaultState)
-
-    private val bounceCounts = MutableStateFlow<Map<Int, Int>>(emptyMap())
-
-    private var eventHandlerJob: Job? = null
-
-    private val lastBounceTimes = mutableMapOf<Int, Long>()
-
-    class LocalBinder(val service: AutoTunnelService) : Binder()
-
-    private val binder = LocalBinder(this)
-
-    override fun onCreate() {
-        super.onCreate()
-        launchWatcherNotification()
-    }
-
-    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)
-        Timber.d("onStartCommand executed with startId: $startId")
-        start()
-        return START_STICKY
-    }
-
-    fun start() {
-        launchWatcherNotification()
-        startAutoTunnelStateJob()
-        startLocationPermissionsNotificationJob()
-    }
-
-    fun stop() {
-        stopSelf()
-    }
-
-    override fun onDestroy() {
-        serviceManager.handleAutoTunnelServiceDestroy()
-        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
-        super.onDestroy()
-    }
-
-    private fun launchWatcherNotification(
-        description: String = getString(R.string.monitoring_state_changes)
-    ) {
-        val notification =
-            notificationManager.createNotification(
-                WireGuardNotification.NotificationChannels.AUTO_TUNNEL,
-                title = getString(R.string.auto_tunnel_title),
-                description = description,
-                actions =
-                    listOf(
-                        notificationManager.createNotificationAction(
-                            NotificationAction.AUTO_TUNNEL_OFF
-                        )
-                    ),
-            )
-        ServiceCompat.startForeground(
-            this,
-            NotificationManager.AUTO_TUNNEL_NOTIFICATION_ID,
-            notification,
-            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
-        )
-    }
-
-    private fun startAutoTunnelStateJob() =
-        lifecycleScope.launch(ioDispatcher) {
-            val networkFlow =
-                debouncedConnectivityStateFlow
-                    .flowOn(ioDispatcher)
-                    .map(NetworkState::from)
-                    .map { StateChange.NetworkChange(it) }
-                    .distinctUntilChanged()
-
-            val settingsFlow =
-                combineSettings().map { StateChange.SettingsChange(it.first, it.second) }
-
-            val tunnelsFlow =
-                tunnelManager.activeTunnels.map { StateChange.ActiveTunnelsChange(it) }
-
-            val monitoringFlow =
-                tunnelManager.activeTunnels
-                    .map { map -> map.mapValues { (_, state) -> state.pingStates } }
-                    .distinctUntilChanged()
-                    .map { StateChange.MonitoringChange(it) }
-
-            var reevaluationJob: Job? = null
-
-            // get everything in sync before we use merge
-            combine(networkFlow, settingsFlow, tunnelsFlow, monitoringFlow) {
-                    network,
-                    settings,
-                    tunnels,
-                    monitoring ->
-                    autoTunnelStateFlow.update {
-                        it.copy(
-                            activeTunnels = tunnels.activeTunnels,
-                            networkState = network.networkState,
-                            settings = settings.settings,
-                            tunnels = settings.tunnels,
-                        )
-                    }
-                }
-                .first()
-
-            // use merge to limit the noise of a combine and also increase the scalability of auto
-            // tunnel handling new states
-            merge(networkFlow, settingsFlow, tunnelsFlow, monitoringFlow).collect { change ->
-                if (change !is StateChange.ActiveTunnelsChange) {
-                    Timber.d("New state changed to ${change.javaClass.simpleName}")
-                }
-
-                when (change) {
-                    is StateChange.NetworkChange -> {
-                        reevaluationJob?.cancel()
-                        val previousState = autoTunnelStateFlow.value
-                        autoTunnelStateFlow.update { it.copy(networkState = change.networkState) }
-                        // Android late mobile data state change, we can ignore handling this
-                        if (
-                            isAndroidLateCellularActiveChange(
-                                previousState.networkState,
-                                change.networkState,
-                            )
-                        ) {
-                            Timber.d("Android late cellular active state change")
-                            return@collect
-                        }
-                    }
-                    is StateChange.SettingsChange -> {
-                        reevaluationJob?.cancel()
-                        autoTunnelStateFlow.update {
-                            it.copy(settings = change.settings, tunnels = change.tunnels)
-                        }
-                    }
-                    is StateChange.ActiveTunnelsChange -> {
-                        autoTunnelStateFlow.update { it.copy(activeTunnels = change.activeTunnels) }
-                        return@collect
-                    }
-                    is StateChange.MonitoringChange -> {
-                        change.pingStates.forEach { (config, pingState) ->
-                            Timber.d("Ping state $pingState")
-                            if (pingState?.all { it.value.isReachable } == true) {
-                                Timber.d("Clearing bounce count on success")
-                                bounceCounts.update { current ->
-                                    current.toMutableMap().apply { remove(config.id) }
-                                }
-                            }
-                        }
-                        return@collect handleAutoTunnelEvent(
-                            autoTunnelStateFlow.value.determineAutoTunnelEvent(
-                                StateChange.MonitoringChange(change.pingStates)
-                            )
-                        )
-                    }
-                }
-
-                handleAutoTunnelEvent(autoTunnelStateFlow.value.determineAutoTunnelEvent(change))
-
-                reevaluationJob = launch {
-                    delay(REEVALUATE_CHECK_DELAY)
-                    val currentState = autoTunnelStateFlow.value
-                    if (currentState != defaultState) {
-                        Timber.d("Re-evaluating auto-tunnel state..")
-                        handleAutoTunnelEvent(currentState.determineAutoTunnelEvent(change))
-                    }
-                }
-            }
-        }
-
-    private fun isAndroidLateCellularActiveChange(
-        previous: NetworkState,
-        new: NetworkState,
-    ): Boolean {
-        return (previous.isWifiConnected != new.isWifiConnected &&
-            previous.wifiName == new.wifiName &&
-            previous.isMobileDataConnected != new.isMobileDataConnected)
-    }
-
-    // all relevant settings to auto tunnel
-    private fun areAutoTunnelSettingsTheSame(old: AppSettings, new: AppSettings): Boolean {
-        return (old.isTunnelOnWifiEnabled == new.isTunnelOnWifiEnabled &&
-            old.isTunnelOnMobileDataEnabled == new.isTunnelOnMobileDataEnabled &&
-            old.isTunnelOnEthernetEnabled == new.isTunnelOnEthernetEnabled &&
-            old.trustedNetworkSSIDs == new.trustedNetworkSSIDs &&
-            old.isPingEnabled == new.isPingEnabled &&
-            old.debounceDelaySeconds == new.debounceDelaySeconds &&
-            old.wifiDetectionMethod == new.wifiDetectionMethod &&
-            old.isVpnKillSwitchEnabled == new.isVpnKillSwitchEnabled &&
-            old.isLanOnKillSwitchEnabled == new.isLanOnKillSwitchEnabled &&
-            old.isDisableKillSwitchOnTrustedEnabled == new.isDisableKillSwitchOnTrustedEnabled &&
-            old.isStopOnNoInternetEnabled == new.isStopOnNoInternetEnabled)
-    }
-
-    private fun combineSettings(): Flow<Pair<AppSettings, Tunnels>> {
-        return combine(
-                appDataRepository
-                    .get()
-                    .settings
-                    .flow
-                    .distinctUntilChanged(::areAutoTunnelSettingsTheSame),
-                appDataRepository.get().tunnels.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)
-            }
-            .distinctUntilChanged()
-    }
-
-    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) {
-            var locationServicesShown = false
-            var locationPermissionsShown = false
-
-            data class NetworkPermissionState(
-                val detectionMethod: AndroidNetworkMonitor.WifiDetectionMethod,
-                val locationServicesEnabled: Boolean,
-                val locationPermissionsEnabled: Boolean,
-                val ssidReadRequired: Boolean,
-            )
-
-            autoTunnelStateFlow
-                .distinctUntilChanged(::areAutoTunnelPermissionsRequiredTheSame)
-                .map {
-                    NetworkPermissionState(
-                        it.settings.wifiDetectionMethod,
-                        it.networkState.locationServicesEnabled == true,
-                        it.networkState.locationPermissionGranted == true,
-                        (it.tunnels.any { tunnel -> tunnel.tunnelNetworks.isNotEmpty() } ||
-                            it.settings.trustedNetworkSSIDs.isNotEmpty()),
-                    )
-                }
-                .collect { state ->
-                    when (state.detectionMethod) {
-                        AndroidNetworkMonitor.WifiDetectionMethod.DEFAULT,
-                        AndroidNetworkMonitor.WifiDetectionMethod.LEGACY -> {
-                            if (
-                                !state.locationPermissionsEnabled &&
-                                    !locationPermissionsShown &&
-                                    state.ssidReadRequired
-                            ) {
-                                locationPermissionsShown = true
-                                val notification =
-                                    notificationManager.createNotification(
-                                        WireGuardNotification.NotificationChannels.AUTO_TUNNEL,
-                                        title = getString(R.string.warning),
-                                        description =
-                                            getString(R.string.location_permissions_missing),
-                                    )
-                                notificationManager.show(
-                                    NotificationManager.AUTO_TUNNEL_LOCATION_PERMISSION_ID,
-                                    notification,
-                                )
-                            }
-                            if (
-                                !state.locationServicesEnabled &&
-                                    !locationServicesShown &&
-                                    state.ssidReadRequired
-                            ) {
-                                locationServicesShown = true
-                                val notification =
-                                    notificationManager.createNotification(
-                                        WireGuardNotification.NotificationChannels.AUTO_TUNNEL,
-                                        title = getString(R.string.warning),
-                                        description =
-                                            getString(R.string.location_services_not_detected),
-                                    )
-                                notificationManager.show(
-                                    NotificationManager.AUTO_TUNNEL_LOCATION_SERVICES_ID,
-                                    notification,
-                                )
-                            }
-                            if (state.locationServicesEnabled || !state.ssidReadRequired) {
-                                notificationManager.remove(
-                                    NotificationManager.AUTO_TUNNEL_LOCATION_SERVICES_ID
-                                )
-                                locationServicesShown = false
-                            }
-                            if (state.locationPermissionsEnabled || !state.ssidReadRequired) {
-                                notificationManager.remove(
-                                    NotificationManager.AUTO_TUNNEL_LOCATION_PERMISSION_ID
-                                )
-                                locationPermissionsShown = false
-                            }
-                        }
-                        else -> Unit
-                    }
-                }
-        }
-
-    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.tunnelConf ?: appDataRepository.get().getPrimaryOrFirstTunnel())?.let {
-                        tunnelManager.startTunnel(it)
-                    }
-                is AutoTunnelEvent.Stop -> tunnelManager.stopTunnel()
-                AutoTunnelEvent.DoNothing -> Timber.i("Auto-tunneling: nothing to do")
-                is AutoTunnelEvent.Bounce ->
-                    handleBounceWithBackoff(event.configsPeerKeyResolvedMap)
-            }
-        }
-    }
-
-    private suspend fun handleBounceWithBackoff(
-        configsPeerKeyResolvedMap: List<Pair<TunnelConf, Map<String, String?>>>
-    ) { // Simplified param: no failureCount
-        val settings = appDataRepository.get().settings.get()
-        val pingIntervalMillis = settings.tunnelPingIntervalSeconds.toMillis()
-        configsPeerKeyResolvedMap.forEach { (config, peerMap) ->
-            val bounceCount = bounceCounts.value.getOrDefault(config.id, 0)
-            val exponent = bounceCount.toDouble()
-            val backoffDelay =
-                (pingIntervalMillis * 2.0.pow(exponent)).toLong().coerceAtMost(MAX_BACKOFF_MS)
-            val currentTime = System.currentTimeMillis()
-            val lastTime = lastBounceTimes.getOrDefault(config.id, 0L)
-            if (currentTime - lastTime >= backoffDelay) {
-                Timber.d(
-                    "Bouncing tunnel ${config.name} after detecting failure, with bounce count $bounceCount and calculated backoff delay $backoffDelay ms"
-                )
-                tunnelManager.bounceTunnel(config, Ping(peerMap))
-                lastBounceTimes[config.id] = currentTime
-                bounceCounts.update { current ->
-                    current.toMutableMap().apply { this[config.id] = (this[config.id] ?: 0) + 1 }
-                }
-            } else {
-                Timber.d(
-                    "Backoff in progress for tunnel ${config.name}, skipping bounce (required delay: $backoffDelay ms)"
-                )
-            }
-        }
-    }
-
-    @OptIn(FlowPreview::class, ExperimentalCoroutinesApi::class)
-    private val debouncedConnectivityStateFlow: Flow<ConnectivityState> by lazy {
-        appDataRepository
-            .get()
-            .settings
-            .flow
-            .map { it.debounceDelaySeconds.toMillis() }
-            .distinctUntilChanged()
-            .flatMapLatest { debounceMillis ->
-                networkMonitor.connectivityStateFlow.debounce(debounceMillis)
-            }
-    }
-
-    companion object {
-        // try to keep this window short as it will interrupt manual overrides
-        const val REEVALUATE_CHECK_DELAY = 2_000L
-        const val MAX_BACKOFF_MS = 300_000L // 5 minutes
-    }
-}

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

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

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

@@ -1,104 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.service.tile
-
-import android.content.Intent
-import android.os.IBinder
-import android.service.quicksettings.Tile
-import android.service.quicksettings.TileService
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.LifecycleRegistry
-import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
-import kotlinx.coroutines.launch
-import timber.log.Timber
-
-@AndroidEntryPoint
-class AutoTunnelControlTile : TileService(), LifecycleOwner {
-    @Inject lateinit var appDataRepository: AppDataRepository
-
-    @Inject lateinit var serviceManager: ServiceManager
-
-    private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
-
-    override fun onCreate() {
-        super.onCreate()
-        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
-    }
-
-    override fun onStartListening() {
-        super.onStartListening()
-        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
-        Timber.d("Start listening called for auto tunnel tile")
-        lifecycleScope.launch {
-            serviceManager.autoTunnelService.collect {
-                if (it != null) return@collect setActive()
-                setInactive()
-            }
-        }
-        lifecycleScope.launch {
-            appDataRepository.tunnels.flow.collect {
-                if (it.isEmpty()) {
-                    setUnavailable()
-                }
-            }
-        }
-    }
-
-    override fun onClick() {
-        super.onClick()
-        unlockAndRun {
-            lifecycleScope.launch {
-                if (serviceManager.autoTunnelService.value != null) {
-                    serviceManager.stopAutoTunnel()
-                    setInactive()
-                } else {
-                    serviceManager.startAutoTunnel()
-                    setActive()
-                }
-            }
-        }
-    }
-
-    private fun setActive() {
-        runCatching {
-            qsTile.state = Tile.STATE_ACTIVE
-            qsTile.updateTile()
-        }
-    }
-
-    private fun setInactive() {
-        runCatching {
-            qsTile.state = Tile.STATE_INACTIVE
-            qsTile.updateTile()
-        }
-    }
-
-    /* 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
-            qsTile.updateTile()
-        }
-    }
-
-    override val lifecycle: Lifecycle
-        get() = lifecycleRegistry
-}

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

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

@@ -6,13 +6,12 @@ import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.content.pm.ShortcutManagerCompat
 import androidx.core.graphics.drawable.IconCompat
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 
 class DynamicShortcutManager(
     private val context: Context,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+    private val ioDispatcher: CoroutineDispatcher,
 ) : ShortcutManager {
     override suspend fun addShortcuts() {
         withContext(ioDispatcher) {
@@ -35,7 +34,7 @@ class DynamicShortcutManager(
                 intent =
                     Intent(context, ShortcutsActivity::class.java).apply {
                         putExtra("className", "WireGuardTunnelService")
-                        action = ShortcutsActivity.Action.STOP.name
+                        action = ShortcutContract.Action.STOP.name
                     },
                 shortcutIcon = R.drawable.vpn_off,
             ),
@@ -46,7 +45,7 @@ class DynamicShortcutManager(
                 intent =
                     Intent(context, ShortcutsActivity::class.java).apply {
                         putExtra("className", "WireGuardTunnelService")
-                        action = ShortcutsActivity.Action.START.name
+                        action = ShortcutContract.Action.START.name
                     },
                 shortcutIcon = R.drawable.vpn_on,
             ),
@@ -57,7 +56,7 @@ class DynamicShortcutManager(
                 intent =
                     Intent(context, ShortcutsActivity::class.java).apply {
                         putExtra("className", "WireGuardConnectivityWatcherService")
-                        action = ShortcutsActivity.Action.START.name
+                        action = ShortcutContract.Action.START.name
                     },
                 shortcutIcon = R.drawable.auto_play,
             ),
@@ -68,7 +67,7 @@ class DynamicShortcutManager(
                 intent =
                     Intent(context, ShortcutsActivity::class.java).apply {
                         putExtra("className", "WireGuardConnectivityWatcherService")
-                        action = ShortcutsActivity.Action.STOP.name
+                        action = ShortcutContract.Action.STOP.name
                     },
                 shortcutIcon = R.drawable.auto_pause,
             ),

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

@@ -0,0 +1,31 @@
+package com.zaneschepke.wireguardautotunnel.core.shortcut
+
+object ShortcutContract {
+
+    const val EXTRA_SHORTCUT_TYPE = "com.zaneschepke.wireguardautotunnel.shortcut.TYPE"
+
+    const val EXTRA_TUNNEL_NAME = "tunnelName"
+
+    const val EXTRA_CLASS_NAME = "className"
+
+    enum class ShortcutType(val value: String) {
+        TUNNEL("tunnel"),
+        AUTO_TUNNEL("auto_tunnel"),
+    }
+
+    enum class Action {
+        START,
+        STOP,
+    }
+
+    object Legacy {
+
+        const val TUNNEL_PROVIDER_NAME = "TunnelProvider"
+
+        const val AUTO_TUNNEL_SERVICE_CLASS_NAME = "AutoTunnelService"
+
+        const val TUNNEL_SERVICE_NAME = "WireGuardTunnelService"
+
+        const val AUTO_TUNNEL_SERVICE_NAME = "WireGuardConnectivityWatcherService"
+    }
+}

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

@@ -2,75 +2,25 @@ 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 dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
+import com.zaneschepke.wireguardautotunnel.core.orchestration.ShortcutCoordinator
+import com.zaneschepke.wireguardautotunnel.di.Scope
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
-import timber.log.Timber
+import org.koin.android.ext.android.inject
+import org.koin.core.qualifier.named
 
-@AndroidEntryPoint
 class ShortcutsActivity : ComponentActivity() {
-    @Inject lateinit var appDataRepository: AppDataRepository
 
-    @Inject lateinit var serviceManager: ServiceManager
+    private val shortcutCoordinator: ShortcutCoordinator by inject()
 
-    @Inject lateinit var tunnelManager: TunnelManager
-
-    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
+    private val applicationScope: CoroutineScope by inject(named(Scope.APPLICATION))
 
     override fun onCreate(savedInstanceState: Bundle?) {
+
         super.onCreate(savedInstanceState)
-        applicationScope.launch {
-            val settings = appDataRepository.settings.get()
-            if (settings.isShortcutsEnabled) {
-                when (intent.getStringExtra(CLASS_NAME_EXTRA_KEY)) {
-                    LEGACY_TUNNEL_SERVICE_NAME,
-                    TunnelProvider::class.java.simpleName -> {
-                        val tunnelName = intent.getStringExtra(TUNNEL_NAME_EXTRA_KEY)
-                        Timber.d("Tunnel name extra: $tunnelName")
-                        val tunnelConfig =
-                            tunnelName?.let {
-                                appDataRepository.tunnels.getAll().firstOrNull {
-                                    it.tunName == tunnelName
-                                }
-                            } ?: appDataRepository.getStartTunnelConfig()
-                        Timber.d("Shortcut action on name: ${tunnelConfig?.tunName}")
-                        tunnelConfig?.let {
-                            when (intent.action) {
-                                Action.START.name -> tunnelManager.startTunnel(it)
-                                Action.STOP.name -> tunnelManager.stopTunnel()
-                                else -> Unit
-                            }
-                        }
-                    }
-                    AutoTunnelService::class.java.simpleName,
-                    LEGACY_AUTO_TUNNEL_SERVICE_NAME -> {
-                        when (intent.action) {
-                            Action.START.name -> serviceManager.startAutoTunnel()
-                            Action.STOP.name -> serviceManager.stopAutoTunnel()
-                        }
-                    }
-                }
-            }
-        }
+
         finish()
-    }
 
-    enum class Action {
-        START,
-        STOP,
-    }
-
-    companion object {
-        const val LEGACY_TUNNEL_SERVICE_NAME = "WireGuardTunnelService"
-        const val LEGACY_AUTO_TUNNEL_SERVICE_NAME = "WireGuardConnectivityWatcherService"
-        const val TUNNEL_NAME_EXTRA_KEY = "tunnelName"
-        const val CLASS_NAME_EXTRA_KEY = "className"
+        applicationScope.launch { shortcutCoordinator.handle(intent) }
     }
 }

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

@@ -0,0 +1,116 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel
+
+import android.app.Notification
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import com.zaneschepke.tunnel.ApplicationProvider
+import com.zaneschepke.tunnel.model.BackendMode
+import com.zaneschepke.tunnel.state.BackendStatus
+import com.zaneschepke.wireguardautotunnel.MainActivity
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import com.zaneschepke.wireguardautotunnel.notification.AndroidNotificationService
+import com.zaneschepke.wireguardautotunnel.notification.NotificationService
+import com.zaneschepke.wireguardautotunnel.notification.NotificationService.Companion.PROXY_GROUP_KEY
+import com.zaneschepke.wireguardautotunnel.notification.NotificationService.Companion.VPN_GROUP_KEY
+import com.zaneschepke.wireguardautotunnel.notification.TunnelNotificationLine
+import com.zaneschepke.wireguardautotunnel.notification.TunnelNotificationService
+import com.zaneschepke.wireguardautotunnel.service.tile.TunnelTileRefresher
+import com.zaneschepke.wireguardautotunnel.ui.state.DisplayTunnelState
+import kotlinx.coroutines.flow.first
+
+class AndroidApplicationProvider(
+    private val notificationService: NotificationService,
+    private val tunnelNotificationService: TunnelNotificationService,
+    private val tunnelRepository: TunnelRepository,
+) : ApplicationProvider {
+
+    private val context: Context = notificationService.context
+
+    override fun refreshTile(context: Context) {
+        TunnelTileRefresher.refresh(context)
+    }
+
+    override fun createVpnConfigurePendingIntent(context: Context): PendingIntent {
+        return PendingIntent.getActivity(
+            context,
+            0,
+            Intent(context, MainActivity::class.java).apply {
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP)
+            },
+            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT,
+        )
+    }
+
+    override val vpnInitNotification: Notification
+        get() =
+            notificationService.createNotification(
+                channel = AndroidNotificationService.NotificationChannels.Tunnel.VPN,
+                title = context.getString(R.string.initializing),
+                onGoing = true,
+                groupKey = VPN_GROUP_KEY,
+            )
+
+    override val proxyInitNotification: Notification
+        get() =
+            notificationService.createNotification(
+                channel = AndroidNotificationService.NotificationChannels.Tunnel.Proxy,
+                title = context.getString(R.string.initializing),
+                onGoing = true,
+                groupKey = PROXY_GROUP_KEY,
+            )
+
+    override val vpnNotificationId: Int
+        get() = NotificationService.VPN_NOTIFICATION_ID
+
+    override val proxyNotificationId: Int
+        get() = NotificationService.PROXY_NOTIFICATION_ID
+
+    override suspend fun buildVpnPersistentNotification(
+        currentStatus: BackendStatus
+    ): Notification {
+        val lines = computeVpnNotificationLines(currentStatus)
+        return tunnelNotificationService.buildVpnPersistentNotification(lines)
+    }
+
+    override suspend fun buildProxyPersistentNotification(
+        currentStatus: BackendStatus
+    ): Notification {
+        val lines = computeProxyNotificationLines(currentStatus)
+        return tunnelNotificationService.buildProxyPersistentNotification(lines)
+    }
+
+    private suspend fun computeVpnNotificationLines(
+        status: BackendStatus
+    ): Map<Int, TunnelNotificationLine> {
+        val activeTunnels = status.activeTunnels
+        val allTunnels = tunnelRepository.userTunnelsFlow.first()
+        return activeTunnels
+            .mapNotNull { (id, activeTunnel) ->
+                val mode = activeTunnel.mode ?: return@mapNotNull null
+                if (mode !is BackendMode.Vpn && mode !is BackendMode.Proxy.KillSwitchPrimary)
+                    return@mapNotNull null
+                val tunnel = allTunnels.find { it.id == id } ?: return@mapNotNull null
+                val displayState = DisplayTunnelState.from(activeTunnel)
+                TunnelNotificationLine(id, tunnel.name, displayState)
+            }
+            .associateBy { it.id }
+    }
+
+    private suspend fun computeProxyNotificationLines(
+        status: BackendStatus
+    ): Map<Int, TunnelNotificationLine> {
+        val activeTunnels = status.activeTunnels
+        val allTunnels = tunnelRepository.userTunnelsFlow.first()
+        return activeTunnels
+            .mapNotNull { (id, activeTunnel) ->
+                val mode = activeTunnel.mode ?: return@mapNotNull null
+                if (mode !is BackendMode.Proxy.Standard) return@mapNotNull null
+                val tunnel = allTunnels.find { it.id == id } ?: return@mapNotNull null
+                val displayState = DisplayTunnelState.from(activeTunnel)
+                TunnelNotificationLine(id, tunnel.name, displayState)
+            }
+            .associateBy { it.id }
+    }
+}

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

@@ -1,292 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.tunnel
-
-import com.wireguard.android.backend.Tunnel
-import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-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.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.state.PingState
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
-import com.zaneschepke.wireguardautotunnel.ui.state.ConfigProxy
-import com.zaneschepke.wireguardautotunnel.util.extensions.asTunnelState
-import java.util.concurrent.ConcurrentHashMap
-import kotlin.coroutines.cancellation.CancellationException
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import org.amnezia.awg.crypto.Key
-import timber.log.Timber
-
-abstract class BaseTunnel(
-    private val applicationScope: CoroutineScope,
-    private val appDataRepository: AppDataRepository,
-    private val serviceManager: ServiceManager,
-) : TunnelProvider {
-
-    private val _errorEvents = MutableSharedFlow<Pair<TunnelConf, BackendCoreException>>()
-    override val errorEvents = _errorEvents.asSharedFlow()
-
-    private val _messageEvents = MutableSharedFlow<Pair<TunnelConf, BackendMessage>>()
-    override val messageEvents = _messageEvents.asSharedFlow()
-
-    private val activeTuns = MutableStateFlow<Map<TunnelConf, TunnelState>>(emptyMap())
-    private val tunJobs = ConcurrentHashMap<Int, Job>()
-    override val activeTunnels = activeTuns.asStateFlow()
-
-    private val tunMutex = Mutex()
-    private val tunStatusMutex = Mutex()
-    private val bounceTunnelMutex = Mutex()
-
-    override val bouncingTunnelIds = ConcurrentHashMap<Int, TunnelStatus.StopReason>()
-
-    abstract suspend fun startBackend(tunnel: TunnelConf)
-
-    abstract fun stopBackend(tunnel: TunnelConf)
-
-    override fun hasVpnPermission(): Boolean {
-        return serviceManager.hasVpnPermission()
-    }
-
-    override suspend fun updateTunnelStatus(
-        tunnelConf: TunnelConf,
-        status: TunnelStatus?,
-        stats: TunnelStatistics?,
-        pingStates: Map<Key, PingState>?,
-        handshakeSuccessLogs: Boolean?,
-    ) {
-        tunStatusMutex.withLock {
-            activeTuns.update { currentTuns ->
-                val originalConf = currentTuns.getKeyById(tunnelConf.id) ?: tunnelConf
-                val existingState = currentTuns.getValueById(tunnelConf.id) ?: TunnelState()
-                val newStatus = status ?: existingState.status
-                if (newStatus == TunnelStatus.Down) {
-                    Timber.d("Removing tunnel ${tunnelConf.id} from activeTunnels as state is DOWN")
-                    cleanUpTunJob(tunnelConf)
-                    currentTuns - originalConf
-                } else if (
-                    existingState.status == newStatus &&
-                        stats == null &&
-                        pingStates == null &&
-                        handshakeSuccessLogs == null
-                ) {
-                    Timber.d("Skipping redundant state update for ${tunnelConf.id}: $newStatus")
-                    currentTuns
-                } else {
-                    val updated =
-                        existingState.copy(
-                            status = newStatus,
-                            statistics = stats ?: existingState.statistics,
-                            pingStates = pingStates ?: existingState.pingStates,
-                            handshakeSuccessLogs =
-                                handshakeSuccessLogs ?: existingState.handshakeSuccessLogs,
-                        )
-                    currentTuns + (originalConf to updated)
-                }
-            }
-            handleServiceStateOnChange()
-        }
-    }
-
-    private suspend fun stopActiveTunnels() {
-        activeTunnels.value.forEach { (config, state) ->
-            if (state.status.isUpOrStarting()) {
-                stopTunnel(config)
-            }
-        }
-    }
-
-    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 startTunnel(tunnelConf: TunnelConf) {
-        if (activeTuns.exists(tunnelConf.id) || tunJobs.containsKey(tunnelConf.id))
-            return Timber.w("Tunnel is already running ${tunnelConf.name}")
-        // For userspace, we need to make sure all previous tunnels are down
-        if (this@BaseTunnel is UserspaceTunnel) stopActiveTunnels()
-        tunMutex.withLock {
-            val job =
-                applicationScope.launch {
-                    try {
-                        Timber.d("Starting tunnel ${tunnelConf.id}...")
-                        startTunnelInner(tunnelConf)
-                        Timber.d("Started complete for tunnel ${tunnelConf.name}...")
-                        // catch cancellation that could occur before and during startTunnelInner
-                        // and trigger at that suspend point
-                    } catch (e: CancellationException) {
-                        Timber.w(
-                            "Tunnel start has been cancelled as ${tunnelConf.name} failed to start"
-                        )
-                    }
-                }
-            tunJobs[tunnelConf.id] = job
-            job.invokeOnCompletion {
-                tunJobs.remove(tunnelConf.id)
-                Timber.d("Start job completed for tunnel ${tunnelConf.id}")
-            }
-        }
-    }
-
-    private suspend fun startTunnelInner(tunnelConf: TunnelConf) {
-        configureTunnelCallbacks(tunnelConf)
-        Timber.d("Starting backend for tunnel ${tunnelConf.id}...")
-
-        var currentConf = tunnelConf
-        var restoreAttempted = false
-        var originalError: BackendCoreException? = null
-
-        while (true) {
-            try {
-                startBackend(currentConf)
-                updateTunnelStatus(currentConf, TunnelStatus.Up)
-                Timber.d("Started for tun ${currentConf.id}...")
-                saveTunnelActiveState(currentConf, true)
-                serviceManager.startTunnelForegroundService()
-                if (restoreAttempted)
-                    _messageEvents.emit(tunnelConf to BackendMessage.BounceRecovery)
-                if (bouncingTunnelIds[currentConf.id] is TunnelStatus.StopReason.Ping) {
-                    _messageEvents.emit(tunnelConf to BackendMessage.BounceSuccess)
-                }
-                return // Success, return
-            } catch (e: BackendCoreException) {
-                originalError = originalError ?: e
-                val bounceReason = bouncingTunnelIds[currentConf.id]
-                if (!restoreAttempted && bounceReason is TunnelStatus.StopReason.Ping) {
-                    Timber.i(
-                        "Attempting to recover bounce failure with previously resolved endpoints for ${currentConf.name}"
-                    )
-                    try {
-                        val previouslyResolved = bounceReason.previouslyResolvedEndpoints
-                        val configProxy = ConfigProxy.from(currentConf.toAmConfig())
-                        val updatedConfigProxy =
-                            configProxy.copy(
-                                peers =
-                                    configProxy.peers.map {
-                                        it.copy(
-                                            endpoint =
-                                                previouslyResolved[it.publicKey] ?: it.endpoint
-                                        )
-                                    }
-                            )
-                        val (wg, amnezia) = updatedConfigProxy.buildConfigs()
-                        currentConf =
-                            currentConf.copyWithCallback(
-                                amQuick = amnezia.toAwgQuickString(true, false),
-                                wgQuick = wg.toWgQuickString(true),
-                            )
-                        bouncingTunnelIds.remove(currentConf.id)
-                        restoreAttempted = true
-                        continue // Retry
-                    } catch (e: Exception) {
-                        Timber.e(
-                            e,
-                            "Failed to update config with resolved endpoints for ${currentConf.name}",
-                        )
-                        // Fall through to failure (will emit BounceFailed since
-                        // retryAttempted=true)
-                    }
-                }
-                Timber.e(e, "Failed to start backend for ${currentConf.name}")
-                val emitError =
-                    if (restoreAttempted) BackendCoreException.BounceFailed(originalError) else e
-                _errorEvents.emit(currentConf to emitError)
-                updateTunnelStatus(currentConf, TunnelStatus.Down)
-                return
-            }
-        }
-    }
-
-    private suspend fun saveTunnelActiveState(tunnelConf: TunnelConf, active: Boolean) {
-        val tunnelCopy = tunnelConf.copyWithCallback(isActive = active)
-        appDataRepository.tunnels.save(tunnelCopy)
-    }
-
-    override suspend fun stopTunnel(tunnelConf: TunnelConf?, reason: TunnelStatus.StopReason) {
-        if (tunnelConf == null) return stopActiveTunnels()
-        tunMutex.withLock {
-            if (activeTuns.isStarting(tunnelConf.id))
-                return handleStuckStartingTunnelShutdown(tunnelConf)
-            updateTunnelStatus(tunnelConf, TunnelStatus.Stopping(reason))
-            stopTunnelInner(tunnelConf)
-        }
-    }
-
-    private suspend fun stopTunnelInner(tunnelConf: TunnelConf) {
-        try {
-            val tunnel = activeTuns.findTunnel(tunnelConf.id) ?: return
-            stopBackend(tunnel)
-            saveTunnelActiveState(tunnelConf, false)
-            removeActiveTunnel(tunnel)
-        } catch (e: BackendCoreException) {
-            Timber.e(e, "Failed to stop tunnel ${tunnelConf.id}")
-            _errorEvents.emit(tunnelConf to e)
-            updateTunnelStatus(tunnelConf, TunnelStatus.Down)
-        }
-    }
-
-    private fun handleServiceStateOnChange() {
-        if (activeTuns.value.isEmpty()) serviceManager.stopTunnelForegroundService()
-    }
-
-    private suspend fun handleStuckStartingTunnelShutdown(tunnel: TunnelConf) {
-        Timber.d("Stuck in starting state so cancelling job for tunnel ${tunnel.name}")
-        try {
-            tunJobs[tunnel.id]?.cancel() ?: Timber.d("No job found for ${tunnel.name}")
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to cancel job for ${tunnel.name}")
-        } finally {
-            updateTunnelStatus(tunnel, TunnelStatus.Down)
-        }
-    }
-
-    private fun cleanUpTunJob(tunnel: TunnelConf) {
-        Timber.d("Removing job for ${tunnel.name}")
-        tunJobs -= tunnel.id
-    }
-
-    private fun removeActiveTunnel(tunnelConf: TunnelConf) {
-        activeTuns.update { current -> current.toMutableMap().apply { remove(tunnelConf) } }
-    }
-
-    override suspend fun bounceTunnel(tunnelConf: TunnelConf, reason: TunnelStatus.StopReason) {
-        bounceTunnelMutex.withLock {
-            Timber.i(
-                "Bounce tunnel ${tunnelConf.name} for reason: $reason, current bouncing: ${bouncingTunnelIds.size}"
-            )
-            bouncingTunnelIds[tunnelConf.id] = reason
-            runCatching {
-                stopTunnel(tunnelConf, reason)
-                delay(BOUNCE_DELAY)
-                startTunnel(tunnelConf)
-            }
-        }
-    }
-
-    override suspend fun runningTunnelNames(): Set<String> =
-        activeTuns.value.keys.map { it.tunName }.toSet()
-
-    companion object {
-        const val BOUNCE_DELAY = 300L
-    }
-}

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

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

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

@@ -1,74 +0,0 @@
-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.zaneschepke.wireguardautotunnel.di.ApplicationScope
-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.events.BackendCoreException
-import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
-import com.zaneschepke.wireguardautotunnel.domain.state.WireGuardStatistics
-import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendCoreException
-import javax.inject.Inject
-import kotlinx.coroutines.CoroutineScope
-import timber.log.Timber
-
-class KernelTunnel
-@Inject
-constructor(
-    @ApplicationScope private val applicationScope: CoroutineScope,
-    serviceManager: ServiceManager,
-    appDataRepository: AppDataRepository,
-    @Kernel private val backend: Backend,
-) : BaseTunnel(applicationScope, appDataRepository, serviceManager) {
-
-    override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
-        return try {
-            WireGuardStatistics(backend.getStatistics(tunnelConf))
-        } catch (e: Exception) {
-            Timber.e(e)
-            null
-        }
-    }
-
-    override suspend fun startBackend(tunnel: TunnelConf) {
-        // name too long for kernel mode
-        if (!tunnel.isNameKernelCompatible) throw BackendCoreException.TunnelNameTooLong
-        try {
-            updateTunnelStatus(tunnel, TunnelStatus.Starting)
-            backend.setState(tunnel, Tunnel.State.UP, tunnel.toWgConfig())
-        } catch (e: BackendException) {
-            Timber.e(e, "Failed to start up backend for tunnel ${tunnel.name}")
-            throw e.toBackendCoreException()
-        } catch (e: IllegalArgumentException) {
-            Timber.e(e, "Failed to start up backend for tunnel ${tunnel.name}")
-            throw BackendCoreException.Config
-        }
-    }
-
-    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.toBackendCoreException()
-        }
-    }
-
-    override fun setBackendMode(backendMode: BackendMode) {
-        Timber.w("Not yet implemented for kernel")
-    }
-
-    override fun getBackendMode(): BackendMode {
-        return BackendMode.Inactive
-    }
-
-    override suspend fun runningTunnelNames(): Set<String> {
-        return backend.runningTunnelNames
-    }
-}

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

@@ -0,0 +1,52 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel
+
+import com.zaneschepke.tunnel.Tunnel
+import com.zaneschepke.tunnel.backend.Backend
+import com.zaneschepke.tunnel.model.BackendMode
+import com.zaneschepke.tunnel.state.BackendStatus
+import com.zaneschepke.wireguardautotunnel.domain.model.LockdownSettings
+import kotlin.concurrent.atomics.ExperimentalAtomicApi
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.plus
+
+@OptIn(ExperimentalCoroutinesApi::class, ExperimentalAtomicApi::class)
+class TunnelBackendProvider(
+    private val backend: Backend,
+    applicationScope: CoroutineScope,
+    ioDispatcher: CoroutineDispatcher,
+) : TunnelProvider {
+
+    override val backendStatus: StateFlow<BackendStatus> =
+        backend.status.stateIn(
+            scope = applicationScope.plus(ioDispatcher),
+            started = SharingStarted.Eagerly,
+            initialValue = BackendStatus(),
+        )
+
+    override val events = backend.events
+
+    override suspend fun startTunnel(tunnel: Tunnel, mode: BackendMode): Result<Unit> {
+        return backend.start(tunnel = tunnel, mode = mode)
+    }
+
+    override suspend fun stopTunnel(tunnelId: Int): Result<Unit> {
+        return backend.stop(tunnelId)
+    }
+
+    override suspend fun stopActiveTunnels(): Result<Unit> {
+        return backend.stopAllActiveTunnels()
+    }
+
+    override suspend fun setLockDown(settings: LockdownSettings): Result<Unit> {
+        return backend.setKillSwitch(settings.toKillSwitchConfig())
+    }
+
+    override suspend fun disableLockDown(): Result<Unit> {
+        return backend.disableKillSwitch()
+    }
+}

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

@@ -1,198 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.tunnel
-
-import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-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.events.BackendCoreException
-import com.zaneschepke.wireguardautotunnel.domain.events.BackendMessage
-import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
-import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.state.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 kotlin.concurrent.atomics.AtomicBoolean
-import kotlin.concurrent.atomics.AtomicReference
-import kotlin.concurrent.atomics.ExperimentalAtomicApi
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.plus
-import org.amnezia.awg.crypto.Key
-import timber.log.Timber
-
-@OptIn(ExperimentalCoroutinesApi::class)
-class TunnelManager
-@Inject
-constructor(
-    @Kernel private val kernelTunnel: TunnelProvider,
-    @Userspace private val userspaceTunnel: TunnelProvider,
-    @ProxyUserspace private val proxyUserspaceTunnel: TunnelProvider,
-    private val serviceManager: ServiceManager,
-    private val appDataRepository: AppDataRepository,
-    @ApplicationScope applicationScope: CoroutineScope,
-    @IoDispatcher ioDispatcher: CoroutineDispatcher,
-) : TunnelProvider {
-
-    @OptIn(ExperimentalAtomicApi::class)
-    private val tunnelProviderFlow: StateFlow<TunnelProvider> = run {
-        val currentBackend = AtomicReference(userspaceTunnel)
-        val currentSettings = AtomicReference(AppSettings())
-        val initialEmit = AtomicBoolean(true)
-
-        appDataRepository.settings.flow
-            .filterNotNull()
-            // ignore default state
-            .filterNot { it == AppSettings() }
-            .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 oldBackend = currentBackend.exchange(newBackend)
-                val oldSettings = currentSettings.exchange(settings)
-
-                if ((oldSettings.appMode != settings.appMode) && !isInitialEmit) {
-                    oldBackend.stopTunnel()
-                    if (oldSettings.appMode == AppMode.LOCK_DOWN)
-                        proxyUserspaceTunnel.setBackendMode(BackendMode.Inactive)
-                }
-                if (settings.appMode == AppMode.LOCK_DOWN) {
-                    // kill switch will always catch all ipv6, just add ipv4 networks for allowsIps
-                    val allowedIps =
-                        if (settings.isLanOnKillSwitchEnabled) TunnelConf.IPV4_PUBLIC_NETWORKS
-                        else emptySet()
-                    try {
-                        // TODO handle situation where they don't have vpn permission, request it
-                        if (hasVpnPermission()) {
-                            proxyUserspaceTunnel.setBackendMode(BackendMode.KillSwitch(allowedIps))
-                        }
-                    } catch (e: BackendCoreException) {
-                        // TODO expose this error to user
-                        Timber.e(e)
-                    }
-                }
-                // restore state if configured
-                if (isInitialEmit && settings.isRestoreOnBootEnabled) {
-                    Timber.d("Restoring previous state")
-                    if (
-                        settings.isAutoTunnelEnabled &&
-                            serviceManager.autoTunnelService.value == null
-                    ) {
-                        serviceManager.startAutoTunnel()
-                    } else {
-                        val previouslyActiveTuns = appDataRepository.tunnels.getActive()
-                        val tunsToStart =
-                            previouslyActiveTuns.filterNot { tun ->
-                                activeTunnels.value.any { tun.id == it.key.id }
-                            }
-                        tunsToStart.forEach { startTunnel(it) }
-                    }
-                }
-            }
-            .map { (_, backend) -> backend }
-            .stateIn(
-                scope = applicationScope.plus(ioDispatcher),
-                started = SharingStarted.Eagerly,
-                initialValue = userspaceTunnel,
-            )
-    }
-
-    override val activeTunnels: StateFlow<Map<TunnelConf, TunnelState>> =
-        tunnelProviderFlow
-            .flatMapLatest { it.activeTunnels }
-            .stateIn(
-                scope = applicationScope.plus(ioDispatcher),
-                started = SharingStarted.Eagerly,
-                initialValue = emptyMap(),
-            )
-
-    @OptIn(ExperimentalCoroutinesApi::class)
-    override val errorEvents: SharedFlow<Pair<TunnelConf, BackendCoreException>> =
-        tunnelProviderFlow
-            .flatMapLatest { it.errorEvents }
-            .shareIn(
-                scope = applicationScope.plus(ioDispatcher),
-                started = SharingStarted.Eagerly,
-                replay = 0,
-            )
-
-    @OptIn(ExperimentalCoroutinesApi::class)
-    override val messageEvents: SharedFlow<Pair<TunnelConf, BackendMessage>> =
-        tunnelProviderFlow
-            .flatMapLatest { it.messageEvents }
-            .filterNotNull()
-            .shareIn(
-                scope = applicationScope.plus(ioDispatcher),
-                started = SharingStarted.Eagerly,
-                replay = 0,
-            )
-
-    override val bouncingTunnelIds: ConcurrentHashMap<Int, TunnelStatus.StopReason> =
-        tunnelProviderFlow.value.bouncingTunnelIds
-
-    override fun hasVpnPermission(): Boolean {
-        return userspaceTunnel.hasVpnPermission()
-    }
-
-    override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
-        return tunnelProviderFlow.value.getStatistics(tunnelConf)
-    }
-
-    override suspend fun startTunnel(tunnelConf: TunnelConf) {
-        tunnelProviderFlow.value.startTunnel(tunnelConf)
-    }
-
-    override suspend fun stopTunnel(tunnelConf: TunnelConf?, reason: TunnelStatus.StopReason) {
-        tunnelProviderFlow.value.stopTunnel(tunnelConf, reason)
-    }
-
-    override suspend fun bounceTunnel(tunnelConf: TunnelConf, reason: TunnelStatus.StopReason) {
-        tunnelProviderFlow.value.bounceTunnel(tunnelConf, reason)
-    }
-
-    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 suspend fun updateTunnelStatus(
-        tunnelConf: TunnelConf,
-        status: TunnelStatus?,
-        stats: TunnelStatistics?,
-        pingStates: Map<Key, PingState>?,
-        handshakeSuccessLogs: Boolean?,
-    ) {
-        tunnelProviderFlow.value.updateTunnelStatus(
-            tunnelConf,
-            status,
-            stats,
-            pingStates,
-            handshakeSuccessLogs,
-        )
-    }
-}

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

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

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

@@ -1,69 +1,26 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
-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.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.state.PingState
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
-import java.util.concurrent.ConcurrentHashMap
-import kotlinx.coroutines.flow.SharedFlow
+import com.zaneschepke.tunnel.Tunnel
+import com.zaneschepke.tunnel.event.TunnelEvent
+import com.zaneschepke.tunnel.model.BackendMode
+import com.zaneschepke.tunnel.state.BackendStatus
+import com.zaneschepke.wireguardautotunnel.domain.model.LockdownSettings
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
-import org.amnezia.awg.crypto.Key
 
 interface TunnelProvider {
-    /** Starts the specified tunnel configuration. */
-    suspend fun startTunnel(tunnelConf: TunnelConf)
 
-    /**
-     * Stops the specified tunnel, or all tunnels if none is provided.
-     *
-     * @param tunnelConf The tunnel to stop, or null to stop all active tunnels.
-     * @param reason The reason for stopping, defaults to USER for manual stops. Callers should
-     *   override with specific reasons (e.g., PING, CONFIG_CHANGED) when applicable.
-     */
-    suspend fun stopTunnel(
-        tunnelConf: TunnelConf? = null,
-        reason: TunnelStatus.StopReason = TunnelStatus.StopReason.User,
-    )
+    suspend fun startTunnel(tunnel: Tunnel, mode: BackendMode): Result<Unit>
 
-    /**
-     * Bounces (stops and restarts) the specified tunnel.
-     *
-     * @param tunnelConf The tunnel to bounce.
-     * @param reason The reason for bouncing, defaults to User for manual actions. Callers should
-     *   override with specific reasons (e.g., Ping, ConfigChanged) when applicable.
-     */
-    suspend fun bounceTunnel(
-        tunnelConf: TunnelConf,
-        reason: TunnelStatus.StopReason = TunnelStatus.StopReason.User,
-    )
+    suspend fun stopTunnel(tunnelId: Int): Result<Unit>
 
-    fun setBackendMode(backendMode: BackendMode)
+    suspend fun stopActiveTunnels(): Result<Unit>
 
-    fun getBackendMode(): BackendMode
+    suspend fun setLockDown(settings: LockdownSettings): Result<Unit>
 
-    suspend fun runningTunnelNames(): Set<String>
+    suspend fun disableLockDown(): Result<Unit>
 
-    fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics?
+    val backendStatus: StateFlow<BackendStatus>
 
-    val activeTunnels: StateFlow<Map<TunnelConf, TunnelState>>
-
-    val errorEvents: SharedFlow<Pair<TunnelConf, BackendCoreException>>
-
-    val messageEvents: SharedFlow<Pair<TunnelConf, BackendMessage>>
-
-    val bouncingTunnelIds: ConcurrentHashMap<Int, TunnelStatus.StopReason>
-
-    fun hasVpnPermission(): Boolean
-
-    suspend fun updateTunnelStatus(
-        tunnelConf: TunnelConf,
-        status: TunnelStatus? = null,
-        stats: TunnelStatistics? = null,
-        pingStates: Map<Key, PingState>? = null,
-        handshakeSuccessLogs: Boolean? = null,
-    )
+    val events: Flow<TunnelEvent>
 }

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

@@ -1,139 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.tunnel
-
-import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.data.model.DnsProtocol
-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.model.AppProxySettings
-import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.state.AmneziaStatistics
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
-import com.zaneschepke.wireguardautotunnel.util.extensions.asAmBackendMode
-import com.zaneschepke.wireguardautotunnel.util.extensions.asBackendMode
-import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendCoreException
-import java.io.IOException
-import java.util.*
-import javax.inject.Inject
-import kotlinx.coroutines.CoroutineScope
-import org.amnezia.awg.backend.Backend
-import org.amnezia.awg.backend.BackendException
-import org.amnezia.awg.backend.ProxyGoBackend
-import org.amnezia.awg.backend.Tunnel
-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: CoroutineScope,
-    val serviceManager: ServiceManager,
-    val appDataRepository: AppDataRepository,
-    private val backend: Backend,
-) : BaseTunnel(applicationScope, appDataRepository, serviceManager) {
-
-    override suspend fun startBackend(tunnel: TunnelConf) {
-        try {
-            updateTunnelStatus(tunnel, TunnelStatus.Starting)
-
-            val proxies: List<Proxy> =
-                when (backend) {
-                    is ProxyGoBackend -> {
-                        val proxySettings = appDataRepository.proxySettings.get()
-                        Timber.d("Adding proxy configs")
-                        buildList {
-                            if (proxySettings.socks5ProxyEnabled) {
-                                add(
-                                    Socks5Proxy(
-                                        proxySettings.socks5ProxyBindAddress
-                                            ?: AppProxySettings.DEFAULT_SOCKS_BIND_ADDRESS,
-                                        proxySettings.proxyUsername,
-                                        proxySettings.proxyPassword,
-                                    )
-                                )
-                            }
-                            if (proxySettings.httpProxyEnabled) {
-                                add(
-                                    HttpProxy(
-                                        proxySettings.httpProxyBindAddress
-                                            ?: AppProxySettings.DEFAULT_HTTP_BIND_ADDRESS,
-                                        proxySettings.proxyUsername,
-                                        proxySettings.proxyPassword,
-                                    )
-                                )
-                            }
-                        }
-                    }
-                    else -> emptyList()
-                }
-            val setting = appDataRepository.settings.get()
-            val config = tunnel.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(tunnel, Tunnel.State.UP, updatedConfig)
-        } catch (e: BackendException) {
-            Timber.e(e, "Failed to start up backend for tunnel ${tunnel.name}")
-            throw e.toBackendCoreException()
-        } catch (e: IllegalArgumentException) {
-            Timber.e(e, "Failed to start up backend for tunnel ${tunnel.name}")
-            throw BackendCoreException.Config
-        }
-    }
-
-    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.toBackendCoreException()
-        }
-    }
-
-    override fun setBackendMode(backendMode: BackendMode) {
-        Timber.d("Setting backend mode: $backendMode")
-        try {
-            backend.backendMode = backendMode.asAmBackendMode()
-        } catch (e: BackendException) {
-            throw e.toBackendCoreException()
-            // TODO this should be mapped to BackendException in the lib
-        } catch (e: IOException) {
-            throw BackendCoreException.NotAuthorized
-        }
-    }
-
-    override fun getBackendMode(): BackendMode {
-        return backend.backendMode.asBackendMode()
-    }
-
-    override suspend fun runningTunnelNames(): Set<String> {
-        return backend.runningTunnelNames
-    }
-
-    override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
-        return try {
-            AmneziaStatistics(backend.getStatistics(tunnelConf))
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to get stats for ${tunnelConf.tunName}")
-            null
-        }
-    }
-}

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

@@ -1,31 +1,27 @@
 package com.zaneschepke.wireguardautotunnel.core.worker
 
 import android.content.Context
-import androidx.hilt.work.HiltWorker
-import androidx.work.*
-import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
+import androidx.work.CoroutineWorker
+import androidx.work.ExistingPeriodicWorkPolicy
+import androidx.work.PeriodicWorkRequestBuilder
+import androidx.work.WorkManager
+import androidx.work.WorkerParameters
+import com.zaneschepke.wireguardautotunnel.domain.repository.AutoTunnelSettingsRepository
+import com.zaneschepke.wireguardautotunnel.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.service.autotunnel.AutoTunnelStateHolder
 import java.util.concurrent.TimeUnit
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.withContext
 import timber.log.Timber
 
-@HiltWorker
-class ServiceWorker
-@AssistedInject
-constructor(
-    @Assisted private val context: Context,
-    @Assisted private val params: WorkerParameters,
+class ServiceWorker(
+    context: Context,
+    params: WorkerParameters,
     private val serviceManager: ServiceManager,
-    private val appDataRepository: AppDataRepository,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+    private val autoTunnelSettingsRepository: AutoTunnelSettingsRepository,
+    private val autoTunnelStateHolder: AutoTunnelStateHolder,
 ) : CoroutineWorker(context, params) {
 
     companion object {
-        private const val TAG = "service_worker"
+        private const val TAG = "auto_tunnel_service_monitor"
 
         fun stop(context: Context) {
             WorkManager.getInstance(context).cancelAllWorkByTag(TAG)
@@ -47,16 +43,19 @@ constructor(
         }
     }
 
-    override suspend fun doWork(): Result =
-        withContext(ioDispatcher) {
-            Timber.i("Service worker started")
-            with(appDataRepository.settings.get()) {
-                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.startAutoTunnel()
-                }
-            }
-            Result.success()
+    override suspend fun doWork(): Result {
+        Timber.i("AutoTunnel reconciliation worker running")
+
+        val settings = autoTunnelSettingsRepository.getAutoTunnelSettings()
+
+        if (!settings.isAutoTunnelEnabled) {
+            return Result.success()
         }
+
+        if (autoTunnelStateHolder.active.value) return Result.success()
+
+        serviceManager.startAutoTunnelService()
+
+        return Result.success()
+    }
 }

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

@@ -1,18 +1,40 @@
 package com.zaneschepke.wireguardautotunnel.data
 
-import androidx.room.*
+import androidx.room.AutoMigration
+import androidx.room.Database
+import androidx.room.DeleteColumn
+import androidx.room.RenameColumn
+import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
 import androidx.room.migration.AutoMigrationSpec
 import androidx.sqlite.db.SupportSQLiteDatabase
+import com.zaneschepke.wireguardautotunnel.data.dao.AutoTunnelSettingsDao
+import com.zaneschepke.wireguardautotunnel.data.dao.DnsSettingsDao
+import com.zaneschepke.wireguardautotunnel.data.dao.GeneralSettingsDao
+import com.zaneschepke.wireguardautotunnel.data.dao.LockdownSettingsDao
+import com.zaneschepke.wireguardautotunnel.data.dao.MonitoringSettingsDao
 import com.zaneschepke.wireguardautotunnel.data.dao.ProxySettingsDao
-import com.zaneschepke.wireguardautotunnel.data.dao.SettingsDao
 import com.zaneschepke.wireguardautotunnel.data.dao.TunnelConfigDao
+import com.zaneschepke.wireguardautotunnel.data.entity.AutoTunnelSettings
+import com.zaneschepke.wireguardautotunnel.data.entity.DnsSettings
+import com.zaneschepke.wireguardautotunnel.data.entity.GeneralSettings
+import com.zaneschepke.wireguardautotunnel.data.entity.LockdownSettings
+import com.zaneschepke.wireguardautotunnel.data.entity.MonitoringSettings
 import com.zaneschepke.wireguardautotunnel.data.entity.ProxySettings
-import com.zaneschepke.wireguardautotunnel.data.entity.Settings
 import com.zaneschepke.wireguardautotunnel.data.entity.TunnelConfig
 
 @Database(
-    entities = [Settings::class, TunnelConfig::class, ProxySettings::class],
-    version = 21,
+    entities =
+        [
+            TunnelConfig::class,
+            ProxySettings::class,
+            GeneralSettings::class,
+            AutoTunnelSettings::class,
+            MonitoringSettings::class,
+            DnsSettings::class,
+            LockdownSettings::class,
+        ],
+    version = 30,
     autoMigrations =
         [
             AutoMigration(from = 1, to = 2),
@@ -35,16 +57,30 @@ import com.zaneschepke.wireguardautotunnel.data.entity.TunnelConfig
             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),
+            AutoMigration(from = 26, to = 27, spec = GlobalsMigration::class),
+            AutoMigration(from = 27, to = 28, spec = DonationMigration::class),
+            AutoMigration(from = 29, to = 30, spec = SingleConfigMigration::class),
         ],
     exportSchema = true,
 )
 @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 lockdownSettingsDao(): LockdownSettingsDao
+
+    abstract fun dnsSettingsDao(): DnsSettingsDao
 }
 
 @DeleteColumn(tableName = "Settings", columnName = "default_tunnel")
@@ -99,3 +135,72 @@ class FixProxySettingsMigration : AutoMigrationSpec {
         }
     }
 }
+
+@RenameColumn.Entries(
+    RenameColumn(
+        tableName = "general_settings",
+        fromColumnName = "is_tunnel_globals_enabled",
+        toColumnName = "global_split_tunnel_enabled",
+    )
+)
+class GlobalsMigration : AutoMigrationSpec
+
+@DeleteColumn(tableName = "general_settings", columnName = "custom_split_packages")
+class DonationMigration : AutoMigrationSpec
+
+@RenameColumn.Entries(
+    RenameColumn(
+        tableName = "tunnel_config",
+        fromColumnName = "is_ipv4_preferred",
+        toColumnName = "prefer_ipv6",
+    ),
+    RenameColumn(
+        tableName = "tunnel_config",
+        fromColumnName = "am_quick",
+        toColumnName = "quick_config",
+    ),
+    RenameColumn(
+        tableName = "tunnel_config",
+        fromColumnName = "restart_on_ping_failure",
+        toColumnName = "dynamic_dns",
+    ),
+)
+@DeleteColumn.Entries(
+    DeleteColumn(tableName = "tunnel_config", columnName = "wg_quick"),
+    DeleteColumn(tableName = "tunnel_config", columnName = "ping_target"),
+    DeleteColumn(tableName = "tunnel_config", columnName = "is_Active"),
+    DeleteColumn(tableName = "monitoring_settings", columnName = "is_ping_enabled"),
+    DeleteColumn(tableName = "monitoring_settings", columnName = "is_ping_monitoring_enabled"),
+    DeleteColumn(tableName = "monitoring_settings", columnName = "tunnel_ping_interval_sec"),
+    DeleteColumn(tableName = "monitoring_settings", columnName = "tunnel_ping_attempts"),
+    DeleteColumn(tableName = "monitoring_settings", columnName = "tunnel_ping_timeout_sec"),
+    DeleteColumn(tableName = "monitoring_settings", columnName = "show_detailed_ping_stats"),
+    DeleteColumn(tableName = "auto_tunnel_settings", columnName = "debounce_delay_seconds"),
+)
+class SingleConfigMigration : AutoMigrationSpec {
+
+    override fun onPostMigrate(db: SupportSQLiteDatabase) {
+        db.execSQL(
+            """
+            UPDATE tunnel_config
+            SET prefer_ipv6 =
+                CASE prefer_ipv6
+                    WHEN 1 THEN 0
+                    WHEN 0 THEN 1
+                    ELSE 0
+                END
+        """
+        )
+
+        db.execSQL(
+            """
+            UPDATE general_settings
+            SET app_mode = CASE app_mode
+                WHEN 3 THEN 0
+                ELSE app_mode
+            END
+            """
+                .trimIndent()
+        )
+    }
+}

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

@@ -4,46 +4,36 @@ 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
 import kotlinx.coroutines.CoroutineDispatcher
 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
 
 class DataStoreManager(
     private val context: Context,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+    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")
-        val showDetailedPingStats = booleanPreferencesKey("SHOW_DETAILED_PING_STATS")
+        val shouldShowDonationSnackbar = booleanPreferencesKey("SHOW_DONATION_SNACK")
     }
 
-    // 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)
             }
         }
     }
@@ -51,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)
             }
         }
     }
@@ -63,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)
             }
         }
     }
@@ -77,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,25 +2,16 @@ package com.zaneschepke.wireguardautotunnel.data
 
 import androidx.room.RoomDatabase
 import androidx.sqlite.db.SupportSQLiteDatabase
-import com.zaneschepke.wireguardautotunnel.data.entity.ProxySettings
-import com.zaneschepke.wireguardautotunnel.data.entity.Settings
-import javax.inject.Inject
-import javax.inject.Provider
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-
-class DatabaseCallback @Inject constructor(private val databaseProvider: Provider<AppDatabase>) :
-    RoomDatabase.Callback() {
+import timber.log.Timber
 
+class DatabaseCallback(private val databaseProvider: Lazy<AppDatabase>) : RoomDatabase.Callback() {
     override fun onCreate(db: SupportSQLiteDatabase) {
         super.onCreate(db)
-
-        // Launch coroutine to insert default entry
-        CoroutineScope(Dispatchers.IO).launch {
-            val db = databaseProvider.get()
-            db.settingDao().save(Settings())
-            db.proxySettingsDoa().save(ProxySettings())
-        }
+        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

@@ -1,9 +1,9 @@
 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 com.zaneschepke.wireguardautotunnel.domain.enums.DnsProtocol
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelMode
+import com.zaneschepke.wireguardautotunnel.domain.enums.WifiDetectionMethod
 import kotlinx.serialization.json.Json
 
 class DatabaseConverters {
@@ -24,14 +24,42 @@ class DatabaseConverters {
         }
     }
 
+    @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 toMode(value: Int): TunnelMode = TunnelMode.fromValue(value)
 
-    @TypeConverter fun fromMode(mode: AppMode): Int = mode.value
+    @TypeConverter fun fromMode(mode: TunnelMode): Int = mode.value
 
     @TypeConverter fun toDnsProtocol(value: Int): DnsProtocol = DnsProtocol.fromValue(value)
 

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,19 @@
+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?>
+
+    @Query("UPDATE dns_settings SET global_tunnel_dns_enabled = :enabled")
+    suspend fun updateGlobalDnsEnabled(enabled: Boolean)
+}

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

@@ -0,0 +1,37 @@
+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 com.zaneschepke.wireguardautotunnel.domain.enums.TunnelMode
+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?>
+
+    @Query("UPDATE general_settings SET theme = :theme WHERE id = 1")
+    suspend fun updateTheme(theme: String)
+
+    @Query("UPDATE general_settings SET locale = :locale WHERE id = 1")
+    suspend fun updateLocale(locale: String)
+
+    @Query("UPDATE general_settings SET is_pin_lock_enabled = :enabled WHERE id = 1")
+    suspend fun updatePinLockEnabled(enabled: Boolean)
+
+    @Query("UPDATE general_settings SET app_mode = :tunnelMode WHERE id = 1")
+    suspend fun updateAppMode(tunnelMode: TunnelMode)
+
+    @Query("UPDATE general_settings SET global_amnezia_enabled = :enabled")
+    suspend fun updateGlobalAmneziaEnabled(enabled: Boolean)
+
+    @Query("UPDATE general_settings SET screen_recording_security = :enabled")
+    suspend fun updateScreenRecordingSecurity(enabled: Boolean)
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/data/dao/LockdownSettingsDao.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.LockdownSettings
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface LockdownSettingsDao {
+    @Query("SELECT * FROM lockdown_settings LIMIT 1")
+    suspend fun getLockdownSettings(): LockdownSettings?
+
+    @Upsert suspend fun upsert(lockdownSettings: LockdownSettings)
+
+    @Query("SELECT * FROM lockdown_settings LIMIT 1")
+    fun getLockdownSettingsFlow(): Flow<LockdownSettings?>
+}

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

@@ -0,0 +1,40 @@
+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?>
+
+    @Query(
+        """
+    UPDATE monitoring_settings
+    SET tunnel_statistics_poll_interval = :interval
+    WHERE id = (
+        SELECT id FROM monitoring_settings LIMIT 1
+    )
+"""
+    )
+    suspend fun updateStatisticsInterval(interval: Int)
+
+    @Query(
+        """
+    UPDATE monitoring_settings
+    SET tunnel_statistics_enabled = :enabled
+    WHERE id = (
+        SELECT id FROM monitoring_settings LIMIT 1
+    )
+"""
+    )
+    suspend fun updateStatisticsEnabled(enabled: Boolean)
+}

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

@@ -1,25 +1,16 @@
 package com.zaneschepke.wireguardautotunnel.data.dao
 
-import androidx.room.*
+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 {
-    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun save(t: ProxySettings)
+    @Upsert suspend fun upsert(proxySettings: ProxySettings)
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun saveAll(t: List<ProxySettings>)
+    @Query("SELECT * FROM proxy_settings LIMIT 1") suspend fun getProxySettings(): ProxySettings?
 
-    @Query("SELECT * FROM proxy_settings WHERE id=:id")
-    suspend fun getById(id: Long): ProxySettings?
-
-    @Query("SELECT * FROM proxy_settings") suspend fun getAll(): List<ProxySettings>
-
-    @Query("SELECT * FROM proxy_settings LIMIT 1") fun getSettingsFlow(): Flow<ProxySettings>
-
-    @Query("SELECT * FROM proxy_settings") fun getAllFlow(): Flow<List<ProxySettings>>
-
-    @Delete suspend fun delete(t: ProxySettings)
-
-    @Query("SELECT COUNT('id') FROM proxy_settings") suspend fun count(): Long
+    @Query("SELECT * FROM proxy_settings LIMIT 1") fun getProxySettingsFlow(): Flow<ProxySettings?>
 }

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

@@ -1,24 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.dao
-
-import androidx.room.*
-import com.zaneschepke.wireguardautotunnel.data.entity.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<List<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,47 +1,77 @@
 package com.zaneschepke.wireguardautotunnel.data.dao
 
-import androidx.room.*
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Upsert
 import com.zaneschepke.wireguardautotunnel.data.entity.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
 import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface TunnelConfigDao {
-    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun save(t: TunnelConfig)
 
-    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun saveAll(t: TunnelConfigs)
+    @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("UPDATE tunnel_config SET is_metered = :value WHERE id = :id")
+    suspend fun setMetered(id: Int, value: Boolean)
+
+    @Query("UPDATE tunnel_config SET dynamic_dns = :value WHERE id = :id")
+    suspend fun setDynamicDns(id: Int, value: Boolean)
+
+    @Query("SELECT * FROM tunnel_config WHERE id=:id") suspend fun getById(id: Long): TunnelConfig?
+
+    @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 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 ORDER BY position")
+    @Query(
+        """
+    SELECT *
+    FROM tunnel_config
+    WHERE name != '${TunnelConfig.GLOBAL_CONFIG_NAME}'
+    ORDER BY is_primary_tunnel DESC, position ASC
+    LIMIT 1
+    """
+    )
+    suspend fun getDefaultTunnel(): 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,7 @@
+package com.zaneschepke.wireguardautotunnel.data.entity
+
+data class AppState(
+    val isLocationDisclosureShown: Boolean = false,
+    val isBatteryOptimizationDisableShown: Boolean = false,
+    val shouldShowDonationSnackbar: Boolean = false,
+)

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

@@ -0,0 +1,30 @@
+package com.zaneschepke.wireguardautotunnel.data.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.zaneschepke.wireguardautotunnel.domain.enums.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 = "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,16 @@
+package com.zaneschepke.wireguardautotunnel.data.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.zaneschepke.wireguardautotunnel.domain.enums.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,
+    @ColumnInfo(name = "global_tunnel_dns_enabled", defaultValue = "0")
+    val isGlobalTunnelDnsEnabled: Boolean = false,
+)

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

@@ -0,0 +1,37 @@
+package com.zaneschepke.wireguardautotunnel.data.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelMode
+
+@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 = "global_split_tunnel_enabled", defaultValue = "0")
+    val isGlobalSplitTunnelEnabled: Boolean = false,
+    @ColumnInfo(name = "app_mode", defaultValue = "0")
+    val tunnelMode: TunnelMode = TunnelMode.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 = "already_donated", defaultValue = "0") val alreadyDonated: Boolean = false,
+    @ColumnInfo(name = "screen_recording_security", defaultValue = "1")
+    val screenRecordingSecurityEnabled: Boolean = true,
+    @ColumnInfo(name = "global_amnezia_enabled", defaultValue = "0")
+    val isGlobalAmneziaEnabled: Boolean = false,
+    @ColumnInfo(name = "tunnel_scripting_enabled", defaultValue = "0")
+    val tunnelScriptingEnabled: Boolean = true,
+)

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

@@ -1,26 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.entity
-
-import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
-
-data class GeneralState(
-    val isLocationDisclosureShown: Boolean = LOCATION_DISCLOSURE_SHOWN_DEFAULT,
-    val isBatteryOptimizationDisableShown: Boolean = BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
-    val isPinLockEnabled: Boolean = PIN_LOCK_ENABLED_DEFAULT,
-    val expandedTunnelIds: List<Int> = emptyList(),
-    val isLocalLogsEnabled: Boolean = IS_LOGS_ENABLED_DEFAULT,
-    val isRemoteControlEnabled: Boolean = IS_REMOTE_CONTROL_ENABLED,
-    val showDetailedPingStats: Boolean = SHOW_DETAILED_PING_STATS_DEFAULT,
-    val remoteKey: String? = null,
-    val locale: String? = null,
-    val theme: Theme = Theme.AUTOMATIC,
-) {
-
-    companion object {
-        const val LOCATION_DISCLOSURE_SHOWN_DEFAULT = false
-        const val BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT = false
-        const val PIN_LOCK_ENABLED_DEFAULT = false
-        const val IS_LOGS_ENABLED_DEFAULT = false
-        const val IS_REMOTE_CONTROL_ENABLED = false
-        const val SHOW_DETAILED_PING_STATS_DEFAULT = false
-    }
-}

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

@@ -0,0 +1,13 @@
+package com.zaneschepke.wireguardautotunnel.data.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "lockdown_settings")
+data class LockdownSettings(
+    @PrimaryKey(autoGenerate = true) val id: Long = 0,
+    @ColumnInfo(name = "bypass_lan", defaultValue = "0") val bypassLan: Boolean = false,
+    @ColumnInfo(name = "metered", defaultValue = "0") val metered: Boolean = false,
+    @ColumnInfo(name = "dual_stack", defaultValue = "0") val dualStack: Boolean = false,
+)

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

@@ -0,0 +1,16 @@
+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_local_logs_enabled", defaultValue = "0")
+    val isLocalLogsEnabled: Boolean = false,
+    @ColumnInfo(name = "tunnel_statistics_enabled", defaultValue = "1")
+    val tunnelStatisticsEnabled: Boolean = true,
+    @ColumnInfo(name = "tunnel_statistics_poll_interval", defaultValue = "3")
+    val tunnelStatisticsPollInterval: Int = 3,
+)

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

@@ -7,10 +7,10 @@ import androidx.room.PrimaryKey
 @Entity(tableName = "proxy_settings")
 data class ProxySettings(
     @PrimaryKey(autoGenerate = true) val id: Long = 0,
-    @ColumnInfo(name = "socks5_proxy_enabled", defaultValue = "false")
+    @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 = "false")
+    @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,

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

@@ -1,54 +0,0 @@
-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
-import com.zaneschepke.wireguardautotunnel.data.model.DnsProtocol
-import com.zaneschepke.wireguardautotunnel.data.model.WifiDetectionMethod
-
-@Entity
-data class Settings(
-    @PrimaryKey(autoGenerate = true) val id: Int = 0,
-    @ColumnInfo(name = "is_tunnel_enabled") val isAutoTunnelEnabled: Boolean = false,
-    @ColumnInfo(name = "is_tunnel_on_mobile_data_enabled")
-    val isTunnelOnMobileDataEnabled: Boolean = false,
-    @ColumnInfo(name = "trusted_network_ssids") val trustedNetworkSSIDs: List<String> = emptyList(),
-    @ColumnInfo(name = "is_always_on_vpn_enabled") val isAlwaysOnVpnEnabled: Boolean = false,
-    @ColumnInfo(name = "is_tunnel_on_ethernet_enabled")
-    val isTunnelOnEthernetEnabled: Boolean = false,
-    @ColumnInfo(name = "is_shortcuts_enabled", defaultValue = "false")
-    val isShortcutsEnabled: Boolean = false,
-    @ColumnInfo(name = "is_tunnel_on_wifi_enabled", defaultValue = "false")
-    val isTunnelOnWifiEnabled: Boolean = false,
-    @ColumnInfo(name = "is_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_wildcards_enabled", defaultValue = "false")
-    val isWildcardsEnabled: Boolean = false,
-    @ColumnInfo(name = "is_stop_on_no_internet_enabled", defaultValue = "false")
-    val isStopOnNoInternetEnabled: Boolean = false,
-    @ColumnInfo(name = "is_lan_on_kill_switch_enabled", defaultValue = "false")
-    val isLanOnKillSwitchEnabled: Boolean = false,
-    @ColumnInfo(name = "debounce_delay_seconds", defaultValue = "3")
-    val debounceDelaySeconds: Int = 3,
-    @ColumnInfo(name = "is_disable_kill_switch_on_trusted_enabled", defaultValue = "false")
-    val isDisableKillSwitchOnTrustedEnabled: Boolean = false,
-    @ColumnInfo(name = "is_tunnel_on_unsecure_enabled", defaultValue = "false")
-    val isTunnelOnUnsecureEnabled: Boolean = false,
-    @ColumnInfo(name = "wifi_detection_method", defaultValue = "0")
-    val wifiDetectionMethod: WifiDetectionMethod = WifiDetectionMethod.fromValue(0),
-    @ColumnInfo(name = "is_ping_monitoring_enabled", defaultValue = "true")
-    val isPingMonitoringEnabled: Boolean = true,
-    @ColumnInfo(name = "tunnel_ping_interval_sec", defaultValue = "30")
-    val tunnelPingIntervalSeconds: Int = 30,
-    @ColumnInfo(name = "tunnel_ping_attempts", defaultValue = "3") val tunnelPingAttempts: Int = 3,
-    @ColumnInfo(name = "tunnel_ping_timeout_sec") val tunnelPingTimeoutSeconds: Int? = null,
-    @ColumnInfo(name = "app_mode", defaultValue = "0") val appMode: AppMode = AppMode.fromValue(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/TunnelConfig.kt

@@ -5,32 +5,32 @@ import androidx.room.Entity
 import androidx.room.Index
 import androidx.room.PrimaryKey
 
-@Entity(indices = [Index(value = ["name"], unique = true)])
+@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: List<String> = listOf(),
+    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 = AM_QUICK_DEFAULT,
-    @ColumnInfo(name = "is_Active", defaultValue = "false") val isActive: Boolean = false,
-    @ColumnInfo(name = "restart_on_ping_failure", defaultValue = "false")
-    val restartOnPingFailure: Boolean = false,
-    @ColumnInfo(name = "ping_target", defaultValue = "null") var pingTarget: String? = null,
+    @ColumnInfo(name = "quick_config", defaultValue = "") val quickConfig: String = "",
+    @ColumnInfo(name = "dynamic_dns", defaultValue = "false")
+    val dynamicDnsEnabled: Boolean = false,
     @ColumnInfo(name = "is_ethernet_tunnel", defaultValue = "false")
     val isEthernetTunnel: Boolean = false,
-    @ColumnInfo(name = "is_ipv4_preferred", defaultValue = "true")
-    val isIpv4Preferred: Boolean = true,
+    @ColumnInfo(name = "prefer_ipv6", defaultValue = "false") val isIpv6Preferred: Boolean = false,
     @ColumnInfo(name = "position", defaultValue = "0") val position: Int = 0,
     @ColumnInfo(name = "auto_tunnel_apps", defaultValue = "[]")
-    val autoTunnelApps: List<String> = listOf(),
+    val autoTunnelApps: Set<String> = emptySet(),
+    @ColumnInfo(name = "is_metered", defaultValue = "false") val isMetered: Boolean = false,
+    @ColumnInfo(name = "ipv4_fallback", defaultValue = "false")
+    val ipv4FallbackEnabled: Boolean = false,
+    @ColumnInfo(name = "ipv6_restore", defaultValue = "false")
+    val ipv6RestoreEnabled: Boolean = false,
 ) {
-
     companion object {
-        const val AM_QUICK_DEFAULT = ""
+        const val GLOBAL_CONFIG_NAME = "4675ab06-903a-438b-8485-6ea4187a9512"
     }
 }

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

@@ -0,0 +1,34 @@
+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,
+        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,
+        isTunnelOnUnsecureEnabled = isTunnelOnUnsecureEnabled,
+        wifiDetectionMethod = wifiDetectionMethod,
+        startOnBoot = startOnBoot,
+    )

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

@@ -0,0 +1,20 @@
+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,
+        isGlobalTunnelDnsEnabled = isGlobalTunnelDnsEnabled,
+    )
+
+fun Domain.toEntity(): Entity =
+    Entity(
+        id = id,
+        dnsProtocol = dnsProtocol,
+        dnsEndpoint = dnsEndpoint,
+        isGlobalTunnelDnsEnabled = isGlobalTunnelDnsEnabled,
+    )

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

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

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

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

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

@@ -0,0 +1,20 @@
+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,
+        tunnelStatisticsEnabled = tunnelStatisticsEnabled,
+        tunnelStatisticsPollInterval = tunnelStatisticsPollInterval,
+        isLocalLogsEnabled = isLocalLogsEnabled,
+    )
+
+fun Domain.toEntity(): Entity =
+    Entity(
+        id = id,
+        tunnelStatisticsEnabled = tunnelStatisticsEnabled,
+        tunnelStatisticsPollInterval = tunnelStatisticsPollInterval,
+        isLocalLogsEnabled = isLocalLogsEnabled,
+    )

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

@@ -1,32 +1,26 @@
 package com.zaneschepke.wireguardautotunnel.data.mapper
 
-import com.zaneschepke.wireguardautotunnel.data.entity.ProxySettings
-import com.zaneschepke.wireguardautotunnel.domain.model.AppProxySettings
+import com.zaneschepke.wireguardautotunnel.data.entity.ProxySettings as Entity
+import com.zaneschepke.wireguardautotunnel.domain.model.ProxySettings as Domain
 
-object ProxySettingsMapper {
-    fun to(proxySettings: ProxySettings): AppProxySettings =
-        with(proxySettings) {
-            AppProxySettings(
-                id,
-                socks5ProxyEnabled,
-                socks5ProxyBindAddress,
-                httpProxyEnabled,
-                httpProxyBindAddress,
-                proxyUsername,
-                proxyPassword,
-            )
-        }
+fun Entity.toDomain(): Domain =
+    Domain(
+        id = id,
+        socks5ProxyEnabled = socks5ProxyEnabled,
+        socks5ProxyBindAddress = socks5ProxyBindAddress,
+        httpProxyEnabled = httpProxyEnabled,
+        httpProxyBindAddress = httpProxyBindAddress,
+        proxyUsername = proxyUsername,
+        proxyPassword = proxyPassword,
+    )
 
-    fun to(proxySettings: AppProxySettings): ProxySettings =
-        with(proxySettings) {
-            ProxySettings(
-                id,
-                socks5ProxyEnabled,
-                socks5ProxyBindAddress,
-                httpProxyEnabled,
-                httpProxyBindAddress,
-                proxyUsername,
-                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

@@ -1,79 +1,45 @@
 package com.zaneschepke.wireguardautotunnel.data.mapper
 
-import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
-import com.zaneschepke.wireguardautotunnel.data.entity.Settings
-import com.zaneschepke.wireguardautotunnel.data.model.DnsProtocol
-import com.zaneschepke.wireguardautotunnel.data.model.DnsSettings
-import com.zaneschepke.wireguardautotunnel.data.model.WifiDetectionMethod
-import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
+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 Settings.toAppSettings(): AppSettings {
-    return AppSettings(
+fun Entity.toDomain(): Domain =
+    Domain(
         id = id,
-        isAutoTunnelEnabled = isAutoTunnelEnabled,
-        isTunnelOnMobileDataEnabled = isTunnelOnMobileDataEnabled,
-        trustedNetworkSSIDs = trustedNetworkSSIDs,
-        isAlwaysOnVpnEnabled = isAlwaysOnVpnEnabled,
-        isTunnelOnEthernetEnabled = isTunnelOnEthernetEnabled,
         isShortcutsEnabled = isShortcutsEnabled,
-        isTunnelOnWifiEnabled = isTunnelOnWifiEnabled,
         isRestoreOnBootEnabled = isRestoreOnBootEnabled,
         isMultiTunnelEnabled = isMultiTunnelEnabled,
-        isPingEnabled = isPingEnabled,
-        isWildcardsEnabled = isWildcardsEnabled,
-        isStopOnNoInternetEnabled = isStopOnNoInternetEnabled,
-        isLanOnKillSwitchEnabled = isLanOnKillSwitchEnabled,
-        debounceDelaySeconds = debounceDelaySeconds,
-        isDisableKillSwitchOnTrustedEnabled = isDisableKillSwitchOnTrustedEnabled,
-        isTunnelOnUnsecureEnabled = isTunnelOnUnsecureEnabled,
-        wifiDetectionMethod =
-            AndroidNetworkMonitor.WifiDetectionMethod.fromValue(wifiDetectionMethod.value),
-        tunnelPingIntervalSeconds = tunnelPingIntervalSeconds,
-        tunnelPingAttempts = tunnelPingAttempts,
-        tunnelPingTimeoutSeconds = tunnelPingTimeoutSeconds,
-        appMode = appMode,
-        dnsProtocol = dnsProtocol,
-        dnsEndpoint = dnsEndpoint,
-    )
-}
-
-fun AppSettings.toSettings(): Settings {
-    return Settings(
-        id = id,
-        isAutoTunnelEnabled = isAutoTunnelEnabled,
-        isTunnelOnMobileDataEnabled = isTunnelOnMobileDataEnabled,
-        trustedNetworkSSIDs = trustedNetworkSSIDs,
+        isGlobalSplitTunnelEnabled = isGlobalSplitTunnelEnabled,
+        tunnelMode = tunnelMode,
+        theme = Theme.valueOf(theme.uppercase()),
+        locale = locale,
+        remoteKey = remoteKey,
+        isRemoteControlEnabled = isRemoteControlEnabled,
+        isPinLockEnabled = isPinLockEnabled,
         isAlwaysOnVpnEnabled = isAlwaysOnVpnEnabled,
-        isTunnelOnEthernetEnabled = isTunnelOnEthernetEnabled,
+        alreadyDonated = alreadyDonated,
+        screenRecordingSecurityEnabled = screenRecordingSecurityEnabled,
+        isGlobalAmneziaEnabled = isGlobalAmneziaEnabled,
+        tunnelScriptingEnabled = tunnelScriptingEnabled,
+    )
+
+fun Domain.toEntity(): Entity =
+    Entity(
+        id = id,
         isShortcutsEnabled = isShortcutsEnabled,
-        isTunnelOnWifiEnabled = isTunnelOnWifiEnabled,
         isRestoreOnBootEnabled = isRestoreOnBootEnabled,
         isMultiTunnelEnabled = isMultiTunnelEnabled,
-        isPingEnabled = isPingEnabled,
-        isWildcardsEnabled = isWildcardsEnabled,
-        isStopOnNoInternetEnabled = isStopOnNoInternetEnabled,
-        isLanOnKillSwitchEnabled = isLanOnKillSwitchEnabled,
-        debounceDelaySeconds = debounceDelaySeconds,
-        isDisableKillSwitchOnTrustedEnabled = isDisableKillSwitchOnTrustedEnabled,
-        isTunnelOnUnsecureEnabled = isTunnelOnUnsecureEnabled,
-        wifiDetectionMethod = WifiDetectionMethod.fromValue(wifiDetectionMethod.value),
-        tunnelPingIntervalSeconds = tunnelPingIntervalSeconds,
-        tunnelPingAttempts = tunnelPingAttempts,
-        tunnelPingTimeoutSeconds = tunnelPingTimeoutSeconds,
-        appMode = appMode,
-        dnsProtocol = dnsProtocol,
-        dnsEndpoint = dnsEndpoint,
+        isGlobalSplitTunnelEnabled = isGlobalSplitTunnelEnabled,
+        tunnelMode = tunnelMode,
+        theme = theme.name,
+        locale = locale,
+        remoteKey = remoteKey,
+        isRemoteControlEnabled = isRemoteControlEnabled,
+        isPinLockEnabled = isPinLockEnabled,
+        isAlwaysOnVpnEnabled = isAlwaysOnVpnEnabled,
+        alreadyDonated = alreadyDonated,
+        screenRecordingSecurityEnabled = screenRecordingSecurityEnabled,
+        isGlobalAmneziaEnabled = isGlobalAmneziaEnabled,
+        tunnelScriptingEnabled = tunnelScriptingEnabled,
     )
-}
-
-fun AppSettings.toDomain(): DnsSettings {
-    return DnsSettings(
-        protocol =
-            DnsProtocol.entries.toTypedArray().getOrElse(dnsProtocol.value) { DnsProtocol.SYSTEM },
-        endpoint = dnsEndpoint,
-    )
-}
-
-fun DnsSettings.toAppSettings(existing: AppSettings): AppSettings {
-    return existing.copy(dnsProtocol = protocol, dnsEndpoint = endpoint)
-}

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

@@ -1,46 +1,40 @@
 package com.zaneschepke.wireguardautotunnel.data.mapper
 
-import com.zaneschepke.wireguardautotunnel.data.entity.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
+import com.zaneschepke.wireguardautotunnel.data.entity.TunnelConfig as Entity
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig as Domain
 
-object TunnelConfigMapper {
-    fun toTunnelConf(tunnelConfig: TunnelConfig): TunnelConf {
-        return with(tunnelConfig) {
-            TunnelConf(
-                id,
-                name,
-                wgQuick,
-                tunnelNetworks,
-                isMobileDataTunnel,
-                isPrimaryTunnel,
-                amQuick,
-                isActive,
-                pingTarget,
-                restartOnPingFailure,
-                isEthernetTunnel,
-                isIpv4Preferred,
-                position,
-            )
-        }
-    }
+fun Entity.toDomain(): Domain =
+    Domain(
+        id = id,
+        name = name,
+        tunnelNetworks = tunnelNetworks,
+        isMobileDataTunnel = isMobileDataTunnel,
+        isPrimaryTunnel = isPrimaryTunnel,
+        quickConfig = quickConfig,
+        dynamicDnsEnabled = dynamicDnsEnabled,
+        isEthernetTunnel = isEthernetTunnel,
+        isIpv6Preferred = isIpv6Preferred,
+        position = position,
+        autoTunnelApps = autoTunnelApps,
+        isMetered = isMetered,
+        ipv4FallbackEnabled = ipv4FallbackEnabled,
+        ipv6RestoreEnabled = ipv6RestoreEnabled,
+    )
 
-    fun toTunnelConfig(tunnelConf: TunnelConf): TunnelConfig {
-        return with(tunnelConf) {
-            TunnelConfig(
-                id,
-                tunName,
-                wgQuick,
-                tunnelNetworks,
-                isMobileDataTunnel,
-                isPrimaryTunnel,
-                amQuick,
-                isActive,
-                restartOnPingFailure,
-                pingTarget,
-                isEthernetTunnel,
-                isIpv4Preferred,
-                position,
-            )
-        }
-    }
-}
+fun Domain.toEntity(): Entity =
+    Entity(
+        id = id,
+        name = name,
+        tunnelNetworks = tunnelNetworks,
+        isMobileDataTunnel = isMobileDataTunnel,
+        isPrimaryTunnel = isPrimaryTunnel,
+        quickConfig = quickConfig,
+        dynamicDnsEnabled = dynamicDnsEnabled,
+        isEthernetTunnel = isEthernetTunnel,
+        isIpv6Preferred = isIpv6Preferred,
+        position = position,
+        autoTunnelApps = autoTunnelApps,
+        isMetered = isMetered,
+        ipv4FallbackEnabled = ipv4FallbackEnabled,
+        ipv6RestoreEnabled = ipv6RestoreEnabled,
+    )

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

@@ -0,0 +1,466 @@
+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")
+            }
+        }
+    }
+
+val MIGRATION_25_26 =
+    object : Migration(25, 26) {
+        override fun migrate(db: SupportSQLiteDatabase) {
+            db.execSQL(
+                """
+                CREATE TABLE IF NOT EXISTS `lockdown_settings` (
+                    `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+                    `bypass_lan` INTEGER NOT NULL DEFAULT 0,
+                    `metered` INTEGER NOT NULL DEFAULT 0,
+                    `dual_stack` INTEGER NOT NULL DEFAULT 0
+                )
+                """
+                    .trimIndent()
+            )
+
+            val cursor =
+                db.query("SELECT `is_lan_on_kill_switch_enabled` FROM `general_settings` LIMIT 1")
+            var bypassLan = 0
+            if (cursor.moveToFirst()) {
+                bypassLan = if (cursor.getInt(0) != 0) 1 else 0
+            }
+            cursor.close()
+
+            db.execSQL(
+                """
+                INSERT INTO `lockdown_settings` (`bypass_lan`, `metered`, `dual_stack`)
+                VALUES (?, 0, 0)
+                """
+                    .trimIndent(),
+                arrayOf(bypassLan),
+            )
+
+            db.execSQL(
+                """
+                CREATE TABLE IF NOT EXISTS `general_settings_new` (
+                    `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,
+                    `custom_split_packages` TEXT NOT NULL DEFAULT '{}'
+                )
+                """
+                    .trimIndent()
+            )
+
+            db.execSQL(
+                """
+                INSERT INTO `general_settings_new` (
+                    `id`,
+                    `is_shortcuts_enabled`,
+                    `is_restore_on_boot_enabled`,
+                    `is_multi_tunnel_enabled`,
+                    `is_tunnel_globals_enabled`,
+                    `app_mode`,
+                    `theme`,
+                    `locale`,
+                    `remote_key`,
+                    `is_remote_control_enabled`,
+                    `is_pin_lock_enabled`,
+                    `is_always_on_vpn_enabled`,
+                    `custom_split_packages`
+                )
+                SELECT
+                    `id`,
+                    `is_shortcuts_enabled`,
+                    `is_restore_on_boot_enabled`,
+                    `is_multi_tunnel_enabled`,
+                    `is_tunnel_globals_enabled`,
+                    `app_mode`,
+                    `theme`,
+                    `locale`,
+                    `remote_key`,
+                    `is_remote_control_enabled`,
+                    `is_pin_lock_enabled`,
+                    `is_always_on_vpn_enabled`,
+                    `custom_split_packages`
+                FROM `general_settings`
+                """
+                    .trimIndent()
+            )
+
+            db.execSQL("DROP TABLE `general_settings`")
+
+            db.execSQL("ALTER TABLE `general_settings_new` RENAME TO `general_settings`")
+        }
+    }
+
+val MIGRATION_28_29 =
+    object : Migration(28, 29) {
+        override fun migrate(database: SupportSQLiteDatabase) {
+            // Migrate tunnel_config table
+            database.execSQL(
+                """
+                CREATE TABLE IF NOT EXISTS `tunnel_config_new` (
+                    `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 '[]',
+                    `is_metered` INTEGER NOT NULL DEFAULT false 
+                )
+                """
+                    .trimIndent()
+            )
+
+            database.execSQL(
+                """
+                INSERT INTO `tunnel_config_new` (
+                    `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`, `is_metered`
+                )
+                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`, 0 AS `is_metered`
+                FROM `tunnel_config`
+                """
+                    .trimIndent()
+            )
+
+            database.execSQL("DROP TABLE `tunnel_config`")
+            database.execSQL("ALTER TABLE `tunnel_config_new` RENAME TO `tunnel_config`")
+            database.execSQL(
+                "CREATE UNIQUE INDEX IF NOT EXISTS `index_tunnel_config_name` ON `tunnel_config` (`name`)"
+            )
+        }
+    }

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

@@ -1,12 +0,0 @@
-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

@@ -1,45 +0,0 @@
-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/network/KtorClient.kt

@@ -1,10 +1,10 @@
 package com.zaneschepke.wireguardautotunnel.data.network
 
-import io.ktor.client.*
-import io.ktor.client.engine.okhttp.*
-import io.ktor.client.plugins.*
-import io.ktor.client.plugins.contentnegotiation.*
-import io.ktor.serialization.kotlinx.json.*
+import 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 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.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.*
+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
 
 class KtorGitHubApi(private val client: HttpClient) : GitHubApi {
     override suspend fun getLatestRelease(owner: String, repo: String): Result<GitHubRelease> {
@@ -32,10 +32,9 @@ class KtorGitHubApi(private val client: HttpClient) : GitHubApi {
                 client.get("https://api.github.com/repos/$owner/$repo/releases").body()
 
             // Find the first release with "nightly" in the tag_name (case-insensitive)
-            val nightlyRelease =
-                releases.firstOrNull { release ->
-                    release.tagName.contains("nightly", ignoreCase = true)
-                }
+            val nightlyRelease = releases.firstOrNull { release ->
+                release.tagName.contains("nightly", ignoreCase = true)
+            }
 
             if (nightlyRelease != null) {
                 Result.success(nightlyRelease)

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

@@ -1,26 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.repository
-
-import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.repository.*
-import javax.inject.Inject
-
-class AppDataRoomRepository
-@Inject
-constructor(
-    override val settings: AppSettingRepository,
-    override val tunnels: TunnelRepository,
-    override val appState: AppStateRepository,
-    override val proxySettings: ProxySettingsRepository,
-) : 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,170 +1,71 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.DataStoreManager
-import com.zaneschepke.wireguardautotunnel.data.entity.GeneralState
-import com.zaneschepke.wireguardautotunnel.data.mapper.GeneralStateMapper
-import com.zaneschepke.wireguardautotunnel.domain.model.AppState
+import com.zaneschepke.wireguardautotunnel.data.entity.AppState as Entity
+import com.zaneschepke.wireguardautotunnel.data.mapper.toDomain
+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: CoroutineScope,
+    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 setShouldShowDonationSnackbar(show: Boolean) {
+        dataStoreManager.saveToDataStore(DataStoreManager.shouldShowDonationSnackbar, show)
     }
 
-    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 shouldShowDonationSnackbar(): Boolean {
+        return dataStoreManager.getFromStore(DataStoreManager.shouldShowDonationSnackbar) ?: false
     }
 
-    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 suspend fun setShowDetailedPingStats(showDetailedPing: Boolean) {
-        dataStoreManager.saveToDataStore(DataStoreManager.showDetailedPingStats, showDetailedPing)
-    }
-
-    override suspend fun getShowDetailedPing(): Boolean {
-        return dataStoreManager.getFromStore(DataStoreManager.showDetailedPingStats)
-            ?: GeneralState.SHOW_DETAILED_PING_STATS_DEFAULT
-    }
-
-    override val flow: Flow<AppState> =
+    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,
-                            showDetailedPingStats =
-                                pref[DataStoreManager.showDetailedPingStats]
-                                    ?: GeneralState.SHOW_DETAILED_PING_STATS_DEFAULT,
-                            remoteKey = pref[DataStoreManager.remoteKey],
-                            locale = pref[DataStoreManager.locale],
-                            theme = getTheme(),
+                                pref[DataStoreManager.batteryDisableShown] ?: false,
+                            shouldShowDonationSnackbar =
+                                pref[DataStoreManager.shouldShowDonationSnackbar] ?: false,
                         )
                     } catch (e: IllegalArgumentException) {
                         Timber.e(e)
-                        GeneralState()
+                        Entity()
                     }
-                } ?: GeneralState()
+                } ?: Entity()
             }
-            .map(GeneralStateMapper::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

@@ -4,16 +4,17 @@ import android.content.Context
 import com.zaneschepke.wireguardautotunnel.BuildConfig
 import com.zaneschepke.wireguardautotunnel.data.mapper.GitHubReleaseMapper
 import com.zaneschepke.wireguardautotunnel.data.network.GitHubApi
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.model.AppUpdate
 import com.zaneschepke.wireguardautotunnel.domain.repository.UpdateRepository
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.NumberUtils
-import io.ktor.client.*
-import io.ktor.client.request.*
-import io.ktor.client.statement.*
-import io.ktor.http.*
-import io.ktor.utils.io.*
+import 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 java.io.File
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
@@ -25,8 +26,9 @@ class GitHubUpdateRepository(
     private val githubOwner: String,
     private val githubRepo: String,
     private val context: Context,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+    private val ioDispatcher: CoroutineDispatcher,
 ) : UpdateRepository {
+
     override suspend fun checkForUpdate(currentVersion: String): Result<AppUpdate?> =
         withContext(ioDispatcher) {
             Timber.i("Checking for update")
@@ -38,27 +40,40 @@ class GitHubUpdateRepository(
                     gitHubApi.getLatestRelease(githubOwner, githubRepo).onFailure(Timber::e)
                 }
             release.map { release ->
-                val standaloneApkAsset =
+                val universalApkAsset =
                     release.assets.find { asset ->
-                        asset.name.startsWith("wgtunnel-${Constants.STANDALONE_FLAVOR}-v") &&
-                            asset.name.endsWith(".apk")
+                        val prefix = "wgtunnel-${Constants.STANDALONE_FLAVOR}-v"
+                        val apkSuffix = ".apk"
+                        asset.name.startsWith(prefix) &&
+                            asset.name.endsWith(apkSuffix) &&
+                            !asset.name.endsWith("-arm64$apkSuffix") &&
+                            !asset.name.endsWith("-armv7$apkSuffix")
                     }
                 val newVersion =
-                    standaloneApkAsset
+                    universalApkAsset
                         ?.name
                         ?.removePrefix("wgtunnel-${Constants.STANDALONE_FLAVOR}-v")
                         ?.removeSuffix(".apk") ?: return@map null
 
                 Timber.i("Latest version: $newVersion, current version: $currentVersion")
-                if (isNightly && newVersion != currentVersion)
-                    return@map GitHubReleaseMapper.toAppUpdate(release, newVersion)
-                if (NumberUtils.compareVersions(newVersion, currentVersion) > 0) {
-                    GitHubReleaseMapper.toAppUpdate(
-                        release.copy(assets = listOf(standaloneApkAsset)),
-                        newVersion,
-                    )
+                if (isNightly) {
+                    if (newVersion != currentVersion) {
+                        GitHubReleaseMapper.toAppUpdate(
+                            release.copy(assets = listOf(universalApkAsset)),
+                            newVersion,
+                        )
+                    } else {
+                        null
+                    }
                 } else {
-                    null
+                    if (NumberUtils.compareVersions(newVersion, currentVersion) > 0) {
+                        GitHubReleaseMapper.toAppUpdate(
+                            release.copy(assets = listOf(universalApkAsset)),
+                            newVersion,
+                        )
+                    } else {
+                        null
+                    }
                 }
             }
         }

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

@@ -0,0 +1,54 @@
+package com.zaneschepke.wireguardautotunnel.data.repository
+
+import android.content.Context
+import android.content.pm.PackageManager
+import com.zaneschepke.wireguardautotunnel.domain.model.InstalledPackage
+import com.zaneschepke.wireguardautotunnel.domain.repository.InstalledPackageRepository
+import com.zaneschepke.wireguardautotunnel.util.extensions.getFriendlyAppName
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+
+class InstalledAndroidPackageRepository(
+    private val context: Context,
+    private val ioDispatcher: CoroutineDispatcher,
+) : InstalledPackageRepository {
+
+    private var cachedPackages: List<InstalledPackage>? = null
+
+    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.packageManager.getInstalledPackages(0)
+
+            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
+        }
+}