chore: release v4.2.2

Co-authored-by: Fill read-only add-on <noreply-addon-fill@weblate.org>
Co-authored-by: solokot <solokot@gmail.com>
Co-authored-by: Matthaiks <kitynska@gmail.com>
Co-authored-by: Qotsa1984 <carlominzi@inwind.it>
Co-authored-by: jaime-grj <weblate.4ljj9@aleeas.com>
Co-authored-by: catelixor <catelixor+weblate@proton.me>
Co-authored-by: Priit Jõerüüt <jrthwlate@users.noreply.hosted.weblate.org>
Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org>
Co-authored-by: Kachelkaiser <kachelkaiser@htpst.de>
Co-authored-by: Henrik Sozzi <henrik_sozzi@hotmail.com>
Co-authored-by: EESF-2 <eesf-2@users.noreply.hosted.weblate.org>
Co-authored-by: ssantos <ssantos@web.de>
Co-authored-by: Aleksandre Ghvineria <Ghvinerias@gmail.com>
Co-authored-by: lateweb <weblate@techkoala.net>
Co-authored-by: 大王叫我来巡山 <hamburger2048@users.noreply.hosted.weblate.org>
Co-authored-by: Alvar Kusma <kaabuta@gmail.com>
Co-authored-by: Denny Schwender <denny.schwender@gmail.com>
Co-authored-by: Salizan <sohrab.sy1@gmail.com>
Co-authored-by: Jacob <jacob.venborg@gmail.com>
Co-authored-by: CyanWolf <hydemr@pm.me>
Co-authored-by: Mostafa Kian <mostafakian77@gmail.com>
Co-authored-by: Tomáš Pernekr <leostreamer@gmail.com>
Co-authored-by: Zane Schepke <zanecschepke@gmail.com>

.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/workflows/build-aab.yml

@@ -0,0 +1,130 @@
+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@v6
+        with:
+          fetch-depth: 0
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          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
+        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@v6
+        with:
+          name: google-play-aab
+          path: ${{ steps.aab-path.outputs.path }}
+          retention-days: 7
+          if-no-files-found: error

.github/workflows/build.yml

@@ -72,7 +72,7 @@ jobs:
     outputs:
       UPLOAD_DIR_ANDROID: ${{ env.UPLOAD_DIR_ANDROID }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
       - name: Set up JDK 17
@@ -114,15 +114,11 @@ jobs:
       - 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@v6
         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@v5
+        uses: actions/checkout@v6
       - 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,13 @@ 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@v5
+      - uses: actions/checkout@v6
 
       - name: Install system dependencies
         run: |
@@ -53,14 +55,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 +71,7 @@ jobs:
         run: mkdir ${{ github.workspace }}/temp
 
       - name: Download artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v7
         with:
           pattern: android_artifacts_*
           path: ${{ github.workspace }}/temp
@@ -84,7 +86,7 @@ jobs:
           tag_name: "nightly"
           delete_release: true
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ github.token }}
 
       - name: Get checksum
         id: checksum
@@ -124,4 +126,4 @@ jobs:
           files: |
             ${{ github.workspace }}/temp/**/*.apk
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.PAT }}

.github/workflows/notifications.yml

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

@@ -10,7 +10,7 @@ jobs:
   format_check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up JDK 17
         uses: actions/setup-java@v5
         with:

.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@v5
+      - uses: actions/checkout@v6
         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@v7
         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
@@ -161,18 +168,22 @@ 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
 
@@ -189,7 +200,7 @@ jobs:
       KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Set up JDK 17
         uses: actions/setup-java@v5
         with:

README.md

@@ -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)
+[![F-Droid](https://img.shields.io/static/v1?style=for-the-badge&message=F-Droid&color=1976D2&logo=F-Droid&logoColor=FFFFFF&label=)](https://github.com/zaneschepke/fdroid)
 [![Obtainium](https://img.shields.io/badge/Obtainium-414141?style=for-the-badge&logo=Obtainium&logoColor=white)](https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22com.zaneschepke.wireguardautotunnel%22%2C%22url%22%3A%22https%3A%2F%2Fgithub.com%2Fzaneschepke%2Fwgtunnel%22%2C%22author%22%3A%22zaneschepke%22%2C%22name%22%3A%22WG%20Tunnel%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22includePrereleases%5C%22%3Afalse%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22filterReleaseNotesByRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22verifyLatestTag%5C%22%3Atrue%2C%5C%22sortMethodChoice%5C%22%3A%5C%22date%5C%22%2C%5C%22useLatestAssetDateAsReleaseDate%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%2C%5C%22trackOnly%5C%22%3Afalse%2C%5C%22versionExtractionRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22matchGroupToUse%5C%22%3A%5C%22%5C%22%2C%5C%22versionDetection%5C%22%3Atrue%2C%5C%22releaseDateAsVersion%5C%22%3Afalse%2C%5C%22useVersionCodeAsOSVersion%5C%22%3Afalse%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22invertAPKFilter%5C%22%3Afalse%2C%5C%22autoApkFilterByArch%5C%22%3Atrue%2C%5C%22appName%5C%22%3A%5C%22WG%20Tunnel%5C%22%2C%5C%22appAuthor%5C%22%3A%5C%22Zane%20Schepke%5C%22%2C%5C%22shizukuPretendToBeGooglePlay%5C%22%3Afalse%2C%5C%22allowInsecure%5C%22%3Afalse%2C%5C%22exemptFromBackgroundUpdates%5C%22%3Afalse%2C%5C%22skipUpdateNotifications%5C%22%3Afalse%2C%5C%22about%5C%22%3A%5C%22%5C%22%2C%5C%22refreshBeforeDownload%5C%22%3Afalse%7D%22%2C%22overrideSource%22%3Anull%7D)
 
 </div>
@@ -60,14 +59,12 @@ WG Tunnel is an alternative Android client for WireGuard and AmneziaWG, inspired
 
 </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
 
 - **Tunnel Import Methods**: Easily add tunnels using .conf files, ZIP archives, manual entry, or QR code scanning.

app/build.gradle.kts

@@ -1,9 +1,9 @@
+import com.android.build.gradle.internal.api.BaseVariantOutputImpl
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 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)
@@ -27,6 +27,15 @@ android {
     // fix okhttp proguard issue
     packaging { resources { pickFirsts.add("okhttp3/internal/publicsuffix/publicsuffixes.gz") } }
 
+    splits {
+        abi {
+            isEnable = !project.hasProperty("noSplits")
+            reset()
+            include("armeabi-v7a", "arm64-v8a")
+            isUniversalApk = !project.hasProperty("noSplits")
+        }
+    }
+
     defaultConfig {
         applicationId = Constants.APP_ID
         minSdk = Constants.MIN_SDK
@@ -126,21 +135,37 @@ android {
     licensee {
         allowedLicenses().forEach { allow(it) }
         allowedLicenseUrls().forEach { allowUrl(it) }
+        // foss, but missing license
+        ignoreDependencies("com.github.T8RIN.QuickieExtended")
     }
 
-    applicationVariants.all {
+    android.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
-            }
+
+        val abiNameMap =
+            mapOf(
+                "armeabi-v7a" to "armv7",
+                "arm64-v8a" to "arm64",
+                "x86" to "x86",
+                "x86_64" to "x64",
+            )
+
+        variant.outputs.all {
+            val output = this as BaseVariantOutputImpl
+            val abi = output.getFilter("ABI")
+
+            val baseFileName = "${Constants.APP_NAME}-${variant.flavorName}-v${variant.versionName}"
+
+            val outputFileName =
+                if (!abi.isNullOrEmpty()) {
+                    val shortAbiName = abiNameMap.getOrDefault(abi, abi)
+                    "${baseFileName}-${shortAbiName}.apk"
+                } else {
+                    "${baseFileName}.apk"
+                }
+
+            output.outputFileName = outputFileName
+        }
     }
 }
 
@@ -148,19 +173,61 @@ dependencies {
     implementation(project(":logcatter"))
     implementation(project(":networkmonitor"))
 
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.lifecycle.runtime.ktx)
-    implementation(libs.androidx.lifecycle.service)
-    implementation(libs.androidx.activity.compose)
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.compose.ui)
-    implementation(libs.androidx.compose.ui.graphics)
-    implementation(libs.androidx.compose.ui.tooling.preview)
-    implementation(libs.androidx.material3)
-    implementation(libs.androidx.appcompat)
-    implementation(libs.material)
-    implementation(libs.androidx.storage)
+    // Core foundations
+    implementation(libs.bundles.androidx.core.full)
+    implementation(libs.bundles.androidx.lifecycle.core)
+    implementation(libs.bundles.androidx.appcompat)
+    implementation(libs.bundles.androidx.storage)
 
+    // Compose setup
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.bundles.androidx.compose.ui)
+    implementation(libs.bundles.androidx.compose.material)
+    implementation(libs.androidx.activity.compose)
+
+    // Navigation
+    implementation(libs.bundles.androidx.navigation3)
+    implementation(libs.bundles.navigation.lifecycle)
+
+    // 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)
+
+    // Tunnel
+    implementation(libs.bundles.wireguard.tunnel)
+
+    // Shizuku
+    implementation(libs.bundles.shizuku)
+
+    // UI utilities
+    implementation(libs.bundles.ui.utilities)
+
+    // Misc utilities
+    implementation(libs.bundles.misc.utilities)
+    coreLibraryDesugaring(libs.desugar.jdk.libs)
+
+    // Accompanist
+    implementation(libs.bundles.accompanist)
+
+    // Lifecycle Compose
+    implementation(libs.lifecycle.runtime.compose)
+
+    // Testing
     testImplementation(libs.junit)
     testImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.junit)
@@ -171,71 +238,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.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")
     }
 
-    // state management
-    implementation(libs.orbit.compose)
-    implementation(libs.orbit.viewmodel)
-    implementation(libs.orbit.core)
+    // 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") {

app/proguard-rules.pro

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

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/src/main/AndroidManifest.xml

@@ -5,6 +5,9 @@
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
+    <!--for split tunneling-->
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+
     <!--foreground service special use for non VPN service tunnels, android 14-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
     <!--foreground service special use for VPN service tunnels, android 14-->
@@ -14,6 +17,7 @@
     <!--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" />
 
@@ -42,17 +46,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"
@@ -66,17 +59,20 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.App.Start"
         tools:targetApi="tiramisu">
-		<activity
-			android:name="com.journeyapps.barcodescanner.CaptureActivity"
-			android:screenOrientation="portrait"
-			tools:replace="screenOrientation" />
+
         <activity
             android:name=".MainActivity"
             android:exported="true"
-			android:windowSoftInputMode="adjustNothing"
+			android:windowSoftInputMode="adjustResize"
             android:theme="@style/Theme.WireguardAutoTunnel"
 			android:configChanges="orientation|screenSize|keyboardHidden"
 			>
+
+            <intent-filter>
+                <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 				<action android:name="android.intent.action.SHOW_APP_INFO" />
@@ -107,13 +103,50 @@
 				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:exported="true"
+            android:icon="@drawable/ic_notification"
+            android:label="@string/tunnel_control"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+            <meta-data
+                android:name="android.service.quicksettings.ACTIVE_TILE"
+                android:value="true" />
+            <meta-data
+                android:name="android.service.quicksettings.TOGGLEABLE_TILE"
+                android:value="true" />
 
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+        </service>
+        <service
+            android:name=".core.service.tile.AutoTunnelControlTile"
+            android:exported="true"
+            android:icon="@drawable/ic_notification"
+            android:label="@string/auto_tunnel"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+            <meta-data
+                android:name="android.service.quicksettings.ACTIVE_TILE"
+                android:value="true" />
+            <meta-data
+                android:name="android.service.quicksettings.TOGGLEABLE_TILE"
+                android:value="true" />
+
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+        </service>
         <service
             android:name=".core.service.tile.TunnelControlTile"
             android:exported="true"
@@ -199,7 +232,10 @@
                 <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

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

@@ -1,106 +1,144 @@
 package com.zaneschepke.wireguardautotunnel
 
 import ProxySettingsScreen
-import android.annotation.SuppressLint
 import android.content.Intent
 import android.graphics.Color
 import android.net.VpnService
 import android.os.Build
 import android.os.Bundle
-import android.provider.Settings
 import androidx.activity.SystemBarStyle
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.background
-import androidx.compose.foundation.gestures.detectTapGestures
-import androidx.compose.foundation.layout.*
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.consumeWindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.surfaceColorAtElevation
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.LinkAnnotation
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.TextLinkStyles
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.intl.Locale
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.withLink
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
-import androidx.core.net.toUri
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.lifecycleScope
-import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.rememberNavController
-import androidx.navigation.navigation
-import androidx.navigation.toRoute
+import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
+import androidx.navigation3.runtime.entryProvider
+import androidx.navigation3.runtime.rememberNavBackStack
+import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
+import androidx.navigation3.ui.NavDisplay
 import com.zaneschepke.networkmonitor.NetworkMonitor
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
 import com.zaneschepke.wireguardautotunnel.data.model.AppMode
-import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.domain.sideeffect.GlobalSideEffect
 import com.zaneschepke.wireguardautotunnel.ui.LocalIsAndroidTV
 import com.zaneschepke.wireguardautotunnel.ui.LocalNavController
-import com.zaneschepke.wireguardautotunnel.ui.LocalSharedVm
 import com.zaneschepke.wireguardautotunnel.ui.common.banner.AppAlertBanner
 import com.zaneschepke.wireguardautotunnel.ui.common.dialog.VpnDeniedDialog
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.CustomSnackBar
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarInfo
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarType
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.rememberCustomSnackbarState
 import com.zaneschepke.wireguardautotunnel.ui.navigation.Route
+import com.zaneschepke.wireguardautotunnel.ui.navigation.Tab
 import com.zaneschepke.wireguardautotunnel.ui.navigation.components.BottomNavbar
 import com.zaneschepke.wireguardautotunnel.ui.navigation.components.DynamicTopAppBar
-import com.zaneschepke.wireguardautotunnel.ui.navigation.components.currentBackStackEntryAsNavbarState
+import com.zaneschepke.wireguardautotunnel.ui.navigation.components.currentRouteAsNavbarState
+import com.zaneschepke.wireguardautotunnel.ui.navigation.functions.rememberNavController
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.AutoTunnelScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.advanced.AutoTunnelAdvancedScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.detection.WifiDetectionMethodScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.disclosure.LocationDisclosureScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.preferred.PreferredTunnelScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.wifi.WifiSettingsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.pin.PinLockScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.SettingsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.AppearanceScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.display.DisplayScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.language.LanguageScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.dns.DnsSettingsScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.logs.LogsScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.integrations.AndroidIntegrationsScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.lockdown.LockdownSettingsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.monitoring.TunnelMonitoringScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.system.SystemFeaturesScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.monitoring.logs.LogsScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.monitoring.ping.PingTargetScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.SupportScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.donate.DonateScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.donate.crypto.AddressesScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.license.LicenseScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.TunnelsScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.autotunnel.TunnelAutoTunnelScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.config.ConfigScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.settings.TunnelSettingsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.sort.SortScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.splittunnel.SplitTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.tunneloptions.TunnelOptionsScreen
 import com.zaneschepke.wireguardautotunnel.ui.theme.AlertRed
 import com.zaneschepke.wireguardautotunnel.ui.theme.OffWhite
 import com.zaneschepke.wireguardautotunnel.ui.theme.WireguardAutoTunnelTheme
 import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
-import com.zaneschepke.wireguardautotunnel.util.extensions.*
-import com.zaneschepke.wireguardautotunnel.viewmodel.*
-import dagger.hilt.android.AndroidEntryPoint
+import com.zaneschepke.wireguardautotunnel.util.extensions.installApk
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
+import com.zaneschepke.wireguardautotunnel.util.extensions.openWebUrl
+import com.zaneschepke.wireguardautotunnel.util.extensions.restartApp
+import com.zaneschepke.wireguardautotunnel.util.extensions.showToast
+import com.zaneschepke.wireguardautotunnel.viewmodel.ConfigViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.SharedAppViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.SplitTunnelViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.TunnelViewModel
 import de.raphaelebner.roomdatabasebackup.core.RoomBackup
-import java.util.*
-import javax.inject.Inject
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
-import timber.log.Timber
+import org.koin.android.ext.android.inject
+import org.koin.androidx.compose.koinViewModel
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
 import xyz.teamgravity.pin_lock_compose.PinManager
 
-@AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
 
-    @Inject lateinit var appStateRepository: AppStateRepository
-    @Inject lateinit var tunnelManager: TunnelManager
-    @Inject lateinit var networkMonitor: NetworkMonitor
-    @Inject lateinit var appDatabase: AppDatabase
+    private val appStateRepository: AppStateRepository by inject()
+    private val tunnelRepository: TunnelRepository by inject()
+    private val appDatabase: AppDatabase by inject()
+    private val networkMonitor: NetworkMonitor by inject()
 
+    val viewModel by viewModel<SharedAppViewModel>()
     private lateinit var roomBackup: RoomBackup
 
-    @SuppressLint("BatteryLife")
+    @OptIn(ExperimentalMaterial3Api::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         enableEdgeToEdge(
             statusBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT),
@@ -113,8 +151,6 @@ class MainActivity : AppCompatActivity() {
 
         roomBackup = RoomBackup(this)
 
-        val viewModel by viewModels<SharedAppViewModel>()
-
         installSplashScreen().apply {
             setKeepOnScreenCondition { !viewModel.container.stateFlow.value.isAppLoaded }
         }
@@ -122,26 +158,38 @@ class MainActivity : AppCompatActivity() {
         setContent {
             val context = LocalContext.current
             val isTv = isRunningOnTv()
-            val appState by viewModel.container.stateFlow.collectAsStateWithLifecycle()
-            val navController = rememberNavController()
+            val uiState by viewModel.container.stateFlow.collectAsStateWithLifecycle()
             val scope = rememberCoroutineScope()
 
-            LaunchedEffect(appState.isAppLoaded) {
-                if (appState.isAppLoaded) {
-                    appState.locale.let { LocaleUtil.changeLocale(it) }
+            LaunchedEffect(uiState.isAppLoaded) {
+                if (uiState.isAppLoaded) {
+                    uiState.locale.let { LocaleUtil.changeLocale(it) }
                 }
             }
 
-            val navState by
-                navController.currentBackStackEntryAsNavbarState(viewModel, navController)
-            val snackbar = remember { SnackbarHostState() }
+            val snackbarState = rememberCustomSnackbarState()
             var showVpnPermissionDialog by remember { mutableStateOf(false) }
             var vpnPermissionDenied by remember { mutableStateOf(false) }
             var requestingAppMode by remember {
-                mutableStateOf<Pair<AppMode?, TunnelConf?>>(Pair(null, null))
+                mutableStateOf<Pair<AppMode?, TunnelConfig?>>(Pair(null, null))
             }
 
-            LaunchedEffect(navState) { Timber.d("New navbar state $navState") }
+            val startingStack = buildList {
+                add(Route.Tunnels)
+                if (intent?.action == Intent.ACTION_APPLICATION_PREFERENCES) add(Route.Settings)
+                if (uiState.pinLockEnabled) add(Route.Lock)
+            }
+
+            val backStack = rememberNavBackStack(*startingStack.toTypedArray())
+            var previousRoute by remember { mutableStateOf<Route?>(null) }
+
+            val navController =
+                rememberNavController(
+                    backStack,
+                    uiState.isLocationDisclosureShown,
+                    onChange = { previousKey -> previousRoute = previousKey as? Route },
+                    onExitApp = { finish() },
+                )
 
             val vpnActivity =
                 rememberLauncherForActivityResult(
@@ -164,53 +212,52 @@ class MainActivity : AppCompatActivity() {
                     },
                 )
 
-            val batteryActivity =
-                rememberLauncherForActivityResult(
-                    ActivityResultContracts.StartActivityForResult()
-                ) { _: ActivityResult ->
-                    viewModel.disableBatteryOptimizationsShown()
-                }
-
-            fun requestDisableBatteryOptimizations() {
-                batteryActivity.launch(
-                    Intent().apply {
-                        action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
-                        data = "package:${this@MainActivity.packageName}".toUri()
-                    }
-                )
-            }
-
             LaunchedEffect(Unit) {
-                viewModel.globalSideEffect.collect { sideEffect ->
+                viewModel.globalSideEffect.collectLatest { sideEffect ->
                     when (sideEffect) {
                         GlobalSideEffect.ConfigChanged -> restartApp()
-                        GlobalSideEffect.PopBackStack -> navController.popBackStack()
-                        GlobalSideEffect.RequestBatteryOptimizationDisabled ->
-                            requestDisableBatteryOptimizations()
+                        GlobalSideEffect.PopBackStack -> navController.pop()
                         is GlobalSideEffect.RequestVpnPermission -> {
                             requestingAppMode = Pair(sideEffect.requestingMode, sideEffect.config)
                             vpnActivity.launch(VpnService.prepare(this@MainActivity))
                         }
-                        is GlobalSideEffect.Snackbar ->
+
+                        is GlobalSideEffect.Snackbar -> {
                             scope.launch {
-                                snackbar.showSnackbar(sideEffect.message.asString(context))
+                                snackbarState.showSnackbar(
+                                    SnackbarInfo(
+                                        message =
+                                            buildAnnotatedString {
+                                                append(sideEffect.message.asString(context))
+                                            },
+                                        type = sideEffect.type ?: SnackbarType.INFO,
+                                        durationMs = sideEffect.durationMs ?: 4000L,
+                                    )
+                                )
                             }
+                        }
+
                         is GlobalSideEffect.Toast ->
                             scope.launch { context.showToast(sideEffect.message.asString(context)) }
+
                         is GlobalSideEffect.LaunchUrl -> context.openWebUrl(sideEffect.url)
                         is GlobalSideEffect.InstallApk -> context.installApk(sideEffect.apk)
                     }
                 }
             }
 
-            if (!appState.isAppLoaded) return@setContent
+            if (!uiState.isAppLoaded) return@setContent
+
+            var showLock by remember {
+                mutableStateOf(uiState.pinLockEnabled && !uiState.isPinVerified)
+            }
+            LaunchedEffect(uiState.isPinVerified) { if (uiState.isPinVerified) showLock = false }
 
             CompositionLocalProvider(
                 LocalIsAndroidTV provides isTv,
-                LocalSharedVm provides viewModel,
                 LocalNavController provides navController,
             ) {
-                WireguardAutoTunnelTheme(theme = appState.theme) {
+                WireguardAutoTunnelTheme(theme = uiState.theme) {
                     VpnDeniedDialog(
                         showVpnPermissionDialog,
                         onDismiss = {
@@ -219,174 +266,245 @@ class MainActivity : AppCompatActivity() {
                         },
                     )
 
-                    Box(modifier = Modifier.fillMaxSize()) {
-                        if (appState.settings.appMode == AppMode.LOCK_DOWN) {
-                            AppAlertBanner(
-                                stringResource(R.string.locked_down).uppercase(Locale.getDefault()),
-                                OffWhite,
-                                AlertRed,
-                                modifier = Modifier.fillMaxWidth().zIndex(2f),
+                    val annotatedMessage = buildAnnotatedString {
+                        append(context.getString(R.string.donation_prompt_prefix))
+                        append(" ")
+                        withLink(
+                            LinkAnnotation.Clickable(
+                                tag = context.getString(R.string.support),
+                                styles =
+                                    TextLinkStyles(
+                                        style =
+                                            SpanStyle(
+                                                textDecoration = TextDecoration.Underline,
+                                                color = MaterialTheme.colorScheme.primary,
+                                            ),
+                                        focusedStyle =
+                                            SpanStyle(
+                                                textDecoration = TextDecoration.Underline,
+                                                color = MaterialTheme.colorScheme.primary,
+                                                background =
+                                                    MaterialTheme.colorScheme.primary.copy(
+                                                        alpha = 0.2f
+                                                    ),
+                                            ),
+                                    ),
+                            ) {
+                                snackbarState.dismissCurrent()
+                                navController.push(Route.Donate)
+                            }
+                        ) {
+                            append(context.getString(R.string.donation_prompt_link))
+                        }
+                        append(" ")
+                        append(context.getString(R.string.donation_prompt_suffix))
+                    }
+
+                    LaunchedEffect(Unit) {
+                        if (uiState.shouldShowDonationSnackbar && !uiState.alreadyDonated) {
+                            viewModel.setShouldShowDonationSnackbar(false)
+                            snackbarState.showSnackbar(
+                                SnackbarInfo(
+                                    message = annotatedMessage,
+                                    type = SnackbarType.THANK_YOU,
+                                    durationMs = 30_000L,
+                                )
                             )
                         }
+                    }
 
-                        Scaffold(
-                            snackbarHost = {
-                                SnackbarHost(snackbar) { snackbarData ->
-                                    CustomSnackBar(
-                                        snackbarData.visuals.message,
-                                        isRtl = false,
-                                        containerColor =
-                                            MaterialTheme.colorScheme.surfaceColorAtElevation(2.dp),
-                                    )
-                                }
-                            },
-                            topBar = { DynamicTopAppBar(navState) },
-                            bottomBar = {
-                                BottomNavbar(appState.isAutoTunnelActive, navState, navController)
-                            },
-                            modifier =
-                                Modifier.pointerInput(Unit) {
-                                    detectTapGestures { viewModel.clearSelectedTunnels() }
+                    if (showLock) {
+                        PinManager.initialize(context = this@MainActivity)
+                        PinLockScreen()
+                    } else {
+                        val currentRoute by remember {
+                            derivedStateOf { backStack.lastOrNull() as? Route }
+                        }
+                        val currentTab by remember {
+                            derivedStateOf { Tab.fromRoute(currentRoute ?: Route.Tunnels) }
+                        }
+                        val navState by
+                            currentRouteAsNavbarState(
+                                uiState,
+                                viewModel,
+                                currentRoute,
+                                navController,
+                            )
+
+                        Box(modifier = Modifier.fillMaxSize()) {
+                            if (uiState.appMode == AppMode.LOCK_DOWN) {
+                                AppAlertBanner(
+                                    stringResource(R.string.locked_down)
+                                        .uppercase(Locale.current.platformLocale),
+                                    OffWhite,
+                                    AlertRed,
+                                    modifier = Modifier.fillMaxWidth().zIndex(2f),
+                                )
+                            }
+                            Scaffold(
+                                snackbarHost = {
+                                    snackbarState.SnackbarHost(
+                                        modifier =
+                                            Modifier.align(Alignment.BottomCenter)
+                                                .padding(
+                                                    bottom =
+                                                        if (LocalIsAndroidTV.current) 120.dp
+                                                        else 80.dp
+                                                )
+                                    ) { info ->
+                                        CustomSnackBar(
+                                            message = info.message,
+                                            type = info.type,
+                                            onDismiss = { snackbarState.dismissCurrent() },
+                                            containerColor =
+                                                MaterialTheme.colorScheme.surfaceColorAtElevation(
+                                                    2.dp
+                                                ),
+                                            modifier =
+                                                Modifier.wrapContentHeight(align = Alignment.Top),
+                                        )
+                                    }
                                 },
-                        ) { padding ->
-                            Box(
-                                modifier =
-                                    Modifier.fillMaxSize()
-                                        .background(MaterialTheme.colorScheme.surface)
-                                        .padding(padding)
-                                        .consumeWindowInsets(padding)
-                                        .imePadding()
-                            ) {
-                                NavHost(
-                                    navController = navController,
-                                    startDestination =
-                                        if (appState.pinLockEnabled && !appState.isAuthorized)
-                                            Route.Lock
-                                        else Route.TunnelsGraph,
+                                topBar = { DynamicTopAppBar(navState) },
+                                bottomBar = {
+                                    if (navState.showBottomItems) {
+                                        BottomNavbar(
+                                            uiState.isAutoTunnelActive,
+                                            currentTab,
+                                            onTabSelected = { tab ->
+                                                navController.popUpTo(tab.startRoute)
+                                            },
+                                        )
+                                    }
+                                },
+                            ) { padding ->
+                                Column(
+                                    modifier =
+                                        Modifier.fillMaxSize()
+                                            .background(MaterialTheme.colorScheme.surface)
+                                            .padding(
+                                                top = padding.calculateTopPadding().plus(8.dp),
+                                                bottom = padding.calculateBottomPadding(),
+                                            )
+                                            .consumeWindowInsets(padding)
+                                            .imePadding()
                                 ) {
-                                    composable<Route.Lock> {
-                                        PinManager.initialize(context = this@MainActivity)
-                                        PinLockScreen()
-                                    }
-                                    navigation<Route.TunnelsGraph>(
-                                        startDestination = Route.Tunnels
-                                    ) {
-                                        composable<Route.Tunnels> {
-                                            val viewModel =
-                                                it.sharedViewModel<TunnelsViewModel>(navController)
-                                            TunnelsScreen(viewModel)
-                                        }
-                                        composable<Route.Sort> {
-                                            val viewModel =
-                                                it.sharedViewModel<TunnelsViewModel>(navController)
-                                            SortScreen(viewModel)
-                                        }
-                                        composable<Route.TunnelOptions> { backStackEntry ->
-                                            val args = backStackEntry.toRoute<Route.TunnelOptions>()
-                                            val viewModel =
-                                                backStackEntry.sharedViewModel<TunnelsViewModel>(
-                                                    navController
-                                                )
-                                            TunnelOptionsScreen(args.id, viewModel)
-                                        }
-                                        composable<Route.SplitTunnel> { backStackEntry ->
-                                            val args = backStackEntry.toRoute<Route.SplitTunnel>()
-                                            SplitTunnelScreen(args.id)
-                                        }
-                                        composable<Route.TunnelAutoTunnel> { backStackEntry ->
-                                            val args =
-                                                backStackEntry.toRoute<Route.TunnelAutoTunnel>()
-                                            val viewModel =
-                                                backStackEntry.sharedViewModel<TunnelsViewModel>(
-                                                    navController
-                                                )
-                                            TunnelAutoTunnelScreen(args.id, viewModel)
-                                        }
-                                        composable<Route.Config> { backStackEntry ->
-                                            val args = backStackEntry.toRoute<Route.Config>()
-                                            val viewModel =
-                                                backStackEntry.sharedViewModel<TunnelsViewModel>(
-                                                    navController
-                                                )
-                                            ConfigScreen(args.id, viewModel)
-                                        }
-                                    }
-
-                                    navigation<Route.AutoTunnelGraph>(
-                                        startDestination = Route.AutoTunnel
-                                    ) {
-                                        composable<Route.LocationDisclosure> {
-                                            val viewModel =
-                                                it.sharedViewModel<AutoTunnelViewModel>(
-                                                    navController
-                                                )
-                                            LocationDisclosureScreen(viewModel)
-                                        }
-                                        composable<Route.AutoTunnel> {
-                                            val viewModel =
-                                                it.sharedViewModel<AutoTunnelViewModel>(
-                                                    navController
-                                                )
-                                            AutoTunnelScreen(viewModel)
-                                        }
-                                        composable<Route.AdvancedAutoTunnel> {
-                                            val viewModel =
-                                                it.sharedViewModel<AutoTunnelViewModel>(
-                                                    navController
-                                                )
-                                            AutoTunnelAdvancedScreen(viewModel)
-                                        }
-                                        composable<Route.WifiDetectionMethod> {
-                                            val viewModel =
-                                                it.sharedViewModel<AutoTunnelViewModel>(
-                                                    navController
-                                                )
-                                            WifiDetectionMethodScreen(viewModel)
-                                        }
-                                    }
-
-                                    navigation<Route.SettingsGraph>(
-                                        startDestination = Route.Settings
-                                    ) {
-                                        composable<Route.Settings> {
-                                            val viewModel =
-                                                it.sharedViewModel<SettingsViewModel>(navController)
-                                            SettingsScreen(viewModel)
-                                        }
-                                        composable<Route.TunnelMonitoring> {
-                                            val viewModel =
-                                                it.sharedViewModel<SettingsViewModel>(navController)
-                                            TunnelMonitoringScreen(viewModel)
-                                        }
-                                        composable<Route.SystemFeatures> {
-                                            val viewModel =
-                                                it.sharedViewModel<SettingsViewModel>(navController)
-                                            SystemFeaturesScreen(viewModel)
-                                        }
-                                        composable<Route.Dns> {
-                                            val viewModel =
-                                                it.sharedViewModel<SettingsViewModel>(navController)
-                                            DnsSettingsScreen(viewModel)
-                                        }
-                                        composable<Route.ProxySettings> { ProxySettingsScreen() }
-                                        composable<Route.Appearance> { AppearanceScreen() }
-                                        composable<Route.Language> { LanguageScreen() }
-                                        composable<Route.Display> { DisplayScreen() }
-                                        composable<Route.Logs> { LogsScreen() }
-                                    }
-
-                                    navigation<Route.SupportGraph>(
-                                        startDestination = Route.Support
-                                    ) {
-                                        composable<Route.Support> {
-                                            val viewModel =
-                                                it.sharedViewModel<SupportViewModel>(navController)
-                                            SupportScreen(viewModel)
-                                        }
-                                        composable<Route.License> { LicenseScreen() }
-                                        composable<Route.Donate> { DonateScreen(navController) }
-                                        composable<Route.Addresses> { AddressesScreen() }
-                                    }
+                                    NavDisplay(
+                                        backStack = backStack,
+                                        modifier = Modifier.fillMaxSize(),
+                                        onBack = { navController.pop() },
+                                        transitionSpec = {
+                                            val initialIndex =
+                                                previousRoute?.let(Tab::fromRoute)?.index ?: 0
+                                            val targetIndex =
+                                                currentRoute?.let(Tab::fromRoute)?.index ?: 0
+                                            if (initialIndex != targetIndex) {
+                                                val dir = if (targetIndex > initialIndex) 1 else -1
+                                                (slideInHorizontally { dir * it } +
+                                                    fadeIn()) togetherWith
+                                                    (slideOutHorizontally { dir * -it } + fadeOut())
+                                            } else {
+                                                (slideInHorizontally { it } + fadeIn()) togetherWith
+                                                    (slideOutHorizontally { -it } + fadeOut())
+                                            }
+                                        },
+                                        popTransitionSpec = {
+                                            (slideInHorizontally { -it } + fadeIn()) togetherWith
+                                                (slideOutHorizontally { it } + fadeOut())
+                                        },
+                                        predictivePopTransitionSpec = {
+                                            (slideInHorizontally { -it } + fadeIn()) togetherWith
+                                                (slideOutHorizontally { it } + fadeOut())
+                                        },
+                                        entryDecorators =
+                                            listOf(
+                                                rememberSaveableStateHolderNavEntryDecorator(),
+                                                rememberViewModelStoreNavEntryDecorator(),
+                                            ),
+                                        entryProvider =
+                                            entryProvider {
+                                                entry<Route.Lock> {
+                                                    PinManager.initialize(
+                                                        context = this@MainActivity
+                                                    )
+                                                    PinLockScreen()
+                                                }
+                                                entry<Route.Tunnels> { TunnelsScreen() }
+                                                entry<Route.Sort> { SortScreen() }
+                                                entry<Route.TunnelSettings> { key ->
+                                                    val viewModel: TunnelViewModel =
+                                                        koinViewModel(
+                                                            parameters = { parametersOf(key.id) }
+                                                        )
+                                                    TunnelSettingsScreen(viewModel)
+                                                }
+                                                entry<Route.SplitTunnel> { key ->
+                                                    val viewModel: SplitTunnelViewModel =
+                                                        koinViewModel(
+                                                            parameters = { parametersOf(key.id) }
+                                                        )
+                                                    SplitTunnelScreen(viewModel)
+                                                }
+                                                entry<Route.Config> { key ->
+                                                    val viewModel: ConfigViewModel =
+                                                        koinViewModel(
+                                                            parameters = { parametersOf(key.id) }
+                                                        )
+                                                    ConfigScreen(viewModel)
+                                                }
+                                                entry<Route.LocationDisclosure> {
+                                                    LocationDisclosureScreen()
+                                                }
+                                                entry<Route.AutoTunnel> { AutoTunnelScreen() }
+                                                entry<Route.WifiPreferences> {
+                                                    WifiSettingsScreen()
+                                                }
+                                                entry<Route.AdvancedAutoTunnel> {
+                                                    AutoTunnelAdvancedScreen()
+                                                }
+                                                entry<Route.WifiDetectionMethod> {
+                                                    WifiDetectionMethodScreen()
+                                                }
+                                                entry<Route.Settings> { SettingsScreen() }
+                                                entry<Route.TunnelMonitoring> {
+                                                    TunnelMonitoringScreen()
+                                                }
+                                                entry<Route.AndroidIntegrations> {
+                                                    AndroidIntegrationsScreen()
+                                                }
+                                                entry<Route.Dns> { DnsSettingsScreen() }
+                                                entry<Route.ConfigGlobal> { key ->
+                                                    val viewModel: ConfigViewModel =
+                                                        koinViewModel(
+                                                            parameters = { parametersOf(key.id) }
+                                                        )
+                                                    ConfigScreen(viewModel)
+                                                }
+                                                entry<Route.SplitTunnelGlobal> { key ->
+                                                    val viewModel: SplitTunnelViewModel =
+                                                        koinViewModel(
+                                                            parameters = { parametersOf(key.id) }
+                                                        )
+                                                    SplitTunnelScreen(viewModel)
+                                                }
+                                                entry<Route.LockdownSettings> {
+                                                    LockdownSettingsScreen()
+                                                }
+                                                entry<Route.ProxySettings> { ProxySettingsScreen() }
+                                                entry<Route.Appearance> { AppearanceScreen() }
+                                                entry<Route.Language> { LanguageScreen() }
+                                                entry<Route.Display> { DisplayScreen() }
+                                                entry<Route.Logs> { LogsScreen() }
+                                                entry<Route.Support> { SupportScreen() }
+                                                entry<Route.License> { LicenseScreen() }
+                                                entry<Route.Donate> { DonateScreen() }
+                                                entry<Route.Addresses> { AddressesScreen() }
+                                                entry<Route.PreferredTunnel> { key ->
+                                                    PreferredTunnelScreen(key.tunnelNetwork)
+                                                }
+                                                entry<Route.PingTarget> { PingTargetScreen() }
+                                            },
+                                    )
                                 }
                             }
                         }
@@ -398,8 +516,8 @@ class MainActivity : AppCompatActivity() {
 
     override fun onResume() {
         super.onResume()
-        WireGuardAutoTunnel.setUiActive(true)
         networkMonitor.checkPermissionsAndUpdateState()
+        WireGuardAutoTunnel.setUiActive(true)
     }
 
     override fun onPause() {
@@ -409,6 +527,9 @@ class MainActivity : AppCompatActivity() {
 
     fun performBackup() =
         lifecycleScope.launch {
+            // reset active tuns before backup to prevent trying to start them without permission on
+            // restore
+            tunnelRepository.resetActiveTunnels()
             roomBackup
                 .database(appDatabase)
                 .backupLocation(RoomBackup.BACKUP_FILE_LOCATION_CUSTOM_DIALOG)

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

@@ -2,99 +2,87 @@ 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.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.domain.enums.BackendMode
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import com.zaneschepke.wireguardautotunnel.di.Dispatcher
+import com.zaneschepke.wireguardautotunnel.di.Scope
+import com.zaneschepke.wireguardautotunnel.di.appModule
+import com.zaneschepke.wireguardautotunnel.di.databaseModule
+import com.zaneschepke.wireguardautotunnel.di.dispatchersModule
+import com.zaneschepke.wireguardautotunnel.di.networkModule
+import com.zaneschepke.wireguardautotunnel.di.tunnelModule
+import com.zaneschepke.wireguardautotunnel.di.workerModule
+import com.zaneschepke.wireguardautotunnel.domain.repository.MonitoringSettingsRepository
 import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
-import dagger.hilt.android.HiltAndroidApp
-import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.distinctUntilChangedBy
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import org.amnezia.awg.backend.GoBackend
+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.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))
+    private val logReader: LogReader by inject()
 
-    override val workManagerConfiguration: Configuration
-        get() = Configuration.Builder().setWorkerFactory(workerFactory).build()
-
-    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
-
-    @Inject lateinit var logReader: LogReader
-
-    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
-
-    @Inject lateinit var settingsRepository: GeneralSettingRepository
-    @Inject lateinit var tunnelsRepository: TunnelRepository
-    @Inject lateinit var appStateRepository: AppStateRepository
-
-    @Inject lateinit var notificationMonitor: NotificationMonitor
-
-    @Inject lateinit var tunnelManager: TunnelManager
+    private val monitoringRepository: MonitoringSettingsRepository by inject()
+    private val notificationMonitor: NotificationMonitor by inject()
 
     override fun onCreate() {
         super.onCreate()
+        startKoin {
+            androidContext(this@WireGuardAutoTunnel)
+            if (BuildConfig.DEBUG) androidLogger()
+            workManagerFactory()
+            modules(dispatchersModule, appModule, databaseModule, tunnelModule, workerModule)
+            options(viewModelScopeFactory())
+            lazyModules(networkModule)
+        }
         instance = this
         if (BuildConfig.DEBUG) {
             Timber.plant(Timber.DebugTree())
             StrictMode.setThreadPolicy(
-                ThreadPolicy.Builder()
-                    .detectDiskReads()
-                    .detectDiskWrites()
-                    .detectNetwork()
+                StrictMode.ThreadPolicy.Builder()
+                    .detectAll()
                     .penaltyLog()
+                    .penaltyFlashScreen()
                     .build()
             )
+            StrictMode.setVmPolicy(StrictMode.VmPolicy.Builder().detectAll().penaltyLog().build())
         } else {
             Timber.plant(ReleaseTree())
         }
 
         applicationScope.launch(ioDispatcher) {
-            launch { if (appStateRepository.isLocalLogsEnabled()) logReader.start() }
+            launch {
+                monitoringRepository.flow
+                    .distinctUntilChangedBy { it.isLocalLogsEnabled }
+                    .collect { settings ->
+                        if (settings.isLocalLogsEnabled) {
+                            logReader.start()
+                        } else {
+                            logReader.stop()
+                        }
+                    }
+            }
             launch { notificationMonitor.handleApplicationNotifications() }
         }
-
-        GoBackend.setAlwaysOnCallback {
-            applicationScope.launch {
-                val settings = settingsRepository.get()
-                if (settings.isAlwaysOnVpnEnabled) {
-                    val tunnel = tunnelsRepository.getDefaultTunnel()
-                    tunnel?.let { tunnelManager.startTunnel(it) }
-                } else {
-                    Timber.w("Always-on VPN is not enabled in app settings")
-                }
-            }
-        }
-
-        ServiceWorker.start(this)
-    }
-
-    override fun onTerminate() {
-        applicationScope.cancel()
-        tunnelManager.setBackendMode(BackendMode.Inactive)
-        super.onTerminate()
     }
 
     companion object {
-
         private val _uiActive = MutableStateFlow(false)
 
         val uiActive: StateFlow<Boolean>

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

@@ -4,21 +4,19 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.di.Scope
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+import org.koin.core.qualifier.named
 
-@AndroidEntryPoint
-class KernelReceiver : BroadcastReceiver() {
+class KernelReceiver : BroadcastReceiver(), KoinComponent {
 
-    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
-
-    @Inject lateinit var tunnelRepository: TunnelRepository
-
-    @Inject lateinit var tunnelManager: TunnelManager
+    private val applicationScope: CoroutineScope by inject(named(Scope.APPLICATION))
+    private val tunnelRepository: TunnelRepository by inject()
+    private val tunnelManager: TunnelManager by inject()
 
     override fun onReceive(context: Context, intent: Intent) {
         val action = intent.action ?: return

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

@@ -5,31 +5,27 @@ import android.content.Context
 import android.content.Intent
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.di.Scope
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
-import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
+import com.zaneschepke.wireguardautotunnel.domain.repository.AutoTunnelSettingsRepository
 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 tunnelManager: TunnelManager
-
-    @Inject lateinit var tunnelRepository: TunnelRepository
-
-    @Inject lateinit var settingsRepository: GeneralSettingRepository
-
-    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
+    private val tunnelManager: TunnelManager by inject()
+    private val autoTunnelRepository: AutoTunnelSettingsRepository by inject()
+    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 ->
-                    settingsRepository.updateAutoTunnelEnabled(false)
+                    autoTunnelRepository.updateAutoTunnelEnabled(false)
                 NotificationAction.TUNNEL_OFF.name -> {
                     val tunnelId = intent.getIntExtra(NotificationManager.EXTRA_ID, 0)
                     if (tunnelId == STOP_ALL_TUNNELS_ID)

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

@@ -4,27 +4,25 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
+import com.zaneschepke.wireguardautotunnel.di.Scope
+import com.zaneschepke.wireguardautotunnel.domain.repository.AutoTunnelSettingsRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+import org.koin.core.qualifier.named
 import timber.log.Timber
 
-@AndroidEntryPoint
-class RemoteControlReceiver : BroadcastReceiver() {
+class RemoteControlReceiver : BroadcastReceiver(), KoinComponent {
 
-    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
-
-    @Inject lateinit var appStateRepository: AppStateRepository
-    @Inject lateinit var settingsRepository: GeneralSettingRepository
-    @Inject lateinit var tunnelsRepository: TunnelRepository
-
-    @Inject lateinit var tunnelManager: TunnelManager
+    private val applicationScope: CoroutineScope by inject(named(Scope.APPLICATION))
+    private val settingsRepository: GeneralSettingRepository by inject()
+    private val tunnelsRepository: TunnelRepository by inject()
+    private val autoTunnelSettingsRepository: AutoTunnelSettingsRepository by inject()
+    private val tunnelManager: TunnelManager by inject()
 
     enum class Action(private val suffix: String) {
         START_TUNNEL("START_TUNNEL"),
@@ -53,11 +51,9 @@ class RemoteControlReceiver : BroadcastReceiver() {
         val action = intent.action ?: return
         val appAction = Action.fromAction(action) ?: return Timber.w("Unknown action $action")
         applicationScope.launch {
-            if (!appStateRepository.isRemoteControlEnabled())
-                return@launch Timber.w("Remote control disabled")
-            val key =
-                appStateRepository.getRemoteKey()
-                    ?: return@launch Timber.w("Remote control key missing")
+            val settings = settingsRepository.getGeneralSettings()
+            if (!settings.isRemoteControlEnabled) return@launch Timber.w("Remote control disabled")
+            val key = settings.remoteKey ?: return@launch Timber.w("Remote control key missing")
             if (key != intent.getStringExtra(EXTRA_KEY)?.trim())
                 return@launch Timber.w("Invalid remote control key")
             when (appAction) {
@@ -78,8 +74,10 @@ class RemoteControlReceiver : BroadcastReceiver() {
                             ?: return@launch tunnelManager.stopActiveTunnels()
                     tunnelManager.stopTunnel(tunnel.id)
                 }
-                Action.START_AUTO_TUNNEL -> settingsRepository.updateAutoTunnelEnabled(true)
-                Action.STOP_AUTO_TUNNEL -> settingsRepository.updateAutoTunnelEnabled(false)
+                Action.START_AUTO_TUNNEL ->
+                    autoTunnelSettingsRepository.updateAutoTunnelEnabled(true)
+                Action.STOP_AUTO_TUNNEL ->
+                    autoTunnelSettingsRepository.updateAutoTunnelEnabled(false)
             }
         }
     }

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

@@ -5,29 +5,42 @@ import android.content.Context
 import android.content.Intent
 import com.zaneschepke.logcatter.LogReader
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
-import kotlinx.coroutines.CoroutineDispatcher
+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() {
+class RestartReceiver : BroadcastReceiver(), KoinComponent {
 
-    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
+    private val applicationScope: CoroutineScope = get(named(Scope.APPLICATION))
 
-    @Inject lateinit var tunnelManager: TunnelManager
+    private val tunnelManager: TunnelManager by inject()
 
-    @Inject lateinit var logReader: LogReader
+    private val appStateRepository: AppStateRepository by inject()
 
-    @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}")
-        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" -> {
+                    tunnelManager.handleReboot()
+                }
+                Intent.ACTION_MY_PACKAGE_REPLACED -> {
+                    Timber.i("Restoring state on package upgrade")
+                    tunnelManager.handleRestore()
+                    logReader.deleteAndClearLogs()
+                    appStateRepository.setShouldShowDonationSnackbar(true)
+                }
+            }
+        }
     }
 }

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

@@ -17,9 +17,11 @@ interface NotificationManager {
         actions: Collection<NotificationCompat.Action> = emptyList(),
         description: String = "",
         showTimestamp: Boolean = true,
-        importance: Int = NotificationManager.IMPORTANCE_HIGH,
+        importance: Int = NotificationManager.IMPORTANCE_LOW,
         onGoing: Boolean = false,
         onlyAlertOnce: Boolean = true,
+        groupKey: String? = null,
+        isGroupSummary: Boolean = false,
     ): Notification
 
     fun createNotification(
@@ -28,9 +30,11 @@ interface NotificationManager {
         actions: Collection<NotificationCompat.Action> = emptyList(),
         description: StringValue,
         showTimestamp: Boolean = true,
-        importance: Int = NotificationManager.IMPORTANCE_HIGH,
+        importance: Int = NotificationManager.IMPORTANCE_LOW,
         onGoing: Boolean = false,
         onlyAlertOnce: Boolean = true,
+        groupKey: String? = null,
+        isGroupSummary: Boolean = false,
     ): Notification
 
     fun createNotificationAction(
@@ -43,6 +47,8 @@ interface NotificationManager {
     fun show(notificationId: Int, notification: Notification)
 
     companion object {
+        const val VPN_GROUP_KEY = "VPN_GROUP"
+        const val AUTO_TUNNEL_GROUP_KEY = "AUTO_TUNNEL_GROUP"
         const val AUTO_TUNNEL_LOCATION_PERMISSION_ID = 123
         const val AUTO_TUNNEL_LOCATION_SERVICES_ID = 124
         // For auto tunnel foreground notification

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

@@ -3,16 +3,12 @@ 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(
+class NotificationMonitor(
     private val tunnelManager: TunnelManager,
     private val notificationManager: NotificationManager,
 ) {
@@ -27,16 +23,15 @@ constructor(
                 val notification =
                     notificationManager.createNotification(
                         WireGuardNotification.NotificationChannels.VPN,
-                        title = StringValue.DynamicString(tunName),
+                        title =
+                            tunName?.let { StringValue.DynamicString(it) }
+                                ?: StringValue.StringResource(R.string.tunnel),
                         description =
-                            when (error) {
-                                is BackendCoreException.BounceFailed -> error.toStringValue()
-                                else ->
-                                    StringValue.StringResource(
-                                        R.string.tunnel_error_template,
-                                        error.toStringRes(),
-                                    )
-                            },
+                            StringValue.StringResource(
+                                R.string.tunnel_error_template,
+                                error.stringRes,
+                            ),
+                        groupKey = NotificationManager.VPN_GROUP_KEY,
                     )
                 notificationManager.show(
                     NotificationManager.TUNNEL_ERROR_NOTIFICATION_ID,
@@ -51,8 +46,11 @@ constructor(
                 val notification =
                     notificationManager.createNotification(
                         WireGuardNotification.NotificationChannels.VPN,
-                        title = StringValue.DynamicString(tunName),
+                        title =
+                            tunName?.let { StringValue.DynamicString(it) }
+                                ?: StringValue.StringResource(R.string.tunnel),
                         description = message.toStringValue(),
+                        groupKey = NotificationManager.VPN_GROUP_KEY,
                     )
                 notificationManager.show(
                     NotificationManager.TUNNEL_MESSAGES_NOTIFICATION_ID,

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

@@ -3,12 +3,10 @@ package com.zaneschepke.wireguardautotunnel.core.notification
 import android.Manifest
 import android.app.Notification
 import android.app.NotificationChannel
-import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.graphics.Color
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
@@ -18,11 +16,8 @@ import com.zaneschepke.wireguardautotunnel.core.broadcast.NotificationActionRece
 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 {
+class WireGuardNotification(override val context: Context) : NotificationManager {
 
     enum class NotificationChannels {
         VPN,
@@ -40,8 +35,10 @@ class WireGuardNotification @Inject constructor(@ApplicationContext override val
         importance: Int,
         onGoing: Boolean,
         onlyAlertOnce: Boolean,
+        groupKey: String?,
+        isGroupSummary: Boolean,
     ): Notification {
-        notificationManager.createNotificationChannel(channel.asChannel())
+        notificationManager.createNotificationChannel(channel.asChannel(importance))
         return channel
             .asBuilder()
             .apply {
@@ -59,9 +56,15 @@ class WireGuardNotification @Inject constructor(@ApplicationContext override val
                 setContentText(description)
                 setOnlyAlertOnce(onlyAlertOnce)
                 setOngoing(onGoing)
-                setPriority(NotificationCompat.PRIORITY_HIGH)
+                setPriority(NotificationCompat.PRIORITY_LOW)
                 setShowWhen(showTimestamp)
                 setSmallIcon(R.drawable.ic_notification)
+                if (groupKey != null) {
+                    setGroup(groupKey)
+                    if (isGroupSummary) {
+                        setGroupSummary(true)
+                    }
+                }
             }
             .build()
     }
@@ -75,6 +78,8 @@ class WireGuardNotification @Inject constructor(@ApplicationContext override val
         importance: Int,
         onGoing: Boolean,
         onlyAlertOnce: Boolean,
+        groupKey: String?,
+        isGroupSummary: Boolean,
     ): Notification {
         return createNotification(
             channel,
@@ -142,34 +147,24 @@ class WireGuardNotification @Inject constructor(@ApplicationContext override val
         }
     }
 
-    private fun NotificationChannels.asChannel(): NotificationChannel {
+    private fun NotificationChannels.asChannel(importance: Int): NotificationChannel {
         return when (this) {
             NotificationChannels.VPN -> {
                 NotificationChannel(
                         context.getString(R.string.vpn_channel_id),
                         context.getString(R.string.vpn_channel_name),
-                        NotificationManager.IMPORTANCE_HIGH,
+                        importance,
                     )
-                    .apply {
-                        description = context.getString(R.string.vpn_channel_description)
-                        enableLights(true)
-                        lightColor = Color.WHITE
-                        enableVibration(false)
-                        vibrationPattern = longArrayOf(100, 200, 300)
-                    }
+                    .apply { description = context.getString(R.string.vpn_channel_description) }
             }
             NotificationChannels.AUTO_TUNNEL -> {
                 NotificationChannel(
                         context.getString(R.string.auto_tunnel_channel_id),
                         context.getString(R.string.auto_tunnel_channel_name),
-                        NotificationManager.IMPORTANCE_HIGH,
+                        importance,
                     )
                     .apply {
                         description = context.getString(R.string.auto_tunnel_channel_description)
-                        enableLights(true)
-                        lightColor = Color.WHITE
-                        enableVibration(false)
-                        vibrationPattern = longArrayOf(100, 200, 300)
                     }
             }
         }

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

@@ -10,32 +10,31 @@ 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.di.Dispatcher
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
-import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.util.extensions.distinctByKeys
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.launch
+import org.koin.android.ext.android.inject
+import org.koin.core.qualifier.named
 import timber.log.Timber
 
-@AndroidEntryPoint
 abstract class BaseTunnelForegroundService : LifecycleService(), TunnelService {
 
-    @Inject lateinit var notificationManager: NotificationManager
+    private val notificationManager: NotificationManager by inject()
 
-    @Inject lateinit var serviceManager: ServiceManager
+    private val serviceManager: ServiceManager by inject()
 
-    @Inject lateinit var tunnelManager: TunnelManager
+    private val tunnelManager: TunnelManager by inject()
 
-    @Inject lateinit var tunnelMonitor: TunnelMonitor
+    private val ioDispatcher: CoroutineDispatcher by inject(named(Dispatcher.IO))
 
-    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
+    private val settingsRepository: GeneralSettingRepository by inject()
 
-    @Inject lateinit var tunnelsRepository: TunnelRepository
+    private val tunnelsRepository: TunnelRepository by inject()
 
     protected abstract val fgsType: Int
 
@@ -62,7 +61,24 @@ abstract class BaseTunnelForegroundService : LifecycleService(), TunnelService {
             onCreateNotification(),
             fgsType,
         )
-        start()
+        if (
+            intent == null ||
+                intent.component == null ||
+                (intent.component?.packageName != this.packageName)
+        ) {
+            Timber.d("Service started by Always-on VPN feature")
+            lifecycleScope.launch {
+                val settings = settingsRepository.getGeneralSettings()
+                if (settings.isAlwaysOnVpnEnabled) {
+                    val tunnel = tunnelsRepository.getDefaultTunnel()
+                    tunnel?.let { tunnelManager.startTunnel(it) }
+                } else {
+                    Timber.w("Always-on VPN is not enabled in app settings")
+                }
+            }
+        } else {
+            start()
+        }
         return START_STICKY
     }
 
@@ -78,7 +94,7 @@ abstract class BaseTunnelForegroundService : LifecycleService(), TunnelService {
     }
 
     // TODO Would be cool to have this include kill switch
-    private fun updateServiceNotification(activeConfigs: List<TunnelConf>) {
+    private fun updateServiceNotification(activeConfigs: List<TunnelConfig>) {
         val notification =
             when (activeConfigs.size) {
                 0 -> onCreateNotification()
@@ -106,18 +122,20 @@ abstract class BaseTunnelForegroundService : LifecycleService(), TunnelService {
         super.onDestroy()
     }
 
-    private fun createTunnelNotification(tunnelConf: TunnelConf): Notification {
+    private fun createTunnelNotification(tunnelConfig: TunnelConfig): Notification {
         return notificationManager.createNotification(
             WireGuardNotification.NotificationChannels.VPN,
-            title = "${getString(R.string.tunnel_running)} - ${tunnelConf.tunName}",
+            title = "${getString(R.string.tunnel_running)} - ${tunnelConfig.name}",
             actions =
                 listOf(
                     notificationManager.createNotificationAction(
                         NotificationAction.TUNNEL_OFF,
-                        tunnelConf.id,
+                        tunnelConfig.id,
                     )
                 ),
             onGoing = true,
+            groupKey = NotificationManager.VPN_GROUP_KEY,
+            isGroupSummary = true,
         )
     }
 
@@ -129,6 +147,8 @@ abstract class BaseTunnelForegroundService : LifecycleService(), TunnelService {
                 listOf(
                     notificationManager.createNotificationAction(NotificationAction.TUNNEL_OFF, 0)
                 ),
+            groupKey = NotificationManager.VPN_GROUP_KEY,
+            isGroupSummary = true,
         )
     }
 
@@ -136,6 +156,8 @@ abstract class BaseTunnelForegroundService : LifecycleService(), TunnelService {
         return notificationManager.createNotification(
             WireGuardNotification.NotificationChannels.VPN,
             title = getString(R.string.tunnel_starting),
+            groupKey = NotificationManager.VPN_GROUP_KEY,
+            isGroupSummary = true,
         )
     }
 }

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

@@ -1,5 +1,11 @@
 package com.zaneschepke.wireguardautotunnel.core.service
 
 import android.os.Binder
+import java.lang.ref.WeakReference
 
-class LocalBinder(val service: TunnelService) : Binder()
+class LocalBinder(service: TunnelService) : Binder() {
+    private val serviceRef = WeakReference(service)
+
+    val service: TunnelService?
+        get() = serviceRef.get()
+}

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

@@ -8,29 +8,33 @@ import android.net.VpnService
 import android.os.IBinder
 import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelService
 import com.zaneschepke.wireguardautotunnel.data.model.AppMode
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AutoTunnelSettingsRepository
 import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
 import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
-import jakarta.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeoutOrNull
 import timber.log.Timber
 
-class ServiceManager
-@Inject
-constructor(
+class ServiceManager(
     private val context: Context,
-    @IoDispatcher ioDispatcher: CoroutineDispatcher,
-    @ApplicationScope applicationScope: CoroutineScope,
+    ioDispatcher: CoroutineDispatcher,
+    applicationScope: CoroutineScope,
     private val mainDispatcher: CoroutineDispatcher,
-    private val settingsRepository: GeneralSettingRepository,
+    private val autoTunnelSettingsRepository: AutoTunnelSettingsRepository,
 ) {
 
     private val autoTunnelMutex = Mutex()
@@ -49,7 +53,9 @@ constructor(
         }
         applicationScope.launch(ioDispatcher) {
             combine(
-                    settingsRepository.flow.map { it.isAutoTunnelEnabled }.distinctUntilChanged(),
+                    autoTunnelSettingsRepository.flow
+                        .map { it.isAutoTunnelEnabled }
+                        .distinctUntilChanged(),
                     _autoTunnelService,
                 ) { enabled, service ->
                     enabled to (service != null)
@@ -71,7 +77,7 @@ constructor(
         object : ServiceConnection {
             override fun onServiceConnected(name: ComponentName, service: IBinder) {
                 val binder = service as? LocalBinder
-                _tunnelService.value = binder?.service
+                _tunnelService.update { binder?.service }
                 val serviceClass =
                     when {
                         name.className.contains("VpnForegroundService") -> "VpnForegroundService"
@@ -83,7 +89,7 @@ constructor(
             }
 
             override fun onServiceDisconnected(name: ComponentName) {
-                _tunnelService.value = null
+                _tunnelService.update { null }
                 val serviceClass =
                     when {
                         name.className.contains("VpnForegroundService") -> "VpnForegroundService"
@@ -99,12 +105,12 @@ constructor(
         object : ServiceConnection {
             override fun onServiceConnected(name: ComponentName, service: IBinder) {
                 val binder = service as? AutoTunnelService.LocalBinder
-                _autoTunnelService.value = binder?.service
+                _autoTunnelService.update { binder?.service }
                 Timber.d("AutoTunnelService connected")
             }
 
             override fun onServiceDisconnected(name: ComponentName) {
-                _autoTunnelService.value = null
+                _autoTunnelService.update { null }
                 Timber.d("AutoTunnelService disconnected")
             }
         }
@@ -114,11 +120,15 @@ constructor(
     }
 
     private fun startServiceInternal() {
-        val intent = Intent(context, AutoTunnelService::class.java)
-        context.startForegroundService(intent)
-        context.bindService(intent, autoTunnelServiceConnection, Context.BIND_AUTO_CREATE)
+        if (autoTunnelService.value == null) {
+            val intent = Intent(context, AutoTunnelService::class.java)
+            context.startForegroundService(intent)
+            context.bindService(intent, autoTunnelServiceConnection, Context.BIND_AUTO_CREATE)
+        }
     }
 
+    suspend fun startAutoTunnelService() = autoTunnelMutex.withLock { startServiceInternal() }
+
     private fun stopServiceInternal() {
         _autoTunnelService.value?.stop()
         try {
@@ -131,17 +141,25 @@ constructor(
 
     suspend fun startTunnelService(appMode: AppMode) =
         tunnelMutex.withLock {
-            if (_tunnelService.value != null) return@withLock
-            val serviceClass =
-                when (appMode) {
-                    AppMode.VPN,
-                    AppMode.LOCK_DOWN -> VpnForegroundService::class.java
-                    AppMode.KERNEL,
-                    AppMode.PROXY -> TunnelForegroundService::class.java
-                }
-            val intent = Intent(context, serviceClass)
-            context.startForegroundService(intent)
-            context.bindService(intent, tunnelServiceConnection, Context.BIND_AUTO_CREATE)
+            if (_tunnelService.value != null) {
+                Timber.d("Service already exists, waiting for disconnect")
+                withTimeoutOrNull(2000L) { _tunnelService.first { it == null } }
+                    ?: Timber.w("Timeout waiting for existing service to disconnect")
+            }
+            if (_tunnelService.value == null) {
+                val serviceClass =
+                    when (appMode) {
+                        AppMode.VPN,
+                        AppMode.LOCK_DOWN -> VpnForegroundService::class.java
+                        AppMode.KERNEL,
+                        AppMode.PROXY -> TunnelForegroundService::class.java
+                    }
+                val intent = Intent(context, serviceClass)
+                context.startForegroundService(intent)
+                context.bindService(intent, tunnelServiceConnection, Context.BIND_AUTO_CREATE)
+            } else {
+                Timber.e("Service still not null after timeout")
+            }
         }
 
     suspend fun stopTunnelService() =
@@ -151,7 +169,7 @@ constructor(
                 try {
                     context.unbindService(tunnelServiceConnection)
                 } catch (e: Exception) {
-                    Timber.e(e, "Failed to stop Tunnel Service")
+                    Timber.e(e, "Failed to unbind Tunnel Service")
                 }
             }
         }

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

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

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

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

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

@@ -14,42 +14,59 @@ 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.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.data.model.AppMode
+import com.zaneschepke.wireguardautotunnel.di.Dispatcher
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
 import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
-import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.AutoTunnelSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.domain.repository.AutoTunnelSettingsRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.AutoTunnelState
-import com.zaneschepke.wireguardautotunnel.domain.state.NetworkState
+import com.zaneschepke.wireguardautotunnel.domain.state.toDomain
 import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.Tunnels
 import com.zaneschepke.wireguardautotunnel.util.extensions.to
 import com.zaneschepke.wireguardautotunnel.util.extensions.toMillis
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
-import javax.inject.Provider
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.*
+import java.lang.ref.WeakReference
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.debounce
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flatMapLatest
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.merge
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import org.koin.android.ext.android.inject
+import org.koin.core.qualifier.named
 import timber.log.Timber
 
-@AndroidEntryPoint
 class AutoTunnelService : LifecycleService() {
 
-    @Inject lateinit var networkMonitor: NetworkMonitor
+    private val networkMonitor: NetworkMonitor by inject()
 
-    @Inject lateinit var notificationManager: NotificationManager
+    private val notificationManager: NotificationManager by inject()
 
-    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
+    private val ioDispatcher: CoroutineDispatcher by inject(named(Dispatcher.IO))
 
-    @Inject lateinit var serviceManager: ServiceManager
+    private val serviceManager: ServiceManager by inject()
 
-    @Inject lateinit var tunnelManager: TunnelManager
+    private val tunnelManager: TunnelManager by inject()
 
-    @Inject lateinit var settingsRepository: Provider<GeneralSettingRepository>
-    @Inject lateinit var tunnelsRepository: TunnelRepository
+    private val autoTunnelRepository: AutoTunnelSettingsRepository by inject()
+    private val settingsRepository: GeneralSettingRepository by inject()
+    private val tunnelsRepository: TunnelRepository by inject()
 
     private val defaultState = AutoTunnelState()
 
@@ -57,7 +74,16 @@ class AutoTunnelService : LifecycleService() {
 
     private val autoTunnelStateFlow = MutableStateFlow(defaultState)
 
-    class LocalBinder(val service: AutoTunnelService) : Binder()
+    private var autoTunnelJob: Job? = null
+    private var permissionsJob: Job? = null
+    private var autoTunnelFailoverJob: Job? = null
+
+    class LocalBinder(service: AutoTunnelService) : Binder() {
+        private val serviceRef = WeakReference(service)
+
+        val service: AutoTunnelService?
+            get() = serviceRef.get()
+    }
 
     private val binder = LocalBinder(this)
 
@@ -80,8 +106,10 @@ class AutoTunnelService : LifecycleService() {
 
     fun start() {
         launchWatcherNotification()
-        startAutoTunnelStateJob()
-        startLocationPermissionsNotificationJob()
+        autoTunnelJob?.cancel()
+        autoTunnelJob = startAutoTunnelStateJob()
+        permissionsJob?.cancel()
+        permissionsJob = startLocationPermissionsNotificationJob()
     }
 
     fun stop() {
@@ -109,6 +137,8 @@ class AutoTunnelService : LifecycleService() {
                         )
                     ),
                 onGoing = true,
+                groupKey = NotificationManager.AUTO_TUNNEL_GROUP_KEY,
+                isGroupSummary = true,
             )
         ServiceCompat.startForeground(
             this,
@@ -118,20 +148,21 @@ class AutoTunnelService : LifecycleService() {
         )
     }
 
-    private fun startAutoTunnelStateJob() =
+    private fun startAutoTunnelStateJob(): Job =
         lifecycleScope.launch(ioDispatcher) {
             val networkFlow =
                 debouncedConnectivityStateFlow
                     .flowOn(ioDispatcher)
-                    .map(NetworkState::from)
-                    .map { StateChange.NetworkChange(it) }
+                    .map { it.toDomain() }
+                    .map(::NetworkChange)
                     .distinctUntilChanged()
 
             val settingsFlow =
-                combineSettings().map { StateChange.SettingsChange(it.first, it.second) }
+                combineSettings().map { (appMode, settings, tunnels) ->
+                    SettingsChange(appMode, settings, tunnels)
+                }
 
-            val tunnelsFlow =
-                tunnelManager.activeTunnels.map { StateChange.ActiveTunnelsChange(it) }
+            val tunnelsFlow = tunnelManager.activeTunnels.map(::ActiveTunnelsChange)
 
             var reevaluationJob: Job? = null
 
@@ -148,36 +179,46 @@ class AutoTunnelService : LifecycleService() {
                 }
                 .first()
 
+            val initialState = autoTunnelStateFlow.value
+            if (initialState != defaultState) {
+                handleAutoTunnelEvent(
+                    initialState.determineAutoTunnelEvent(NetworkChange(initialState.networkState))
+                )
+            }
+
             // use merge to limit the noise of a combine and also increase the scalability of auto
             // tunnel handling new states
             merge(networkFlow, settingsFlow, tunnelsFlow).collect { change ->
-                if (change !is StateChange.ActiveTunnelsChange) {
+                if (change !is ActiveTunnelsChange) {
                     Timber.d("New state changed to ${change.javaClass.simpleName}")
                 }
 
+                val previousState = autoTunnelStateFlow.value
+
                 when (change) {
-                    is StateChange.NetworkChange -> {
+                    is NetworkChange -> {
+                        Timber.d("Network change: ${change.networkState}")
                         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")
+                        if (previousState.networkState == change.networkState) {
+                            Timber.d("Duplicate network state change detected, ignoring")
                             return@collect
                         }
                     }
-                    is StateChange.SettingsChange -> {
+                    is SettingsChange -> {
                         reevaluationJob?.cancel()
                         autoTunnelStateFlow.update {
                             it.copy(settings = change.settings, tunnels = change.tunnels)
                         }
+                        if (
+                            previousState.settings == change.settings &&
+                                previousState.tunnels == change.tunnels
+                        ) {
+                            Timber.d("Duplicate settings change detected, ignoring")
+                            return@collect
+                        }
                     }
-                    is StateChange.ActiveTunnelsChange -> {
+                    is ActiveTunnelsChange -> {
                         autoTunnelStateFlow.update { it.copy(activeTunnels = change.activeTunnels) }
                         return@collect
                     }
@@ -185,52 +226,36 @@ class AutoTunnelService : LifecycleService() {
 
                 handleAutoTunnelEvent(autoTunnelStateFlow.value.determineAutoTunnelEvent(change))
 
+                // re-evaluate network state after a short duration to prevent missed state changes
                 reevaluationJob = launch {
+                    val snapshotNetwork = autoTunnelStateFlow.value.networkState
                     delay(REEVALUATE_CHECK_DELAY)
                     val currentState = autoTunnelStateFlow.value
-                    if (currentState != defaultState) {
-                        Timber.d("Re-evaluating auto-tunnel state..")
+                    if (
+                        currentState != defaultState && currentState.networkState != snapshotNetwork
+                    ) {
+                        Timber.d(
+                            "Re-evaluating auto-tunnel state.. (network changed since snapshot)"
+                        )
                         handleAutoTunnelEvent(currentState.determineAutoTunnelEvent(change))
+                    } else {
+                        Timber.d("Skipping re-eval: network unchanged or default state")
                     }
                 }
             }
         }
 
-    private fun 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: GeneralSettings, new: GeneralSettings): 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 &&
-            old.appMode == new.appMode)
-    }
-
-    private fun combineSettings(): Flow<Pair<GeneralSettings, Tunnels>> {
+    private fun combineSettings(): Flow<Triple<AppMode, AutoTunnelSettings, List<TunnelConfig>>> {
         return combine(
-                settingsRepository.get().flow.distinctUntilChanged(::areAutoTunnelSettingsTheSame),
-                tunnelsRepository.flow.map { tunnels ->
+                settingsRepository.flow.map { it.appMode }.distinctUntilChanged(),
+                autoTunnelRepository.flow,
+                tunnelsRepository.userTunnelsFlow.map { tunnels ->
                     // isActive is ignored for equality checks so user can manually toggle off
                     // tunnel with auto-tunnel
                     tunnels.map { it.copy(isActive = false) }
                 },
-            ) { settings, tunnels ->
-                Pair(settings, tunnels)
+            ) { appMode, autoTunnel, tunnels ->
+                Triple(appMode, autoTunnel, tunnels)
             }
             .distinctUntilChanged()
     }
@@ -266,8 +291,8 @@ class AutoTunnelService : LifecycleService() {
                 .map {
                     NetworkPermissionState(
                         it.settings.wifiDetectionMethod.to(),
-                        it.networkState.locationServicesEnabled == true,
-                        it.networkState.locationPermissionGranted == true,
+                        it.networkState.locationServicesEnabled,
+                        it.networkState.locationPermissionGranted,
                         (it.tunnels.any { tunnel -> tunnel.tunnelNetworks.isNotEmpty() } ||
                             it.settings.trustedNetworkSSIDs.isNotEmpty()),
                     )
@@ -339,8 +364,11 @@ class AutoTunnelService : LifecycleService() {
                     }
             ) {
                 is AutoTunnelEvent.Start ->
-                    (event.tunnelConf ?: tunnelsRepository.getDefaultTunnel())?.let {
-                        tunnelManager.startTunnel(it)
+                    (event.tunnelConfig ?: tunnelsRepository.getDefaultTunnel())?.let {
+                        tunnelManager.startTunnel(it).onFailure { e ->
+                            Timber.e(e, "Auto-tunnel start failed for ${it.name}")
+                            // TODO notify or retry
+                        }
                     }
                 is AutoTunnelEvent.Stop -> tunnelManager.stopActiveTunnels()
                 AutoTunnelEvent.DoNothing -> Timber.i("Auto-tunneling: nothing to do")
@@ -348,11 +376,10 @@ class AutoTunnelService : LifecycleService() {
         }
     }
 
+    // restart network flow on debounce changes
     @OptIn(FlowPreview::class, ExperimentalCoroutinesApi::class)
     private val debouncedConnectivityStateFlow: Flow<ConnectivityState> by lazy {
-        settingsRepository
-            .get()
-            .flow
+        autoTunnelRepository.flow
             .map { it.debounceDelaySeconds.toMillis() }
             .distinctUntilChanged()
             .flatMapLatest { debounceMillis ->
@@ -361,7 +388,6 @@ class AutoTunnelService : LifecycleService() {
     }
 
     companion object {
-        // try to keep this window short as it will interrupt manual overrides
-        const val REEVALUATE_CHECK_DELAY = 2_000L
+        const val REEVALUATE_CHECK_DELAY = 3_000L
     }
 }

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

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

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

@@ -4,25 +4,22 @@ 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 androidx.lifecycle.*
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
+import com.zaneschepke.wireguardautotunnel.domain.repository.AutoTunnelSettingsRepository
+import kotlin.concurrent.atomics.AtomicBoolean
+import kotlin.concurrent.atomics.ExperimentalAtomicApi
 import kotlinx.coroutines.launch
+import org.koin.android.ext.android.inject
 import timber.log.Timber
 
-@AndroidEntryPoint
 class AutoTunnelControlTile : TileService(), LifecycleOwner {
 
-    @Inject lateinit var settingsRepository: GeneralSettingRepository
-    @Inject lateinit var tunnelsRepository: TunnelRepository
+    private val autoTunnelSettingsRepository: AutoTunnelSettingsRepository by inject()
 
-    @Inject lateinit var serviceManager: ServiceManager
+    private val serviceManager: ServiceManager by inject()
+
+    @OptIn(ExperimentalAtomicApi::class) val isCollecting = AtomicBoolean(false)
 
     private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
 
@@ -36,34 +33,46 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
         lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
     }
 
-    override fun onStartListening() {
-        super.onStartListening()
+    override fun onTileAdded() {
+        super.onTileAdded()
+        initTileState()
+    }
+
+    override fun onStopListening() {
+        super.onStopListening()
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
+    }
+
+    @OptIn(ExperimentalAtomicApi::class)
+    private fun initTileState() {
         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 {
-            tunnelsRepository.flow.collect {
-                if (it.isEmpty()) {
-                    setUnavailable()
+        if (isCollecting.compareAndSet(expectedValue = false, newValue = true)) {
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.STARTED) {
+                    serviceManager.autoTunnelService.collect {
+                        if (it != null) return@collect setActive()
+                        setInactive()
+                    }
                 }
             }
         }
     }
 
+    override fun onStartListening() {
+        super.onStartListening()
+        initTileState()
+    }
+
     override fun onClick() {
         super.onClick()
         unlockAndRun {
             lifecycleScope.launch {
                 if (serviceManager.autoTunnelService.value != null) {
-                    settingsRepository.updateAutoTunnelEnabled(false)
+                    autoTunnelSettingsRepository.updateAutoTunnelEnabled(false)
                     setInactive()
                 } else {
-                    settingsRepository.updateAutoTunnelEnabled(true)
+                    autoTunnelSettingsRepository.updateAutoTunnelEnabled(true)
                     setActive()
                 }
             }
@@ -71,16 +80,16 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
     }
 
     private fun setActive() {
-        runCatching {
-            qsTile.state = Tile.STATE_ACTIVE
-            qsTile.updateTile()
+        qsTile?.let {
+            it.state = Tile.STATE_ACTIVE
+            it.updateTile()
         }
     }
 
     private fun setInactive() {
-        runCatching {
-            qsTile.state = Tile.STATE_INACTIVE
-            qsTile.updateTile()
+        qsTile?.let {
+            it.state = Tile.STATE_INACTIVE
+            it.updateTile()
         }
     }
 
@@ -90,18 +99,11 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
         try {
             ret = super.onBind(intent)
         } catch (_: Throwable) {
-            Timber.e("Failed to bind to TunnelControlTile")
+            Timber.e("Failed to bind to AutoTunnelControlTile")
         }
         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

@@ -9,29 +9,35 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 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.repository.TunnelRepository
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
+import kotlin.concurrent.atomics.AtomicBoolean
+import kotlin.concurrent.atomics.ExperimentalAtomicApi
+import kotlinx.coroutines.flow.distinctUntilChangedBy
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import org.koin.android.ext.android.inject
 import timber.log.Timber
 
-@AndroidEntryPoint
 class TunnelControlTile : TileService(), LifecycleOwner {
 
-    @Inject lateinit var tunnelsRepository: TunnelRepository
+    private val tunnelsRepository: TunnelRepository by inject()
 
-    @Inject lateinit var serviceManager: ServiceManager
+    private val serviceManager: ServiceManager by inject()
 
-    @Inject lateinit var tunnelManager: TunnelManager
+    private val tunnelManager: TunnelManager by inject()
+
+    @OptIn(ExperimentalAtomicApi::class) val isCollecting = AtomicBoolean(false)
+
+    private val startLock = Mutex()
 
     private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
 
-    private var isCollecting = false
-
     override fun onCreate() {
         super.onCreate()
         lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
@@ -42,13 +48,34 @@ class TunnelControlTile : TileService(), LifecycleOwner {
         lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
     }
 
-    override fun onStartListening() {
-        super.onStartListening()
+    override fun onTileAdded() {
+        super.onTileAdded()
+        initTileState()
+    }
+
+    @OptIn(ExperimentalAtomicApi::class)
+    private fun initTileState() {
         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() } }
+        if (isCollecting.compareAndSet(expectedValue = false, newValue = true)) {
+            lifecycleScope.launch {
+                repeatOnLifecycle(Lifecycle.State.STARTED) {
+                    tunnelManager.activeTunnels
+                        .distinctUntilChangedBy { it.size }
+                        .collect { updateTileState() }
+                }
+            }
+        }
+    }
+
+    override fun onStartListening() {
+        super.onStartListening()
+        initTileState()
+    }
+
+    override fun onStopListening() {
+        super.onStopListening()
+        lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
     }
 
     private suspend fun updateTileState() {
@@ -70,12 +97,13 @@ class TunnelControlTile : TileService(), LifecycleOwner {
                     // this would be better managed elsewhere
                     WireGuardAutoTunnel.setLastActiveTunnels(activeIds)
                     val activeTunNames =
-                        tunnels.filter { activeTunnels.keys.contains(it.id) }.map { it.tunName }
+                        tunnels.filter { activeTunnels.keys.contains(it.id) }.map { it.name }
                     updateTileForActiveTunnels(activeTunNames)
                 }
                 else -> updateTileForLastActiveTunnels()
             }
         } catch (e: Exception) {
+            Timber.e(e, "Failed to update tunnel state")
             setUnavailable()
         }
     }
@@ -93,15 +121,14 @@ class TunnelControlTile : TileService(), LifecycleOwner {
         val lastActiveIds = WireGuardAutoTunnel.getLastActiveTunnels()
         when {
             lastActiveIds.isEmpty() -> {
-                tunnelsRepository.getStartTunnel()?.let { config ->
-                    updateTile(config.tunName, false)
-                } ?: setUnavailable()
+                tunnelsRepository.getStartTunnel()?.let { config -> updateTile(config.name, false) }
+                    ?: setUnavailable()
             }
             lastActiveIds.size > 1 -> updateTile(getString(R.string.multiple), false)
             else -> {
                 val tunnelId = lastActiveIds.first()
                 tunnelsRepository.getById(tunnelId)?.let { tunnel ->
-                    updateTile(tunnel.tunName, false)
+                    updateTile(tunnel.name, false)
                 } ?: setUnavailable()
             }
         }
@@ -111,14 +138,16 @@ class TunnelControlTile : TileService(), LifecycleOwner {
         super.onClick()
         unlockAndRun {
             lifecycleScope.launch {
-                if (tunnelManager.activeTunnels.value.isNotEmpty())
-                    return@launch tunnelManager.stopActiveTunnels()
-                val lastActive = WireGuardAutoTunnel.getLastActiveTunnels()
-                if (lastActive.isEmpty()) {
-                    tunnelsRepository.getStartTunnel()?.let { tunnelManager.startTunnel(it) }
-                } else {
-                    lastActive.forEach { id ->
-                        tunnelsRepository.getById(id)?.let { tunnelManager.startTunnel(it) }
+                startLock.withLock {
+                    if (tunnelManager.activeTunnels.value.isNotEmpty())
+                        return@launch tunnelManager.stopActiveTunnels()
+                    val lastActive = WireGuardAutoTunnel.getLastActiveTunnels()
+                    if (lastActive.isEmpty()) {
+                        tunnelsRepository.getStartTunnel()?.let { tunnelManager.startTunnel(it) }
+                    } else {
+                        lastActive.forEach { id ->
+                            tunnelsRepository.getById(id)?.let { tunnelManager.startTunnel(it) }
+                        }
                     }
                 }
             }
@@ -126,40 +155,48 @@ class TunnelControlTile : TileService(), LifecycleOwner {
     }
 
     private fun setActive() {
-        runCatching {
-            qsTile.state = Tile.STATE_ACTIVE
-            qsTile.updateTile()
+        qsTile?.let {
+            it.state = Tile.STATE_ACTIVE
+            it.updateTile()
         }
     }
 
     private fun setInactive() {
-        runCatching {
-            qsTile.state = Tile.STATE_INACTIVE
-            qsTile.updateTile()
+        qsTile?.let {
+            it.state = Tile.STATE_INACTIVE
+            it.updateTile()
         }
     }
 
     private fun setUnavailable() {
-        runCatching {
-            qsTile.state = Tile.STATE_UNAVAILABLE
+        qsTile?.let {
+            it.state = Tile.STATE_UNAVAILABLE
             setTileDescription("")
-            qsTile.updateTile()
+            it.updateTile()
         }
     }
 
     private fun setTileDescription(description: String) {
-        runCatching {
-            if (qsTile == null) return@runCatching
+        qsTile?.let {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                qsTile.subtitle = description
-                qsTile.stateDescription = description
+                it.subtitle = description
+                it.stateDescription = description
             } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                qsTile.subtitle = description
+                it.subtitle = description
             }
-            qsTile.updateTile()
+            it.updateTile()
         }
     }
 
+    private fun updateTile(name: String, active: Boolean) {
+        runCatching {
+                setTileDescription(name)
+                if (active) return setActive()
+                setInactive()
+            }
+            .onFailure { Timber.e(it) }
+    }
+
     /* This works around an annoying unsolved frameworks bug some people are hitting. */
     override fun onBind(intent: Intent): IBinder? {
         var ret: IBinder? = null
@@ -171,15 +208,6 @@ class TunnelControlTile : TileService(), LifecycleOwner {
         return ret
     }
 
-    private fun updateTile(name: String, active: Boolean) {
-        runCatching {
-                setTileDescription(name)
-                if (active) return setActive()
-                setInactive()
-            }
-            .onFailure { Timber.e(it) }
-    }
-
     override val lifecycle: Lifecycle
         get() = lifecycleRegistry
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/shortcut/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) {

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

@@ -5,29 +5,28 @@ import androidx.activity.ComponentActivity
 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.di.Scope
+import com.zaneschepke.wireguardautotunnel.domain.repository.AutoTunnelSettingsRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import org.koin.android.ext.android.inject
+import org.koin.core.qualifier.named
 import timber.log.Timber
 
-@AndroidEntryPoint
 class ShortcutsActivity : ComponentActivity() {
 
-    @Inject lateinit var settingsRepository: GeneralSettingRepository
-    @Inject lateinit var tunnelsRepository: TunnelRepository
-
-    @Inject lateinit var tunnelManager: TunnelManager
-
-    @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
+    private val settingsRepository: GeneralSettingRepository by inject()
+    private val autoTunnelSettingsRepository: AutoTunnelSettingsRepository by inject()
+    private val tunnelsRepository: TunnelRepository by inject()
+    private val tunnelManager: TunnelManager by inject()
+    private val applicationScope: CoroutineScope by inject(named(Scope.APPLICATION))
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         applicationScope.launch {
-            val settings = settingsRepository.get()
+            val settings = settingsRepository.getGeneralSettings()
             if (settings.isShortcutsEnabled) {
                 when (intent.getStringExtra(CLASS_NAME_EXTRA_KEY)) {
                     LEGACY_TUNNEL_SERVICE_NAME,
@@ -37,7 +36,7 @@ class ShortcutsActivity : ComponentActivity() {
                         val tunnelConfig =
                             tunnelName?.let { tunnelsRepository.findByTunnelName(it) }
                                 ?: tunnelsRepository.getDefaultTunnel()
-                        Timber.d("Shortcut action on name: ${tunnelConfig?.tunName}")
+                        Timber.d("Shortcut action on name: ${tunnelConfig?.name}")
                         tunnelConfig?.let {
                             when (intent.action) {
                                 Action.START.name -> tunnelManager.startTunnel(it)
@@ -49,8 +48,10 @@ class ShortcutsActivity : ComponentActivity() {
                     AutoTunnelService::class.java.simpleName,
                     LEGACY_AUTO_TUNNEL_SERVICE_NAME -> {
                         when (intent.action) {
-                            Action.START.name -> settingsRepository.updateAutoTunnelEnabled(true)
-                            Action.STOP.name -> settingsRepository.updateAutoTunnelEnabled(false)
+                            Action.START.name ->
+                                autoTunnelSettingsRepository.updateAutoTunnelEnabled(true)
+                            Action.STOP.name ->
+                                autoTunnelSettingsRepository.updateAutoTunnelEnabled(false)
                         }
                     }
                 }

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

@@ -1,137 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.tunnel
-
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-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.LogHealthState
-import com.zaneschepke.wireguardautotunnel.domain.state.PingState
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
-import java.util.concurrent.ConcurrentHashMap
-import kotlin.coroutines.cancellation.CancellationException
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-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(@ApplicationScope protected val applicationScope: CoroutineScope) :
-    TunnelProvider {
-
-    protected val errors = MutableSharedFlow<Pair<String, BackendCoreException>>()
-    override val errorEvents = errors.asSharedFlow()
-
-    private val _messageEvents = MutableSharedFlow<Pair<String, BackendMessage>>()
-    override val messageEvents = _messageEvents.asSharedFlow()
-
-    protected val activeTuns = MutableStateFlow<Map<Int, TunnelState>>(emptyMap())
-    override val activeTunnels = activeTuns.asStateFlow()
-
-    private val tunJobs = ConcurrentHashMap<Int, Job>()
-    private val tunMutex = Mutex()
-    private val tunStatusMutex = Mutex()
-
-    abstract fun tunnelStateFlow(tunnelConf: TunnelConf): Flow<TunnelStatus>
-
-    abstract override fun setBackendMode(backendMode: BackendMode)
-
-    abstract override fun getBackendMode(): BackendMode
-
-    abstract override fun handleDnsReresolve(tunnelConf: TunnelConf): Boolean
-
-    abstract override fun getStatistics(tunnelId: Int): TunnelStatistics?
-
-    override suspend fun updateTunnelStatus(
-        tunnelId: Int,
-        status: TunnelStatus?,
-        stats: TunnelStatistics?,
-        pingStates: Map<Key, PingState>?,
-        logHealthState: LogHealthState?,
-    ) {
-        tunStatusMutex.withLock {
-            activeTuns.update { currentTuns ->
-                if (!currentTuns.containsKey(tunnelId) && status != TunnelStatus.Starting) {
-                    Timber.d("Ignoring update for inactive tunnel $tunnelId")
-                    return@update currentTuns
-                }
-                val existingState = currentTuns[tunnelId] ?: TunnelState()
-                val newStatus = status ?: existingState.status
-                if (newStatus == TunnelStatus.Down) {
-                    Timber.d("Removing tunnel $tunnelId from activeTunnels as state is DOWN")
-                    cleanUpTunJob(tunnelId)
-                    currentTuns - tunnelId
-                } else if (
-                    existingState.status == newStatus &&
-                        stats == null &&
-                        pingStates == null &&
-                        logHealthState == null
-                ) {
-                    Timber.d("Skipping redundant state update for ${tunnelId}: $newStatus")
-                    currentTuns
-                } else {
-                    val updated =
-                        existingState.copy(
-                            status = newStatus,
-                            statistics = stats ?: existingState.statistics,
-                            pingStates = pingStates ?: existingState.pingStates,
-                            logHealthState = logHealthState ?: existingState.logHealthState,
-                        )
-                    currentTuns + (tunnelId to updated)
-                }
-            }
-        }
-    }
-
-    override suspend fun stopActiveTunnels() {
-        activeTunnels.value.forEach { (config, state) ->
-            if (state.status.isUpOrStarting()) {
-                stopTunnel(config)
-            }
-        }
-    }
-
-    override suspend fun startTunnel(tunnelConf: TunnelConf) {
-        tunMutex.withLock {
-            if (activeTuns.value.containsKey(tunnelConf.id) || tunJobs.containsKey(tunnelConf.id)) {
-                return Timber.w("Tunnel is already running: ${tunnelConf.tunName}")
-            }
-
-            updateTunnelStatus(tunnelConf.id, TunnelStatus.Starting)
-
-            val job =
-                applicationScope.launch {
-                    try {
-                        tunnelStateFlow(tunnelConf).collect { status ->
-                            updateTunnelStatus(tunnelConf.id, status)
-                        }
-                    } catch (e: BackendCoreException) {
-                        errors.emit(tunnelConf.tunName to e)
-                        updateTunnelStatus(tunnelConf.id, TunnelStatus.Down)
-                    } catch (_: CancellationException) {}
-                }
-            tunJobs[tunnelConf.id] = job
-            job.invokeOnCompletion {
-                tunJobs.remove(tunnelConf.id)
-                activeTuns.update { it - tunnelConf.id }
-            }
-        }
-    }
-
-    override suspend fun stopTunnel(tunnelId: Int) {
-        tunMutex.withLock {
-            updateTunnelStatus(tunnelId, TunnelStatus.Stopping)
-            tunJobs[tunnelId]?.cancel() // Triggers awaitClose to stop backend
-        }
-    }
-
-    private fun cleanUpTunJob(tunnelId: Int) {
-        Timber.d("Removing job for $tunnelId")
-        tunJobs -= tunnelId
-    }
-}

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

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

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

@@ -1,102 +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 as WgTunnel
-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.state.TunnelStatistics
-import com.zaneschepke.wireguardautotunnel.domain.state.WireGuardStatistics
-import com.zaneschepke.wireguardautotunnel.util.extensions.asTunnelState
-import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendCoreException
-import java.util.concurrent.ConcurrentHashMap
-import javax.inject.Inject
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.consumeAsFlow
-import kotlinx.coroutines.launch
-import timber.log.Timber
-
-class KernelTunnel
-@Inject
-constructor(
-    @ApplicationScope applicationScope: CoroutineScope,
-    @Kernel private val backend: Backend,
-) : BaseTunnel(applicationScope) {
-
-    private val runtimeTunnels = ConcurrentHashMap<Int, WgTunnel>()
-
-    // TODO Add DNS settings
-    override fun tunnelStateFlow(tunnelConf: TunnelConf): Flow<TunnelStatus> = callbackFlow {
-        if (!tunnelConf.isNameKernelCompatible) close(BackendCoreException.TunnelNameTooLong)
-
-        val stateChannel = Channel<WgTunnel.State>()
-
-        val runtimeTunnel = RuntimeWgTunnel(tunnelConf, stateChannel)
-        runtimeTunnels[tunnelConf.id] = runtimeTunnel
-
-        val consumerJob = launch {
-            stateChannel.consumeAsFlow().collect { state -> trySend(state.asTunnelState()) }
-        }
-
-        try {
-            updateTunnelStatus(tunnelConf.id, TunnelStatus.Starting)
-            backend.setState(runtimeTunnel, WgTunnel.State.UP, tunnelConf.toWgConfig())
-        } catch (e: BackendException) {
-            close(e.toBackendCoreException())
-        } catch (e: IllegalArgumentException) {
-            Timber.e(e, "Invalid backend arguments")
-            close(BackendCoreException.Config)
-        } catch (e: Exception) {
-            Timber.e(e, "Error while setting tunnel state")
-            close(BackendCoreException.Unknown)
-        }
-
-        awaitClose {
-            try {
-                backend.setState(runtimeTunnel, WgTunnel.State.DOWN, null)
-            } catch (e: BackendException) {
-                errors.tryEmit(tunnelConf.tunName to e.toBackendCoreException())
-            } finally {
-                consumerJob.cancel()
-                stateChannel.close()
-                runtimeTunnels.remove(tunnelConf.id)
-                trySend(TunnelStatus.Down)
-                close()
-            }
-        }
-    }
-
-    override fun getStatistics(tunnelId: Int): TunnelStatistics? {
-        return try {
-            val runtimeTunnel = runtimeTunnels[tunnelId] ?: return null
-            WireGuardStatistics(backend.getStatistics(runtimeTunnel))
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to get stats for $tunnelId")
-            null
-        }
-    }
-
-    override fun setBackendMode(backendMode: BackendMode) {
-        Timber.w("Not yet implemented for kernel")
-    }
-
-    override fun getBackendMode(): BackendMode {
-        return BackendMode.Inactive
-    }
-
-    override fun handleDnsReresolve(tunnelConf: TunnelConf): Boolean {
-        throw NotImplementedError()
-    }
-
-    override suspend fun runningTunnelNames(): Set<String> {
-        return backend.runningTunnelNames
-    }
-}

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

@@ -0,0 +1,187 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel
+
+import com.zaneschepke.wireguardautotunnel.core.tunnel.backend.TunnelBackend
+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.events.UnknownError
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.domain.state.LogHealthState
+import com.zaneschepke.wireguardautotunnel.domain.state.PingState
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
+import java.util.concurrent.ConcurrentHashMap
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withTimeoutOrNull
+import timber.log.Timber
+
+class TunnelLifecycleManager(
+    private val backend: TunnelBackend,
+    private val applicationScope: CoroutineScope,
+    private val ioDispatcher: CoroutineDispatcher,
+    private val sharedActiveTunnels: MutableStateFlow<Map<Int, TunnelState>>,
+) : TunnelProvider {
+
+    override val activeTunnels: StateFlow<Map<Int, TunnelState>> = sharedActiveTunnels.asStateFlow()
+
+    private val _errorEvents = MutableSharedFlow<Pair<String?, BackendCoreException>>()
+    override val errorEvents: SharedFlow<Pair<String?, BackendCoreException>> =
+        _errorEvents.asSharedFlow()
+
+    private val _messageEvents = MutableSharedFlow<Pair<String?, BackendMessage>>()
+    override val messageEvents: SharedFlow<Pair<String?, BackendMessage>> =
+        _messageEvents.asSharedFlow()
+
+    private val tunnelJobs = ConcurrentHashMap<Int, Job>()
+    private val tunMutex = Mutex()
+    private val tunStatusMutex = Mutex()
+
+    override suspend fun startTunnel(tunnelConfig: TunnelConfig): Result<Unit> =
+        tunMutex.withLock {
+            val id = tunnelConfig.id
+            if (sharedActiveTunnels.value.containsKey(id)) {
+                Timber.w("Tunnel is already running: ${tunnelConfig.name}")
+                return Result.failure(IllegalStateException("Tunnel already running"))
+            }
+
+            val startupCompleted = CompletableDeferred<Result<Unit>>()
+
+            val job =
+                applicationScope.launch(ioDispatcher) {
+                    try {
+                        updateTunnelStatus(id, TunnelStatus.Starting)
+                        backend.tunnelStateFlow(tunnelConfig).collect { status ->
+                            updateTunnelStatus(id, status)
+
+                            if (status != TunnelStatus.Starting && !startupCompleted.isCompleted) {
+                                if (status is TunnelStatus.Up) {
+                                    startupCompleted.complete(Result.success(Unit))
+                                } else {
+                                    startupCompleted.complete(Result.failure(UnknownError()))
+                                }
+                            }
+                        }
+                    } catch (e: BackendCoreException) {
+                        _errorEvents.emit(tunnelConfig.name to e)
+                        updateTunnelStatus(id, TunnelStatus.Down)
+                        startupCompleted.complete(Result.failure(e))
+                    } catch (_: CancellationException) {} finally {
+                        tunnelJobs.remove(id)
+                        sharedActiveTunnels.update { it - id }
+                    }
+                }
+
+            tunnelJobs[id] = job
+            job.invokeOnCompletion { tunnelJobs.remove(id) }
+
+            try {
+                startupCompleted.await()
+            } catch (e: Throwable) {
+                job.cancel()
+                Result.failure(e)
+            }
+        }
+
+    override suspend fun stopTunnel(tunnelId: Int) =
+        tunMutex.withLock {
+            val currentState = sharedActiveTunnels.value[tunnelId]?.status ?: return@withLock
+            updateTunnelStatus(tunnelId, TunnelStatus.Stopping)
+            tunnelJobs[tunnelId]?.cancel()
+
+            withTimeoutOrNull(STOP_TIMEOUT_MS) {
+                activeTunnels.first {
+                    !it.containsKey(tunnelId) || it[tunnelId]!!.status == TunnelStatus.Down
+                }
+            }
+                ?: run {
+                    Timber.w("Stop timeout for $tunnelId (was $currentState); forcing kill")
+                    forceStopTunnel(tunnelId)
+                }
+        }
+
+    override suspend fun forceStopTunnel(tunnelId: Int) {
+        backend.forceStopTunnel(tunnelId)
+        tunnelJobs[tunnelId]?.cancel()
+        tunnelJobs.remove(tunnelId)
+        sharedActiveTunnels.update { it - tunnelId }
+        updateTunnelStatus(tunnelId, TunnelStatus.Down)
+    }
+
+    override suspend fun stopActiveTunnels() {
+        sharedActiveTunnels.value.forEach { (id, state) ->
+            if (state.status.isUpOrStarting()) {
+                stopTunnel(id)
+            }
+        }
+    }
+
+    override suspend fun updateTunnelStatus(
+        tunnelId: Int,
+        status: TunnelStatus?,
+        stats: TunnelStatistics?,
+        pingStates: Map<String, PingState>?,
+        logHealthState: LogHealthState?,
+    ) =
+        tunStatusMutex.withLock {
+            sharedActiveTunnels.update { currentTuns ->
+                if (!currentTuns.containsKey(tunnelId) && status != TunnelStatus.Starting) {
+                    Timber.d("Ignoring update for inactive tunnel $tunnelId")
+                    return@update currentTuns
+                }
+                val existingState = currentTuns[tunnelId] ?: TunnelState()
+                val newStatus = status ?: existingState.status
+                if (newStatus == TunnelStatus.Down) {
+                    Timber.d("Removing tunnel $tunnelId from activeTunnels as state is DOWN")
+                    currentTuns - tunnelId
+                } else if (
+                    existingState.status == newStatus &&
+                        stats == null &&
+                        pingStates == null &&
+                        logHealthState == null
+                ) {
+                    Timber.d("Skipping redundant state update for ${tunnelId}: $newStatus")
+                    currentTuns
+                } else {
+                    val updated =
+                        existingState.copy(
+                            status = newStatus,
+                            statistics = stats ?: existingState.statistics,
+                            pingStates = pingStates ?: existingState.pingStates,
+                            logHealthState = logHealthState ?: existingState.logHealthState,
+                        )
+                    currentTuns + (tunnelId to updated)
+                }
+            }
+        }
+
+    override fun setBackendMode(backendMode: BackendMode) = backend.setBackendMode(backendMode)
+
+    override fun getBackendMode(): BackendMode = backend.getBackendMode()
+
+    override suspend fun runningTunnelNames(): Set<String> = backend.runningTunnelNames()
+
+    override fun handleDnsReresolve(tunnelConfig: TunnelConfig): Boolean =
+        backend.handleDnsReresolve(tunnelConfig)
+
+    override fun getStatistics(tunnelId: Int): TunnelStatistics? = backend.getStatistics(tunnelId)
+
+    companion object {
+        const val STOP_TIMEOUT_MS: Long = 5_000L
+    }
+}

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

@@ -1,418 +1,359 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
+import android.os.PowerManager
+import com.zaneschepke.logcatter.LogReader
+import com.zaneschepke.networkmonitor.NetworkMonitor
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.core.tunnel.backend.TunnelBackend
+import com.zaneschepke.wireguardautotunnel.core.tunnel.handler.DynamicDnsHandler
+import com.zaneschepke.wireguardautotunnel.core.tunnel.handler.TunnelActiveStatePersister
+import com.zaneschepke.wireguardautotunnel.core.tunnel.handler.TunnelMonitorHandler
+import com.zaneschepke.wireguardautotunnel.core.tunnel.handler.TunnelServiceHandler
 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.events.NotAuthorized
+import com.zaneschepke.wireguardautotunnel.domain.model.AutoTunnelSettings
 import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings
-import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.domain.repository.AutoTunnelSettingsRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.LockdownSettingsRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.MonitoringSettingsRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.LogHealthState
 import com.zaneschepke.wireguardautotunnel.domain.state.PingState
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
-import java.util.concurrent.ConcurrentHashMap
-import javax.inject.Inject
+import com.zaneschepke.wireguardautotunnel.util.network.NetworkUtils
 import kotlin.concurrent.atomics.AtomicBoolean
 import kotlin.concurrent.atomics.AtomicReference
 import kotlin.concurrent.atomics.ExperimentalAtomicApi
-import kotlinx.coroutines.*
-import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import org.amnezia.awg.crypto.Key
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.distinctUntilChangedBy
+import kotlinx.coroutines.flow.filterNot
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.merge
+import kotlinx.coroutines.flow.shareIn
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.plus
+import kotlinx.coroutines.supervisorScope
+import kotlinx.coroutines.withContext
 import timber.log.Timber
 
 @OptIn(ExperimentalCoroutinesApi::class, ExperimentalAtomicApi::class)
-class TunnelManager
-@Inject
-constructor(
-    @Kernel private val kernelTunnel: TunnelProvider,
-    @Userspace private val userspaceTunnel: TunnelProvider,
-    @ProxyUserspace private val proxyUserspaceTunnel: TunnelProvider,
+class TunnelManager(
+    kernelBackend: TunnelBackend,
+    userspaceBackend: TunnelBackend,
+    proxyUserspaceBackend: TunnelBackend,
+    networkMonitor: NetworkMonitor,
+    networkUtils: NetworkUtils,
+    powerManager: PowerManager,
+    logReader: LogReader,
+    monitoringSettingsRepository: MonitoringSettingsRepository,
     private val serviceManager: ServiceManager,
     private val settingsRepository: GeneralSettingRepository,
+    private val autoTunnelSettingsRepository: AutoTunnelSettingsRepository,
+    private val lockdownSettingsRepository: LockdownSettingsRepository,
     private val tunnelsRepository: TunnelRepository,
-    private val tunnelMonitor: TunnelMonitor,
-    @ApplicationScope private val applicationScope: CoroutineScope,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+    private val applicationScope: CoroutineScope,
+    private val ioDispatcher: CoroutineDispatcher,
 ) : TunnelProvider {
 
-    private val monitoringMutex = Mutex()
-    private val monitoringJobs = ConcurrentHashMap<Int, Job>()
+    private val _activeTunnels = MutableStateFlow<Map<Int, TunnelState>>(emptyMap())
+    override val activeTunnels: StateFlow<Map<Int, TunnelState>> = _activeTunnels.asStateFlow()
 
-    private data class SideEffectState(
-        val activeTuns: Map<Int, TunnelState>,
-        val tuns: List<TunnelConf>,
-        val settings: GeneralSettings,
-        val previouslyActive: Map<Int, TunnelState>,
-    )
+    @OptIn(ExperimentalAtomicApi::class) val currentAppMode = AtomicReference(AppMode.VPN)
 
-    private data class SideEffectWithCondition(
-        val effect: suspend (SideEffectState) -> Unit,
-        val condition: (SideEffectState) -> Boolean,
-    )
+    private val defaultManager =
+        TunnelLifecycleManager(userspaceBackend, applicationScope, ioDispatcher, _activeTunnels)
 
-    private val tunnelProviderFlow: StateFlow<TunnelProvider> = run {
-        val currentBackend = AtomicReference(userspaceTunnel)
-        val currentSettings = AtomicReference(GeneralSettings())
-        val initialEmit = AtomicBoolean(true)
+    private val lifecycleManagers: Map<AppMode, TunnelLifecycleManager> =
+        mapOf(
+            AppMode.KERNEL to
+                TunnelLifecycleManager(
+                    kernelBackend,
+                    applicationScope,
+                    ioDispatcher,
+                    _activeTunnels,
+                ),
+            AppMode.VPN to defaultManager,
+            AppMode.PROXY to
+                TunnelLifecycleManager(
+                    proxyUserspaceBackend,
+                    applicationScope,
+                    ioDispatcher,
+                    _activeTunnels,
+                ),
+            AppMode.LOCK_DOWN to
+                TunnelLifecycleManager(
+                    proxyUserspaceBackend,
+                    applicationScope,
+                    ioDispatcher,
+                    _activeTunnels,
+                ),
+        )
 
-        settingsRepository.flow
-            .filterNotNull()
-            // ignore default state
-            .filterNot { it == GeneralSettings() }
-            .distinctUntilChanged { old, new ->
-                old.appMode == new.appMode &&
-                    old.isLanOnKillSwitchEnabled == new.isLanOnKillSwitchEnabled
-            }
-            .map { settings ->
-                Timber.d("App mode changes with ${settings.appMode}")
-                val backend =
-                    when (settings.appMode) {
-                        AppMode.VPN -> userspaceTunnel
-                        AppMode.PROXY -> proxyUserspaceTunnel
-                        AppMode.LOCK_DOWN -> proxyUserspaceTunnel
-                        AppMode.KERNEL -> kernelTunnel
-                    }
-                settings to backend
-            }
-            .onEach { (settings, newBackend) ->
-                val isInitialEmit = initialEmit.exchange(false)
-                val previousBackend = currentBackend.exchange(newBackend)
-                val previousSettings = currentSettings.exchange(settings)
-
-                if ((previousSettings.appMode != settings.appMode) && !isInitialEmit) {
-                    handleModeChangeCleanup(previousBackend, previousSettings.appMode)
-                }
-                if (settings.appMode == AppMode.LOCK_DOWN) {
-                    handleLockDownModeInit(settings.isLanOnKillSwitchEnabled)
-                }
-            }
-            .map { (_, backend) -> backend }
-            .stateIn(
-                scope = applicationScope.plus(ioDispatcher),
-                started = SharingStarted.Eagerly,
-                initialValue = userspaceTunnel,
-            )
+    @OptIn(ExperimentalAtomicApi::class)
+    private fun getProvider(): TunnelProvider {
+        return lifecycleManagers[currentAppMode.load()] ?: defaultManager
     }
 
-    override val activeTunnels: StateFlow<Map<Int, TunnelState>> = run {
-        val activeTunsReference: AtomicReference<Map<Int, TunnelState>> =
-            AtomicReference(emptyMap())
+    override suspend fun startTunnel(tunnelConfig: TunnelConfig): Result<Unit> =
+        getProvider().startTunnel(tunnelConfig)
 
-        tunnelProviderFlow
-            .flatMapLatest { backend ->
-                combine(
-                    backend.activeTunnels,
-                    tunnelsRepository.flow,
-                    settingsRepository.flow.filterNotNull(),
-                ) { activeTuns, tuns, settings ->
-                    Triple(activeTuns, tuns, settings)
-                }
-            }
-            .onStart { handleStateRestore() }
-            .onEach { (activeTuns, tuns, settings) ->
-                val previouslyActive = activeTunsReference.exchange(activeTuns)
-                val state = SideEffectState(activeTuns, tuns, settings, previouslyActive)
+    override suspend fun stopTunnel(tunnelId: Int) = getProvider().stopTunnel(tunnelId)
 
-                applicationScope.launch(ioDispatcher) {
-                    supervisorScope {
-                        val sideEffects =
-                            listOf(
-                                SideEffectWithCondition(
-                                    effect = { s ->
-                                        handleTunnelServiceChange(s.settings.appMode, s.activeTuns)
-                                    },
-                                    condition = { s ->
-                                        s.activeTuns.size != s.previouslyActive.size
-                                    },
-                                ),
-                                SideEffectWithCondition(
-                                    effect = { s ->
-                                        handleTunnelsActiveChange(
-                                            s.previouslyActive,
-                                            s.activeTuns,
-                                            s.tuns,
-                                        )
-                                    },
-                                    condition = { s ->
-                                        s.activeTuns.size != s.previouslyActive.size
-                                    },
-                                ),
-                                // TODO Not for kernel mode for now
-                                SideEffectWithCondition(
-                                    effect = { s ->
-                                        handleTunnelMonitoringChanges(s.activeTuns, s.tuns)
-                                    },
-                                    condition = { s ->
-                                        s.tuns.any {
-                                            it.restartOnPingFailure &&
-                                                s.activeTuns.keys.contains(it.id)
-                                        } && s.settings.appMode != AppMode.KERNEL
-                                    },
-                                ),
-                                SideEffectWithCondition(
-                                    effect = { s ->
-                                        handleFullTunnelMonitoring(s.activeTuns, s.tuns, s.settings)
-                                    },
-                                    condition = { s ->
-                                        s.activeTuns.keys != s.previouslyActive.keys
-                                    },
-                                ),
-                            )
+    override suspend fun forceStopTunnel(tunnelId: Int) = getProvider().forceStopTunnel(tunnelId)
 
-                        sideEffects
-                            .filter { it.condition(state) }
-                            .forEach { sideEffect ->
-                                launch {
-                                    try {
-                                        sideEffect.effect(state)
-                                    } catch (e: Exception) {
-                                        Timber.e(e, "Side effect failed")
-                                    }
-                                }
-                            }
-                    }
-                }
-            }
-            .map { (activeTuns, _, _) -> activeTuns }
-            .stateIn(
-                scope = applicationScope,
-                started = SharingStarted.Eagerly,
-                initialValue = emptyMap(),
-            )
-    }
+    override suspend fun stopActiveTunnels() = getProvider().stopActiveTunnels()
 
-    @OptIn(ExperimentalCoroutinesApi::class)
-    override val errorEvents: SharedFlow<Pair<String, BackendCoreException>> =
-        tunnelProviderFlow
-            .flatMapLatest { it.errorEvents }
-            .shareIn(
-                scope = applicationScope.plus(ioDispatcher),
-                started = SharingStarted.Eagerly,
-                replay = 0,
-            )
+    override fun setBackendMode(backendMode: BackendMode) =
+        getProvider().setBackendMode(backendMode)
 
-    @OptIn(ExperimentalCoroutinesApi::class)
-    override val messageEvents: SharedFlow<Pair<String, BackendMessage>> =
-        tunnelProviderFlow
-            .flatMapLatest { it.messageEvents }
-            .shareIn(
-                scope = applicationScope.plus(ioDispatcher),
-                started = SharingStarted.Eagerly,
-                replay = 0,
-            )
+    override fun getBackendMode(): BackendMode = getProvider().getBackendMode()
 
-    override fun getStatistics(tunnelId: Int): TunnelStatistics? {
-        return tunnelProviderFlow.value.getStatistics(tunnelId)
-    }
+    override suspend fun runningTunnelNames(): Set<String> = getProvider().runningTunnelNames()
 
-    override suspend fun startTunnel(tunnelConf: TunnelConf) {
-        // for VPN Mode, we need to stop active tunnels as we can only have one active at a time
-        if (activeTunnels.value.isNotEmpty() && tunnelProviderFlow.value == userspaceTunnel)
-            stopActiveTunnels()
-        tunnelProviderFlow.value.startTunnel(tunnelConf)
-    }
+    override fun handleDnsReresolve(tunnelConfig: TunnelConfig): Boolean =
+        getProvider().handleDnsReresolve(tunnelConfig)
 
-    override suspend fun stopTunnel(tunnelId: Int) {
-        tunnelProviderFlow.value.stopTunnel(tunnelId)
-    }
-
-    override suspend fun stopActiveTunnels() {
-        tunnelProviderFlow.value.stopActiveTunnels()
-    }
-
-    override fun setBackendMode(backendMode: BackendMode) {
-        tunnelProviderFlow.value.setBackendMode(backendMode)
-    }
-
-    override fun getBackendMode(): BackendMode {
-        return tunnelProviderFlow.value.getBackendMode()
-    }
-
-    override suspend fun runningTunnelNames(): Set<String> {
-        return tunnelProviderFlow.value.runningTunnelNames()
-    }
-
-    override fun handleDnsReresolve(tunnelConf: TunnelConf): Boolean {
-        return tunnelProviderFlow.value.handleDnsReresolve(tunnelConf)
-    }
+    override fun getStatistics(tunnelId: Int): TunnelStatistics? =
+        getProvider().getStatistics(tunnelId)
 
     override suspend fun updateTunnelStatus(
         tunnelId: Int,
         status: TunnelStatus?,
         stats: TunnelStatistics?,
-        pingStates: Map<Key, PingState>?,
+        pingStates: Map<String, PingState>?,
         logHealthState: LogHealthState?,
-    ) {
-        tunnelProviderFlow.value.updateTunnelStatus(
-            tunnelId,
-            status,
-            stats,
-            pingStates,
-            logHealthState,
-        )
-    }
+    ) = getProvider().updateTunnelStatus(tunnelId, status, stats, pingStates, logHealthState)
 
-    private suspend fun handleTunnelServiceChange(
-        appMode: AppMode,
-        activeTuns: Map<Int, TunnelState>,
-    ) {
-        if (activeTuns.isEmpty()) serviceManager.stopTunnelService()
-        if (activeTuns.isNotEmpty() && serviceManager.tunnelService.value == null)
-            serviceManager.startTunnelService(appMode)
-        serviceManager.updateTunnelTile()
-    }
+    @OptIn(ExperimentalCoroutinesApi::class)
+    private val localErrorEvents = MutableSharedFlow<Pair<String?, BackendCoreException>>()
 
-    private fun handleLockDownModeInit(withLanBypass: Boolean) {
-        val allowedIps = if (withLanBypass) TunnelConf.IPV4_PUBLIC_NETWORKS else emptySet()
-        try {
-            // TODO handle situation where they don't have vpn permission, request it
-            if (serviceManager.hasVpnPermission()) {
-                proxyUserspaceTunnel.setBackendMode(BackendMode.KillSwitch(allowedIps))
-            }
-        } catch (e: BackendCoreException) {
-            // TODO expose this error to user
-            Timber.e(e)
-        }
-    }
+    @OptIn(ExperimentalCoroutinesApi::class)
+    private val localMessageEvents = MutableSharedFlow<Pair<String?, BackendMessage>>()
 
-    private suspend fun handleModeChangeCleanup(
-        previousBackend: TunnelProvider,
-        previousAppMode: AppMode,
-    ) {
-        previousBackend.stopActiveTunnels()
-        // stop lockdown if we switch from that mode
-        if (previousAppMode == AppMode.LOCK_DOWN)
-            proxyUserspaceTunnel.setBackendMode(BackendMode.Inactive)
-    }
-
-    private suspend fun handleStateRestore() {
-        val settings = settingsRepository.flow.first()
-        if (settings.isRestoreOnBootEnabled) {
-            if (settings.isAutoTunnelEnabled) {
-                tunnelsRepository.resetActiveTunnels()
-                return settingsRepository.updateAutoTunnelEnabled(true)
-            }
-            val tunnels = tunnelsRepository.flow.first()
-            when (settings.appMode) {
-                // TODO eventually, lockdown/proxy can support multi
-                AppMode.VPN,
-                AppMode.LOCK_DOWN,
-                AppMode.PROXY ->
-                    tunnels
-                        .firstOrNull { it.isActive }
-                        ?.let {
-                            // clear any duplicates
-                            tunnelsRepository.resetActiveTunnels()
-                            startTunnel(it)
-                        }
-                // kernel supports multi
-                AppMode.KERNEL ->
-                    tunnels.filter { it.isActive }.forEach { conf -> startTunnel(conf) }
-            }
-        }
-    }
-
-    private suspend fun handleTunnelMonitoringChanges(
-        activeTuns: Map<Int, TunnelState>,
-        configs: List<TunnelConf>,
-    ) {
-        configs
-            .filter { it.restartOnPingFailure && activeTuns.keys.contains(it.id) }
-            .forEach { conf ->
-                val tunState = activeTuns[conf.id] ?: return@forEach
-                if (tunState.health() == TunnelState.Health.UNHEALTHY) {
-                    runCatching {
-                            val updated = handleDnsReresolve(conf)
-                            // TODO user messages
-                            if (updated) {
-                                Timber.i("Successfully update the peer endpoint to new address.")
-                            } else {
-                                Timber.i("Current endpoint address is already up to date.")
-                            }
-                        }
-                        .onFailure {
-                            Timber.e(it, "Failed to handle dns re-resolution for ${conf.tunName}")
-                        }
-                    // TODO backoff
-                    delay(30_000L)
-                }
-            }
-    }
-
-    private suspend fun handleTunnelsActiveChange(
-        previousActiveTuns: Map<Int, TunnelState>,
-        activeTuns: Map<Int, TunnelState>,
-        tuns: List<TunnelConf>,
-    ) {
-        val relevantTunnels = previousActiveTuns.keys + activeTuns.keys
-
-        relevantTunnels.forEach { tunnelId ->
-            val wasActive = previousActiveTuns.containsKey(tunnelId)
-            val isActiveNow = activeTuns.containsKey(tunnelId)
-
-            when {
-                !wasActive && isActiveNow -> {
-                    tuns
-                        .find { it.id == tunnelId }
-                        ?.let { dbTunnelConf ->
-                            tunnelsRepository.save(dbTunnelConf.copy(isActive = true))
-                        }
-                }
-                wasActive && !isActiveNow -> {
-                    tuns
-                        .find { it.id == tunnelId }
-                        ?.let { dbTunnelConf ->
-                            tunnelsRepository.save(dbTunnelConf.copy(isActive = false))
-                        }
-                }
-            }
-        }
-    }
-
-    private suspend fun handleFullTunnelMonitoring(
-        activeTuns: Map<Int, TunnelState>,
-        configs: List<TunnelConf>,
-        settings: GeneralSettings,
-    ) =
-        monitoringMutex.withLock {
-            val activeIds = activeTuns.keys.toSet()
-            val currentJobs = monitoringJobs.keys.toSet()
-            val obsoleteIds = currentJobs - activeIds
-
-            Timber.d(
-                "Monitoring: Active IDs: $activeIds, Obsolete IDs: $obsoleteIds, Total jobs before: ${monitoringJobs.size}"
+    override val errorEvents: SharedFlow<Pair<String?, BackendCoreException>> =
+        merge(localErrorEvents, *lifecycleManagers.values.map { it.errorEvents }.toTypedArray())
+            .shareIn(
+                scope = applicationScope + ioDispatcher,
+                started = SharingStarted.Eagerly,
+                replay = 0,
             )
 
-            obsoleteIds.forEach { id ->
-                monitoringJobs[id]?.cancel()
-                monitoringJobs.remove(id)
-            }
+    override val messageEvents: SharedFlow<Pair<String?, BackendMessage>> =
+        merge(localMessageEvents, *lifecycleManagers.values.map { it.messageEvents }.toTypedArray())
+            .shareIn(
+                scope = applicationScope.plus(ioDispatcher),
+                started = SharingStarted.Eagerly,
+                replay = 0,
+            )
 
-            activeIds.forEach { id ->
-                if (monitoringJobs.containsKey(id)) return@forEach // Skip if already monitored
-                val config = configs.find { it.id == id } ?: return@forEach
-                val tunStateFlow =
-                    activeTunnels.map { it[id] }.stateIn(applicationScope + ioDispatcher)
-                val newJob =
-                    applicationScope.launch(ioDispatcher) {
-                        tunnelMonitor.startMonitoring(
-                            id,
-                            withLogs = settings.appMode != AppMode.KERNEL,
-                            tunStateFlow = tunStateFlow,
-                            getStatistics = { tunnelId -> getStatistics(tunnelId) },
-                            updateTunnelStatus = { tid, status, stats, pings, logHealth ->
-                                updateTunnelStatus(tid, null, stats, pings, logHealth)
-                            },
-                        )
+    private val tunnelServiceHandler =
+        TunnelServiceHandler(
+            activeTunnels = activeTunnels,
+            settingsRepository = settingsRepository,
+            serviceManager = serviceManager,
+            applicationScope = applicationScope,
+            ioDispatcher = ioDispatcher,
+        )
+
+    private val tunnelActiveStatePersister =
+        TunnelActiveStatePersister(
+            activeTunnels = activeTunnels,
+            tunnelsRepository = tunnelsRepository,
+            applicationScope = applicationScope,
+            ioDispatcher = ioDispatcher,
+        )
+
+    private val dynamicDnsHandler =
+        DynamicDnsHandler(
+            activeTunnels = activeTunnels,
+            tunnelsRepository = tunnelsRepository,
+            settingsRepository = settingsRepository,
+            localMessageEvents = localMessageEvents,
+            handleDnsReresolve = { config -> handleDnsReresolve(config) },
+            applicationScope = applicationScope,
+            ioDispatcher = ioDispatcher,
+        )
+
+    private val fullTunnelMonitorHandler =
+        TunnelMonitorHandler(
+            activeTunnels = activeTunnels,
+            tunnelsRepository = tunnelsRepository,
+            settingsRepository = settingsRepository,
+            monitoringSettingsRepository = monitoringSettingsRepository,
+            networkMonitor = networkMonitor,
+            networkUtils = networkUtils,
+            powerManager = powerManager,
+            logReader = logReader,
+            getStatistics = { id -> getStatistics(id) },
+            updateTunnelStatus = { id, status, stats, pings, logHealth ->
+                updateTunnelStatus(id, status, stats, pings, logHealth)
+            },
+            applicationScope = applicationScope,
+            ioDispatcher = ioDispatcher,
+        )
+
+    init {
+        applicationScope.launch(ioDispatcher) {
+            val initialEmit = AtomicBoolean(true)
+            settingsRepository.flow
+                .filterNotNull()
+                .filterNot { it == GeneralSettings() }
+                .distinctUntilChangedBy { it.appMode }
+                .collect { settings ->
+                    val isInitialEmit = initialEmit.exchange(false)
+                    val previousMode = currentAppMode.exchange(settings.appMode)
+
+                    if (isInitialEmit) {
+                        return@collect handleRestore(settings)
                     }
-                monitoringJobs[id] = newJob
+
+                    if (previousMode != settings.appMode) {
+                        handleModeChangeCleanup(previousMode)
+                    }
+                    if (settings.appMode == AppMode.LOCK_DOWN) {
+                        handleLockDownModeInit()
+                    }
+                }
+        }
+    }
+
+    // TODO this can crash if we haven't started foreground service yet, especially for
+    // workerManager
+    private suspend fun handleLockDownModeInit() {
+        val lockdownSettings = lockdownSettingsRepository.getLockdownSettings()
+        val allowedIps =
+            if (lockdownSettings.bypassLan) TunnelConfig.IPV4_PUBLIC_NETWORKS else emptySet()
+        try {
+            if (serviceManager.hasVpnPermission()) {
+                setBackendMode(
+                    BackendMode.KillSwitch(
+                        allowedIps,
+                        lockdownSettings.metered,
+                        lockdownSettings.dualStack,
+                    )
+                )
+            } else {
+                throw NotAuthorized()
+            }
+        } catch (e: BackendCoreException) {
+            localErrorEvents.tryEmit(null to e)
+        }
+    }
+
+    private suspend fun handleModeChangeCleanup(previousAppMode: AppMode) {
+        lifecycleManagers[previousAppMode]?.stopActiveTunnels()
+        if (previousAppMode == AppMode.LOCK_DOWN) {
+            lifecycleManagers[previousAppMode]?.setBackendMode(BackendMode.Inactive)
+        }
+    }
+
+    suspend fun handleRestore(settings: GeneralSettings? = null) =
+        withContext(ioDispatcher) {
+            val currentSettings = settings ?: settingsRepository.getGeneralSettings()
+            val autoTunnelSettings = autoTunnelSettingsRepository.getAutoTunnelSettings()
+            val tunnels = tunnelsRepository.userTunnelsFlow.firstOrNull()
+            if (autoTunnelSettings.isAutoTunnelEnabled)
+                return@withContext restoreAutoTunnel(autoTunnelSettings)
+            if (currentSettings.appMode == AppMode.LOCK_DOWN) handleLockDownModeInit()
+            if (tunnels?.any { it.isActive } == true) {
+                if (currentSettings.appMode == AppMode.VPN && !serviceManager.hasVpnPermission())
+                    return@withContext localErrorEvents.emit(null to NotAuthorized())
+                when (currentSettings.appMode) {
+                    AppMode.VPN,
+                    AppMode.PROXY,
+                    AppMode.LOCK_DOWN -> {
+                        tunnels.firstOrNull { it.isActive }?.let { startTunnel(it) }
+                    }
+                    AppMode.KERNEL ->
+                        tunnels.filter { it.isActive }.forEach { conf -> startTunnel(conf) }
+                }
             }
         }
+
+    private suspend fun restoreAutoTunnel(autoTunnelSettings: AutoTunnelSettings) {
+        autoTunnelSettingsRepository.upsert(autoTunnelSettings.copy(isAutoTunnelEnabled = true))
+        serviceManager.startAutoTunnelService()
+    }
+
+    suspend fun handleReboot() =
+        withContext(ioDispatcher) {
+            val settings = settingsRepository.getGeneralSettings()
+            val autoTunnelSettings = autoTunnelSettingsRepository.getAutoTunnelSettings()
+            val defaultTunnel = tunnelsRepository.getDefaultTunnel()
+            if (autoTunnelSettings.startOnBoot)
+                return@withContext restoreAutoTunnel(autoTunnelSettings)
+            if (settings.isRestoreOnBootEnabled) {
+                tunnelsRepository.resetActiveTunnels()
+                when (settings.appMode) {
+                    AppMode.LOCK_DOWN -> handleLockDownModeInit()
+                    AppMode.VPN ->
+                        if (!serviceManager.hasVpnPermission())
+                            return@withContext localErrorEvents.emit(null to NotAuthorized())
+                    AppMode.KERNEL,
+                    AppMode.PROXY -> Unit
+                }
+                defaultTunnel?.let { startTunnel(it) }
+            }
+        }
+
+    suspend fun restartActiveTunnel(id: Int) =
+        withContext(ioDispatcher) {
+            val activeIds = activeTunnels.value.keys.toList()
+            if (activeIds.isEmpty()) return@withContext
+            if (!activeIds.contains(id)) return@withContext
+            val tunnel = tunnelsRepository.getById(id) ?: return@withContext
+            restartTunnel(tunnel)
+        }
+
+    suspend fun restartActiveTunnels() =
+        withContext(ioDispatcher) {
+            val activeIds = activeTunnels.value.keys.toList()
+            if (activeIds.isEmpty()) return@withContext
+
+            val tunnels = tunnelsRepository.getAll()
+            if (tunnels.isEmpty()) return@withContext
+
+            supervisorScope {
+                activeIds.forEach { id ->
+                    val tunnel =
+                        tunnels.find { it.id == id }
+                            ?: run {
+                                Timber.w("Tunnel config $id not found; skipping restart")
+                                return@forEach
+                            }
+                    restartTunnel(tunnel)
+                }
+            }
+        }
+
+    private suspend fun restartTunnel(tunnel: TunnelConfig) {
+        runCatching { stopTunnel(tunnel.id) }
+            .onFailure { e -> Timber.e(e, "Failed to stop tunnel ${tunnel.id} during restart") }
+
+        delay(RESTART_TUNNEL_DELAY)
+
+        runCatching { startTunnel(tunnel) }
+            .onFailure { e -> Timber.e(e, "Failed to restart tunnel ${tunnel.id}") }
+    }
+
+    companion object {
+        const val RESTART_TUNNEL_DELAY = 300L
+    }
 }

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

@@ -1,301 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.tunnel
-
-import com.zaneschepke.logcatter.LogReader
-import com.zaneschepke.networkmonitor.NetworkMonitor
-import com.zaneschepke.wireguardautotunnel.data.model.AppMode
-import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
-import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import com.zaneschepke.wireguardautotunnel.domain.state.FailureReason
-import com.zaneschepke.wireguardautotunnel.domain.state.LogHealthState
-import com.zaneschepke.wireguardautotunnel.domain.state.PingState
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
-import com.zaneschepke.wireguardautotunnel.util.extensions.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 settingsRepository: GeneralSettingRepository,
-    private val tunnelsRepository: TunnelRepository,
-    private val networkMonitor: NetworkMonitor,
-    private val networkUtils: NetworkUtils,
-    private val logReader: LogReader,
-) {
-
-    @OptIn(FlowPreview::class)
-    suspend fun startMonitoring(
-        tunnelId: Int,
-        withLogs: Boolean,
-        tunStateFlow: StateFlow<TunnelState?>,
-        getStatistics: suspend (Int) -> TunnelStatistics?,
-        updateTunnelStatus:
-            suspend (
-                Int, TunnelStatus?, TunnelStatistics?, Map<Key, PingState>?, LogHealthState?,
-            ) -> Unit,
-    ): Job = coroutineScope {
-        launch {
-            val config = tunnelsRepository.getById(tunnelId) ?: return@launch
-            launch { startPingMonitor(config, tunStateFlow, updateTunnelStatus) }
-            launch { startWgStatsPoll(tunnelId, getStatistics, updateTunnelStatus) }
-            if (withLogs) launch { startLogsMonitor(config, updateTunnelStatus) }
-        }
-    }
-
-    private suspend fun startLogsMonitor(
-        tunnelConf: TunnelConf,
-        updateTunnelStatus:
-            suspend (
-                Int, TunnelStatus?, TunnelStatistics?, Map<Key, PingState>?, LogHealthState?,
-            ) -> Unit,
-    ) {
-        logReader.liveLogs
-            .filter { log -> log.tag.contains(tunnelConf.tunName) }
-            .mapNotNull { log ->
-                val now = System.currentTimeMillis()
-
-                when {
-                    successLogRegex.containsMatchIn(log.message) ->
-                        LogHealthState(isHealthy = true, timestamp = now)
-
-                    failureLogRegex.containsMatchIn(log.message) ->
-                        LogHealthState(isHealthy = false, timestamp = now)
-
-                    else -> null
-                }
-            }
-            .distinctUntilChangedBy { it.isHealthy } // Only emit when health changes
-            .collect { logHealthState ->
-                Timber.d("Tunnel log health updated for ${tunnelConf.tunName}: $logHealthState")
-                updateTunnelStatus(tunnelConf.id, null, null, null, logHealthState)
-            }
-    }
-
-    private suspend fun startPingMonitor(
-        tunnelConf: TunnelConf,
-        tunStateFlow: StateFlow<TunnelState?>,
-        updateTunnelStatus:
-            suspend (
-                Int, TunnelStatus?, TunnelStatistics?, Map<Key, PingState>?, LogHealthState?,
-            ) -> Unit,
-    ) = coroutineScope {
-        val pingStatsFlow = MutableStateFlow<Map<Key, PingState>>(emptyMap())
-
-        val connectivityStateFlow = networkMonitor.connectivityStateFlow.stateIn(this)
-
-        val isNetworkConnected = connectivityStateFlow.map { it.hasConnectivity() }.stateIn(this)
-
-        data class NetworkChangeKey(
-            val ethernetConnected: Boolean,
-            val wifiConnected: Boolean,
-            val cellularConnected: Boolean,
-            val wifiSsid: String?,
-        )
-
-        connectivityStateFlow
-            .map {
-                NetworkChangeKey(
-                    ethernetConnected = it.ethernetConnected,
-                    wifiConnected = it.wifiState.connected,
-                    cellularConnected = it.cellularConnected,
-                    wifiSsid = if (it.wifiState.connected) it.wifiState.ssid else null,
-                )
-            }
-            .distinctUntilChanged()
-            .stateIn(this)
-
-        settingsRepository.flow
-            .distinctUntilChanged { old, new ->
-                old.isPingEnabled == new.isPingEnabled &&
-                    old.tunnelPingIntervalSeconds == new.tunnelPingIntervalSeconds &&
-                    old.tunnelPingAttempts == new.tunnelPingAttempts &&
-                    old.tunnelPingTimeoutSeconds == new.tunnelPingTimeoutSeconds &&
-                    old.appMode == new.appMode
-            }
-            .collectLatest { settings ->
-                if (!settings.isPingEnabled) return@collectLatest
-                // TODO for now until we get monitoring for these modes
-                if (settings.appMode == AppMode.LOCK_DOWN || settings.appMode == AppMode.PROXY)
-                    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 ->
-                        ensureActive()
-                        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 {
-                                withTimeout(
-                                    settings.tunnelPingTimeoutSeconds?.toMillis() ?: 5000L
-                                ) {
-                                    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()) {
-                        ensureActive()
-                        pingStatsFlow.update { updates }
-                        updateTunnelStatus(tunnelConf.id, null, null, updates, null)
-                    }
-                }
-
-                // Wait for the tunnel to be fully active
-                tunStateFlow.filter { state -> state?.status == TunnelStatus.Up }.first()
-
-                // small delay to make sure tunnel is fully up before we actively monitor
-                delay(3_000L)
-
-                while (isActive) {
-                    ensureActive()
-                    if (isNetworkConnected.value) {
-                        performPing()
-                    } else {
-                        pingStatsFlow.update { current ->
-                            current.mapValues { entry ->
-                                entry.value.copy(
-                                    isReachable = false,
-                                    failureReason = FailureReason.NoConnectivity,
-                                    lastPingAttemptMillis = System.currentTimeMillis(),
-                                )
-                            }
-                        }
-                        ensureActive()
-                        updateTunnelStatus(tunnelConf.id, null, null, pingStatsFlow.value, null)
-                    }
-                    delay(settings.tunnelPingIntervalSeconds.toMillis())
-                }
-            }
-    }
-
-    private suspend fun startWgStatsPoll(
-        tunnelId: Int,
-        getStatistics: suspend (Int) -> TunnelStatistics?,
-        updateTunnelStatus:
-            suspend (
-                Int, TunnelStatus?, TunnelStatistics?, Map<Key, PingState>?, LogHealthState?,
-            ) -> Unit,
-    ) = coroutineScope {
-        while (isActive) {
-            ensureActive()
-            val stats = getStatistics(tunnelId)
-            ensureActive()
-            updateTunnelStatus(tunnelId, null, stats, null, null)
-            delay(STATS_DELAY)
-        }
-    }
-
-    companion object {
-
-        private val successLogRegex =
-            Regex("Received handshake response|Receiving keepalive packet", RegexOption.IGNORE_CASE)
-
-        private val failureLogRegex =
-            Regex(
-                "Failed to send handshake initiation: write udp|" +
-                    "Handshake did not complete after 5 seconds, retrying|" +
-                    "Failed to send data packets",
-                RegexOption.IGNORE_CASE,
-            )
-
-        const val CLOUDFLARE_IPV6_IP = "2606:4700:4700::1111"
-        const val CLOUDFLARE_IPV4_IP = "1.1.1.1"
-
-        const val STATS_DELAY = 1_000L
-    }
-}

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

@@ -4,27 +4,21 @@ 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.model.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.domain.state.LogHealthState
 import com.zaneschepke.wireguardautotunnel.domain.state.PingState
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
-import org.amnezia.awg.crypto.Key
 
 interface TunnelProvider {
-    /** Starts the specified tunnel configuration. */
-    suspend fun startTunnel(tunnelConf: TunnelConf)
+    suspend fun startTunnel(tunnelConfig: TunnelConfig): Result<Unit>
 
-    /**
-     * Stops the specified tunnel.
-     *
-     * @param tunnelId The tunnelConf to stop.
-     */
     suspend fun stopTunnel(tunnelId: Int)
 
-    /** Stops all active tunnels. */
+    suspend fun forceStopTunnel(tunnelId: Int)
+
     suspend fun stopActiveTunnels()
 
     fun setBackendMode(backendMode: BackendMode)
@@ -33,21 +27,19 @@ interface TunnelProvider {
 
     suspend fun runningTunnelNames(): Set<String>
 
-    fun handleDnsReresolve(tunnelConf: TunnelConf): Boolean
+    fun handleDnsReresolve(tunnelConfig: TunnelConfig): Boolean
 
     fun getStatistics(tunnelId: Int): TunnelStatistics?
 
     val activeTunnels: StateFlow<Map<Int, TunnelState>>
-
-    val errorEvents: SharedFlow<Pair<String, BackendCoreException>>
-
-    val messageEvents: SharedFlow<Pair<String, BackendMessage>>
+    val errorEvents: SharedFlow<Pair<String?, BackendCoreException>>
+    val messageEvents: SharedFlow<Pair<String?, BackendMessage>>
 
     suspend fun updateTunnelStatus(
         tunnelId: Int,
         status: TunnelStatus? = null,
         stats: TunnelStatistics? = null,
-        pingStates: Map<Key, PingState>? = null,
+        pingStates: Map<String, PingState>? = null,
         logHealthState: LogHealthState? = null,
     )
 }

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

@@ -1,170 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.tunnel
-
-import com.zaneschepke.wireguardautotunnel.data.model.DnsProtocol
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-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.GeneralSettingRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.ProxySettingsRepository
-import com.zaneschepke.wireguardautotunnel.domain.state.AmneziaStatistics
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
-import com.zaneschepke.wireguardautotunnel.util.extensions.asAmBackendMode
-import com.zaneschepke.wireguardautotunnel.util.extensions.asBackendMode
-import com.zaneschepke.wireguardautotunnel.util.extensions.asTunnelState
-import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendCoreException
-import java.io.IOException
-import java.util.*
-import java.util.concurrent.ConcurrentHashMap
-import javax.inject.Inject
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.consumeAsFlow
-import kotlinx.coroutines.launch
-import org.amnezia.awg.backend.Backend
-import org.amnezia.awg.backend.BackendException
-import org.amnezia.awg.backend.ProxyGoBackend
-import org.amnezia.awg.backend.Tunnel as AwgTunnel
-import org.amnezia.awg.config.Config
-import org.amnezia.awg.config.DnsSettings
-import org.amnezia.awg.config.proxy.HttpProxy
-import org.amnezia.awg.config.proxy.Proxy
-import org.amnezia.awg.config.proxy.Socks5Proxy
-import timber.log.Timber
-
-class UserspaceTunnel
-@Inject
-constructor(
-    @ApplicationScope applicationScope: CoroutineScope,
-    private val proxySettingsRepository: ProxySettingsRepository,
-    private val settingsRepository: GeneralSettingRepository,
-    private val backend: Backend,
-) : BaseTunnel(applicationScope) {
-
-    private val runtimeTunnels = ConcurrentHashMap<Int, AwgTunnel>()
-
-    override fun tunnelStateFlow(tunnelConf: TunnelConf): Flow<TunnelStatus> = callbackFlow {
-        val stateChannel = Channel<AwgTunnel.State>()
-
-        val runtimeTunnel = RuntimeAwgTunnel(tunnelConf, stateChannel)
-        runtimeTunnels[tunnelConf.id] = runtimeTunnel
-
-        val consumerJob = launch {
-            stateChannel.consumeAsFlow().collect { awgState -> trySend(awgState.asTunnelState()) }
-        }
-
-        try {
-            updateTunnelStatus(tunnelConf.id, TunnelStatus.Starting)
-
-            val proxies: List<Proxy> =
-                when (backend) {
-                    is ProxyGoBackend -> {
-                        val proxySettings = proxySettingsRepository.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 = settingsRepository.get()
-            val config = tunnelConf.toAmConfig()
-            val updatedConfig =
-                Config.Builder()
-                    .apply {
-                        setInterface(config.`interface`)
-                        addPeers(config.peers)
-                        addProxies(proxies)
-                        setDnsSettings(
-                            DnsSettings(
-                                setting.dnsProtocol == DnsProtocol.DOH,
-                                Optional.ofNullable(setting.dnsEndpoint),
-                            )
-                        )
-                    }
-                    .build()
-            backend.setState(runtimeTunnel, AwgTunnel.State.UP, updatedConfig)
-        } catch (e: BackendException) {
-            close(e.toBackendCoreException())
-        } catch (e: IllegalArgumentException) {
-            close(BackendCoreException.Config)
-        } catch (e: Exception) {
-            Timber.e(e, "Error while setting tunnel state")
-            close(BackendCoreException.Unknown)
-        }
-
-        awaitClose {
-            try {
-                backend.setState(runtimeTunnel, AwgTunnel.State.DOWN, null)
-            } catch (e: BackendException) {
-                errors.tryEmit(tunnelConf.tunName to e.toBackendCoreException())
-            } finally {
-                consumerJob.cancel()
-                stateChannel.close()
-                runtimeTunnels.remove(tunnelConf.id)
-                trySend(TunnelStatus.Down)
-                close()
-            }
-        }
-    }
-
-    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 fun handleDnsReresolve(tunnelConf: TunnelConf): Boolean {
-        val tunnel =
-            runtimeTunnels.get(tunnelConf.id) ?: throw BackendCoreException.ServiceNotRunning
-        return backend.resolveDDNS(tunnelConf.toAmConfig(), tunnel.isIpv4ResolutionPreferred)
-    }
-
-    override suspend fun runningTunnelNames(): Set<String> {
-        return backend.runningTunnelNames
-    }
-
-    override fun getStatistics(tunnelId: Int): TunnelStatistics? {
-        return try {
-            val runtimeTunnel = runtimeTunnels[tunnelId] ?: return null
-            AmneziaStatistics(backend.getStatistics(runtimeTunnel))
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to get stats for $tunnelId")
-            null
-        }
-    }
-}

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

@@ -0,0 +1,128 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel.backend
+
+import com.wireguard.android.backend.Backend
+import com.wireguard.android.backend.BackendException
+import com.wireguard.android.backend.Tunnel
+import com.wireguard.android.backend.WgQuickBackend
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
+import com.zaneschepke.wireguardautotunnel.domain.events.DnsFailure
+import com.zaneschepke.wireguardautotunnel.domain.events.InvalidConfig
+import com.zaneschepke.wireguardautotunnel.domain.events.KernelTunnelName
+import com.zaneschepke.wireguardautotunnel.domain.events.KernelWireguardNotSupported
+import com.zaneschepke.wireguardautotunnel.domain.events.UnknownError
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
+import com.zaneschepke.wireguardautotunnel.domain.state.WireGuardStatistics
+import com.zaneschepke.wireguardautotunnel.util.extensions.asTunnelState
+import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendCoreException
+import java.util.concurrent.ConcurrentHashMap
+import java.util.regex.Pattern
+import kotlinx.coroutines.TimeoutCancellationException
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.consumeAsFlow
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+class KernelTunnel(private val runConfigHelper: RunConfigHelper, private val backend: Backend) :
+    TunnelBackend {
+
+    private val runtimeTunnels = ConcurrentHashMap<Int, Tunnel>()
+
+    private fun validateWireGuardInterfaceName(name: String): Result<Unit> {
+        if (name.isEmpty() || name.length > 15)
+            return Result.failure(KernelTunnelName(R.string.kernel_name_error))
+        if (name == "." || name == "..") {
+            return Result.failure(KernelTunnelName(R.string.kernel_name_dots))
+        }
+        val pattern = Pattern.compile("^[a-zA-Z0-9_=+.-]{1,15}$")
+        if (!pattern.matcher(name).matches()) {
+            return Result.failure(KernelTunnelName(R.string.kernel_name_special_characters))
+        }
+        return Result.success(Unit)
+    }
+
+    override fun tunnelStateFlow(tunnelConfig: TunnelConfig): Flow<TunnelStatus> = callbackFlow {
+        if (!WgQuickBackend.hasKernelSupport()) throw KernelWireguardNotSupported()
+        validateWireGuardInterfaceName(tunnelConfig.name).onFailure { throw it }
+
+        val stateChannel = Channel<Tunnel.State>()
+
+        val runtimeTunnel = RuntimeWgTunnel(tunnelConfig, stateChannel)
+        runtimeTunnels[tunnelConfig.id] = runtimeTunnel
+
+        val consumerJob = launch {
+            stateChannel.consumeAsFlow().collect { state -> trySend(state.asTunnelState()) }
+        }
+
+        try {
+            val runConfig = runConfigHelper.buildWgRunConfig(tunnelConfig)
+            backend.setState(runtimeTunnel, Tunnel.State.UP, runConfig)
+        } catch (e: TimeoutCancellationException) {
+            Timber.Forest.e("Startup timed out for ${tunnelConfig.name}")
+            throw DnsFailure()
+        } catch (e: BackendException) {
+            throw e.toBackendCoreException()
+        } catch (e: IllegalArgumentException) {
+            Timber.Forest.e(e, "Invalid backend arguments")
+            throw InvalidConfig()
+        } catch (e: Exception) {
+            Timber.Forest.e(e, "Error while setting tunnel state")
+            throw UnknownError()
+        }
+
+        awaitClose {
+            try {
+                backend.setState(runtimeTunnel, Tunnel.State.DOWN, null)
+            } catch (e: BackendException) {
+                // Errors are emitted by caller (lifecycle manager)
+            } finally {
+                consumerJob.cancel()
+                stateChannel.close()
+                runtimeTunnels.remove(tunnelConfig.id)
+                trySend(TunnelStatus.Down)
+            }
+        }
+    }
+
+    override fun getStatistics(tunnelId: Int): TunnelStatistics? {
+        return try {
+            val runtimeTunnel = runtimeTunnels[tunnelId] ?: return null
+            WireGuardStatistics(backend.getStatistics(runtimeTunnel))
+        } catch (e: Exception) {
+            Timber.Forest.e(e, "Failed to get stats for $tunnelId")
+            null
+        }
+    }
+
+    override fun setBackendMode(backendMode: BackendMode) {
+        Timber.Forest.w("Not yet implemented for kernel")
+    }
+
+    override fun getBackendMode(): BackendMode {
+        return BackendMode.Inactive
+    }
+
+    override fun handleDnsReresolve(tunnelConfig: TunnelConfig): Boolean {
+        throw NotImplementedError()
+    }
+
+    override suspend fun runningTunnelNames(): Set<String> {
+        return backend.runningTunnelNames
+    }
+
+    override suspend fun forceStopTunnel(tunnelId: Int) {
+        val runtimeTunnel = runtimeTunnels[tunnelId] ?: return
+        try {
+            backend.setState(runtimeTunnel, Tunnel.State.DOWN, null)
+        } catch (e: BackendException) {
+            Timber.Forest.e(e, "Force stop failed for $tunnelId")
+        } finally {
+            runtimeTunnels.remove(tunnelId)
+        }
+    }
+}

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

@@ -0,0 +1,101 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel.backend
+
+import com.zaneschepke.wireguardautotunnel.data.model.AppMode
+import com.zaneschepke.wireguardautotunnel.data.model.DnsProtocol
+import com.zaneschepke.wireguardautotunnel.domain.events.InvalidConfig
+import com.zaneschepke.wireguardautotunnel.domain.model.DnsSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.ProxySettings
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.domain.repository.DnsSettingsRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.ProxySettingsRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import java.util.Optional
+import kotlinx.coroutines.flow.firstOrNull
+import org.amnezia.awg.config.Config
+import org.amnezia.awg.config.proxy.HttpProxy
+import org.amnezia.awg.config.proxy.Socks5Proxy
+
+class RunConfigHelper(
+    private val settingsRepository: GeneralSettingRepository,
+    private val proxySettingsRepository: ProxySettingsRepository,
+    private val dnsSettingsRepository: DnsSettingsRepository,
+    private val tunnelsRepository: TunnelRepository,
+) {
+
+    private data class PrepResult(
+        val effectiveConfig: TunnelConfig,
+        val generalSettings: GeneralSettings,
+        val dnsSettings: DnsSettings,
+    )
+
+    private suspend fun prepare(tunnelConfig: TunnelConfig): PrepResult {
+        val generalSettings = settingsRepository.getGeneralSettings()
+        val dnsSettings = dnsSettingsRepository.getDnsSettings()
+        val effectiveConfig =
+            if (
+                generalSettings.isGlobalSplitTunnelEnabled || dnsSettings.isGlobalTunnelDnsEnabled
+            ) {
+                val globalConfig =
+                    tunnelsRepository.globalTunnelFlow.firstOrNull() ?: throw InvalidConfig()
+                tunnelConfig.copyWithGlobalValues(
+                    globalConfig,
+                    dnsSettings.isGlobalTunnelDnsEnabled,
+                    generalSettings.isGlobalSplitTunnelEnabled,
+                )
+            } else {
+                tunnelConfig
+            }
+        return PrepResult(effectiveConfig, generalSettings, dnsSettings)
+    }
+
+    suspend fun buildAmRunConfig(tunnelConfig: TunnelConfig): Config {
+        val prep = prepare(tunnelConfig)
+        val proxies =
+            if (prep.generalSettings.appMode == AppMode.PROXY) {
+                val proxySettings = proxySettingsRepository.getProxySettings()
+                buildList {
+                    if (proxySettings.socks5ProxyEnabled) {
+                        add(
+                            Socks5Proxy(
+                                proxySettings.socks5ProxyBindAddress
+                                    ?: ProxySettings.DEFAULT_SOCKS_BIND_ADDRESS,
+                                proxySettings.proxyUsername,
+                                proxySettings.proxyPassword,
+                            )
+                        )
+                    }
+                    if (proxySettings.httpProxyEnabled) {
+                        add(
+                            HttpProxy(
+                                proxySettings.httpProxyBindAddress
+                                    ?: ProxySettings.DEFAULT_HTTP_BIND_ADDRESS,
+                                proxySettings.proxyUsername,
+                                proxySettings.proxyPassword,
+                            )
+                        )
+                    }
+                }
+            } else {
+                emptyList()
+            }
+        val amConfig = prep.effectiveConfig.toAmConfig()
+        return Config.Builder()
+            .setInterface(amConfig.`interface`)
+            .addPeers(amConfig.peers)
+            .addProxies(proxies)
+            .setDnsSettings(
+                org.amnezia.awg.config.DnsSettings(
+                    prep.dnsSettings.dnsProtocol == DnsProtocol.DOH,
+                    Optional.ofNullable(prep.dnsSettings.dnsEndpoint),
+                )
+            )
+            .build()
+    }
+
+    suspend fun buildWgRunConfig(tunnelConfig: TunnelConfig): com.wireguard.config.Config {
+        val prep = prepare(tunnelConfig)
+        return prep.effectiveConfig.toWgConfig()
+    }
+}

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

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

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

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

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

@@ -0,0 +1,23 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel.backend
+
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
+import kotlinx.coroutines.flow.Flow
+
+interface TunnelBackend {
+    fun tunnelStateFlow(tunnelConfig: TunnelConfig): Flow<TunnelStatus>
+
+    fun getStatistics(tunnelId: Int): TunnelStatistics?
+
+    fun setBackendMode(backendMode: BackendMode)
+
+    fun getBackendMode(): BackendMode
+
+    fun handleDnsReresolve(tunnelConfig: TunnelConfig): Boolean
+
+    suspend fun runningTunnelNames(): Set<String>
+
+    suspend fun forceStopTunnel(tunnelId: Int)
+}

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

@@ -0,0 +1,119 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel.backend
+
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
+import com.zaneschepke.wireguardautotunnel.domain.events.DnsFailure
+import com.zaneschepke.wireguardautotunnel.domain.events.InvalidConfig
+import com.zaneschepke.wireguardautotunnel.domain.events.ServiceNotRunning
+import com.zaneschepke.wireguardautotunnel.domain.events.UnknownError
+import com.zaneschepke.wireguardautotunnel.domain.events.VpnUnauthorized
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
+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.asTunnelState
+import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendCoreException
+import java.io.IOException
+import java.util.concurrent.ConcurrentHashMap
+import kotlinx.coroutines.TimeoutCancellationException
+import kotlinx.coroutines.channels.Channel
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.consumeAsFlow
+import kotlinx.coroutines.launch
+import org.amnezia.awg.backend.Backend
+import org.amnezia.awg.backend.BackendException
+import org.amnezia.awg.backend.Tunnel
+import timber.log.Timber
+
+class UserspaceTunnel(private val backend: Backend, private val runConfigHelper: RunConfigHelper) :
+    TunnelBackend {
+
+    private val runtimeTunnels = ConcurrentHashMap<Int, Tunnel>()
+
+    override fun tunnelStateFlow(tunnelConfig: TunnelConfig): Flow<TunnelStatus> = callbackFlow {
+        val stateChannel = Channel<Tunnel.State>()
+
+        val runtimeTunnel = RuntimeAwgTunnel(tunnelConfig, stateChannel)
+        runtimeTunnels[tunnelConfig.id] = runtimeTunnel
+
+        val consumerJob = launch {
+            stateChannel.consumeAsFlow().collect { awgState -> trySend(awgState.asTunnelState()) }
+        }
+
+        try {
+            val runConfig = runConfigHelper.buildAmRunConfig(tunnelConfig)
+            backend.setState(runtimeTunnel, Tunnel.State.UP, runConfig)
+        } catch (_: TimeoutCancellationException) {
+            Timber.e("Startup timed out for ${tunnelConfig.name} (likely DNS hang)")
+            throw DnsFailure()
+        } catch (e: BackendException) {
+            throw e.toBackendCoreException()
+        } catch (_: IllegalArgumentException) {
+            throw InvalidConfig()
+        } catch (e: Exception) {
+            Timber.e(e, "Error while setting tunnel state")
+            throw UnknownError()
+        }
+
+        awaitClose {
+            try {
+                backend.setState(runtimeTunnel, Tunnel.State.DOWN, null)
+            } catch (e: BackendException) {
+                // Errors emitted by caller
+            } finally {
+                consumerJob.cancel()
+                stateChannel.close()
+                runtimeTunnels.remove(tunnelConfig.id)
+                trySend(TunnelStatus.Down)
+            }
+        }
+    }
+
+    override fun setBackendMode(backendMode: BackendMode) {
+        Timber.d("Setting backend mode: $backendMode")
+        try {
+            backend.backendMode = backendMode.asAmBackendMode()
+        } catch (e: BackendException) {
+            throw e.toBackendCoreException()
+        } catch (_: IOException) {
+            throw VpnUnauthorized()
+        }
+    }
+
+    override fun getBackendMode(): BackendMode {
+        return backend.backendMode.asBackendMode()
+    }
+
+    override fun handleDnsReresolve(tunnelConfig: TunnelConfig): Boolean {
+        val tunnel = runtimeTunnels[tunnelConfig.id] ?: throw ServiceNotRunning()
+        return backend.resolveDDNS(tunnelConfig.toAmConfig(), tunnel.isIpv4ResolutionPreferred)
+    }
+
+    override suspend fun runningTunnelNames(): Set<String> {
+        return backend.runningTunnelNames
+    }
+
+    override fun getStatistics(tunnelId: Int): TunnelStatistics? {
+        return try {
+            val runtimeTunnel = runtimeTunnels[tunnelId] ?: return null
+            AmneziaStatistics(backend.getStatistics(runtimeTunnel))
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to get stats for $tunnelId")
+            null
+        }
+    }
+
+    override suspend fun forceStopTunnel(tunnelId: Int) {
+        val runtimeTunnel = runtimeTunnels[tunnelId] ?: return
+        try {
+            backend.setState(runtimeTunnel, Tunnel.State.DOWN, null)
+        } catch (e: BackendException) {
+            Timber.e(e, "Force stop failed for $tunnelId")
+        } finally {
+            runtimeTunnels.remove(tunnelId)
+        }
+    }
+}

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

@@ -0,0 +1,114 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel.handler
+
+import com.zaneschepke.wireguardautotunnel.data.model.AppMode
+import com.zaneschepke.wireguardautotunnel.domain.events.BackendMessage
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
+import java.util.concurrent.ConcurrentHashMap
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.plus
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import timber.log.Timber
+
+class DynamicDnsHandler(
+    private val activeTunnels: StateFlow<Map<Int, TunnelState>>,
+    private val tunnelsRepository: TunnelRepository,
+    private val settingsRepository: GeneralSettingRepository,
+    private val localMessageEvents: MutableSharedFlow<Pair<String?, BackendMessage>>,
+    private val handleDnsReresolve: (TunnelConfig) -> Boolean,
+    private val applicationScope: CoroutineScope,
+    private val ioDispatcher: CoroutineDispatcher,
+) {
+    private val mutex = Mutex()
+    private val jobs = ConcurrentHashMap<Int, Job>()
+
+    init {
+        applicationScope.launch(ioDispatcher) {
+            combine(activeTunnels, settingsRepository.flow.filterNotNull()) { active, settings ->
+                    active to settings
+                }
+                .collect { (activeTuns, settings) ->
+                    mutex.withLock {
+                        val activeIds =
+                            activeTuns.keys
+                                .filter { id ->
+                                    val config =
+                                        tunnelsRepository.getById(id) ?: return@filter false
+                                    config.restartOnPingFailure &&
+                                        settings.appMode != AppMode.KERNEL
+                                }
+                                .toSet()
+
+                        (jobs.keys - activeIds).forEach { id ->
+                            Timber.d("Shutting down Dynamic DNS monitoring job for tunnelId: $id")
+                            jobs.remove(id)?.cancel()
+                        }
+
+                        activeIds.forEach { id ->
+                            if (jobs.containsKey(id)) return@forEach
+                            val config = tunnelsRepository.getById(id) ?: return@forEach
+                            val tunStateFlow =
+                                activeTunnels
+                                    .map { it[id] }
+                                    .stateIn(applicationScope + ioDispatcher)
+                            Timber.d("Starting Dynamic DNS monitoring job for tunnelId: $id")
+                            jobs[id] =
+                                applicationScope.launch(ioDispatcher) {
+                                    monitorDynamicDns(config, tunStateFlow)
+                                }
+                        }
+                    }
+                }
+        }
+    }
+
+    private suspend fun monitorDynamicDns(
+        config: TunnelConfig,
+        tunStateFlow: StateFlow<TunnelState?>,
+    ) {
+        var backoff = BASE_BACKOFF
+        while (true) {
+            val state = tunStateFlow.value ?: break
+            if (state.health() != TunnelState.Health.UNHEALTHY) {
+                backoff = BASE_BACKOFF
+                tunStateFlow.first { it?.health() == TunnelState.Health.UNHEALTHY || it == null }
+                continue
+            }
+
+            runCatching {
+                    val updated = handleDnsReresolve(config)
+                    if (updated) {
+                        localMessageEvents.emit(config.name to BackendMessage.DynamicDnsSuccess)
+                        backoff = BASE_BACKOFF
+                    } else {
+                        Timber.i(
+                            "Dynamic DNS check completed, current endpoint address is already up to date."
+                        )
+                    }
+                }
+                .onFailure { Timber.e(it, "Failed to handle dns re-resolution for ${config.name}") }
+
+            delay(backoff)
+            backoff = (backoff * 1.5).toLong().coerceAtMost(MAX_BACKOFF_TIME)
+        }
+    }
+
+    companion object {
+        const val BASE_BACKOFF = 30_000L
+        const val MAX_BACKOFF_TIME = 300_000L
+    }
+}

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

@@ -0,0 +1,47 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel.handler
+
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.supervisorScope
+
+class TunnelActiveStatePersister(
+    private val activeTunnels: StateFlow<Map<Int, TunnelState>>,
+    private val tunnelsRepository: TunnelRepository,
+    applicationScope: CoroutineScope,
+    ioDispatcher: CoroutineDispatcher,
+) {
+    private var previousActiveIds: Set<Int> = emptySet()
+
+    init {
+        applicationScope.launch(ioDispatcher) {
+            activeTunnels.collect { currentActive ->
+                val currentActiveIds = currentActive.keys
+                if (currentActiveIds == previousActiveIds) return@collect
+
+                val tunnels = tunnelsRepository.userTunnelsFlow.firstOrNull() ?: return@collect
+                val tunnelsById = tunnels.associateBy { it.id }
+
+                val relevantIds = previousActiveIds + currentActiveIds
+
+                supervisorScope {
+                    relevantIds.forEach { id ->
+                        launch {
+                            val config = tunnelsById[id] ?: return@launch
+                            val wasActive = previousActiveIds.contains(id)
+                            val isActive = currentActiveIds.contains(id)
+                            if (wasActive != isActive) {
+                                tunnelsRepository.save(config.copy(isActive = isActive))
+                            }
+                        }
+                    }
+                }
+                previousActiveIds = currentActiveIds.toSet()
+            }
+        }
+    }
+}

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

@@ -0,0 +1,390 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel.handler
+
+import android.os.PowerManager
+import com.zaneschepke.logcatter.LogReader
+import com.zaneschepke.networkmonitor.NetworkMonitor
+import com.zaneschepke.wireguardautotunnel.data.model.AppMode
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.MonitoringSettingsRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import com.zaneschepke.wireguardautotunnel.domain.state.FailureReason
+import com.zaneschepke.wireguardautotunnel.domain.state.LogHealthState
+import com.zaneschepke.wireguardautotunnel.domain.state.PingState
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
+import com.zaneschepke.wireguardautotunnel.util.extensions.toMillis
+import com.zaneschepke.wireguardautotunnel.util.network.NetworkUtils
+import inet.ipaddr.AddressValueException
+import inet.ipaddr.IPAddress
+import inet.ipaddr.IPAddressString
+import io.ktor.util.collections.ConcurrentMap
+import java.util.concurrent.ConcurrentHashMap
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.FlowPreview
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.combine
+import kotlinx.coroutines.flow.distinctUntilChangedBy
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.mapNotNull
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.plus
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
+import kotlinx.coroutines.withTimeout
+import timber.log.Timber
+
+class TunnelMonitorHandler(
+    private val activeTunnels: StateFlow<Map<Int, TunnelState>>,
+    private val tunnelsRepository: TunnelRepository,
+    private val settingsRepository: GeneralSettingRepository,
+    private val monitoringSettingsRepository: MonitoringSettingsRepository,
+    private val networkMonitor: NetworkMonitor,
+    private val networkUtils: NetworkUtils,
+    private val logReader: LogReader,
+    private val powerManager: PowerManager,
+    private val getStatistics: (Int) -> TunnelStatistics?,
+    private val updateTunnelStatus:
+        suspend (
+            Int, TunnelStatus?, TunnelStatistics?, Map<String, PingState>?, LogHealthState?,
+        ) -> Unit,
+    private val applicationScope: CoroutineScope,
+    private val ioDispatcher: CoroutineDispatcher,
+) {
+    private val mutex = Mutex()
+    private val jobs = ConcurrentHashMap<Int, Job>()
+
+    init {
+        applicationScope.launch(ioDispatcher) {
+            activeTunnels.collect { activeTuns ->
+                mutex.withLock {
+                    val activeIds = activeTuns.keys.toSet()
+                    (jobs.keys - activeIds).forEach { id ->
+                        Timber.d("Shutting down tunnel monitoring job for tunnelId: $id")
+                        jobs.remove(id)?.cancel()
+                    }
+
+                    val tunnels = tunnelsRepository.flow.firstOrNull() ?: return@collect
+                    val tunnelsById = tunnels.associateBy { it.id }
+
+                    activeIds.forEach { id ->
+                        if (jobs.containsKey(id)) return@forEach
+                        val config = tunnelsById[id] ?: return@forEach
+                        val settings = settingsRepository.flow.filterNotNull().first()
+                        val tunStateFlow =
+                            activeTunnels.map { it[id] }.stateIn(applicationScope + ioDispatcher)
+                        jobs[id] =
+                            applicationScope.launch(ioDispatcher) {
+                                Timber.d("Starting tunnel monitoring job for tunnelId: $id")
+                                startMonitoring(
+                                    config = config,
+                                    withLogs = settings.appMode != AppMode.KERNEL,
+                                    tunStateFlow = tunStateFlow,
+                                    getStatistics = { tunnelId -> getStatistics(tunnelId) },
+                                    updateTunnelStatus = { tid, _, stats, pings, logHealth ->
+                                        updateTunnelStatus(tid, null, stats, pings, logHealth)
+                                    },
+                                )
+                            }
+                    }
+                }
+            }
+        }
+    }
+
+    @OptIn(FlowPreview::class)
+    private suspend fun startMonitoring(
+        config: TunnelConfig,
+        withLogs: Boolean,
+        tunStateFlow: StateFlow<TunnelState?>,
+        getStatistics: suspend (Int) -> TunnelStatistics?,
+        updateTunnelStatus:
+            suspend (
+                Int, TunnelStatus?, TunnelStatistics?, Map<String, PingState>?, LogHealthState?,
+            ) -> Unit,
+    ) = coroutineScope {
+        launch { startPingMonitor(config, tunStateFlow, updateTunnelStatus) }
+        launch { startWgStatsPoll(config.id, getStatistics, updateTunnelStatus) }
+        if (withLogs) launch { startLogsMonitor(config, updateTunnelStatus) }
+    }
+
+    private suspend fun startLogsMonitor(
+        tunnelConfig: TunnelConfig,
+        updateTunnelStatus:
+            suspend (
+                Int, TunnelStatus?, TunnelStatistics?, Map<String, PingState>?, LogHealthState?,
+            ) -> Unit,
+    ) {
+        logReader.liveLogs
+            .filter { log -> log.tag.contains(tunnelConfig.name) }
+            .mapNotNull { log ->
+                val now = System.currentTimeMillis()
+
+                when {
+                    successLogRegex.containsMatchIn(log.message) ->
+                        LogHealthState(isHealthy = true, timestamp = now)
+
+                    failureLogRegex.containsMatchIn(log.message) ->
+                        LogHealthState(isHealthy = false, timestamp = now)
+
+                    else -> null
+                }
+            }
+            .distinctUntilChangedBy { it.isHealthy }
+            .collect { logHealthState ->
+                Timber.d("Tunnel log health updated for ${tunnelConfig.name}: $logHealthState")
+                updateTunnelStatus(tunnelConfig.id, null, null, null, logHealthState)
+            }
+    }
+
+    private suspend fun startPingMonitor(
+        tunnelConfig: TunnelConfig,
+        tunStateFlow: StateFlow<TunnelState?>,
+        updateTunnelStatus:
+            suspend (
+                Int, TunnelStatus?, TunnelStatistics?, Map<String, PingState>?, LogHealthState?,
+            ) -> Unit,
+    ) = coroutineScope {
+        val pingStatsFlow = MutableStateFlow<Map<String, PingState>>(emptyMap())
+
+        val connectivityStateFlow = networkMonitor.connectivityStateFlow.stateIn(this)
+
+        val isNetworkConnected = connectivityStateFlow.map { it.hasInternet() }.stateIn(this)
+
+        combine(
+                settingsRepository.flow.distinctUntilChangedBy { it.appMode },
+                monitoringSettingsRepository.flow,
+            ) { settings, monitorSettings ->
+                Pair(settings.appMode, monitorSettings)
+            }
+            .collectLatest { (appMode, settings) ->
+                if (!settings.isPingEnabled) return@collectLatest
+                // TODO for now until we get monitoring for these modes
+                if (appMode == AppMode.LOCK_DOWN || appMode == AppMode.PROXY) return@collectLatest
+
+                Timber.d("Starting pinger for ${tunnelConfig.name} with settings")
+
+                val config = tunnelConfig.toAmConfig()
+
+                val pingablePeers = config.peers.filter { it.allowedIps.isNotEmpty() }
+                if (pingablePeers.isEmpty()) return@collectLatest
+
+                suspend fun performPing() {
+                    val updates = ConcurrentMap<String, PingState>()
+
+                    pingablePeers
+                        .map { it.publicKey.toBase64() to it }
+                        .forEach { (key, peer) ->
+                            ensureActive()
+                            val previousState = pingStatsFlow.value[key] ?: PingState()
+
+                            val allowedIpStr = peer.allowedIps.firstOrNull()?.toString()
+                            if (allowedIpStr == null) {
+                                updates[key] =
+                                    previousState.copy(
+                                        isReachable = false,
+                                        failureReason = FailureReason.NoResolvedEndpoint,
+                                        lastPingAttemptMillis = System.currentTimeMillis(),
+                                    )
+                                return@forEach
+                            }
+
+                            val host =
+                                tunnelConfig.pingTarget
+                                    ?: run {
+                                        val parts = allowedIpStr.split("/")
+                                        val internalIp =
+                                            if (parts.size == 2) parts[0] else allowedIpStr
+                                        val prefix =
+                                            if (parts.size == 2) parts[1].toIntOrNull() ?: 32
+                                            else 32
+                                        val cleanedIp = internalIp.removeSurrounding("[", "]")
+                                        val defaultCloudflare =
+                                            if (cleanedIp.contains(":")) CLOUDFLARE_IPV6_IP
+                                            else CLOUDFLARE_IPV4_IP
+
+                                        if (prefix <= 1) {
+                                            defaultCloudflare
+                                        } else {
+                                            try {
+                                                val addrStr = IPAddressString(cleanedIp)
+                                                val addr: IPAddress =
+                                                    addrStr.address
+                                                        ?: throw AddressValueException(
+                                                            "Invalid IP: $cleanedIp"
+                                                        )
+                                                val isIpv6 = addr.isIPv6
+                                                val cloudflareIp =
+                                                    if (isIpv6) CLOUDFLARE_IPV6_IP
+                                                    else CLOUDFLARE_IPV4_IP
+                                                val max = if (isIpv6) 128 else 32
+
+                                                if (prefix == max) {
+                                                    addr.toCanonicalString()
+                                                } else {
+                                                    val nextAddr: IPAddress? = addr.increment(1)
+                                                    nextAddr?.toCanonicalString() ?: cloudflareIp
+                                                }
+                                            } catch (e: AddressValueException) {
+                                                Timber.e(
+                                                    e,
+                                                    "Failed to parse or increment IP: $cleanedIp",
+                                                )
+                                                defaultCloudflare
+                                            }
+                                        }
+                                    }
+
+                            val attemptTime = System.currentTimeMillis()
+                            val timeout = settings.tunnelPingTimeoutSeconds?.toMillis() ?: 5000L
+                            runCatching {
+                                    withTimeout(
+                                        settings.tunnelPingTimeoutSeconds?.toMillis() ?: 5000L
+                                    ) {
+                                        val pingStats =
+                                            settings.tunnelPingTimeoutSeconds?.let {
+                                                networkUtils.pingWithStats(
+                                                    host,
+                                                    settings.tunnelPingAttempts,
+                                                    it.toMillis(),
+                                                )
+                                            }
+                                                ?: networkUtils.pingWithStats(
+                                                    host,
+                                                    settings.tunnelPingAttempts,
+                                                )
+
+                                        updates[key] =
+                                            previousState.copy(
+                                                transmitted = pingStats.transmitted,
+                                                received = pingStats.received,
+                                                packetLoss = pingStats.packetLoss,
+                                                rttMin = pingStats.rttMin,
+                                                rttMax = pingStats.rttMax,
+                                                rttAvg = pingStats.rttAvg,
+                                                rttStddev = pingStats.rttStddev,
+                                                isReachable = pingStats.isReachable,
+                                                failureReason =
+                                                    if (pingStats.isReachable) null
+                                                    else FailureReason.PingFailed,
+                                                lastSuccessfulPingMillis =
+                                                    pingStats.lastSuccessfulPingMillis
+                                                        ?: previousState.lastSuccessfulPingMillis,
+                                                pingTarget = host,
+                                                lastPingAttemptMillis = attemptTime,
+                                            )
+                                        Timber.d(
+                                            "Ping completed for peer ${peer.publicKey.toBase64().substring(0, 5)}.. to host $host with stats: $pingStats"
+                                        )
+                                    }
+                                }
+                                .onFailure {
+                                    Timber.e(
+                                        it,
+                                        "Ping failed for peer ${peer.publicKey} in ${tunnelConfig.name} to host $host",
+                                    )
+                                    updates[key] =
+                                        previousState.copy(
+                                            isReachable = false,
+                                            failureReason = FailureReason.PingFailed,
+                                            pingTarget = host,
+                                            lastPingAttemptMillis = attemptTime,
+                                        )
+                                }
+                        }
+
+                    if (updates.isNotEmpty()) {
+                        ensureActive()
+                        pingStatsFlow.update { updates }
+                        updateTunnelStatus(tunnelConfig.id, null, null, updates, null)
+                    }
+                }
+
+                // Wait for the tunnel to be fully active
+                tunStateFlow.filter { state -> state?.status is TunnelStatus.Up }.first()
+
+                // small delay to make sure tunnel is fully up before we actively monitor
+                delay(PING_MONITOR_START_DELAY)
+
+                while (isActive) {
+                    ensureActive()
+                    if (!powerManager.isDeviceIdleMode) {
+                        if (isNetworkConnected.value) {
+                            performPing()
+                        } else {
+                            pingStatsFlow.update { current ->
+                                current.mapValues { entry ->
+                                    entry.value.copy(
+                                        isReachable = false,
+                                        failureReason = FailureReason.NoConnectivity,
+                                        lastPingAttemptMillis = System.currentTimeMillis(),
+                                    )
+                                }
+                            }
+                            ensureActive()
+                            updateTunnelStatus(
+                                tunnelConfig.id,
+                                null,
+                                null,
+                                pingStatsFlow.value,
+                                null,
+                            )
+                        }
+                    }
+                    delay(settings.tunnelPingIntervalSeconds.toMillis())
+                }
+            }
+    }
+
+    private suspend fun startWgStatsPoll(
+        tunnelId: Int,
+        getStatistics: suspend (Int) -> TunnelStatistics?,
+        updateTunnelStatus:
+            suspend (
+                Int, TunnelStatus?, TunnelStatistics?, Map<String, PingState>?, LogHealthState?,
+            ) -> Unit,
+    ) = coroutineScope {
+        while (isActive) {
+            ensureActive()
+            if (!powerManager.isDeviceIdleMode) {
+                val stats = getStatistics(tunnelId)
+                ensureActive()
+                updateTunnelStatus(tunnelId, null, stats, null, null)
+            }
+            delay(STATS_DELAY)
+        }
+    }
+
+    companion object {
+        private val successLogRegex =
+            Regex("Received handshake response|Receiving keepalive packet", RegexOption.IGNORE_CASE)
+
+        private val failureLogRegex =
+            Regex(
+                "Failed to send handshake initiation: write udp|" +
+                    "Handshake did not complete after 5 seconds, retrying|" +
+                    "Failed to send data packets",
+                RegexOption.IGNORE_CASE,
+            )
+
+        const val CLOUDFLARE_IPV6_IP = "2606:4700:4700::1111"
+        const val CLOUDFLARE_IPV4_IP = "1.1.1.1"
+        const val STATS_DELAY = 1_000L
+        const val PING_MONITOR_START_DELAY = 5_000L
+    }
+}

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

@@ -0,0 +1,36 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel.handler
+
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings
+import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+class TunnelServiceHandler(
+    private val activeTunnels: StateFlow<Map<Int, TunnelState>>,
+    private val settingsRepository: GeneralSettingRepository,
+    private val serviceManager: ServiceManager,
+    applicationScope: CoroutineScope,
+    ioDispatcher: CoroutineDispatcher,
+) {
+    init {
+        applicationScope.launch(ioDispatcher) {
+            activeTunnels.collect { activeTuns ->
+                if (activeTuns.isEmpty()) {
+                    Timber.d("Stopping tunnel service, no tunnels active.")
+                    serviceManager.stopTunnelService()
+                } else if (serviceManager.tunnelService.value == null) {
+                    val settings = settingsRepository.flow.firstOrNull() ?: GeneralSettings()
+                    Timber.d("Starting tunnel foreground service for active tunnel.")
+                    serviceManager.startTunnelService(settings.appMode)
+                }
+                serviceManager.updateTunnelTile()
+            }
+        }
+    }
+}

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

@@ -1,31 +1,25 @@
 package com.zaneschepke.wireguardautotunnel.core.worker
 
 import android.content.Context
-import androidx.hilt.work.HiltWorker
-import androidx.work.*
+import androidx.work.CoroutineWorker
+import androidx.work.ExistingPeriodicWorkPolicy
+import androidx.work.PeriodicWorkRequestBuilder
+import androidx.work.WorkManager
+import androidx.work.WorkerParameters
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
+import com.zaneschepke.wireguardautotunnel.domain.repository.AutoTunnelSettingsRepository
 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 settingsRepository: GeneralSettingRepository,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+    private val autoTunnelSettingsRepository: AutoTunnelSettingsRepository,
 ) : 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 +41,15 @@ constructor(
         }
     }
 
-    override suspend fun doWork(): Result =
-        withContext(ioDispatcher) {
-            Timber.i("Service worker started")
-            with(settingsRepository.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.")
-                    settingsRepository.updateAutoTunnelEnabled(true)
-                }
+    override suspend fun doWork(): Result {
+        Timber.i("Service worker started")
+        with(autoTunnelSettingsRepository.getAutoTunnelSettings()) {
+            Timber.i("Checking to see if auto-tunnel has been killed by system")
+            if (isAutoTunnelEnabled && serviceManager.autoTunnelService.value == null) {
+                Timber.i("Service has been killed by system, restoring.")
+                serviceManager.startAutoTunnelService()
             }
-            Result.success()
+            return Result.success()
         }
+    }
 }

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

@@ -3,16 +3,21 @@ package com.zaneschepke.wireguardautotunnel.data
 import androidx.room.*
 import androidx.room.migration.AutoMigrationSpec
 import androidx.sqlite.db.SupportSQLiteDatabase
-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.ProxySettings
-import com.zaneschepke.wireguardautotunnel.data.entity.Settings
-import com.zaneschepke.wireguardautotunnel.data.entity.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.dao.*
+import com.zaneschepke.wireguardautotunnel.data.entity.*
 
 @Database(
-    entities = [Settings::class, TunnelConfig::class, ProxySettings::class],
-    version = 22,
+    entities =
+        [
+            TunnelConfig::class,
+            ProxySettings::class,
+            GeneralSettings::class,
+            AutoTunnelSettings::class,
+            MonitoringSettings::class,
+            DnsSettings::class,
+            LockdownSettings::class,
+        ],
+    version = 29,
     autoMigrations =
         [
             AutoMigration(from = 1, to = 2),
@@ -36,16 +41,28 @@ import com.zaneschepke.wireguardautotunnel.data.entity.TunnelConfig
             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),
         ],
     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")
@@ -100,3 +117,15 @@ 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

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

@@ -4,9 +4,7 @@ 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
@@ -18,29 +16,22 @@ 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.e(e)
             }
@@ -50,7 +41,7 @@ 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.e(e)
             } catch (e: Exception) {
@@ -62,7 +53,7 @@ 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.e(e)
             } catch (e: Exception) {
@@ -76,7 +67,7 @@ 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.e(e)
                 null
@@ -84,5 +75,5 @@ class DataStoreManager(
         }
     }
 
-    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,15 +2,16 @@ package com.zaneschepke.wireguardautotunnel.data
 
 import androidx.room.RoomDatabase
 import androidx.sqlite.db.SupportSQLiteDatabase
-import javax.inject.Inject
-import javax.inject.Provider
-
-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)
+        Timber.d("Database created, inserting default rows")
         db.execSQL("INSERT INTO proxy_settings DEFAULT VALUES")
-        db.execSQL("INSERT INTO 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

@@ -24,6 +24,24 @@ 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())

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

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

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

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

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

@@ -0,0 +1,31 @@
+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.data.model.AppMode
+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 = :appMode WHERE id = 1")
+    suspend fun updateAppMode(appMode: AppMode)
+}

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

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

@@ -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,27 +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
-
-    @Query("UPDATE settings SET is_tunnel_enabled = :enabled")
-    suspend fun updateAutoTunnelEnabled(enabled: Boolean)
-}

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

@@ -2,73 +2,86 @@ package com.zaneschepke.wireguardautotunnel.data.dao
 
 import androidx.room.*
 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("UPDATE TunnelConfig SET is_Active = 0 WHERE is_Active = 1")
+    @Query("SELECT * FROM tunnel_config WHERE id=:id") suspend fun getById(id: Long): TunnelConfig?
+
+    @Query("UPDATE tunnel_config SET is_Active = 0 WHERE is_Active = 1")
     suspend fun resetActiveTunnels()
 
-    @Query("SELECT * FROM TunnelConfig WHERE name=:name")
+    @Query("SELECT * FROM tunnel_config WHERE name=:name")
     suspend fun getByName(name: String): TunnelConfig?
 
-    @Query("SELECT * FROM TunnelConfig WHERE is_Active=1") suspend fun getActive(): TunnelConfigs
+    @Query("SELECT * FROM tunnel_config WHERE is_Active=1")
+    suspend fun getActive(): List<TunnelConfig>
 
-    @Query("SELECT * FROM TunnelConfig") suspend fun getAll(): TunnelConfigs
+    @Query("SELECT * FROM tunnel_config") suspend fun getAll(): List<TunnelConfig>
 
     @Delete suspend fun delete(t: TunnelConfig)
 
-    @Delete suspend fun delete(t: TunnelConfigs)
+    @Delete suspend fun delete(t: List<TunnelConfig>)
 
-    @Query("SELECT COUNT('id') FROM TunnelConfig") suspend fun count(): Long
+    @Query("SELECT COUNT('id') FROM tunnel_config") suspend fun count(): Long
 
-    @Query("SELECT * FROM TunnelConfig WHERE tunnel_networks LIKE '%' || :name || '%'")
-    suspend fun findByTunnelNetworkName(name: String): TunnelConfigs
+    @Query("SELECT * FROM tunnel_config WHERE tunnel_networks LIKE '%' || :name || '%'")
+    suspend fun findByTunnelNetworkName(name: String): List<TunnelConfig>
 
-    @Query("UPDATE TunnelConfig SET is_primary_tunnel = 0 WHERE is_primary_tunnel =1")
+    @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 
-        CASE WHEN is_primary_tunnel = 1 THEN 0 ELSE 1 END, 
-        position ASC 
-    LIMIT 1"""
+        SELECT * FROM tunnel_config
+        WHERE name != '${TunnelConfig.GLOBAL_CONFIG_NAME}'
+        ORDER BY
+        CASE WHEN is_primary_tunnel = 1 THEN 0 ELSE 1 END,
+        position ASC
+        LIMIT 1
+        """
     )
     suspend fun getDefaultTunnel(): TunnelConfig?
 
     @Query(
         """
-    SELECT * FROM TunnelConfig 
-    ORDER BY 
-        CASE WHEN is_Active = 1 THEN 0 
-             WHEN is_primary_tunnel = 1 THEN 1 
-             ELSE 2 END, 
-        position ASC 
-    LIMIT 1"""
+        SELECT * FROM tunnel_config
+        WHERE name != '${TunnelConfig.GLOBAL_CONFIG_NAME}'
+        ORDER BY
+        CASE WHEN is_Active = 1 THEN 0
+        WHEN is_primary_tunnel = 1 THEN 1
+        ELSE 2 END,
+        position ASC
+        LIMIT 1
+        """
     )
     suspend fun getStartTunnel(): TunnelConfig?
 
-    @Query("SELECT * FROM tunnelconfig ORDER BY position")
+    @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,32 @@
+package com.zaneschepke.wireguardautotunnel.data.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.zaneschepke.wireguardautotunnel.data.model.WifiDetectionMethod
+
+@Entity(tableName = "auto_tunnel_settings")
+data class AutoTunnelSettings(
+    @PrimaryKey(autoGenerate = true) val id: Int = 0,
+    @ColumnInfo(name = "is_tunnel_enabled", defaultValue = "0")
+    val isAutoTunnelEnabled: Boolean = false,
+    @ColumnInfo(name = "is_tunnel_on_mobile_data_enabled", defaultValue = "0")
+    val isTunnelOnMobileDataEnabled: Boolean = false,
+    @ColumnInfo(name = "trusted_network_ssids", defaultValue = "")
+    val trustedNetworkSSIDs: Set<String> = emptySet(),
+    @ColumnInfo(name = "is_tunnel_on_ethernet_enabled", defaultValue = "0")
+    val isTunnelOnEthernetEnabled: Boolean = false,
+    @ColumnInfo(name = "is_tunnel_on_wifi_enabled", defaultValue = "0")
+    val isTunnelOnWifiEnabled: Boolean = false,
+    @ColumnInfo(name = "is_wildcards_enabled", defaultValue = "0")
+    val isWildcardsEnabled: Boolean = false,
+    @ColumnInfo(name = "is_stop_on_no_internet_enabled", defaultValue = "0")
+    val isStopOnNoInternetEnabled: Boolean = false,
+    @ColumnInfo(name = "debounce_delay_seconds", defaultValue = "3")
+    val debounceDelaySeconds: Int = 3,
+    @ColumnInfo(name = "is_tunnel_on_unsecure_enabled", defaultValue = "0")
+    val isTunnelOnUnsecureEnabled: Boolean = false,
+    @ColumnInfo(name = "wifi_detection_method", defaultValue = "0")
+    val wifiDetectionMethod: WifiDetectionMethod = WifiDetectionMethod.fromValue(0),
+    @ColumnInfo(name = "start_on_boot", defaultValue = "0") val startOnBoot: Boolean = false,
+)

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

@@ -0,0 +1,16 @@
+package com.zaneschepke.wireguardautotunnel.data.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.zaneschepke.wireguardautotunnel.data.model.DnsProtocol
+
+@Entity(tableName = "dns_settings")
+data class DnsSettings(
+    @PrimaryKey(autoGenerate = true) val id: Int = 0,
+    @ColumnInfo(name = "dns_protocol", defaultValue = "0")
+    val dnsProtocol: DnsProtocol = DnsProtocol.fromValue(0),
+    @ColumnInfo(name = "dns_endpoint") val dnsEndpoint: String? = null,
+    @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,30 @@
+package com.zaneschepke.wireguardautotunnel.data.entity
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.zaneschepke.wireguardautotunnel.data.model.AppMode
+
+@Entity(tableName = "general_settings")
+data class GeneralSettings(
+    @PrimaryKey(autoGenerate = true) val id: Int = 0,
+    @ColumnInfo(name = "is_shortcuts_enabled", defaultValue = "0")
+    val isShortcutsEnabled: Boolean = false,
+    @ColumnInfo(name = "is_restore_on_boot_enabled", defaultValue = "0")
+    val isRestoreOnBootEnabled: Boolean = false,
+    @ColumnInfo(name = "is_multi_tunnel_enabled", defaultValue = "0")
+    val isMultiTunnelEnabled: Boolean = false,
+    @ColumnInfo(name = "global_split_tunnel_enabled", defaultValue = "0")
+    val isGlobalSplitTunnelEnabled: Boolean = false,
+    @ColumnInfo(name = "app_mode", defaultValue = "0") val appMode: AppMode = AppMode.fromValue(0),
+    @ColumnInfo(name = "theme", defaultValue = "AUTOMATIC") val theme: String = "AUTOMATIC",
+    @ColumnInfo(name = "locale") val locale: String? = null,
+    @ColumnInfo(name = "remote_key") val remoteKey: String? = null,
+    @ColumnInfo(name = "is_remote_control_enabled", defaultValue = "0")
+    val isRemoteControlEnabled: Boolean = false,
+    @ColumnInfo(name = "is_pin_lock_enabled", defaultValue = "0")
+    val isPinLockEnabled: Boolean = false,
+    @ColumnInfo(name = "is_always_on_vpn_enabled", defaultValue = "0")
+    val isAlwaysOnVpnEnabled: Boolean = false,
+    @ColumnInfo(name = "already_donated", defaultValue = "0") val alreadyDonated: Boolean = false,
+)

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

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

@@ -1,56 +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", 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_always_on_vpn_enabled", defaultValue = "0")
-    val isAlwaysOnVpnEnabled: Boolean = false,
-    @ColumnInfo(name = "is_tunnel_on_ethernet_enabled", defaultValue = "0")
-    val isTunnelOnEthernetEnabled: Boolean = false,
-    @ColumnInfo(name = "is_shortcuts_enabled", defaultValue = "0")
-    val isShortcutsEnabled: Boolean = false,
-    @ColumnInfo(name = "is_tunnel_on_wifi_enabled", defaultValue = "0")
-    val isTunnelOnWifiEnabled: Boolean = false,
-    @ColumnInfo(name = "is_restore_on_boot_enabled", defaultValue = "0")
-    val isRestoreOnBootEnabled: Boolean = false,
-    @ColumnInfo(name = "is_multi_tunnel_enabled", defaultValue = "0")
-    val isMultiTunnelEnabled: Boolean = false,
-    @ColumnInfo(name = "is_ping_enabled", defaultValue = "0") val isPingEnabled: 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_lan_on_kill_switch_enabled", defaultValue = "0")
-    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 = "0")
-    val isDisableKillSwitchOnTrustedEnabled: 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 = "is_ping_monitoring_enabled", defaultValue = "1")
-    val isPingMonitoringEnabled: Boolean = true,
-    @ColumnInfo(name = "tunnel_ping_interval_sec", defaultValue = "30")
-    val tunnelPingIntervalSeconds: Int = 30,
-    @ColumnInfo(name = "tunnel_ping_attempts", defaultValue = "3") val tunnelPingAttempts: Int = 3,
-    @ColumnInfo(name = "tunnel_ping_timeout_sec") val tunnelPingTimeoutSeconds: Int? = null,
-    @ColumnInfo(name = "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,7 +5,7 @@ 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,
@@ -16,7 +16,7 @@ data class TunnelConfig(
     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 = "am_quick", defaultValue = "") val amQuick: String = "",
     @ColumnInfo(name = "is_Active", defaultValue = "false") val isActive: Boolean = false,
     @ColumnInfo(name = "restart_on_ping_failure", defaultValue = "false")
     val restartOnPingFailure: Boolean = false,
@@ -27,10 +27,10 @@ data class TunnelConfig(
     val isIpv4Preferred: Boolean = true,
     @ColumnInfo(name = "position", defaultValue = "0") val position: Int = 0,
     @ColumnInfo(name = "auto_tunnel_apps", defaultValue = "[]")
-    val autoTunnelApps: Set<String> = setOf(),
+    val autoTunnelApps: Set<String> = emptySet(),
+    @ColumnInfo(name = "is_metered", defaultValue = "false") val isMetered: 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,36 @@
+package com.zaneschepke.wireguardautotunnel.data.mapper
+
+import com.zaneschepke.wireguardautotunnel.data.entity.AutoTunnelSettings as Entity
+import com.zaneschepke.wireguardautotunnel.domain.model.AutoTunnelSettings as Domain
+
+fun Entity.toDomain(): Domain =
+    Domain(
+        id = id,
+        isAutoTunnelEnabled = isAutoTunnelEnabled,
+        isTunnelOnMobileDataEnabled = isTunnelOnMobileDataEnabled,
+        trustedNetworkSSIDs = trustedNetworkSSIDs,
+        isTunnelOnEthernetEnabled = isTunnelOnEthernetEnabled,
+        isTunnelOnWifiEnabled = isTunnelOnWifiEnabled,
+        isWildcardsEnabled = isWildcardsEnabled,
+        isStopOnNoInternetEnabled = isStopOnNoInternetEnabled,
+        debounceDelaySeconds = debounceDelaySeconds,
+        isTunnelOnUnsecureEnabled = isTunnelOnUnsecureEnabled,
+        wifiDetectionMethod = wifiDetectionMethod,
+        startOnBoot = startOnBoot,
+    )
+
+fun Domain.toEntity(): Entity =
+    Entity(
+        id = id,
+        isAutoTunnelEnabled = isAutoTunnelEnabled,
+        isTunnelOnMobileDataEnabled = isTunnelOnMobileDataEnabled,
+        trustedNetworkSSIDs = trustedNetworkSSIDs,
+        isTunnelOnEthernetEnabled = isTunnelOnEthernetEnabled,
+        isTunnelOnWifiEnabled = isTunnelOnWifiEnabled,
+        isWildcardsEnabled = isWildcardsEnabled,
+        isStopOnNoInternetEnabled = isStopOnNoInternetEnabled,
+        debounceDelaySeconds = debounceDelaySeconds,
+        isTunnelOnUnsecureEnabled = isTunnelOnUnsecureEnabled,
+        wifiDetectionMethod = wifiDetectionMethod,
+        startOnBoot = startOnBoot,
+    )

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

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

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

@@ -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,77 +1,39 @@
 package com.zaneschepke.wireguardautotunnel.data.mapper
 
-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.GeneralSettings
+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(): GeneralSettings {
-    return GeneralSettings(
+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 = WifiDetectionMethod.fromValue(wifiDetectionMethod.value),
-        tunnelPingIntervalSeconds = tunnelPingIntervalSeconds,
-        tunnelPingAttempts = tunnelPingAttempts,
-        tunnelPingTimeoutSeconds = tunnelPingTimeoutSeconds,
+        isGlobalSplitTunnelEnabled = isGlobalSplitTunnelEnabled,
         appMode = appMode,
-        dnsProtocol = dnsProtocol,
-        dnsEndpoint = dnsEndpoint,
-    )
-}
-
-fun GeneralSettings.toSettings(): Settings {
-    return Settings(
-        id = id,
-        isAutoTunnelEnabled = isAutoTunnelEnabled,
-        isTunnelOnMobileDataEnabled = isTunnelOnMobileDataEnabled,
-        trustedNetworkSSIDs = trustedNetworkSSIDs,
+        theme = Theme.valueOf(theme.uppercase()),
+        locale = locale,
+        remoteKey = remoteKey,
+        isRemoteControlEnabled = isRemoteControlEnabled,
+        isPinLockEnabled = isPinLockEnabled,
         isAlwaysOnVpnEnabled = isAlwaysOnVpnEnabled,
-        isTunnelOnEthernetEnabled = isTunnelOnEthernetEnabled,
+        alreadyDonated = alreadyDonated,
+    )
+
+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,
+        isGlobalSplitTunnelEnabled = isGlobalSplitTunnelEnabled,
         appMode = appMode,
-        dnsProtocol = dnsProtocol,
-        dnsEndpoint = dnsEndpoint,
+        theme = theme.name,
+        locale = locale,
+        remoteKey = remoteKey,
+        isRemoteControlEnabled = isRemoteControlEnabled,
+        isPinLockEnabled = isPinLockEnabled,
+        isAlwaysOnVpnEnabled = isAlwaysOnVpnEnabled,
+        alreadyDonated = alreadyDonated,
     )
-}
-
-fun GeneralSettings.toDomain(): DnsSettings {
-    return DnsSettings(
-        protocol =
-            DnsProtocol.entries.toTypedArray().getOrElse(dnsProtocol.value) { DnsProtocol.SYSTEM },
-        endpoint = dnsEndpoint,
-    )
-}
-
-fun DnsSettings.toAppSettings(existing: GeneralSettings): GeneralSettings {
-    return existing.copy(dnsProtocol = protocol, dnsEndpoint = endpoint)
-}

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

@@ -1,46 +1,42 @@
 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,
+        wgQuick = wgQuick,
+        tunnelNetworks = tunnelNetworks,
+        isMobileDataTunnel = isMobileDataTunnel,
+        isPrimaryTunnel = isPrimaryTunnel,
+        amQuick = amQuick,
+        isActive = isActive,
+        restartOnPingFailure = restartOnPingFailure,
+        pingTarget = pingTarget,
+        isEthernetTunnel = isEthernetTunnel,
+        isIpv4Preferred = isIpv4Preferred,
+        position = position,
+        autoTunnelApps = autoTunnelApps,
+        isMetered = isMetered,
+    )
 
-    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,
+        wgQuick = wgQuick,
+        tunnelNetworks = tunnelNetworks,
+        isMobileDataTunnel = isMobileDataTunnel,
+        isPrimaryTunnel = isPrimaryTunnel,
+        amQuick = amQuick,
+        isActive = isActive,
+        restartOnPingFailure = restartOnPingFailure,
+        pingTarget = pingTarget,
+        isEthernetTunnel = isEthernetTunnel,
+        isIpv4Preferred = isIpv4Preferred,
+        position = position,
+        autoTunnelApps = autoTunnelApps,
+        isMetered = isMetered,
+    )

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

@@ -20,10 +20,7 @@ enum class DnsProtocol(val value: Int) {
     }
 }
 
-data class DnsSettings(
-    val protocol: DnsProtocol = DnsProtocol.SYSTEM,
-    val endpoint: String? = null,
-)
+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"),

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

@@ -1,13 +1,10 @@
 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.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-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
@@ -19,167 +16,56 @@ import timber.log.Timber
 
 class DataStoreAppStateRepository(
     private val dataStoreManager: DataStoreManager,
-    @ApplicationScope private val applicationScope: CoroutineScope,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+    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 = AppState(),
+                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

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

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

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

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

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

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

@@ -0,0 +1,23 @@
+package com.zaneschepke.wireguardautotunnel.data.repository
+
+import com.zaneschepke.wireguardautotunnel.data.dao.LockdownSettingsDao
+import com.zaneschepke.wireguardautotunnel.data.entity.LockdownSettings as Entity
+import com.zaneschepke.wireguardautotunnel.data.mapper.toDomain
+import com.zaneschepke.wireguardautotunnel.data.mapper.toEntity
+import com.zaneschepke.wireguardautotunnel.domain.model.LockdownSettings as Domain
+import com.zaneschepke.wireguardautotunnel.domain.repository.LockdownSettingsRepository
+import kotlinx.coroutines.flow.map
+
+class RoomLockdownSettingsRepository(private val lockdownSettingsDao: LockdownSettingsDao) :
+    LockdownSettingsRepository {
+    override suspend fun upsert(lockdownSettings: Domain) {
+        lockdownSettingsDao.upsert(lockdownSettings.toEntity())
+    }
+
+    override val flow =
+        lockdownSettingsDao.getLockdownSettingsFlow().map { (it ?: Entity()).toDomain() }
+
+    override suspend fun getLockdownSettings(): Domain {
+        return (lockdownSettingsDao.getLockdownSettings() ?: Entity()).toDomain()
+    }
+}

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

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

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

@@ -1,30 +1,23 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.dao.ProxySettingsDao
-import com.zaneschepke.wireguardautotunnel.data.entity.ProxySettings
-import com.zaneschepke.wireguardautotunnel.data.mapper.ProxySettingsMapper
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.model.AppProxySettings
+import com.zaneschepke.wireguardautotunnel.data.entity.ProxySettings as Entity
+import com.zaneschepke.wireguardautotunnel.data.mapper.toDomain
+import com.zaneschepke.wireguardautotunnel.data.mapper.toEntity
+import com.zaneschepke.wireguardautotunnel.domain.model.ProxySettings as Domain
 import com.zaneschepke.wireguardautotunnel.domain.repository.ProxySettingsRepository
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.withContext
 
-class RoomProxySettingsRepository(
-    private val proxySettingsDao: ProxySettingsDao,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-) : ProxySettingsRepository {
-    override suspend fun save(proxySettings: AppProxySettings) {
-        withContext(ioDispatcher) { proxySettingsDao.save(ProxySettingsMapper.to(proxySettings)) }
+class RoomProxySettingsRepository(private val proxySettingsDao: ProxySettingsDao) :
+    ProxySettingsRepository {
+
+    override suspend fun upsert(proxySettings: Domain) {
+        proxySettingsDao.upsert(proxySettings.toEntity())
     }
 
-    override val flow =
-        proxySettingsDao.getSettingsFlow().flowOn(ioDispatcher).map(ProxySettingsMapper::to)
+    override val flow = proxySettingsDao.getProxySettingsFlow().map { (it ?: Entity()).toDomain() }
 
-    override suspend fun get(): AppProxySettings {
-        return withContext(ioDispatcher) {
-            ProxySettingsMapper.to(proxySettingsDao.getAll().firstOrNull() ?: ProxySettings())
-        }
+    override suspend fun getProxySettings(): Domain {
+        return (proxySettingsDao.getProxySettings() ?: Entity()).toDomain()
     }
 }

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

@@ -1,36 +1,40 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
-import com.zaneschepke.wireguardautotunnel.data.dao.SettingsDao
-import com.zaneschepke.wireguardautotunnel.data.entity.Settings
-import com.zaneschepke.wireguardautotunnel.data.mapper.toAppSettings
-import com.zaneschepke.wireguardautotunnel.data.mapper.toSettings
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings
+import com.zaneschepke.wireguardautotunnel.data.dao.GeneralSettingsDao
+import com.zaneschepke.wireguardautotunnel.data.entity.GeneralSettings as Entity
+import com.zaneschepke.wireguardautotunnel.data.mapper.toDomain
+import com.zaneschepke.wireguardautotunnel.data.mapper.toEntity
+import com.zaneschepke.wireguardautotunnel.data.model.AppMode
+import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings as Domain
 import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.flow.flowOn
+import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.withContext
 
-class RoomSettingsRepository(
-    private val settingsDoa: SettingsDao,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-) : GeneralSettingRepository {
-
-    override suspend fun save(generalSettings: GeneralSettings) {
-        withContext(ioDispatcher) { settingsDoa.save(generalSettings.toSettings()) }
+class RoomSettingsRepository(private val settingsDao: GeneralSettingsDao) :
+    GeneralSettingRepository {
+    override suspend fun upsert(generalSettings: Domain) {
+        settingsDao.upsert(generalSettings.toEntity())
     }
 
-    override val flow =
-        settingsDoa.getSettingsFlow().flowOn(ioDispatcher).map { it.toAppSettings() }
+    override val flow = settingsDao.getGeneralSettingsFlow().map { (it ?: Entity()).toDomain() }
 
-    override suspend fun get(): GeneralSettings {
-        return withContext(ioDispatcher) {
-            (settingsDoa.getAll().firstOrNull() ?: Settings()).toAppSettings()
-        }
+    override suspend fun getGeneralSettings(): Domain {
+        return (settingsDao.getGeneralSettings() ?: Entity()).toDomain()
     }
 
-    override suspend fun updateAutoTunnelEnabled(enabled: Boolean) {
-        withContext(ioDispatcher) { settingsDoa.updateAutoTunnelEnabled(enabled) }
+    override suspend fun updateTheme(theme: Theme) {
+        settingsDao.updateTheme(theme.name)
+    }
+
+    override suspend fun updateLocale(locale: String) {
+        settingsDao.updateLocale(locale)
+    }
+
+    override suspend fun updatePinLockEnabled(enabled: Boolean) {
+        settingsDao.updatePinLockEnabled(enabled)
+    }
+
+    override suspend fun updateAppMode(appMode: AppMode) {
+        settingsDao.updateAppMode(appMode)
     }
 }

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

@@ -1,130 +1,98 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.dao.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.data.mapper.TunnelConfigMapper
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
+import com.zaneschepke.wireguardautotunnel.data.mapper.toDomain
+import com.zaneschepke.wireguardautotunnel.data.mapper.toEntity
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConfig as Domain
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import com.zaneschepke.wireguardautotunnel.util.extensions.Tunnels
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.withContext
 
-class RoomTunnelRepository(
-    private val tunnelConfigDao: TunnelConfigDao,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-) : TunnelRepository {
+class RoomTunnelRepository(private val tunnelConfigDao: TunnelConfigDao) : TunnelRepository {
 
     override val flow =
-        tunnelConfigDao.getAllFlow().flowOn(ioDispatcher).map {
-            it.map(TunnelConfigMapper::toTunnelConf)
+        tunnelConfigDao.getAllFlow().map { it.map { tunnelConfig -> tunnelConfig.toDomain() } }
+
+    override val userTunnelsFlow =
+        tunnelConfigDao.getAllTunnelsExceptGlobal().map {
+            it.map { tunnelConfig -> tunnelConfig.toDomain() }
         }
 
-    override suspend fun getAll(): Tunnels {
-        return withContext(ioDispatcher) {
-            tunnelConfigDao.getAll().map(TunnelConfigMapper::toTunnelConf)
-        }
+    override val globalTunnelFlow: Flow<Domain?> =
+        tunnelConfigDao.getGlobalTunnel().map { it?.toDomain() }
+
+    override suspend fun getAll(): List<Domain> {
+        return tunnelConfigDao.getAll().map { it.toDomain() }
     }
 
-    override suspend fun save(tunnelConf: TunnelConf) {
-        withContext(ioDispatcher) {
-            tunnelConfigDao.save(TunnelConfigMapper.toTunnelConfig(tunnelConf))
-        }
+    override suspend fun save(tunnelConfig: Domain) {
+        tunnelConfigDao.upsert(tunnelConfig.toEntity())
     }
 
-    override suspend fun saveAll(tunnelConfList: List<TunnelConf>) {
-        withContext(ioDispatcher) {
-            tunnelConfigDao.saveAll(tunnelConfList.map(TunnelConfigMapper::toTunnelConfig))
-        }
+    override suspend fun saveAll(tunnelConfigList: List<Domain>) {
+        tunnelConfigDao.saveAll(tunnelConfigList.map { tunnelConfig -> tunnelConfig.toEntity() })
     }
 
-    override suspend fun updatePrimaryTunnel(tunnelConf: TunnelConf?) {
-        withContext(ioDispatcher) {
-            tunnelConfigDao.resetPrimaryTunnel()
-            tunnelConf?.let { save(it.copy(isPrimaryTunnel = true)) }
-        }
+    override suspend fun updatePrimaryTunnel(tunnelConfig: Domain?) {
+        tunnelConfigDao.resetPrimaryTunnel()
+        tunnelConfig?.let { save(it.copy(isPrimaryTunnel = true)) }
     }
 
     override suspend fun resetActiveTunnels() {
-        withContext(ioDispatcher) { tunnelConfigDao.resetActiveTunnels() }
+        tunnelConfigDao.resetActiveTunnels()
     }
 
-    override suspend fun updateMobileDataTunnel(tunnelConf: TunnelConf?) {
-        withContext(ioDispatcher) {
-            tunnelConfigDao.resetMobileDataTunnel()
-            tunnelConf?.let { save(it.copy(isMobileDataTunnel = true)) }
-        }
+    override suspend fun updateMobileDataTunnel(tunnelConfig: Domain?) {
+        tunnelConfigDao.resetMobileDataTunnel()
+        tunnelConfig?.let { save(it.copy(isMobileDataTunnel = true)) }
     }
 
-    override suspend fun updateEthernetTunnel(tunnelConf: TunnelConf?) {
-        withContext(ioDispatcher) {
-            tunnelConfigDao.resetEthernetTunnel()
-            tunnelConf?.let { save(it.copy(isEthernetTunnel = true)) }
-        }
+    override suspend fun updateEthernetTunnel(tunnelConfig: Domain?) {
+        tunnelConfigDao.resetEthernetTunnel()
+        tunnelConfig?.let { save(it.copy(isEthernetTunnel = true)) }
     }
 
-    override suspend fun delete(tunnelConf: TunnelConf) {
-        withContext(ioDispatcher) {
-            tunnelConfigDao.delete(TunnelConfigMapper.toTunnelConfig(tunnelConf))
-        }
+    override suspend fun delete(tunnelConfig: Domain) {
+        tunnelConfigDao.delete(tunnelConfig.toEntity())
     }
 
-    override suspend fun getById(id: Int): TunnelConf? {
-        return withContext(ioDispatcher) {
-            tunnelConfigDao.getById(id.toLong())?.let(TunnelConfigMapper::toTunnelConf)
-        }
+    override suspend fun getById(id: Int): Domain? {
+        return tunnelConfigDao.getById(id.toLong())?.toDomain()
     }
 
-    override suspend fun getActive(): Tunnels {
-        return withContext(ioDispatcher) {
-            tunnelConfigDao.getActive().map(TunnelConfigMapper::toTunnelConf)
-        }
+    override suspend fun getActive(): List<Domain> {
+        return tunnelConfigDao.getActive().map { it.toDomain() }
     }
 
-    override suspend fun getDefaultTunnel(): TunnelConf? {
-        return withContext(ioDispatcher) {
-            tunnelConfigDao.getDefaultTunnel()?.let(TunnelConfigMapper::toTunnelConf)
-        }
+    override suspend fun getDefaultTunnel(): Domain? {
+        return tunnelConfigDao.getDefaultTunnel()?.toDomain()
     }
 
-    override suspend fun getStartTunnel(): TunnelConf? {
-        return withContext(ioDispatcher) {
-            tunnelConfigDao.getStartTunnel()?.let(TunnelConfigMapper::toTunnelConf)
-        }
+    override suspend fun getStartTunnel(): Domain? {
+        return tunnelConfigDao.getStartTunnel()?.toDomain()
     }
 
     override suspend fun count(): Int {
-        return withContext(ioDispatcher) { tunnelConfigDao.count().toInt() }
+        return tunnelConfigDao.count().toInt()
     }
 
-    override suspend fun findByTunnelName(name: String): TunnelConf? {
-        return withContext(ioDispatcher) {
-            tunnelConfigDao.getByName(name)?.let(TunnelConfigMapper::toTunnelConf)
-        }
+    override suspend fun findByTunnelName(name: String): Domain? {
+        return tunnelConfigDao.getByName(name)?.toDomain()
     }
 
-    override suspend fun findByTunnelNetworksName(name: String): Tunnels {
-        return withContext(ioDispatcher) {
-            tunnelConfigDao.findByTunnelNetworkName(name).map(TunnelConfigMapper::toTunnelConf)
-        }
+    override suspend fun findByTunnelNetworksName(name: String): List<Domain> {
+        return tunnelConfigDao.findByTunnelNetworkName(name).map { it.toDomain() }
     }
 
-    override suspend fun findByMobileDataTunnel(): Tunnels {
-        return withContext(ioDispatcher) {
-            tunnelConfigDao.findByMobileDataTunnel().map(TunnelConfigMapper::toTunnelConf)
-        }
+    override suspend fun findByMobileDataTunnel(): List<Domain> {
+        return tunnelConfigDao.findByMobileDataTunnel().map { it.toDomain() }
     }
 
-    override suspend fun findPrimary(): Tunnels {
-        return withContext(ioDispatcher) {
-            tunnelConfigDao.findByPrimary().map(TunnelConfigMapper::toTunnelConf)
-        }
+    override suspend fun findPrimary(): List<Domain> {
+        return tunnelConfigDao.findByPrimary().map { it.toDomain() }
     }
 
-    override suspend fun delete(tunnels: List<TunnelConf>) {
-        withContext(ioDispatcher) {
-            tunnelConfigDao.delete(tunnels.map { TunnelConfigMapper.toTunnelConfig(it) })
-        }
+    override suspend fun delete(tunnels: List<Domain>) {
+        tunnelConfigDao.delete(tunnels.map { it.toEntity() })
     }
 }

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

@@ -1,69 +1,92 @@
 package com.zaneschepke.wireguardautotunnel.di
 
 import android.content.Context
+import android.os.PowerManager
 import com.zaneschepke.logcatter.LogReader
 import com.zaneschepke.logcatter.LogcatReader
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationMonitor
 import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.shortcut.DynamicShortcutManager
 import com.zaneschepke.wireguardautotunnel.core.shortcut.ShortcutManager
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.domain.repository.GlobalEffectRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.SelectedTunnelsRepository
+import com.zaneschepke.wireguardautotunnel.util.FileUtils
 import com.zaneschepke.wireguardautotunnel.util.network.NetworkUtils
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.components.SingletonComponent
-import javax.inject.Singleton
+import com.zaneschepke.wireguardautotunnel.viewmodel.AutoTunnelViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.ConfigViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.DnsViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.LicenseViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.LockdownViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.LoggerViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.MonitoringViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.ProxySettingsViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.SettingsViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.SharedAppViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.SplitTunnelViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.SupportViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.TunnelViewModel
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.SupervisorJob
+import org.koin.android.ext.koin.androidContext
+import org.koin.core.annotation.KoinExperimentalAPI
+import org.koin.core.module.dsl.scopedOf
+import org.koin.core.module.dsl.singleOf
+import org.koin.core.module.dsl.viewModel
+import org.koin.core.module.dsl.viewModelOf
+import org.koin.core.qualifier.named
+import org.koin.dsl.bind
+import org.koin.dsl.module
+import org.koin.viewmodel.scope.viewModelScope
 
-@Module
-@InstallIn(SingletonComponent::class)
-class AppModule {
-
-    @Singleton
-    @ApplicationScope
-    @Provides
-    fun providesApplicationScope(
-        @DefaultDispatcher defaultDispatcher: CoroutineDispatcher
-    ): CoroutineScope = CoroutineScope(SupervisorJob() + defaultDispatcher)
-
-    @Singleton
-    @Provides
-    fun provideLogCollect(@ApplicationContext context: Context): LogReader {
-        return LogcatReader.init(storageDir = context.filesDir.absolutePath)
+@OptIn(KoinExperimentalAPI::class)
+val appModule = module {
+    single<CoroutineScope>(named(Scope.APPLICATION)) {
+        CoroutineScope(SupervisorJob() + get<CoroutineDispatcher>(named(Dispatcher.DEFAULT)))
     }
 
-    @Singleton
-    @Provides
-    fun provideNotificationService(@ApplicationContext context: Context): NotificationManager {
-        return WireGuardNotification(context)
+    single<LogReader> { LogcatReader.init(storageDir = androidContext().filesDir.absolutePath) }
+
+    single<PowerManager> {
+        androidContext().getSystemService(Context.POWER_SERVICE) as PowerManager
+    }
+    singleOf(::NotificationMonitor)
+    singleOf(::WireGuardNotification) bind NotificationManager::class
+    single {
+        ServiceManager(
+            androidContext(),
+            get(named(Dispatcher.IO)),
+            get(named(Scope.APPLICATION)),
+            get(named(Dispatcher.MAIN)),
+            get(),
+        )
     }
 
-    @Singleton
-    @Provides
-    fun provideShortcutManager(
-        @ApplicationContext context: Context,
-        @IoDispatcher ioDispatcher: CoroutineDispatcher,
-    ): ShortcutManager {
-        return DynamicShortcutManager(context, ioDispatcher)
+    singleOf(::GlobalEffectRepository)
+
+    viewModelScope {
+        scoped { FileUtils(androidContext(), get(named(Dispatcher.IO))) }
+        scoped<ShortcutManager> {
+            DynamicShortcutManager(androidContext(), get(named(Dispatcher.IO)))
+        }
+        scopedOf(::SelectedTunnelsRepository)
     }
 
-    @Singleton
-    @Provides
-    fun provideNetworkUtils(@IoDispatcher ioDispatcher: CoroutineDispatcher): NetworkUtils {
-        return NetworkUtils(ioDispatcher)
-    }
+    single { NetworkUtils(get(named(Dispatcher.IO))) }
 
-    @Singleton
-    @Provides
-    fun provideNotificationMonitor(
-        tunnelManager: TunnelManager,
-        notificationManager: NotificationManager,
-    ): NotificationMonitor {
-        return NotificationMonitor(tunnelManager, notificationManager)
-    }
+    viewModelOf(::AutoTunnelViewModel)
+    viewModel { (id: Int) -> ConfigViewModel(get(), get(), get(), id) }
+    viewModelOf(::DnsViewModel)
+    viewModelOf(::LicenseViewModel)
+    viewModelOf(::LockdownViewModel)
+    viewModelOf(::LoggerViewModel)
+    viewModelOf(::MonitoringViewModel)
+    viewModelOf(::ProxySettingsViewModel)
+    viewModelOf(::SettingsViewModel)
+    viewModelOf(::SharedAppViewModel)
+    viewModel { (id: Int) -> SplitTunnelViewModel(get(), get(), get(), id) }
+    viewModel { SupportViewModel(get(), get(named(Dispatcher.MAIN)), get()) }
+    viewModel { (id: Int) -> TunnelViewModel(get(), get(), id) }
 }