build(deps): bump compose from 1.7.5 to 1.7.6

Bumps `compose` from 1.7.5 to 1.7.6.

Updates `androidx.compose.ui:ui-test-junit4` from 1.7.5 to 1.7.6

Updates `androidx.compose.ui:ui-tooling` from 1.7.5 to 1.7.6

Updates `androidx.compose.ui:ui-test-manifest` from 1.7.5 to 1.7.6

Updates `androidx.compose.ui:ui-graphics` from 1.7.5 to 1.7.6

Updates `androidx.compose.ui:ui-tooling-preview` from 1.7.5 to 1.7.6

Updates `androidx.compose.ui:ui` from 1.7.5 to 1.7.6

Updates `androidx.compose.material:material-icons-extended` from 1.7.5 to 1.7.6

---
updated-dependencies:
- dependency-name: androidx.compose.ui:ui-test-junit4
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.compose.ui:ui-tooling
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.compose.ui:ui-test-manifest
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.compose.ui:ui-graphics
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.compose.ui:ui-tooling-preview
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.compose.ui:ui
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: androidx.compose.material:material-icons-extended
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

.github/workflows/build.yml

@@ -1,125 +0,0 @@
-name: build
-on:
-  workflow_dispatch:
-    inputs:
-      build_type:
-        type: choice
-        description: "Build type"
-        required: true
-        default: debug
-        options:
-          - debug
-          - prerelease
-          - nightly
-          - release
-    secrets:
-      SIGNING_KEY_ALIAS:
-        required: false
-      SIGNING_KEY_PASSWORD:
-        required: false
-      SIGNING_STORE_PASSWORD:
-        required: false
-      SERVICE_ACCOUNT_JSON:
-        required: false
-      KEYSTORE:
-        required: false
-  workflow_call:
-    inputs:
-      build_type:
-        type: string
-        description: "Build type"
-        required: true
-        default: debug
-    secrets:
-      SIGNING_KEY_ALIAS:
-        required: false
-      SIGNING_KEY_PASSWORD:
-        required: false
-      SIGNING_STORE_PASSWORD:
-        required: false
-      SERVICE_ACCOUNT_JSON:
-        required: false
-      KEYSTORE:
-        required: false
-env:
-  UPLOAD_DIR_ANDROID: android_artifacts
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    env:
-      SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
-      SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
-      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
-      KEY_STORE_FILE: 'android_keystore.jks'
-      KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
-    outputs:
-      UPLOAD_DIR_ANDROID: ${{ env.UPLOAD_DIR_ANDROID }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '17'
-          cache: gradle
-      - name: Grant execute permission for gradlew
-        run: chmod +x gradlew
-
-      # Here we need to decode keystore.jks from base64 string and place it
-      # in the folder specified in the release signing configuration
-      - name: Decode Keystore
-        id: decode_keystore
-        uses: timheuer/base64-to-file@v1.2
-        with:
-          fileName: ${{ env.KEY_STORE_FILE }}
-          fileDir: ${{ env.KEY_STORE_LOCATION }}
-          encodedString: ${{ secrets.KEYSTORE }}
-
-      # create keystore path for gradle to read
-      - name: Create keystore path env var
-        if: ${{ inputs.build_type != 'debug' }}
-        run: |
-          store_path=${{ env.KEY_STORE_LOCATION }}${{ env.KEY_STORE_FILE }}
-          echo "KEY_STORE_PATH=$store_path" >> $GITHUB_ENV
-
-      - name: Create service_account.json
-        if: ${{ inputs.build_type != 'debug' }}
-        id: createServiceAccount
-        run: echo '${{ secrets.ANDROID_SERVICE_ACCOUNT_JSON }}' > service_account.json
-
-      - name: Build Fdroid Release APK
-        if: ${{ inputs.build_type == 'release' }}
-        run: ./gradlew :app:assembleFdroidRelease --info
-
-      - name: Build Fdroid Prerelease APK
-        if: ${{ inputs.build_type == 'prerelease' }}
-        run: ./gradlew :app:assembleFdroidPrerelease --info
-
-      - name: Build Fdroid Nightly APK
-        if: ${{ inputs.build_type == 'nightly' }}
-        run: ./gradlew :app:assembleFdroidNightly --info
-
-      - name: Build Debug APK
-        if: ${{ inputs.build_type == 'debug' }}
-        run: ./gradlew :app:assembleFdroidDebug --stacktrace
-
-      # bump versionCode for nightly and prerelease builds
-      - name: Commit and push versionCode changes
-        if: ${{ inputs.build_type == 'nightly' || inputs.build_type == 'prerelease' }}
-        run: |
-          git config --global user.name 'GitHub Actions'
-          git config --global user.email 'actions@github.com'
-          git add versionCode.txt
-          git commit -m "Automated build update"
-
-      - name: Get release apk path
-        id: apk-path
-        run: echo "path=$(find . -regex '^.*/build/outputs/apk/fdroid/${{ inputs.build_type }}/.*\.apk$' -type f | head -1 | tail -c+2)" >> $GITHUB_OUTPUT
-
-      - name: Upload release apk
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ env.UPLOAD_DIR_ANDROID }}
-          path: ${{github.workspace}}/${{ steps.apk-path.outputs.path }}
-          retention-days: 1

.github/workflows/ci.yml

@@ -1,11 +1,11 @@
-name: on-pr
+name: ci-android
 
 on:
     workflow_dispatch:
     pull_request:
 
 jobs:
-  format_check:
+  format:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.github/workflows/on-issue.yml

@@ -17,18 +17,4 @@ jobs:
             status: ${{ github.event.issue.state }} - #${{ github.event.issue.number }} ${{ github.event.issue.title }}
             https://github.com/zaneschepke/wgtunnel/issues/${{ github.event.issue.number }}'
           curl -s -X POST 'https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage' \
-          -d "chat_id=${{ secrets.TELEGRAM_TO }}&text=${msg_text}&message_thread_id=${{ vars.TELEGRAM_ACTIVITY_TOPIC }}"
+          -d "chat_id=${{ secrets.TELEGRAM_TO }}&text=${msg_text}&message_thread_id=${{ secrets.TELEGRAM_TOPIC }}"
-
-      -   name: Send Matrix Message
-          run: |
-            msg_text='${{ github.actor }} updated an issue:
-              status: ${{ github.event.issue.state }} - #${{ github.event.issue.number }} ${{ github.event.issue.title }}
-              https://github.com/zaneschepke/wgtunnel/issues/${{ github.event.issue.number }}'
-            curl -s -X POST \
-              -H "Authorization: Bearer ${{ secrets.MATRIX_TOKEN }}" \
-              -H "Content-Type: application/json" \
-              -d '{
-                "msgtype": "m.text",
-                "body": "'"$msg_text"'"
-              }' \
-              "https://matrix.yourserver.com/_matrix/client/v3/rooms/${{ vars.MATRIX_ACTIVITY_TOPIC }}/send/m.room.message/$(date +%s)"

.github/workflows/on-publish.yml

@@ -1,10 +1,12 @@
 name: on-publish
 
 on:
-  repository_dispatch:
+  release:
-    types: [ publish-release ]
+    types: [ published ]
+
 
 jobs:
+
   on-publish:
     name: On publish
     runs-on: ubuntu-latest
@@ -16,19 +18,4 @@ jobs:
             ${{ github.event.release.body }}
             https://github.com/zaneschepke/wgtunnel/releases/tag/${{ github.event.release.tag_name }}'
           curl -s -X POST 'https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage' \
-          -d "chat_id=${{ secrets.TELEGRAM_TO }}&text=${msg_text}&message_thread_id=${{ vars.TELEGRAM_RELEASE_TOPIC }}"
+          -d "chat_id=${{ secrets.TELEGRAM_TO }}&text=${msg_text}&message_thread_id=${{ secrets.TELEGRAM_TOPIC }}"
-
-      - name: Send Matrix Message
-        run: |
-          msg_text='${{ github.actor }} published a new release:
-            Release: ${{ github.event.release.tag_name }}
-            ${{ github.event.release.body }}
-            https://github.com/zaneschepke/wgtunnel/releases/tag/${{ github.event.release.tag_name }}'
-          curl -s -X POST \
-            -H "Authorization: Bearer ${{ secrets.MATRIX_TOKEN }}" \
-            -H "Content-Type: application/json" \
-            -d '{
-              "msgtype": "m.text",
-              "body": "'"$msg_text"'"
-            }' \
-            "https://matrix.yourserver.com/_matrix/client/v3/rooms/${{ vars.MATRIX_RELEASE_TOPIC }}/send/m.room.message/$(date +%s)"

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: publish
+name: release-android
 
 on:
   schedule:
@@ -31,8 +31,6 @@ on:
         required: false
         default: nightly
   workflow_call:
-env:
-  UPLOAD_DIR_ANDROID: android_artifacts
 
 jobs:
   check_commits:
@@ -55,22 +53,17 @@ jobs:
           # This script checks for commits newer than 23 hours ago
           NEW_COMMITS=$(git rev-list --count --after="$(date -Iseconds -d '23 hours ago')" ${{ github.sha }})
           echo "new_commits=$NEW_COMMITS" >> $GITHUB_OUTPUT
-
   build:
-    if: ${{ inputs.release_type != 'none' }}
+    needs: check_commits
-    uses: ./.github/workflows/build.yml
-    secrets: inherit
-    with:
-      build_type: ${{ inputs.release_type == '' && 'nightly' || inputs.release_type }}
-
-  publish:
-    needs:
-      - check_commits
-      - build
     if: ${{ needs.check_commits.outputs.has_new_commits > 0 && inputs.release_type != 'none' }}
-    name: publish-github
+    name: Build Signed APK
     runs-on: ubuntu-latest
     env:
+      SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
+      SIGNING_KEY_PASSWORD: ${{ secrets.SIGNING_KEY_PASSWORD }}
+      SIGNING_STORE_PASSWORD: ${{ secrets.SIGNING_STORE_PASSWORD }}
+      KEY_STORE_FILE: 'android_keystore.jks'
+      KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
       GH_USER: ${{ secrets.GH_USER }}
       # GH needed for gh cli
       GH_TOKEN: ${{ secrets.GH_TOKEN }}
@@ -78,10 +71,29 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: gradle
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
       - name: Install system dependencies
         run: |
           sudo apt update && sudo apt install -y gh apksigner
 
+      # Here we need to decode keystore.jks from base64 string and place it
+      # in the folder specified in the release signing configuration
+      - name: Decode Keystore
+        id: decode_keystore
+        uses: timheuer/base64-to-file@v1.2
+        with:
+          fileName: ${{ env.KEY_STORE_FILE }}
+          fileDir: ${{ env.KEY_STORE_LOCATION }}
+          encodedString: ${{ secrets.KEYSTORE }}
+
       # update latest tag
       - name: Set latest tag
         uses: rickstaa/action-create-tag@v1
@@ -108,12 +120,51 @@ jobs:
           fromTag: "latest"
           writeToFile: false  # we won't write to file, just output
 
+      # create keystore path for gradle to read
+      - name: Create keystore path env var
+        run: |
+          store_path=${{ env.KEY_STORE_LOCATION }}${{ env.KEY_STORE_FILE }}
+          echo "KEY_STORE_PATH=$store_path" >> $GITHUB_ENV
+
+      - name: Create service_account.json
+        id: createServiceAccount
+        run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json
+
+      # Build and sign APK ("-x test" argument is used to skip tests)
+      # add fdroid flavor for apk upload
+      - name: Build Fdroid Release APK
+        if: ${{ inputs.release_type != '' && inputs.release_type == 'release' }}
+        run: ./gradlew :app:assembleFdroidRelease -x test
+
+      - name: Build Fdroid Prerelease APK
+        if: ${{ inputs.release_type != '' && inputs.release_type == 'prerelease' }}
+        run: ./gradlew :app:assembleFdroidPrerelease -x test
+
+      - name: Build Fdroid Nightly APK
+        if: ${{ inputs.release_type == '' || inputs.release_type == 'nightly' }}
+        run: ./gradlew :app:assembleFdroidNightly -x test
+
+      - if: ${{ inputs.release_type == '' || inputs.release_type == 'nightly' }}
+        run: echo "APK_PATH=$(find . -regex '^.*/build/outputs/apk/fdroid/nightly/.*\.apk$' -type f | head -1)" >> $GITHUB_ENV
+      - if: ${{ inputs.release_type != '' && inputs.release_type == 'release' }}
+        run: echo "APK_PATH=$(find . -regex '^.*/build/outputs/apk/fdroid/release/.*\.apk$' -type f | head -1)" >> $GITHUB_ENV
+      - if: ${{ inputs.release_type != '' && inputs.release_type == 'prerelease' }}
+        run: echo "APK_PATH=$(find . -regex '^.*/build/outputs/apk/fdroid/prerelease/.*\.apk$' -type f | head -1)" >> $GITHUB_ENV
+
       - name: Get version code
         if: ${{ inputs.release_type == 'release' }}
         run: |
           version_code=$(grep "VERSION_CODE" buildSrc/src/main/kotlin/Constants.kt | awk '{print $5}' | tr -d '\n')
           echo "VERSION_CODE=$version_code" >> $GITHUB_ENV
 
+      - name: Commit and push versionCode changes
+        if: ${{ inputs.release_type == '' || inputs.release_type == 'nightly'  || inputs.release_type == 'prerelease' }}
+        run: |
+          git config --global user.name 'GitHub Actions'
+          git config --global user.email 'actions@github.com'
+          git add versionCode.txt
+          git commit -m "Automated build update"
+
       - name: Push changes
         if: ${{ inputs.release_type == '' || inputs.release_type == 'nightly'  || inputs.release_type == 'prerelease' }}
         uses: ad-m/github-push-action@master
@@ -121,14 +172,25 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           branch: ${{ github.ref }}
 
-      - name: Make download dir
+      # Save the APK after the Build job is complete to publish it as a Github release in the next job
-        run: mkdir ${{ github.workspace }}/temp
+      - name: Upload APK
+        uses: actions/upload-artifact@v4.4.3
+        with:
+          name: wgtunnel
+          path: ${{ env.APK_PATH }}
 
-      - name: Download artifacts
+      - name: Download APK from build
         uses: actions/download-artifact@v4
         with:
-          name: ${{ env.UPLOAD_DIR_ANDROID }}
+          name: wgtunnel
-          path: ${{ github.workspace }}/temp
+
+      - name: Repository Dispatch for my F-Droid repo
+        uses: peter-evans/repository-dispatch@v3
+        if: ${{ inputs.release_type == 'release' }}
+        with:
+          token: ${{ secrets.PAT }}
+          repository: zaneschepke/fdroid
+          event-type: fdroid-update
 
       # Setup TAG_NAME, which is used as a general "name"
       - if: github.event_name == 'workflow_dispatch'
@@ -159,9 +221,7 @@ jobs:
 
       - name: Get checksum
         id: checksum
-        run: |
+        run: echo "checksum=$(apksigner verify -print-certs ${{ env.APK_PATH }} | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")" >> $GITHUB_OUTPUT
-          file_path=$(find ${{ github.workspace }}/temp -type f -iname "*.apk" | tail -n1)
-          echo "checksum=$(apksigner verify -print-certs $file_path | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")" >> $GITHUB_OUTPUT
 
 
       - name: Create Release with Fastlane changelog notes
@@ -173,15 +233,8 @@ jobs:
           body: |
             ${{ env.RELEASE_NOTES }}
 
-            SHA-256 fingerprint for the 4096-bit signing certificate:
+            SHA256 fingerprint:
-            ```sh
+            ```${{ steps.checksum.outputs.checksum }}```
-            ${{ steps.checksum.outputs.checksum }}
-            ```
-
-            To verify fingerprint:
-            ```sh
-            apksigner verify --print-certs [path to APK file] | grep SHA-256
-            ```
 
             ### Changelog
             ${{ steps.changelog.outputs.changes }}
@@ -190,29 +243,7 @@ jobs:
           draft: false
           prerelease: ${{ inputs.release_type == 'prerelease' || inputs.release_type == '' || inputs.release_type == 'nightly' }}
           make_latest: ${{ inputs.release_type == 'release' }}
-          files: |
+          files: ${{ github.workspace }}/${{ env.APK_PATH }}
-            ${{ github.workspace }}/temp/*
-
-      # notify socials
-      - name: Trigger on-publish workflow
-        if: ${{ inputs.release_type == 'release' }}
-        uses: peter-evans/repository-dispatch@v3
-        with:
-          token: ${{ secrets.PAT }}
-          event-type: publish-release
-
-  publish-fdroid:
-    runs-on: ubuntu-latest
-    needs:
-      - build
-    if: inputs.release_type == 'release'
-    steps:
-      - name: Dispatch update for fdroid repo
-        uses: peter-evans/repository-dispatch@v3
-        with:
-          token: ${{ secrets.PAT }}
-          repository: zaneschepke/fdroid
-          event-type: fdroid-update
 
   publish-play:
     if: ${{ inputs.track != 'none' && inputs.track != '' }}

README.md

@@ -4,107 +4,79 @@ WG Tunnel
 
 <div align="center">
 
-An alternative Android client app for [WireGuard](https://www.wireguard.com/)
+[![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/rbRRNh6H7V)
-and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/)
+[![Telegram](https://img.shields.io/badge/Telegram-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)](https://t.me/wgtunnel)
-<br />
-<br />
-<a href="https://github.com/zaneschepke/wgtunnel/issues/new?assignees=zaneschepke&labels=bug&projects=&template=bug_report.md&title=%5BBUG%5D+-+Problem+with+app">Report a Bug</a>
-·
-<a href="https://github.com/zaneschepke/wgtunnel/issues/new?assignees=zaneschepke&labels=enhancement&projects=&template=feature_request.md&title=%5BFEATURE%5D+-+New+feature+request">Request a Feature</a>
-·
-<a href="https://github.com/zaneschepke/wgtunnel/discussions">Ask a Question</a>
 
 </div>
 
-<br/>
-
 <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)
+
-[![Obtainium](https://img.shields.io/badge/Obtainium-414141?style=for-the-badge&logo=Obtainium&logoColor=white)](https://apps.obtainium.imranr.dev/redirect?r=obtainium://app/%7B%22id%22%3A%22com.zaneschepke.wireguardautotunnel%22%2C%22url%22%3A%22https%3A%2F%2Fgithub.com%2Fzaneschepke%2Fwgtunnel%22%2C%22author%22%3A%22zaneschepke%22%2C%22name%22%3A%22WG%20Tunnel%22%2C%22preferredApkIndex%22%3A0%2C%22additionalSettings%22%3A%22%7B%5C%22includePrereleases%5C%22%3Afalse%2C%5C%22fallbackToOlderReleases%5C%22%3Atrue%2C%5C%22filterReleaseTitlesByRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22filterReleaseNotesByRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22verifyLatestTag%5C%22%3Atrue%2C%5C%22sortMethodChoice%5C%22%3A%5C%22date%5C%22%2C%5C%22useLatestAssetDateAsReleaseDate%5C%22%3Afalse%2C%5C%22releaseTitleAsVersion%5C%22%3Afalse%2C%5C%22trackOnly%5C%22%3Afalse%2C%5C%22versionExtractionRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22matchGroupToUse%5C%22%3A%5C%22%5C%22%2C%5C%22versionDetection%5C%22%3Atrue%2C%5C%22releaseDateAsVersion%5C%22%3Afalse%2C%5C%22useVersionCodeAsOSVersion%5C%22%3Afalse%2C%5C%22apkFilterRegEx%5C%22%3A%5C%22%5C%22%2C%5C%22invertAPKFilter%5C%22%3Afalse%2C%5C%22autoApkFilterByArch%5C%22%3Atrue%2C%5C%22appName%5C%22%3A%5C%22WG%20Tunnel%5C%22%2C%5C%22appAuthor%5C%22%3A%5C%22Zane%20Schepke%5C%22%2C%5C%22shizukuPretendToBeGooglePlay%5C%22%3Afalse%2C%5C%22allowInsecure%5C%22%3Afalse%2C%5C%22exemptFromBackgroundUpdates%5C%22%3Afalse%2C%5C%22skipUpdateNotifications%5C%22%3Afalse%2C%5C%22about%5C%22%3A%5C%22%5C%22%2C%5C%22refreshBeforeDownload%5C%22%3Afalse%7D%22%2C%22overrideSource%22%3Anull%7D)
+
+</div>
+
+
+<div align="left">
+
+This is an alternative Android Application for [WireGuard](https://www.wireguard.com/)
+and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) with added
+features. Built using the [wireguard-android](https://github.com/WireGuard/wireguard-android)
+library and [Jetpack Compose](https://developer.android.com/jetpack/compose), this application was
+inspired by the official [WireGuard Android](https://github.com/WireGuard/wireguard-android) app.
 
 </div>
 
 <div align="center">
 
-[<img  src="https://img.shields.io/badge/Telegram-26A5E4.svg?style=for-the-badge&logo=Telegram&logoColor=white">](https://t.me/wgtunnel)
-[<img src="https://img.shields.io/badge/Matrix-000000.svg?style=for-the-badge&logo=Matrix&logoColor=white">](https://matrix.to/#/#wg-tunnel-space:matrix.org)
-</div>
-
-<details open="open">
-<summary>Table of Contents</summary>
-
-- [About](#about)
-- [Acknowledgements](#acknowledgements)
-- [Screenshots](#screenshots)
-- [Features](#features)
-- [Building](#building)
-- [Translation](#translation)
-- [Contributing](#contributing)
-
-</details>
-
-<div style="text-align: left;">
-
-## About
-Inspired by the official [wireguard-android](https://github.com/WireGuard/wireguard-android) app, WG Tunnel was created to address features and support missing from the official app. This app combines support for both [WireGuard](https://www.wireguard.com/)
-and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/), with its primary feature of auto-tunneling (on-demand tunneling).
-
-</div>
-
-<div style="text-align: left;">
-
-## Acknowledgements
-
-Thank you to the following:
-
-- All of the users that have helped contribute to the project with ideas, translations, feedback, bug reports, testing, and donations.
-- [WireGuard](https://www.wireguard.com/) - Jason A. Donenfeld (https://github.com/WireGuard/wireguard-android)
-
-- [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) - Amnezia Team (https://github.com/amnezia-vpn/amneziawg-android)
-
 ## Screenshots
 
-</div>
+<p float="center">
-<div style="display: flex; flex-wrap: wrap; justify-content: left; gap: 10px;">
+  <img label="Main" style="padding-right:25px" src="fastlane/metadata/android/en-US/images/phoneScreenshots/main_screen.png" width="200" />
- <img label="Main" src="fastlane/metadata/android/en-US/images/phoneScreenshots/main_screen.png" width="200" />
+  <img label="Config" style="padding-left:25px" src="fastlane/metadata/android/en-US/images/phoneScreenshots/config_screen.png" width="200" />
- <img label="Settings" src="fastlane/metadata/android/en-US/images/phoneScreenshots/settings_screen.png" width="200" />
+  <img label="Settings" style="padding-left:25px" 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="Support" style="padding-left:25px" src="fastlane/metadata/android/en-US/images/phoneScreenshots/support_screen.png" width="200" />
-  <img label="Config" src="fastlane/metadata/android/en-US/images/phoneScreenshots/config_screen.png" width="200" />
+</p>
-</div>
 
-<div style="text-align: left;">
+<div align="left">
+
+## Inspiration
+
+The original inspiration for this app came from the inconvenience of having to manually turn VPN off
+and on while on different networks. This app was created to offer a free solution to this problem.
 
 ## Features
 
-* Add tunnels via .conf file, zip, manual entry, clipboard, or QR code
+* Add tunnels via .conf file, zip, manual entry, or QR code
-* Auto-tunnel based on Wi-Fi SSID, ethernet, or mobile data
+* Auto connect to tunnels based on Wi-Fi SSID, ethernet, or mobile data
 * Split tunneling by application with search
-* Support for kernel and userspace modes
+* WireGuard support for kernel and userspace modes
 * Amnezia support for userspace mode for DPI/censorship protection
 * Pre/Post Up/Down scripts support for all modes on a rooted device
 * Always-On VPN support
-* Export tunnels to zip
+* Export Amnezia and WireGuard tunnels to zip
 * Quick tile support for tunnel toggling, auto-tunneling
-* Shortcuts support for tunnel toggling, auto-tunneling
+* Static shortcuts support for tunnel toggling, auto-tunneling
 * Intent automation support for all tunnels
-* In app VPN kill switch with LAN bypass
 * Automatic auto-tunneling service and/or tunnel restart after reboot or app update
 * Battery preservation measures
-* Restart tunnel on ping failure
+* Restart tunnel on ping failure (beta)
 
-## Building
+## Fdroid
 
-```sh
+Want updates faster?
-git clone https://github.com/zaneschepke/wgtunnel
-cd wgtunnel
-```
 
-```sh
+Check out my personal [fdroid repository](https://github.com/zaneschepke/fdroid) to get updates the
-./gradlew assembleDebug
+moment they are released.
-```
+
+## Docs
+
+Information about features, behaviors, and answers to common questions can be found in the
+app [documentation](https://zaneschepke.com/wgtunnel-docs/overview.html).
+
+The repository for these docs can be found [here](https://github.com/zaneschepke/wgtunnel-docs).
 
 ## Translation
 
@@ -114,6 +86,19 @@ Help translate WG Tunnel into your language
 at [Hosted Weblate](https://hosted.weblate.org/engage/wg-tunnel/).\
 [![Translation status](https://hosted.weblate.org/widgets/wg-tunnel/-/multi-auto.svg)](https://hosted.weblate.org/engage/wg-tunnel/)
 
+## Building
+
+```
+$ git clone https://github.com/zaneschepke/wgtunnel
+$ cd wgtunnel
+```
+
+And then build the app:
+
+```
+$ ./gradlew assembleDebug
+```
+
 ## Contributing
 
 Any contributions in the form of feedback, issues, code, or translations are welcome and much

app/build.gradle.kts

@@ -14,7 +14,7 @@ val versionCodeIncrement = with(getBuildTaskName().lowercase()) {
 	when {
 		this.contains(Constants.NIGHTLY) || this.contains(Constants.PRERELEASE) -> {
 			if (versionFile.exists()) {
-				versionFile.readText().trim().toInt() + 1
+				versionFile.readText().toInt() + 1
 			} else {
 				1
 			}
@@ -31,14 +31,6 @@ android {
 		generateLocaleConfig = true
 	}
 
-	// reproducibility
-	dependenciesInfo {
-		// Disables dependency metadata when building APKs.
-		includeInApk = false
-		// Disables dependency metadata when building Android App Bundles.
-		includeInBundle = false
-	}
-
 	defaultConfig {
 		applicationId = Constants.APP_ID
 		minSdk = Constants.MIN_SDK
@@ -86,6 +78,7 @@ android {
 		}
 		debug {
 			applicationIdSuffix = ".debug"
+			versionNameSuffix = "-debug"
 			resValue("string", "app_name", "WG Tunnel - Debug")
 			isDebuggable = true
 			resValue("string", "provider", "\"${Constants.APP_NAME}.provider.debug\"")
@@ -94,6 +87,7 @@ android {
 		create(Constants.PRERELEASE) {
 			initWith(buildTypes.getByName(Constants.RELEASE))
 			applicationIdSuffix = ".prerelease"
+			versionNameSuffix = "-pre"
 			resValue("string", "app_name", "WG Tunnel - Pre")
 			resValue("string", "provider", "\"${Constants.APP_NAME}.provider.pre\"")
 		}
@@ -101,6 +95,7 @@ android {
 		create(Constants.NIGHTLY) {
 			initWith(buildTypes.getByName(Constants.RELEASE))
 			applicationIdSuffix = ".nightly"
+			versionNameSuffix = "-nightly"
 			resValue("string", "app_name", "WG Tunnel - Nightly")
 			resValue("string", "provider", "\"${Constants.APP_NAME}.provider.nightly\"")
 		}
@@ -141,8 +136,8 @@ android {
 }
 
 dependencies {
+
 	implementation(project(":logcatter"))
-	implementation(project(":networkmonitor"))
 
 	implementation(libs.androidx.core.ktx)
 	implementation(libs.androidx.lifecycle.runtime.ktx)
@@ -157,7 +152,6 @@ dependencies {
 	implementation(libs.androidx.material3)
 	implementation(libs.androidx.appcompat)
 	implementation(libs.material)
-	implementation(libs.androidx.storage)
 
 	// test
 	testImplementation(libs.junit)
@@ -170,7 +164,8 @@ dependencies {
 	debugImplementation(libs.androidx.compose.ui.tooling)
 	debugImplementation(libs.androidx.compose.manifest)
 
-	// tunnel
+	// get tunnel lib from github packages or mavenLocal
+// 	implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.aar"))))
 	implementation(libs.tunnel)
 	implementation(libs.amneziawg.android)
 	coreLibraryDesugaring(libs.desugar.jdk.libs)
@@ -185,10 +180,10 @@ dependencies {
 	// hilt
 	implementation(libs.hilt.android)
 	ksp(libs.hilt.android.compiler)
-	ksp(libs.androidx.hilt.compiler)
 
 	// accompanist
 	implementation(libs.accompanist.permissions)
+	implementation(libs.accompanist.flowlayout)
 	implementation(libs.accompanist.drawablepainter)
 
 	// storage
@@ -202,12 +197,13 @@ dependencies {
 	implementation(libs.androidx.lifecycle.runtime.ktx)
 	implementation(libs.androidx.lifecycle.process)
 
+	// icons
+	implementation(libs.material.icons.extended)
 	// serialization
 	implementation(libs.kotlinx.serialization.json)
 
-	// ui
+	// barcode scanning
 	implementation(libs.zxing.android.embedded)
-	implementation(libs.material.icons.extended)
 
 	// bio
 	implementation(libs.androidx.biometric.ktx)
@@ -215,13 +211,10 @@ dependencies {
 
 	// shortcuts
 	implementation(libs.androidx.core)
+	implementation(libs.androidx.core.google.shortcuts)
 
 	// splash
 	implementation(libs.androidx.core.splashscreen)
-
-	// worker
-	implementation(libs.androidx.work.runtime)
-	implementation(libs.androidx.hilt.work)
 }
 
 fun determineVersionName(): String {

app/fdroid-rules.pro

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

app/proguard-rules.pro

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

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

@@ -1,274 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 14,
-    "identityHash": "f2b260c389fb2e53216de40e4b1047f3",
-    "entities": [
-      {
-        "tableName": "Settings",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_tunnel_enabled` INTEGER NOT NULL, `is_tunnel_on_mobile_data_enabled` INTEGER NOT NULL, `trusted_network_ssids` TEXT NOT NULL, `is_always_on_vpn_enabled` INTEGER NOT NULL, `is_tunnel_on_ethernet_enabled` INTEGER NOT NULL, `is_shortcuts_enabled` INTEGER NOT NULL DEFAULT false, `is_tunnel_on_wifi_enabled` INTEGER NOT NULL DEFAULT false, `is_kernel_enabled` INTEGER NOT NULL DEFAULT false, `is_restore_on_boot_enabled` INTEGER NOT NULL DEFAULT false, `is_multi_tunnel_enabled` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `is_amnezia_enabled` INTEGER NOT NULL DEFAULT false, `is_wildcards_enabled` INTEGER NOT NULL DEFAULT false, `is_wifi_by_shell_enabled` INTEGER NOT NULL DEFAULT false, `is_stop_on_no_internet_enabled` INTEGER NOT NULL DEFAULT false, `is_vpn_kill_switch_enabled` INTEGER NOT NULL DEFAULT false, `is_kernel_kill_switch_enabled` INTEGER NOT NULL DEFAULT false, `is_lan_on_kill_switch_enabled` INTEGER NOT NULL DEFAULT false, `debounce_delay_seconds` INTEGER NOT NULL DEFAULT 3)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAutoTunnelEnabled",
-            "columnName": "is_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnMobileDataEnabled",
-            "columnName": "is_tunnel_on_mobile_data_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "trustedNetworkSSIDs",
-            "columnName": "trusted_network_ssids",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAlwaysOnVpnEnabled",
-            "columnName": "is_always_on_vpn_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnEthernetEnabled",
-            "columnName": "is_tunnel_on_ethernet_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isShortcutsEnabled",
-            "columnName": "is_shortcuts_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isTunnelOnWifiEnabled",
-            "columnName": "is_tunnel_on_wifi_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isKernelEnabled",
-            "columnName": "is_kernel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isRestoreOnBootEnabled",
-            "columnName": "is_restore_on_boot_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isMultiTunnelEnabled",
-            "columnName": "is_multi_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isAmneziaEnabled",
-            "columnName": "is_amnezia_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isWildcardsEnabled",
-            "columnName": "is_wildcards_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isWifiNameByShellEnabled",
-            "columnName": "is_wifi_by_shell_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isStopOnNoInternetEnabled",
-            "columnName": "is_stop_on_no_internet_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isVpnKillSwitchEnabled",
-            "columnName": "is_vpn_kill_switch_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isKernelKillSwitchEnabled",
-            "columnName": "is_kernel_kill_switch_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isLanOnKillSwitchEnabled",
-            "columnName": "is_lan_on_kill_switch_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "debounceDelaySeconds",
-            "columnName": "debounce_delay_seconds",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "3"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "TunnelConfig",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `wg_quick` TEXT NOT NULL, `tunnel_networks` TEXT NOT NULL DEFAULT '', `is_mobile_data_tunnel` INTEGER NOT NULL DEFAULT false, `is_primary_tunnel` INTEGER NOT NULL DEFAULT false, `am_quick` TEXT NOT NULL DEFAULT '', `is_Active` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `ping_interval` INTEGER DEFAULT null, `ping_cooldown` INTEGER DEFAULT null, `ping_ip` TEXT DEFAULT null, `is_ethernet_tunnel` INTEGER NOT NULL DEFAULT false)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "wgQuick",
-            "columnName": "wg_quick",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "tunnelNetworks",
-            "columnName": "tunnel_networks",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isMobileDataTunnel",
-            "columnName": "is_mobile_data_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPrimaryTunnel",
-            "columnName": "is_primary_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "amQuick",
-            "columnName": "am_quick",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isActive",
-            "columnName": "is_Active",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "pingInterval",
-            "columnName": "ping_interval",
-            "affinity": "INTEGER",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "pingCooldown",
-            "columnName": "ping_cooldown",
-            "affinity": "INTEGER",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "pingIp",
-            "columnName": "ping_ip",
-            "affinity": "TEXT",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "isEthernetTunnel",
-            "columnName": "is_ethernet_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_TunnelConfig_name",
-            "unique": true,
-            "columnNames": [
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_TunnelConfig_name` ON `${TABLE_NAME}` (`name`)"
-          }
-        ],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'f2b260c389fb2e53216de40e4b1047f3')"
-    ]
-  }
-}

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

@@ -1,281 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 15,
-    "identityHash": "4827f3b1ab5a4e5aa35937a0925d50e4",
-    "entities": [
-      {
-        "tableName": "Settings",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_tunnel_enabled` INTEGER NOT NULL, `is_tunnel_on_mobile_data_enabled` INTEGER NOT NULL, `trusted_network_ssids` TEXT NOT NULL, `is_always_on_vpn_enabled` INTEGER NOT NULL, `is_tunnel_on_ethernet_enabled` INTEGER NOT NULL, `is_shortcuts_enabled` INTEGER NOT NULL DEFAULT false, `is_tunnel_on_wifi_enabled` INTEGER NOT NULL DEFAULT false, `is_kernel_enabled` INTEGER NOT NULL DEFAULT false, `is_restore_on_boot_enabled` INTEGER NOT NULL DEFAULT false, `is_multi_tunnel_enabled` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `is_amnezia_enabled` INTEGER NOT NULL DEFAULT false, `is_wildcards_enabled` INTEGER NOT NULL DEFAULT false, `is_wifi_by_shell_enabled` INTEGER NOT NULL DEFAULT false, `is_stop_on_no_internet_enabled` INTEGER NOT NULL DEFAULT false, `is_vpn_kill_switch_enabled` INTEGER NOT NULL DEFAULT false, `is_kernel_kill_switch_enabled` INTEGER NOT NULL DEFAULT false, `is_lan_on_kill_switch_enabled` INTEGER NOT NULL DEFAULT false, `debounce_delay_seconds` INTEGER NOT NULL DEFAULT 3, `is_disable_kill_switch_on_trusted_enabled` INTEGER NOT NULL DEFAULT false)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAutoTunnelEnabled",
-            "columnName": "is_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnMobileDataEnabled",
-            "columnName": "is_tunnel_on_mobile_data_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "trustedNetworkSSIDs",
-            "columnName": "trusted_network_ssids",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAlwaysOnVpnEnabled",
-            "columnName": "is_always_on_vpn_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnEthernetEnabled",
-            "columnName": "is_tunnel_on_ethernet_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isShortcutsEnabled",
-            "columnName": "is_shortcuts_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isTunnelOnWifiEnabled",
-            "columnName": "is_tunnel_on_wifi_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isKernelEnabled",
-            "columnName": "is_kernel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isRestoreOnBootEnabled",
-            "columnName": "is_restore_on_boot_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isMultiTunnelEnabled",
-            "columnName": "is_multi_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isAmneziaEnabled",
-            "columnName": "is_amnezia_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isWildcardsEnabled",
-            "columnName": "is_wildcards_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isWifiNameByShellEnabled",
-            "columnName": "is_wifi_by_shell_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isStopOnNoInternetEnabled",
-            "columnName": "is_stop_on_no_internet_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isVpnKillSwitchEnabled",
-            "columnName": "is_vpn_kill_switch_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isKernelKillSwitchEnabled",
-            "columnName": "is_kernel_kill_switch_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isLanOnKillSwitchEnabled",
-            "columnName": "is_lan_on_kill_switch_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "debounceDelaySeconds",
-            "columnName": "debounce_delay_seconds",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "3"
-          },
-          {
-            "fieldPath": "isDisableKillSwitchOnTrustedEnabled",
-            "columnName": "is_disable_kill_switch_on_trusted_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "TunnelConfig",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `wg_quick` TEXT NOT NULL, `tunnel_networks` TEXT NOT NULL DEFAULT '', `is_mobile_data_tunnel` INTEGER NOT NULL DEFAULT false, `is_primary_tunnel` INTEGER NOT NULL DEFAULT false, `am_quick` TEXT NOT NULL DEFAULT '', `is_Active` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `ping_interval` INTEGER DEFAULT null, `ping_cooldown` INTEGER DEFAULT null, `ping_ip` TEXT DEFAULT null, `is_ethernet_tunnel` INTEGER NOT NULL DEFAULT false)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "wgQuick",
-            "columnName": "wg_quick",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "tunnelNetworks",
-            "columnName": "tunnel_networks",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isMobileDataTunnel",
-            "columnName": "is_mobile_data_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPrimaryTunnel",
-            "columnName": "is_primary_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "amQuick",
-            "columnName": "am_quick",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isActive",
-            "columnName": "is_Active",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "pingInterval",
-            "columnName": "ping_interval",
-            "affinity": "INTEGER",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "pingCooldown",
-            "columnName": "ping_cooldown",
-            "affinity": "INTEGER",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "pingIp",
-            "columnName": "ping_ip",
-            "affinity": "TEXT",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "isEthernetTunnel",
-            "columnName": "is_ethernet_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_TunnelConfig_name",
-            "unique": true,
-            "columnNames": [
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_TunnelConfig_name` ON `${TABLE_NAME}` (`name`)"
-          }
-        ],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '4827f3b1ab5a4e5aa35937a0925d50e4')"
-    ]
-  }
-}

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

@@ -1,288 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 16,
-    "identityHash": "ae51793c4d09ea3194ecd26f0606f35c",
-    "entities": [
-      {
-        "tableName": "Settings",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_tunnel_enabled` INTEGER NOT NULL, `is_tunnel_on_mobile_data_enabled` INTEGER NOT NULL, `trusted_network_ssids` TEXT NOT NULL, `is_always_on_vpn_enabled` INTEGER NOT NULL, `is_tunnel_on_ethernet_enabled` INTEGER NOT NULL, `is_shortcuts_enabled` INTEGER NOT NULL DEFAULT false, `is_tunnel_on_wifi_enabled` INTEGER NOT NULL DEFAULT false, `is_kernel_enabled` INTEGER NOT NULL DEFAULT false, `is_restore_on_boot_enabled` INTEGER NOT NULL DEFAULT false, `is_multi_tunnel_enabled` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `is_amnezia_enabled` INTEGER NOT NULL DEFAULT false, `is_wildcards_enabled` INTEGER NOT NULL DEFAULT false, `is_wifi_by_shell_enabled` INTEGER NOT NULL DEFAULT false, `is_stop_on_no_internet_enabled` INTEGER NOT NULL DEFAULT false, `is_vpn_kill_switch_enabled` INTEGER NOT NULL DEFAULT false, `is_kernel_kill_switch_enabled` INTEGER NOT NULL DEFAULT false, `is_lan_on_kill_switch_enabled` INTEGER NOT NULL DEFAULT false, `debounce_delay_seconds` INTEGER NOT NULL DEFAULT 3, `is_disable_kill_switch_on_trusted_enabled` INTEGER NOT NULL DEFAULT false)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAutoTunnelEnabled",
-            "columnName": "is_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnMobileDataEnabled",
-            "columnName": "is_tunnel_on_mobile_data_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "trustedNetworkSSIDs",
-            "columnName": "trusted_network_ssids",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAlwaysOnVpnEnabled",
-            "columnName": "is_always_on_vpn_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isTunnelOnEthernetEnabled",
-            "columnName": "is_tunnel_on_ethernet_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isShortcutsEnabled",
-            "columnName": "is_shortcuts_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isTunnelOnWifiEnabled",
-            "columnName": "is_tunnel_on_wifi_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isKernelEnabled",
-            "columnName": "is_kernel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isRestoreOnBootEnabled",
-            "columnName": "is_restore_on_boot_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isMultiTunnelEnabled",
-            "columnName": "is_multi_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isAmneziaEnabled",
-            "columnName": "is_amnezia_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isWildcardsEnabled",
-            "columnName": "is_wildcards_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isWifiNameByShellEnabled",
-            "columnName": "is_wifi_by_shell_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isStopOnNoInternetEnabled",
-            "columnName": "is_stop_on_no_internet_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isVpnKillSwitchEnabled",
-            "columnName": "is_vpn_kill_switch_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isKernelKillSwitchEnabled",
-            "columnName": "is_kernel_kill_switch_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isLanOnKillSwitchEnabled",
-            "columnName": "is_lan_on_kill_switch_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "debounceDelaySeconds",
-            "columnName": "debounce_delay_seconds",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "3"
-          },
-          {
-            "fieldPath": "isDisableKillSwitchOnTrustedEnabled",
-            "columnName": "is_disable_kill_switch_on_trusted_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "TunnelConfig",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `wg_quick` TEXT NOT NULL, `tunnel_networks` TEXT NOT NULL DEFAULT '', `is_mobile_data_tunnel` INTEGER NOT NULL DEFAULT false, `is_primary_tunnel` INTEGER NOT NULL DEFAULT false, `am_quick` TEXT NOT NULL DEFAULT '', `is_Active` INTEGER NOT NULL DEFAULT false, `is_ping_enabled` INTEGER NOT NULL DEFAULT false, `ping_interval` INTEGER DEFAULT null, `ping_cooldown` INTEGER DEFAULT null, `ping_ip` TEXT DEFAULT null, `is_ethernet_tunnel` INTEGER NOT NULL DEFAULT false, `is_ipv4_preferred` INTEGER NOT NULL DEFAULT true)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "wgQuick",
-            "columnName": "wg_quick",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "tunnelNetworks",
-            "columnName": "tunnel_networks",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isMobileDataTunnel",
-            "columnName": "is_mobile_data_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPrimaryTunnel",
-            "columnName": "is_primary_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "amQuick",
-            "columnName": "am_quick",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isActive",
-            "columnName": "is_Active",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "pingInterval",
-            "columnName": "ping_interval",
-            "affinity": "INTEGER",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "pingCooldown",
-            "columnName": "ping_cooldown",
-            "affinity": "INTEGER",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "pingIp",
-            "columnName": "ping_ip",
-            "affinity": "TEXT",
-            "notNull": false,
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "isEthernetTunnel",
-            "columnName": "is_ethernet_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isIpv4Preferred",
-            "columnName": "is_ipv4_preferred",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "true"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_TunnelConfig_name",
-            "unique": true,
-            "columnNames": [
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_TunnelConfig_name` ON `${TABLE_NAME}` (`name`)"
-          }
-        ],
-        "foreignKeys": []
-      }
-    ],
-    "views": [],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'ae51793c4d09ea3194ecd26f0606f35c')"
-    ]
-  }
-}

app/src/main/AndroidManifest.xml

@@ -3,8 +3,13 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
-	<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <!--foreground service exempt android 14-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"
@@ -20,8 +25,6 @@
 
 	<permission
 		android:name="${applicationId}.permission.CONTROL_TUNNELS"
-		android:label="@string/app_permission_title"
-		android:description="@string/app_permission_description"
 		android:icon="@mipmap/ic_launcher"
 		android:protectionLevel="dangerous" />
 
@@ -47,7 +50,6 @@
     <queries>
         <intent>
             <action android:name="android.intent.action.MAIN" />
-			<category android:name="android.intent.category.LAUNCHER" />
         </intent>
     </queries>
     <application
@@ -64,20 +66,21 @@
         android:theme="@style/Theme.App.Start"
         tools:targetApi="tiramisu">
         <activity
-            android:name=".MainActivity"
+            android:name=".ui.MainActivity"
             android:exported="true"
-			android:windowSoftInputMode="adjustNothing"
             android:theme="@style/Theme.WireguardAutoTunnel"
 			android:configChanges="orientation|screenSize|keyboardHidden"
 			>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-				<action android:name="android.intent.action.SHOW_APP_INFO" />
+
-				<category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
                 <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
             </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
         </activity>
         <activity
             android:name="com.journeyapps.barcodescanner.CaptureActivity"
@@ -85,9 +88,9 @@
             tools:replace="screenOrientation" />
 
         <activity
-            android:name=".core.shortcut.ShortcutsActivity"
+            android:name=".service.shortcut.ShortcutsActivity"
             android:enabled="true"
-            android:exported="false"
+            android:exported="true"
 			android:noHistory="true"
 			android:excludeFromRecents="true"
 			android:finishOnTaskLaunch="true"
@@ -104,18 +107,11 @@
 				android:resource="@xml/file_paths" />
 		</provider>
 
-		<provider
-			android:name="androidx.startup.InitializationProvider"
-			android:authorities="${applicationId}.androidx-startup"
-			android:multiprocess="true"
-			tools:node="remove">
-		</provider>
-
         <service
-            android:name=".core.service.tile.TunnelControlTile"
+            android:name=".service.tile.TunnelControlTile"
             android:exported="true"
             android:icon="@drawable/ic_launcher"
-            android:label="@string/tunnel_control"
+            android:label="Tunnel control"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <meta-data
                 android:name="android.service.quicksettings.ACTIVE_TILE"
@@ -129,10 +125,10 @@
             </intent-filter>
         </service>
         <service
-            android:name=".core.service.tile.AutoTunnelControlTile"
+            android:name=".service.tile.AutoTunnelControlTile"
             android:exported="true"
             android:icon="@drawable/ic_launcher"
-            android:label="@string/auto_tunnel"
+            android:label="Auto-tunnel"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <meta-data
                 android:name="android.service.quicksettings.ACTIVE_TILE"
@@ -145,8 +141,23 @@
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
             </intent-filter>
         </service>
+		<service
+			android:name=".service.tunnel.AlwaysOnVpnService"
+			android:enabled="true"
+			android:exported="false"
+			android:foregroundServiceType="systemExempted"
+			android:permission="android.permission.BIND_VPN_SERVICE"
+			android:persistent="true"
+			tools:node="merge">
+			<intent-filter>
+				<action android:name="android.net.VpnService" />
+			</intent-filter>
+			<meta-data
+				android:name="android.net.VpnService.SUPPORTS_ALWAYS_ON"
+				android:value="true" />
+		</service>
         <service
-            android:name=".core.service.autotunnel.AutoTunnelService"
+            android:name=".service.foreground.autotunnel.AutoTunnelService"
             android:enabled="true"
             android:exported="false"
             android:foregroundServiceType="systemExempted"
@@ -155,7 +166,7 @@
             tools:node="merge" />
 
 		<service
-			android:name=".core.service.TunnelForegroundService"
+			android:name=".service.foreground.TunnelBackgroundService"
 			android:exported="false"
 			android:persistent="true"
 			android:foregroundServiceType="systemExempted"
@@ -164,44 +175,37 @@
 				<action android:name="android.net.VpnService" />
 			</intent-filter>
 		</service>
+
         <receiver
-            android:name=".core.broadcast.RestartReceiver"
+            android:name=".receiver.BootReceiver"
             android:enabled="true"
-            android:exported="false"
+            android:exported="false">
-			android:directBootAware="true">
             <intent-filter>
                 <category android:name="android.intent.category.DEFAULT" />
+
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.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.LOCKED_BOOT_COMPLETED" />
-				<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
             </intent-filter>
         </receiver>
 		<receiver
-			android:name=".core.broadcast.KernelReceiver"
+			android:name=".receiver.AppUpdateReceiver"
+			android:exported="false">
+			<intent-filter>
+				<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+			</intent-filter>
+		</receiver>
+		<receiver
+			android:name=".receiver.KernelReceiver"
 			android:exported="false"
 			android:permission="${applicationId}.permission.CONTROL_TUNNELS">
 			<intent-filter>
 				<action android:name="com.wireguard.android.action.REFRESH_TUNNEL_STATES" />
 			</intent-filter>
 		</receiver>
-		<!--custom security solution for easier user integration-->
 		<receiver
-			android:name=".core.broadcast.RemoteControlReceiver"
+			android:name=".receiver.NotificationActionReceiver"
-			android:enabled="true"
-			android:exported="true" tools:ignore="ExportedReceiver">
-			<intent-filter>
-				<action android:name="com.zaneschepke.wireguardautotunnel.START_TUNNEL" />
-				<action android:name="com.zaneschepke.wireguardautotunnel.STOP_TUNNEL" />
-				<action android:name="com.zaneschepke.wireguardautotunnel.START_AUTO_TUNNEL" />
-				<action android:name="com.zaneschepke.wireguardautotunnel.STOP_AUTO_TUNNEL" />
-				<action android:name="com.zaneschepke.wireguardautotunnel.START_KILL_SWITCH" />
-				<action android:name="com.zaneschepke.wireguardautotunnel.STOP_KILL_SWITCH" />
-			</intent-filter>
-		</receiver>
-		<receiver
-			android:name=".core.broadcast.NotificationActionReceiver"
 			android:exported="false"
 			android:permission="${applicationId}.permission.CONTROL_TUNNELS">
 		</receiver>

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

@@ -1,387 +0,0 @@
-package com.zaneschepke.wireguardautotunnel
-
-import android.Manifest
-import android.annotation.SuppressLint
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.graphics.Color
-import android.net.Uri
-import android.os.Build
-import android.os.Bundle
-import android.provider.Settings
-import androidx.activity.SystemBarStyle
-import androidx.activity.compose.BackHandler
-import androidx.activity.compose.rememberLauncherForActivityResult
-import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
-import androidx.activity.result.ActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.activity.viewModels
-import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.slideInVertically
-import androidx.compose.animation.slideOutVertically
-import androidx.compose.foundation.background
-import androidx.compose.foundation.gestures.detectTapGestures
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.consumeWindowInsets
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.imePadding
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.rounded.Bolt
-import androidx.compose.material.icons.rounded.Home
-import androidx.compose.material.icons.rounded.QuestionMark
-import androidx.compose.material.icons.rounded.Settings
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.SnackbarData
-import androidx.compose.material3.SnackbarHost
-import androidx.compose.material3.SnackbarHostState
-import androidx.compose.material3.surfaceColorAtElevation
-import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.core.content.ContextCompat
-import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.currentBackStackEntryAsState
-import androidx.navigation.compose.rememberNavController
-import androidx.navigation.toRoute
-import com.zaneschepke.networkmonitor.NetworkMonitor
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.common.dialog.VpnDeniedDialog
-import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavItem
-import com.zaneschepke.wireguardautotunnel.ui.common.navigation.CustomBottomNavbar
-import com.zaneschepke.wireguardautotunnel.ui.common.navigation.DynamicTopAppBar
-import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
-import com.zaneschepke.wireguardautotunnel.ui.common.navigation.currentNavBackStackEntryAsNavBarState
-import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.CustomSnackBar
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.MainScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.autotunnel.TunnelAutoTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.ConfigScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.scanner.ScannerScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.SplitTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.main.tunneloptions.TunnelOptionsScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.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.autotunnel.AutoTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.advanced.AutoTunnelAdvancedScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.advanced.SettingsAdvancedScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.disclosure.LocationDisclosureScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.killswitch.KillSwitchScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.support.SupportScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.support.logs.LogsScreen
-import com.zaneschepke.wireguardautotunnel.ui.theme.WireguardAutoTunnelTheme
-import com.zaneschepke.wireguardautotunnel.util.extensions.goFromRoot
-import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
-import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
-import dagger.hilt.android.AndroidEntryPoint
-import org.amnezia.awg.backend.GoBackend.VpnService
-import timber.log.Timber
-import javax.inject.Inject
-import kotlin.system.exitProcess
-
-@AndroidEntryPoint
-class MainActivity : AppCompatActivity() {
-
-	@Inject
-	lateinit var appStateRepository: AppStateRepository
-
-	@Inject
-	lateinit var tunnelManager: TunnelManager
-
-	@Inject
-	lateinit var networkMonitor: NetworkMonitor
-
-	private var lastLocationPermissionState: Boolean? = null
-
-	@SuppressLint("BatteryLife")
-	override fun onCreate(savedInstanceState: Bundle?) {
-		enableEdgeToEdge(
-			statusBarStyle = SystemBarStyle.Companion.auto(Color.TRANSPARENT, Color.TRANSPARENT),
-			navigationBarStyle = SystemBarStyle.Companion.auto(Color.TRANSPARENT, Color.TRANSPARENT),
-		)
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-			window.isNavigationBarContrastEnforced = false
-		}
-		super.onCreate(savedInstanceState)
-
-		val viewModel by viewModels<AppViewModel>()
-
-		installSplashScreen().apply {
-			setKeepOnScreenCondition {
-				!viewModel.appViewState.value.isAppReady
-			}
-		}
-
-		setContent {
-			val appUiState by viewModel.uiState.collectAsStateWithLifecycle()
-			val appViewState by viewModel.appViewState.collectAsStateWithLifecycle()
-
-			val navController = rememberNavController()
-			val backStackEntry by navController.currentBackStackEntryAsState()
-			val navBarState by currentNavBackStackEntryAsNavBarState(navController, backStackEntry, viewModel, appUiState)
-			val snackbar = remember { SnackbarHostState() }
-			var showVpnPermissionDialog by remember { mutableStateOf(false) }
-			var vpnPermissionDenied by remember { mutableStateOf(false) }
-
-			val vpnActivity =
-				rememberLauncherForActivityResult(
-					ActivityResultContracts.StartActivityForResult(),
-					onResult = {
-						if (it.resultCode != RESULT_OK) {
-							showVpnPermissionDialog = true
-							vpnPermissionDenied = true
-						} else {
-							vpnPermissionDenied = false
-						}
-					},
-				)
-
-			LaunchedEffect(appUiState.tunnels) {
-				if (!appViewState.isAppReady) {
-					viewModel.handleEvent(AppEvent.AppReadyCheck(appUiState.tunnels))
-				}
-			}
-
-			val batteryActivity = rememberLauncherForActivityResult(
-				ActivityResultContracts.StartActivityForResult(),
-			) { _: ActivityResult ->
-				viewModel.handleEvent(AppEvent.SetBatteryOptimizeDisableShown)
-			}
-
-			with(appViewState) {
-				LaunchedEffect(isConfigChanged) {
-					if (isConfigChanged) {
-						Intent(this@MainActivity, MainActivity::class.java).also {
-							startActivity(it)
-							exitProcess(0)
-						}
-					}
-				}
-				LaunchedEffect(errorMessage) {
-					errorMessage?.let {
-						snackbar.showSnackbar(it.asString(this@MainActivity))
-						viewModel.handleEvent(AppEvent.MessageShown)
-					}
-				}
-				LaunchedEffect(appUiState.activeTunnels) {
-					appUiState.activeTunnels
-						.mapNotNull { (tunnelConf, tunnelState) ->
-							(tunnelState.status as? TunnelStatus.Error)?.let { error ->
-								val message = error.error.toStringRes()
-								val context = this@MainActivity
-								snackbar.showSnackbar(context.getString(R.string.tunnel_error_template, context.getString(message)))
-								viewModel.handleEvent(AppEvent.ClearTunnelError(tunnelConf))
-							}
-						}
-				}
-				LaunchedEffect(popBackStack) {
-					if (popBackStack) {
-						navController.popBackStack()
-						viewModel.handleEvent(AppEvent.PopBackStack(false))
-					}
-				}
-				LaunchedEffect(requestVpnPermission) {
-					if (requestVpnPermission) {
-						if (!vpnPermissionDenied) {
-							vpnActivity.launch(VpnService.prepare(this@MainActivity))
-						} else {
-							showVpnPermissionDialog = true
-						}
-						viewModel.handleEvent(AppEvent.VpnPermissionRequested)
-					}
-				}
-				LaunchedEffect(requestBatteryPermission) {
-					if (requestBatteryPermission) {
-						batteryActivity.launch(
-							Intent().apply {
-								action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
-								data = Uri.parse("package:${this@MainActivity.packageName}")
-							},
-						)
-					}
-				}
-			}
-
-			CompositionLocalProvider(LocalNavController provides navController) {
-				WireguardAutoTunnelTheme(theme = appUiState.appState.theme) {
-					VpnDeniedDialog(showVpnPermissionDialog, onDismiss = { showVpnPermissionDialog = false })
-
-					Scaffold(
-						modifier = Modifier.pointerInput(Unit) {
-							detectTapGestures {
-								viewModel.handleEvent(AppEvent.SetSelectedTunnel(null))
-							}
-						},
-						snackbarHost = {
-							SnackbarHost(snackbar) { snackbarData: SnackbarData ->
-								CustomSnackBar(
-									snackbarData.visuals.message,
-									isRtl = false,
-									containerColor =
-									MaterialTheme.colorScheme.surfaceColorAtElevation(
-										2.dp,
-									),
-								)
-							}
-						},
-						topBar = {
-							DynamicTopAppBar(navBarState)
-						},
-						bottomBar = {
-							AnimatedVisibility(
-								visible = navBarState.showBottom,
-								enter = slideInVertically(initialOffsetY = { it }),
-								exit = slideOutVertically(targetOffsetY = { it }),
-							) {
-								CustomBottomNavbar(
-									listOf(
-										BottomNavItem(
-											name = stringResource(R.string.tunnels),
-											route = Route.Main,
-											icon = Icons.Rounded.Home,
-											onClick = { navController.goFromRoot(Route.Main) },
-										),
-										BottomNavItem(
-											name = stringResource(R.string.auto_tunnel),
-											route = Route.AutoTunnel,
-											icon = Icons.Rounded.Bolt,
-											onClick = {
-												val route = if (appUiState.appState.isLocationDisclosureShown) Route.AutoTunnel else Route.LocationDisclosure
-												navController.goFromRoot(route)
-											},
-											active = appUiState.isAutoTunnelActive,
-										),
-										BottomNavItem(
-											name = stringResource(R.string.settings),
-											route = Route.Settings,
-											icon = Icons.Rounded.Settings,
-											onClick = { navController.goFromRoot(Route.Settings) },
-										),
-										BottomNavItem(
-											name = stringResource(R.string.support),
-											route = Route.Support,
-											icon = Icons.Rounded.QuestionMark,
-											onClick = { navController.goFromRoot(Route.Support) },
-										),
-									),
-									navBarState = navBarState,
-								)
-							}
-						},
-					) { padding ->
-						Box(
-							modifier = Modifier.fillMaxSize().background(MaterialTheme.colorScheme.surface)
-								.padding(padding)
-								.consumeWindowInsets(padding)
-								.imePadding(),
-						) {
-							NavHost(
-								navController,
-								startDestination = (if (appUiState.appState.isPinLockEnabled) Route.Lock else Route.Main),
-							) {
-								composable<Route.Main> {
-									MainScreen(appUiState, appViewState, viewModel)
-								}
-								composable<Route.Settings> {
-									SettingsScreen(appUiState, appViewState, viewModel)
-								}
-								composable<Route.SettingsAdvanced> {
-									SettingsAdvancedScreen(appUiState, viewModel)
-								}
-								composable<Route.LocationDisclosure> {
-									LocationDisclosureScreen(appUiState, viewModel)
-								}
-								composable<Route.AutoTunnel> {
-									AutoTunnelScreen(appUiState, viewModel)
-								}
-								composable<Route.Appearance> {
-									AppearanceScreen()
-								}
-								composable<Route.Language> {
-									LanguageScreen(appUiState, viewModel)
-								}
-								composable<Route.Display> {
-									DisplayScreen(appUiState, viewModel)
-								}
-								composable<Route.Support> {
-									SupportScreen()
-								}
-								composable<Route.AutoTunnelAdvanced> {
-									AutoTunnelAdvancedScreen(appUiState, viewModel)
-								}
-								composable<Route.Logs> {
-									LogsScreen(appViewState, viewModel)
-								}
-								composable<Route.Config> { backStack ->
-									val args = backStack.toRoute<Route.Config>()
-									val config = appUiState.tunnels.firstOrNull { it.id == args.id }
-									ConfigScreen(config, viewModel)
-								}
-								composable<Route.TunnelOptions> { backStack ->
-									val args = backStack.toRoute<Route.TunnelOptions>()
-									appUiState.tunnels.firstOrNull { it.id == args.id }?.let { config ->
-										TunnelOptionsScreen(config, appUiState, viewModel)
-									}
-								}
-								composable<Route.Lock> {
-									PinLockScreen(viewModel)
-								}
-								composable<Route.Scanner> {
-									ScannerScreen(viewModel)
-								}
-								composable<Route.KillSwitch> {
-									KillSwitchScreen(appUiState, viewModel)
-								}
-								composable<Route.SplitTunnel> {
-									SplitTunnelScreen(viewModel)
-								}
-								composable<Route.TunnelAutoTunnel> { backStack ->
-									val args = backStack.toRoute<Route.TunnelOptions>()
-									appUiState.tunnels.firstOrNull { it.id == args.id }?.let {
-										TunnelAutoTunnelScreen(it, appUiState.appSettings, viewModel)
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-	override fun onResume() {
-		super.onResume()
-		checkPermissionAndNotify()
-	}
-
-	private fun checkPermissionAndNotify() {
-		val hasLocation = ContextCompat.checkSelfPermission(
-			this,
-			Manifest.permission.ACCESS_FINE_LOCATION,
-		) == PackageManager.PERMISSION_GRANTED
-		if (lastLocationPermissionState != hasLocation) {
-			Timber.d("Location permission changed to: $hasLocation")
-			if (hasLocation) {
-				networkMonitor.sendLocationPermissionsGrantedBroadcast()
-			}
-			lastLocationPermissionState = hasLocation
-		}
-	}
-}

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

@@ -3,22 +3,17 @@ package com.zaneschepke.wireguardautotunnel
 import android.app.Application
 import android.os.StrictMode
 import android.os.StrictMode.ThreadPolicy
-import androidx.hilt.work.HiltWorkerFactory
-import androidx.lifecycle.DefaultLifecycleObserver
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.ProcessLifecycleOwner
-import androidx.work.Configuration
-import com.wireguard.android.backend.GoBackend
 import com.zaneschepke.logcatter.LogReader
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.core.worker.ServiceWorker
+import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.di.MainDispatcher
+import com.zaneschepke.wireguardautotunnel.module.MainDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+import com.zaneschepke.wireguardautotunnel.service.tunnel.BackendState
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
 import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
 import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
@@ -28,15 +23,7 @@ import timber.log.Timber
 import javax.inject.Inject
 
 @HiltAndroidApp
-class WireGuardAutoTunnel : Application(), Configuration.Provider {
+class WireGuardAutoTunnel : Application() {
-
-	@Inject
-	lateinit var workerFactory: HiltWorkerFactory
-
-	override val workManagerConfiguration: Configuration
-		get() = Configuration.Builder()
-			.setWorkerFactory(workerFactory)
-			.build()
 
 	@Inject
 	@ApplicationScope
@@ -46,7 +33,13 @@ class WireGuardAutoTunnel : Application(), Configuration.Provider {
 	lateinit var logReader: LogReader
 
 	@Inject
-	lateinit var appDataRepository: AppDataRepository
+	lateinit var appStateRepository: AppStateRepository
+
+	@Inject
+	lateinit var settingsRepository: SettingsRepository
+
+	@Inject
+	lateinit var tunnelService: TunnelService
 
 	@Inject
 	@IoDispatcher
@@ -56,13 +49,9 @@ class WireGuardAutoTunnel : Application(), Configuration.Provider {
 	@MainDispatcher
 	lateinit var mainDispatcher: CoroutineDispatcher
 
-	@Inject
-	lateinit var tunnelManager: TunnelManager
-
 	override fun onCreate() {
 		super.onCreate()
 		instance = this
-		ProcessLifecycleOwner.get().lifecycle.addObserver(AppLifecycleObserver())
 		if (BuildConfig.DEBUG) {
 			Timber.plant(Timber.DebugTree())
 			StrictMode.setThreadPolicy(
@@ -77,76 +66,28 @@ class WireGuardAutoTunnel : Application(), Configuration.Provider {
 			Timber.plant(ReleaseTree())
 		}
 
-		GoBackend.setAlwaysOnCallback {
-			applicationScope.launch {
-				val settings = appDataRepository.settings.get()
-				if (settings.isAlwaysOnVpnEnabled) {
-					val tunnel = appDataRepository.getPrimaryOrFirstTunnel()
-					tunnel?.let {
-						tunnelManager.startTunnel(it)
-					}
-				} else {
-					Timber.w("Always-on VPN is not enabled in app settings")
-				}
-			}
-		}
-
-		ServiceWorker.start(this)
-
 		applicationScope.launch {
-			if (!appDataRepository.settings.get().isKernelEnabled) {
+			withContext(mainDispatcher) {
-				tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
+				if (appStateRepository.isLocalLogsEnabled() && !isRunningOnTv()) logReader.initialize()
 			}
-			appDataRepository.appState.getLocale()?.let {
+			if (!settingsRepository.getSettings().isKernelEnabled) {
-				withContext(mainDispatcher) {
+				tunnelService.setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
-					LocaleUtil.changeLocale(it)
-				}
 			}
-			appDataRepository.appState.isLocalLogsEnabled().let { enabled ->
+
-				if (enabled) logReader.start()
+			appStateRepository.getLocale()?.let {
+				LocaleUtil.changeLocale(it)
 			}
 		}
 	}
 
 	override fun onTerminate() {
 		applicationScope.launch {
-			tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
+			tunnelService.setBackendState(BackendState.INACTIVE, emptyList())
 		}
 		super.onTerminate()
 	}
 
-	class AppLifecycleObserver : DefaultLifecycleObserver {
-
-		override fun onStart(owner: LifecycleOwner) {
-			Timber.d("Application entered foreground")
-			foreground = true
-		}
-		override fun onPause(owner: LifecycleOwner) {
-			Timber.d("Application entered background")
-			foreground = false
-		}
-	}
-
 	companion object {
-		private var foreground = false
-
-		fun isForeground(): Boolean {
-			return foreground
-		}
-
-		@Volatile
-		private var lastActiveTunnels: List<Int> = emptyList()
-
-		@Synchronized
-		fun getLastActiveTunnels(): List<Int> {
-			return lastActiveTunnels
-		}
-
-		@Synchronized
-		fun setLastActiveTunnels(newTunnels: List<Int>) {
-			lastActiveTunnels = newTunnels
-		}
-
 		lateinit var instance: WireGuardAutoTunnel
 			private set
 	}

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

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

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

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

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

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

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

@@ -1,46 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.notification
-
-import android.app.Notification
-import android.app.NotificationManager
-import android.content.Context
-import androidx.core.app.NotificationCompat
-import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification.NotificationChannels
-import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
-import com.zaneschepke.wireguardautotunnel.util.StringValue
-
-interface NotificationManager {
-	val context: Context
-	fun createNotification(
-		channel: NotificationChannels,
-		title: String = "",
-		actions: Collection<NotificationCompat.Action> = emptyList(),
-		description: String = "",
-		showTimestamp: Boolean = false,
-		importance: Int = NotificationManager.IMPORTANCE_HIGH,
-		onGoing: Boolean = true,
-		onlyAlertOnce: Boolean = true,
-	): Notification
-
-	fun createNotification(
-		channel: NotificationChannels,
-		title: StringValue,
-		actions: Collection<NotificationCompat.Action> = emptyList(),
-		description: StringValue,
-		showTimestamp: Boolean = false,
-		importance: Int = NotificationManager.IMPORTANCE_HIGH,
-		onGoing: Boolean = true,
-		onlyAlertOnce: Boolean = true,
-	): Notification
-
-	fun createNotificationAction(notificationAction: NotificationAction, extraId: Int? = null): NotificationCompat.Action
-
-	fun remove(notificationId: Int)
-
-	fun show(notificationId: Int, notification: Notification)
-
-	companion object {
-		const val AUTO_TUNNEL_NOTIFICATION_ID = 122
-		const val VPN_NOTIFICATION_ID = 100
-		const val EXTRA_ID = "id"
-	}
-}

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

@@ -1,130 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.service
-
-import android.app.Service
-import android.content.Context
-import android.content.Intent
-import android.net.VpnService
-import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
-import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelService
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.di.MainDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
-import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
-import jakarta.inject.Inject
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-
-class ServiceManager @Inject constructor(
-	private val context: Context,
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-	@ApplicationScope private val applicationScope: CoroutineScope,
-	@MainDispatcher private val mainDispatcher: CoroutineDispatcher,
-	private val appDataRepository: AppDataRepository,
-) {
-
-	private val autoTunnelMutex = Mutex()
-
-	private val _autoTunnelActive = MutableStateFlow(false)
-	val autoTunnelActive = _autoTunnelActive.asStateFlow()
-
-	var autoTunnelService = CompletableDeferred<AutoTunnelService>()
-	var backgroundService = CompletableDeferred<TunnelForegroundService>()
-
-	private fun <T : Service> startService(cls: Class<T>, background: Boolean) {
-		runCatching {
-			val intent = Intent(context, cls)
-			if (background) {
-				context.startForegroundService(intent)
-			} else {
-				context.startService(intent)
-			}
-		}.onFailure { Timber.e(it) }
-	}
-
-	fun hasVpnPermission(): Boolean {
-		return VpnService.prepare(context) == null
-	}
-
-	suspend fun startAutoTunnel() {
-		autoTunnelMutex.withLock {
-			val settings = appDataRepository.settings.get()
-			appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = true))
-			if (autoTunnelService.isCompleted) {
-				_autoTunnelActive.update { true }
-				return
-			}
-			runCatching {
-				autoTunnelService = CompletableDeferred()
-				startService(AutoTunnelService::class.java, !WireGuardAutoTunnel.isForeground())
-				_autoTunnelActive.update { true }
-			}.onFailure {
-				Timber.e(it)
-				_autoTunnelActive.update { false }
-			}
-			withContext(mainDispatcher) { updateAutoTunnelTile() }
-		}
-	}
-
-	suspend fun stopAutoTunnel() {
-		autoTunnelMutex.withLock {
-			val settings = appDataRepository.settings.get()
-			appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = false))
-			if (!autoTunnelService.isCompleted) return
-			runCatching {
-				val service = autoTunnelService.await()
-				service.stop()
-				_autoTunnelActive.update { false }
-				autoTunnelService = CompletableDeferred()
-			}.onFailure {
-				Timber.e(it)
-			}
-			withContext(mainDispatcher) { updateAutoTunnelTile() }
-		}
-	}
-
-	fun startTunnelForegroundService() {
-		if (backgroundService.isCompleted) return
-		runCatching {
-			backgroundService = CompletableDeferred()
-			startService(TunnelForegroundService::class.java, !WireGuardAutoTunnel.isForeground())
-		}.onFailure {
-			Timber.e(it)
-		}
-	}
-
-	suspend fun stopTunnelForegroundService() {
-		if (!backgroundService.isCompleted) return
-		runCatching {
-			val service = backgroundService.await()
-			service.stop()
-			backgroundService = CompletableDeferred()
-		}.onFailure {
-			Timber.e(it)
-		}
-	}
-
-	fun toggleAutoTunnel() {
-		applicationScope.launch(ioDispatcher) {
-			if (_autoTunnelActive.value) stopAutoTunnel() else startAutoTunnel()
-		}
-	}
-
-	fun updateAutoTunnelTile() {
-		context.requestAutoTunnelTileServiceUpdate()
-	}
-
-	fun updateTunnelTile() {
-		context.requestTunnelTileServiceStateUpdate()
-	}
-}

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

@@ -1,272 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.service
-
-import android.app.Notification
-import android.content.Intent
-import android.os.IBinder
-import androidx.core.app.ServiceCompat
-import androidx.lifecycle.LifecycleService
-import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.networkmonitor.NetworkMonitor
-import com.zaneschepke.networkmonitor.NetworkStatus
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
-import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
-import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.distinctByKeys
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.NonCancellable
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.isActive
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-import java.util.concurrent.ConcurrentHashMap
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class TunnelForegroundService : LifecycleService() {
-
-	@Inject
-	lateinit var notificationManager: NotificationManager
-
-	@Inject
-	lateinit var serviceManager: ServiceManager
-
-	@Inject
-	lateinit var networkMonitor: NetworkMonitor
-
-	@Inject
-	@IoDispatcher
-	lateinit var ioDispatcher: CoroutineDispatcher
-
-	@Inject
-	lateinit var tunnelRepo: TunnelRepository
-
-	@Inject
-	lateinit var tunnelManager: TunnelManager
-
-	private val isNetworkConnected = MutableStateFlow(true)
-
-	private val tunnelJobs = ConcurrentHashMap<TunnelConf, Job>()
-
-	override fun onCreate() {
-		super.onCreate()
-		serviceManager.backgroundService.complete(this)
-		ServiceCompat.startForeground(
-			this@TunnelForegroundService,
-			NotificationManager.VPN_NOTIFICATION_ID,
-			onCreateNotification(),
-			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
-		)
-	}
-
-	override fun onBind(intent: Intent): IBinder? {
-		super.onBind(intent)
-		return null
-	}
-
-	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-		super.onStartCommand(intent, flags, startId)
-		serviceManager.backgroundService.complete(this)
-		ServiceCompat.startForeground(
-			this@TunnelForegroundService,
-			NotificationManager.VPN_NOTIFICATION_ID,
-			onCreateNotification(),
-			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
-		)
-		start()
-		return START_STICKY
-	}
-
-	fun start() = lifecycleScope.launch {
-		tunnelManager.activeTunnels.distinctByKeys().collect { tuns ->
-			if (tuns.isEmpty() && tunnelJobs.isEmpty()) return@collect
-			if (tuns.isEmpty() && tunnelJobs.isNotEmpty()) {
-				return@collect tunnelJobs.forEach { (key, _) ->
-					Timber.d("Stopping all tunnel jobs")
-					tunnelJobs[key]?.cancel()
-					tunnelJobs.remove(key)
-				}
-			}
-			val (jobsToStop, jobsToStart) = findMissingKeys(tuns, tunnelJobs)
-			if (jobsToStop.isEmpty() && jobsToStart.isEmpty()) return@collect
-			jobsToStop.forEach { tun ->
-				Timber.d("Stopping tunnel jobs for ${tun.tunName}")
-				tunnelJobs[tun]?.cancel()
-				tunnelJobs.remove(tun)
-			}
-			jobsToStart.forEach { tun ->
-				Timber.d("Starting tunnel jobs for ${tun.tunName}")
-				tunnelJobs += (tun to startTunnelJobs(tun))
-			}
-			updateServiceNotification()
-		}
-	}
-
-	// TODO Would be cool to have this include kill switch
-	// TODO also we need to include errors
-	private fun updateServiceNotification() {
-		val notification = when (tunnelJobs.size) {
-			0 -> onCreateNotification()
-			1 -> createTunnelNotification(tunnelJobs.keys.first())
-			else -> createTunnelsNotification()
-		}
-		ServiceCompat.startForeground(
-			this@TunnelForegroundService,
-			NotificationManager.VPN_NOTIFICATION_ID,
-			notification,
-			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
-		)
-	}
-
-	// use same scope so we can cancel all of these
-	private fun startTunnelJobs(tunnelConf: TunnelConf) = lifecycleScope.launch {
-		// monitor if we have internet connectivity
-		launch { startNetworkMonitorJob() }
-		// job to trigger stats emit on interval
-		launch { startTunnelStatsJob(tunnelConf) }
-		// monitor changes to the tunnel config
-		launch { startTunnelConfChangesJob(tunnelConf) }
-		// monitor tunnel ping
-		launch { startPingJob(tunnelConf) }
-	}
-
-	private fun findMissingKeys(map1: Map<TunnelConf, Any>, map2: Map<TunnelConf, Any>): Pair<Set<TunnelConf>, Set<TunnelConf>> {
-		val missingMap1 = map2.keys - map1.keys
-		val missingMap2 = map1.keys - map2.keys
-		return missingMap1 to missingMap2
-	}
-
-	private suspend fun startTunnelConfChangesJob(tunnelConf: TunnelConf) {
-		tunnelRepo.flow
-			.flowOn(ioDispatcher)
-			.map { storedTunnels ->
-				storedTunnels.firstOrNull { it.id == tunnelConf.id }
-			}
-			.filterNotNull()
-			// only emit when one of these 3 values change
-			.distinctUntilChanged { old, new ->
-				old == new
-			}
-			.collect { storedTunnel ->
-				if (tunnelConf != storedTunnel) {
-					Timber.d("Config changed for ${storedTunnel.tunName}, bouncing")
-					// let this complete, even after cancel
-					withContext(NonCancellable) {
-						tunnelManager.bounceTunnel(storedTunnel, TunnelStatus.StopReason.CONFIG_CHANGED)
-					}
-				}
-			}
-	}
-
-	private suspend fun startNetworkMonitorJob() {
-		networkMonitor.networkStatusFlow
-			.flowOn(ioDispatcher)
-			.collectLatest { status ->
-				val isAvailable = status !is NetworkStatus.Disconnected
-				isNetworkConnected.value = isAvailable
-				Timber.d("Network available: $status")
-			}
-	}
-
-	private suspend fun startTunnelStatsJob(tunnel: TunnelConf) = coroutineScope {
-		while (isActive) {
-			tunnelManager.updateTunnelStatistics(tunnel)
-			delay(STATS_DELAY)
-		}
-	}
-
-	// TODO fix cooldown
-	private suspend fun startPingJob(tunnel: TunnelConf) = coroutineScope {
-		delay(PING_START_DELAY)
-		while (isActive) {
-			val shouldBounce = shouldBounceTunnel(tunnel)
-			val delayMs = if (shouldBounce) {
-				// let this complete, even after cancel
-				withContext(NonCancellable) {
-					tunnelManager.bounceTunnel(tunnel, TunnelStatus.StopReason.PING)
-				}
-				tunnel.pingCooldown ?: Constants.PING_COOLDOWN
-			} else {
-				tunnel.pingInterval ?: Constants.PING_INTERVAL
-			}
-			delay(delayMs)
-		}
-	}
-
-	private suspend fun shouldBounceTunnel(tunnel: TunnelConf): Boolean {
-		if (!isNetworkConnected.value) {
-			Timber.d("Network disconnected, skipping ping for ${tunnel.tunName}")
-			return false
-		}
-		return runCatching {
-			!tunnel.isTunnelPingable(ioDispatcher)
-		}.onFailure { e ->
-			Timber.e(e, "Ping check failed for ${tunnel.tunName}")
-		}.getOrDefault(true)
-	}
-
-	fun stop() {
-		ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
-		stopSelf()
-	}
-
-	override fun onDestroy() {
-		serviceManager.backgroundService = CompletableDeferred()
-		ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
-		super.onDestroy()
-	}
-
-	private fun createTunnelNotification(tunnelConf: TunnelConf): Notification {
-		return notificationManager.createNotification(
-			WireGuardNotification.NotificationChannels.VPN,
-			title = "${getString(R.string.tunnel_running)} - ${tunnelConf.tunName}",
-			actions = listOf(
-				notificationManager.createNotificationAction(NotificationAction.TUNNEL_OFF, tunnelConf.id),
-			),
-		)
-	}
-
-	private fun createTunnelsNotification(): Notification {
-		return notificationManager.createNotification(
-			WireGuardNotification.NotificationChannels.VPN,
-			title = "${getString(R.string.tunnel_running)} - ${getString(R.string.multiple)}",
-			actions = listOf(
-				notificationManager.createNotificationAction(NotificationAction.TUNNEL_OFF, 0),
-			),
-		)
-	}
-
-	private fun onCreateNotification(): Notification {
-		return notificationManager.createNotification(
-			WireGuardNotification.NotificationChannels.VPN,
-			title = getString(R.string.tunnel_starting),
-		)
-	}
-
-	// TODO add notification handling and optional log reading for restart on handshake failures
-	companion object {
-		const val STATS_DELAY = 1_000L
-		const val PING_START_DELAY = 30_000L
-		// ipv6 disabled or block on network
-// 		const val userspaceStartFailed = "Failed to send handshake initiation: write udp [::]"
-// 		const val ipv6Fails = "Failed to send data packets: write udp [::]"
-// 		const val ipv4Fails = "Failed to send data packets: write udp 0.0.0.0:51820"
-	}
-}

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

@@ -1,257 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.service.autotunnel
-
-import android.content.Intent
-import android.os.IBinder
-import android.os.PowerManager
-import androidx.core.app.ServiceCompat
-import androidx.lifecycle.LifecycleService
-import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.networkmonitor.NetworkMonitor
-import com.zaneschepke.networkmonitor.NetworkStatus
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
-import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
-import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
-import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
-import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
-import com.zaneschepke.wireguardautotunnel.domain.events.KillSwitchEvent
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.state.AutoTunnelState
-import com.zaneschepke.wireguardautotunnel.domain.state.NetworkState
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.Tunnels
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.debounce
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Provider
-
-@AndroidEntryPoint
-class AutoTunnelService : LifecycleService() {
-
-	@Inject
-	lateinit var networkMonitor: NetworkMonitor
-
-	@Inject
-	lateinit var appDataRepository: Provider<AppDataRepository>
-
-	@Inject
-	lateinit var notificationManager: NotificationManager
-
-	@Inject
-	@IoDispatcher
-	lateinit var ioDispatcher: CoroutineDispatcher
-
-	@Inject
-	lateinit var serviceManager: ServiceManager
-
-	@Inject
-	lateinit var tunnelManager: TunnelManager
-
-	private val defaultState = AutoTunnelState()
-
-	private val autoTunnelStateFlow = MutableStateFlow(defaultState)
-
-	private var wakeLock: PowerManager.WakeLock? = null
-
-	private var killSwitchJob: Job? = null
-
-	override fun onCreate() {
-		super.onCreate()
-		serviceManager.autoTunnelService.complete(this)
-		launchWatcherNotification()
-	}
-
-	override fun onBind(intent: Intent): IBinder? {
-		super.onBind(intent)
-		return null
-	}
-
-	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-		super.onStartCommand(intent, flags, startId)
-		Timber.d("onStartCommand executed with startId: $startId")
-		serviceManager.autoTunnelService.complete(this)
-		start()
-		return START_STICKY
-	}
-
-	fun start() {
-		kotlin.runCatching {
-			launchWatcherNotification()
-			initWakeLock()
-			startAutoTunnelJob()
-			startAutoTunnelStateJob()
-			killSwitchJob = startKillSwitchJob()
-		}.onFailure {
-			Timber.e(it)
-		}
-	}
-
-	fun stop() {
-		wakeLock?.let { if (it.isHeld) it.release() }
-		stopSelf()
-	}
-
-	override fun onDestroy() {
-		serviceManager.autoTunnelService = CompletableDeferred()
-		restoreVpnKillSwitch()
-		super.onDestroy()
-	}
-
-	private fun restoreVpnKillSwitch() {
-		with(autoTunnelStateFlow.value) {
-			if (settings.isVpnKillSwitchEnabled && tunnelManager.getBackendState() != BackendState.KILL_SWITCH_ACTIVE) {
-				killSwitchJob?.cancel()
-				val allowedIps = if (settings.isLanOnKillSwitchEnabled) TunnelConf.LAN_BYPASS_ALLOWED_IPS else emptyList()
-				tunnelManager.setBackendState(BackendState.KILL_SWITCH_ACTIVE, allowedIps)
-			}
-		}
-	}
-
-	private fun launchWatcherNotification(description: String = getString(R.string.monitoring_state_changes)) {
-		val notification =
-			notificationManager.createNotification(
-				WireGuardNotification.NotificationChannels.AUTO_TUNNEL,
-				title = getString(R.string.auto_tunnel_title),
-				description = description,
-				actions = listOf(
-					notificationManager.createNotificationAction(NotificationAction.AUTO_TUNNEL_OFF),
-				),
-			)
-		ServiceCompat.startForeground(
-			this,
-			NotificationManager.AUTO_TUNNEL_NOTIFICATION_ID,
-			notification,
-			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
-		)
-	}
-
-	private fun initWakeLock() {
-		wakeLock = (getSystemService(POWER_SERVICE) as PowerManager).run {
-			val tag = this.javaClass.name
-			newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "$tag::lock").apply {
-				try {
-					Timber.i("Initiating wakelock with 10 min timeout")
-					acquire(Constants.BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT)
-				} finally {
-					release()
-				}
-			}
-		}
-	}
-
-	private fun buildNetworkState(networkStatus: NetworkStatus): NetworkState {
-		return with(autoTunnelStateFlow.value.networkState) {
-			val wifiName = when (networkStatus) {
-				is NetworkStatus.Connected -> {
-					networkStatus.wifiSsid
-				}
-				else -> null
-			}
-			copy(
-				isWifiConnected = networkStatus.wifiConnected,
-				isMobileDataConnected = networkStatus.cellularConnected,
-				isEthernetConnected = networkStatus.ethernetConnected,
-				wifiName = wifiName,
-			)
-		}
-	}
-
-	@OptIn(ExperimentalCoroutinesApi::class)
-	private fun startAutoTunnelStateJob() = lifecycleScope.launch(ioDispatcher) {
-		combine(
-			combineSettings(),
-			appDataRepository.get().settings.flow
-				.distinctUntilChanged { old, new -> old.isKernelEnabled == new.isKernelEnabled } // Only emit when isKernelEnabled changes
-				.flatMapLatest {
-					networkMonitor.networkStatusFlow
-						.flowOn(ioDispatcher)
-						.map { buildNetworkState(it) }
-				}
-				.distinctUntilChanged(),
-		) { double, networkState ->
-			AutoTunnelState(
-				tunnelManager.activeTunnels.value,
-				networkState,
-				double.first,
-				double.second,
-			)
-		}.collect { state ->
-			autoTunnelStateFlow.update {
-				it.copy(
-					activeTunnels = state.activeTunnels,
-					networkState = state.networkState,
-					settings = state.settings,
-					tunnels = state.tunnels,
-				)
-			}
-		}
-	}
-
-	private fun combineSettings(): Flow<Pair<AppSettings, Tunnels>> {
-		return combine(
-			appDataRepository.get().settings.flow,
-			appDataRepository.get().tunnels.flow.map { tunnels ->
-				// isActive is ignored for equality checks so user can manually toggle off tunnel with auto-tunnel
-				tunnels.map { it.copy(isActive = false) }
-			},
-		) { settings, tunnels ->
-			Pair(settings, tunnels)
-		}.distinctUntilChanged()
-	}
-
-	private fun startKillSwitchJob() = lifecycleScope.launch(ioDispatcher) {
-		autoTunnelStateFlow.collect {
-			if (it == defaultState) return@collect
-			when (val event = it.asKillSwitchEvent()) {
-				KillSwitchEvent.DoNothing -> Unit
-				is KillSwitchEvent.Start -> {
-					Timber.d("Starting kill switch")
-					tunnelManager.setBackendState(BackendState.KILL_SWITCH_ACTIVE, event.allowedIps)
-				}
-				KillSwitchEvent.Stop -> {
-					Timber.d("Stopping kill switch")
-					tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, emptySet())
-				}
-			}
-		}
-	}
-
-	@OptIn(FlowPreview::class)
-	private fun startAutoTunnelJob() = lifecycleScope.launch(ioDispatcher) {
-		Timber.i("Starting auto-tunnel network event watcher")
-		val settings = appDataRepository.get().settings.get()
-		Timber.d("Starting with debounce delay of: ${settings.debounceDelaySeconds} seconds")
-		autoTunnelStateFlow.debounce(settings.debounceDelayMillis()).collect { watcherState ->
-			if (watcherState == defaultState) return@collect
-			Timber.d("New auto tunnel state emitted ${watcherState.networkState}")
-			when (val event = watcherState.asAutoTunnelEvent()) {
-				is AutoTunnelEvent.Start -> (event.tunnelConf ?: appDataRepository.get().getPrimaryOrFirstTunnel())?.let {
-					tunnelManager.startTunnel(it)
-				}
-				// TODO improve this to target specific tunnels to better support multi-tunnel
-				is AutoTunnelEvent.Stop -> tunnelManager.stopTunnel()
-				AutoTunnelEvent.DoNothing -> Timber.i("Auto-tunneling: no condition met")
-			}
-		}
-	}
-}

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

@@ -1,106 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.service.tile
-
-import android.content.Intent
-import android.os.IBinder
-import android.service.quicksettings.Tile
-import android.service.quicksettings.TileService
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.LifecycleRegistry
-import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
-import timber.log.Timber
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class AutoTunnelControlTile : TileService(), LifecycleOwner {
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
-
-	@Inject
-	lateinit var serviceManager: ServiceManager
-
-	private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
-
-	override fun onCreate() {
-		super.onCreate()
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
-	}
-
-	override fun onDestroy() {
-		super.onDestroy()
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
-	}
-
-	override fun onStartListening() {
-		super.onStartListening()
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
-		Timber.d("Start listening called for auto tunnel tile")
-		lifecycleScope.launch {
-			serviceManager.autoTunnelActive.collect {
-				if (it) return@collect setActive()
-				setInactive()
-			}
-		}
-		lifecycleScope.launch {
-			appDataRepository.tunnels.flow.collect {
-				if (it.isEmpty()) {
-					setUnavailable()
-				}
-			}
-		}
-	}
-
-	override fun onClick() {
-		super.onClick()
-		unlockAndRun {
-			lifecycleScope.launch {
-				if (serviceManager.autoTunnelActive.value) {
-					serviceManager.stopAutoTunnel()
-					setInactive()
-				} else {
-					serviceManager.startAutoTunnel()
-					setActive()
-				}
-			}
-		}
-	}
-
-	private fun setActive() {
-		runCatching {
-			qsTile.state = Tile.STATE_ACTIVE
-			qsTile.updateTile()
-		}
-	}
-
-	private fun setInactive() {
-		runCatching {
-			qsTile.state = Tile.STATE_INACTIVE
-			qsTile.updateTile()
-		}
-	}
-
-	/* This works around an annoying unsolved frameworks bug some people are hitting. */
-	override fun onBind(intent: Intent): IBinder? {
-		var ret: IBinder? = null
-		try {
-			ret = super.onBind(intent)
-		} catch (_: Throwable) {
-			Timber.e("Failed to bind to TunnelControlTile")
-		}
-		return ret
-	}
-
-	private fun setUnavailable() {
-		runCatching {
-			qsTile.state = Tile.STATE_UNAVAILABLE
-			qsTile.updateTile()
-		}
-	}
-
-	override val lifecycle: Lifecycle
-		get() = lifecycleRegistry
-}

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

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

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

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

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

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

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

@@ -1,203 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.tunnel
-
-import com.wireguard.android.backend.Tunnel
-import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendError
-import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
-import com.zaneschepke.wireguardautotunnel.util.extensions.asTunnelState
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import timber.log.Timber
-import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.atomic.AtomicBoolean
-import kotlin.concurrent.thread
-
-abstract class BaseTunnel(
-	@ApplicationScope private val applicationScope: CoroutineScope,
-	private val appDataRepository: AppDataRepository,
-	private val serviceManager: ServiceManager,
-) : TunnelProvider {
-
-	private val activeTuns = MutableStateFlow<Map<TunnelConf, TunnelState>>(emptyMap())
-	private val tunThreads = ConcurrentHashMap<Int, Thread>()
-	override val activeTunnels = activeTuns.asStateFlow()
-
-	private val tunMutex = Mutex()
-	private val tunStatusMutex = Mutex()
-
-	private val isBouncing = AtomicBoolean(false)
-
-	abstract suspend fun startBackend(tunnel: TunnelConf)
-
-	abstract fun stopBackend(tunnel: TunnelConf)
-
-	override suspend fun clearError(tunnelConf: TunnelConf) = updateTunnelStatus(tunnelConf, TunnelStatus.Down)
-
-	override fun hasVpnPermission(): Boolean {
-		return serviceManager.hasVpnPermission()
-	}
-
-	protected suspend fun updateTunnelStatus(tunnelConf: TunnelConf, state: TunnelStatus? = null, stats: TunnelStatistics? = null) {
-		tunStatusMutex.withLock {
-			activeTuns.update { current ->
-				val originalConf = current.getKeyById(tunnelConf.id) ?: tunnelConf
-				val existingState = current.getValueById(tunnelConf.id) ?: TunnelState()
-				val newState = state ?: existingState.status
-				if (newState == TunnelStatus.Down) {
-					Timber.d("Removing tunnel ${tunnelConf.id} from activeTunnels as state is DOWN")
-					cleanUpTunThread(tunnelConf)
-					current - originalConf
-				} else if (existingState.status == newState && stats == null) {
-					Timber.d("Skipping redundant state update for ${tunnelConf.id}: $newState")
-					current
-				} else {
-					val updated = existingState.copy(
-						status = newState,
-						statistics = stats ?: existingState.statistics,
-					)
-					current + (originalConf to updated)
-				}
-			}
-		}
-	}
-
-	private suspend fun stopActiveTunnels() {
-		activeTunnels.value.forEach { (config, state) ->
-			if (state.status.isUpOrStarting()) {
-				stopTunnel(config)
-			}
-		}
-	}
-
-	private fun configureTunnelCallbacks(tunnelConf: TunnelConf) {
-		Timber.d("Configuring TunnelConf instance: ${tunnelConf.hashCode()}")
-		tunnelConf.setStateChangeCallback { state ->
-			applicationScope.launch {
-				Timber.d("State change callback triggered for tunnel ${tunnelConf.id}: ${tunnelConf.tunName} with state $state at ${System.currentTimeMillis()}")
-				when (state) {
-					is Tunnel.State -> updateTunnelStatus(tunnelConf, state.asTunnelState())
-					is org.amnezia.awg.backend.Tunnel.State -> updateTunnelStatus(tunnelConf, state.asTunnelState())
-				}
-				handleServiceChangesOnStop()
-			}
-			serviceManager.updateTunnelTile()
-		}
-	}
-
-	override suspend fun updateTunnelStatistics(tunnel: TunnelConf) {
-		val stats = getStatistics(tunnel)
-		updateTunnelStatus(tunnel, null, stats)
-	}
-
-	override suspend fun startTunnel(tunnelConf: TunnelConf) {
-		if (activeTuns.exists(tunnelConf.id) || tunThreads.containsKey(tunnelConf.id)) return
-		// stop active tunnels if we are userspace
-		if (this@BaseTunnel is UserspaceTunnel) stopActiveTunnels()
-		tunMutex.withLock {
-			// use thread to interrupt java backend if stuck (like in dns resolution)
-			tunThreads += tunnelConf.id to thread {
-				runBlocking {
-					try {
-						Timber.d("Starting tunnel ${tunnelConf.id}...")
-						startTunnelInner(tunnelConf)
-						Timber.d("Started complete for tunnel ${tunnelConf.name}...")
-					} catch (e: BackendError) {
-						Timber.e(e, "Failed to start tunnel ${tunnelConf.name} userspace")
-						updateTunnelStatus(tunnelConf, TunnelStatus.Error(e))
-					} catch (e: InterruptedException) {
-						Timber.i("Tunnel start has been interrupted as ${tunnelConf.name} failed to start")
-					}
-				}
-			}
-		}
-	}
-
-	private suspend fun startTunnelInner(tunnelConf: TunnelConf) {
-		configureTunnelCallbacks(tunnelConf)
-		Timber.d("Started backend for tunnel ${tunnelConf.id}...")
-		startBackend(tunnelConf)
-		updateTunnelStatus(tunnelConf, TunnelStatus.Up)
-		Timber.d("DONE for tun ${tunnelConf.id}...")
-		saveTunnelActiveState(tunnelConf, true)
-		serviceManager.startTunnelForegroundService()
-	}
-
-	private suspend fun saveTunnelActiveState(tunnelConf: TunnelConf, active: Boolean) {
-		val tunnelCopy = tunnelConf.copyWithCallback(isActive = active)
-		appDataRepository.tunnels.save(tunnelCopy)
-	}
-
-	override suspend fun stopTunnel(tunnelConf: TunnelConf?, reason: TunnelStatus.StopReason) {
-		if (tunnelConf == null) return stopActiveTunnels()
-		tunMutex.withLock {
-			try {
-				if (activeTuns.isStarting(tunnelConf.id)) return handleStuckStartingTunnelShutdown(tunnelConf)
-				updateTunnelStatus(tunnelConf, TunnelStatus.Stopping(reason))
-				stopTunnelInner(tunnelConf)
-			} catch (e: BackendError) {
-				Timber.e(e, "Failed to stop tunnel ${tunnelConf.id}")
-				updateTunnelStatus(tunnelConf, TunnelStatus.Error(e))
-			}
-		}
-	}
-
-	private suspend fun stopTunnelInner(tunnelConf: TunnelConf) {
-		val tunnel = activeTuns.findTunnel(tunnelConf.id) ?: return
-		stopBackend(tunnel)
-		saveTunnelActiveState(tunnelConf, false)
-		removeActiveTunnel(tunnel)
-	}
-
-	private suspend fun handleServiceChangesOnStop() {
-		if (activeTuns.value.isEmpty() && !isBouncing.get()) return serviceManager.stopTunnelForegroundService()
-	}
-
-	private suspend fun handleStuckStartingTunnelShutdown(tunnel: TunnelConf) {
-		Timber.d("Stuck in starting state so shutting down tunnel thread for tunnel ${tunnel.name}")
-		try {
-			tunThreads[tunnel.id]?.let {
-				if (it.state != Thread.State.TERMINATED) {
-					it.interrupt()
-					updateTunnelStatus(tunnel, TunnelStatus.Down)
-				} else {
-					Timber.d("Thread already terminated")
-				}
-			}
-		} catch (e: Exception) {
-			Timber.e(e, "Failed to stop tunnel thread for ${tunnel.name}")
-		}
-		cleanUpTunThread(tunnel)
-	}
-
-	private fun cleanUpTunThread(tunnel: TunnelConf) {
-		Timber.d("Removing thread for ${tunnel.name}")
-		tunThreads -= tunnel.id
-	}
-
-	private fun removeActiveTunnel(tunnelConf: TunnelConf) {
-		activeTuns.update { current ->
-			current.toMutableMap().apply { remove(tunnelConf) }
-		}
-	}
-
-	override suspend fun bounceTunnel(tunnelConf: TunnelConf, reason: TunnelStatus.StopReason) {
-		Timber.i("Bounce tunnel ${tunnelConf.name}")
-		isBouncing.set(true)
-		stopTunnel(tunnelConf, reason)
-		startTunnel(tunnelConf)
-		isBouncing.set(false)
-	}
-
-	override suspend fun runningTunnelNames(): Set<String> = activeTuns.value.keys.map { it.tunName }.toSet()
-}

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

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

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

@@ -1,64 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.tunnel
-
-import com.wireguard.android.backend.Backend
-import com.wireguard.android.backend.BackendException
-import com.wireguard.android.backend.Tunnel
-import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
-import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
-import com.zaneschepke.wireguardautotunnel.domain.state.WireGuardStatistics
-import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
-import kotlinx.coroutines.CoroutineScope
-import timber.log.Timber
-import javax.inject.Inject
-
-class KernelTunnel @Inject constructor(
-	@ApplicationScope private val applicationScope: CoroutineScope,
-	serviceManager: ServiceManager,
-	appDataRepository: AppDataRepository,
-	private val backend: Backend,
-) : BaseTunnel(applicationScope, appDataRepository, serviceManager) {
-
-	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
-		return try {
-			WireGuardStatistics(backend.getStatistics(tunnelConf))
-		} catch (e: Exception) {
-			Timber.e(e)
-			null
-		}
-	}
-
-	override suspend fun startBackend(tunnel: TunnelConf) {
-		try {
-			updateTunnelStatus(tunnel, TunnelStatus.Starting)
-			backend.setState(tunnel, Tunnel.State.UP, tunnel.toWgConfig())
-		} catch (e: BackendException) {
-			throw e.toBackendError()
-		}
-	}
-
-	override fun stopBackend(tunnel: TunnelConf) {
-		Timber.i("Stopping tunnel ${tunnel.id} kernel")
-		try {
-			backend.setState(tunnel, Tunnel.State.DOWN, tunnel.toWgConfig())
-		} catch (e: BackendException) {
-			throw e.toBackendError()
-		}
-	}
-
-	override fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
-		Timber.w("Not yet implemented for kernel")
-	}
-
-	override fun getBackendState(): BackendState {
-		return BackendState.INACTIVE
-	}
-
-	override suspend fun runningTunnelNames(): Set<String> {
-		return backend.runningTunnelNames
-	}
-}

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

@@ -1,114 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.tunnel
-
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.di.Kernel
-import com.zaneschepke.wireguardautotunnel.di.Userspace
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
-import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.filterNotNull
-import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.plus
-import javax.inject.Inject
-
-class TunnelManager @Inject constructor(
-	@Kernel private val kernelTunnel: TunnelProvider,
-	@Userspace private val userspaceTunnel: TunnelProvider,
-	private val appDataRepository: AppDataRepository,
-	@ApplicationScope private val applicationScope: CoroutineScope,
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-) : TunnelProvider {
-
-	@OptIn(ExperimentalCoroutinesApi::class)
-	private val tunnelProviderFlow = appDataRepository.settings.flow
-		.filterNotNull()
-		.flatMapLatest { settings ->
-			MutableStateFlow(if (settings.isKernelEnabled) kernelTunnel else userspaceTunnel)
-		}
-		.stateIn(
-			scope = applicationScope.plus(ioDispatcher),
-			started = SharingStarted.Eagerly,
-			initialValue = userspaceTunnel,
-		)
-
-	@OptIn(ExperimentalCoroutinesApi::class)
-	override val activeTunnels = appDataRepository.settings.flow
-		.filterNotNull()
-		.flatMapLatest { settings ->
-			if (settings.isKernelEnabled) {
-				kernelTunnel.activeTunnels
-			} else {
-				userspaceTunnel.activeTunnels
-			}
-		}
-		.stateIn(
-			scope = applicationScope.plus(ioDispatcher),
-			started = SharingStarted.Eagerly,
-			initialValue = emptyMap(),
-		)
-
-	override fun hasVpnPermission(): Boolean {
-		return userspaceTunnel.hasVpnPermission()
-	}
-
-	override suspend fun clearError(tunnelConf: TunnelConf) {
-		tunnelProviderFlow.value.clearError(tunnelConf)
-	}
-
-	override suspend fun updateTunnelStatistics(tunnel: TunnelConf) {
-		tunnelProviderFlow.value.updateTunnelStatistics(tunnel)
-	}
-
-	override suspend fun startTunnel(tunnelConf: TunnelConf) {
-		tunnelProviderFlow.value.startTunnel(tunnelConf)
-	}
-
-	override suspend fun stopTunnel(tunnelConf: TunnelConf?, reason: TunnelStatus.StopReason) {
-		tunnelProviderFlow.value.stopTunnel(tunnelConf)
-	}
-
-	override suspend fun bounceTunnel(tunnelConf: TunnelConf, reason: TunnelStatus.StopReason) {
-		tunnelProviderFlow.value.bounceTunnel(tunnelConf)
-	}
-
-	override fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
-		tunnelProviderFlow.value.setBackendState(backendState, allowedIps)
-	}
-
-	override fun getBackendState(): BackendState {
-		return tunnelProviderFlow.value.getBackendState()
-	}
-
-	override suspend fun runningTunnelNames(): Set<String> {
-		return tunnelProviderFlow.value.runningTunnelNames()
-	}
-
-	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
-		return tunnelProviderFlow.value.getStatistics(tunnelConf)
-	}
-
-	fun restorePreviousState() = applicationScope.launch(ioDispatcher) {
-		val settings = appDataRepository.settings.get()
-		if (settings.isRestoreOnBootEnabled) {
-			val previouslyActiveTuns = appDataRepository.tunnels.getActive()
-			val tunsToStart = previouslyActiveTuns.filterNot { tun -> activeTunnels.value.any { tun.id == it.key.id } }
-			if (settings.isKernelEnabled) {
-				return@launch tunsToStart.forEach {
-					startTunnel(it)
-				}
-			} else {
-				tunsToStart.firstOrNull()?.let { startTunnel(it) }
-			}
-		}
-	}
-}

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

@@ -1,22 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.tunnel
-
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
-import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
-import kotlinx.coroutines.flow.StateFlow
-
-interface TunnelProvider {
-	suspend fun startTunnel(tunnelConf: TunnelConf)
-	suspend fun stopTunnel(tunnelConf: TunnelConf? = null, reason: TunnelStatus.StopReason = TunnelStatus.StopReason.USER)
-	suspend fun bounceTunnel(tunnelConf: TunnelConf, reason: TunnelStatus.StopReason = TunnelStatus.StopReason.USER)
-	fun setBackendState(backendState: BackendState, allowedIps: Collection<String>)
-	fun getBackendState(): BackendState
-	suspend fun runningTunnelNames(): Set<String>
-	fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics?
-	val activeTunnels: StateFlow<Map<TunnelConf, TunnelState>>
-	fun hasVpnPermission(): Boolean
-	suspend fun clearError(tunnelConf: TunnelConf)
-	suspend fun updateTunnelStatistics(tunnel: TunnelConf)
-}

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

@@ -1,104 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.tunnel
-
-import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
-import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.state.AmneziaStatistics
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
-import com.zaneschepke.wireguardautotunnel.util.extensions.asAmBackendState
-import com.zaneschepke.wireguardautotunnel.util.extensions.asBackendState
-import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
-import kotlinx.coroutines.CoroutineScope
-import org.amnezia.awg.backend.Backend
-import org.amnezia.awg.backend.BackendException
-import org.amnezia.awg.backend.Tunnel
-import org.amnezia.awg.config.Config
-import timber.log.Timber
-import javax.inject.Inject
-import kotlin.jvm.optionals.getOrNull
-
-class UserspaceTunnel @Inject constructor(
-	@ApplicationScope private val applicationScope: CoroutineScope,
-	val serviceManager: ServiceManager,
-	val appDataRepository: AppDataRepository,
-	private val backend: Backend,
-) : BaseTunnel(applicationScope, appDataRepository, serviceManager) {
-
-	private var previousBackendState: Pair<BackendState, Boolean>? = null
-
-	override suspend fun startBackend(tunnel: TunnelConf) {
-		try {
-			updateTunnelStatus(tunnel, TunnelStatus.Starting)
-			val amConfig = tunnel.toAmConfig()
-			handleVpnKillSwitchWithDomainEndpoints(amConfig)
-			backend.setState(tunnel, Tunnel.State.UP, amConfig)
-		} catch (e: BackendException) {
-			Timber.e(e, "Failed to start up backend for tunnel ${tunnel.name}")
-			throw e.toBackendError()
-		}
-	}
-
-	override fun stopBackend(tunnel: TunnelConf) {
-		Timber.i("Stopping tunnel ${tunnel.name} userspace")
-		try {
-			backend.setState(tunnel, Tunnel.State.DOWN, tunnel.toAmConfig())
-		} catch (e: BackendException) {
-			Timber.e(e, "Failed to stop tunnel ${tunnel.id}")
-			throw e.toBackendError()
-		}
-		handlePreviouslyEnabledVpnKillSwitch()
-	}
-
-	// stop vpn kill switch if we need to resolve DNS for peer endpoints
-	private suspend fun handleVpnKillSwitchWithDomainEndpoints(config: Config) {
-		if (config.peers.any { it.endpoint.getOrNull()?.toString()?.isUrl() == true } &&
-			backend.backendState.asBackendState() == BackendState.KILL_SWITCH_ACTIVE
-		) {
-			val bypassLan = appDataRepository.settings.get().isLanOnKillSwitchEnabled
-			previousBackendState = Pair(BackendState.KILL_SWITCH_ACTIVE, bypassLan)
-			setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
-		}
-	}
-
-	// restore vpn kill switch if needed
-	private fun handlePreviouslyEnabledVpnKillSwitch() {
-		// let auto tunnel handle this if it is active
-		if (!serviceManager.autoTunnelActive.value) {
-			previousBackendState?.let { (state, lanEnabled) ->
-				Timber.d("Restoring kill switch configuration")
-				val lan = if (lanEnabled) TunnelConf.LAN_BYPASS_ALLOWED_IPS else emptyList()
-				backend.setBackendState(state.asAmBackendState(), lan)
-			}
-		}
-		previousBackendState = null
-	}
-
-	override fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
-		Timber.d("Setting backend state: $backendState with allowedIps: $allowedIps")
-		try {
-			backend.setBackendState(backendState.asAmBackendState(), allowedIps)
-		} catch (e: BackendException) {
-			throw e.toBackendError()
-		}
-	}
-
-	override fun getBackendState(): BackendState {
-		return backend.backendState.asBackendState()
-	}
-
-	override suspend fun runningTunnelNames(): Set<String> {
-		return backend.runningTunnelNames
-	}
-
-	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
-		return try {
-			AmneziaStatistics(backend.getStatistics(tunnelConf))
-		} catch (e: Exception) {
-			Timber.e(e, "Failed to get stats for ${tunnelConf.tunName}")
-			null
-		}
-	}
-}

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

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

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

@@ -6,14 +6,12 @@ import androidx.room.DeleteColumn
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
 import androidx.room.migration.AutoMigrationSpec
-import com.zaneschepke.wireguardautotunnel.data.dao.SettingsDao
+import com.zaneschepke.wireguardautotunnel.data.domain.Settings
-import com.zaneschepke.wireguardautotunnel.data.dao.TunnelConfigDao
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.data.model.Settings
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 
 @Database(
 	entities = [Settings::class, TunnelConfig::class],
-	version = 16,
+	version = 13,
 	autoMigrations =
 	[
 		AutoMigration(from = 1, to = 2),
@@ -51,18 +49,6 @@ import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 			from = 12,
 			to = 13,
 		),
-		AutoMigration(
-			from = 13,
-			to = 14,
-		),
-		AutoMigration(
-			from = 14,
-			to = 15,
-		),
-		AutoMigration(
-			from = 15,
-			to = 16,
-		),
 	],
 	exportSchema = true,
 )

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

@@ -1,6 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.data
 
 import androidx.room.TypeConverter
+import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 
 class DatabaseListConverters {

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

@@ -1,11 +1,11 @@
-package com.zaneschepke.wireguardautotunnel.data.dao
+package com.zaneschepke.wireguardautotunnel.data
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import com.zaneschepke.wireguardautotunnel.data.model.Settings
+import com.zaneschepke.wireguardautotunnel.data.domain.Settings
 import kotlinx.coroutines.flow.Flow
 
 @Dao

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

@@ -1,11 +1,11 @@
-package com.zaneschepke.wireguardautotunnel.data.dao
+package com.zaneschepke.wireguardautotunnel.data
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
 import kotlinx.coroutines.flow.Flow
 

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.data
+package com.zaneschepke.wireguardautotunnel.data.datastore
 
 import android.content.Context
 import androidx.datastore.preferences.core.Preferences
@@ -6,11 +6,10 @@ 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 com.zaneschepke.wireguardautotunnel.module.IoDispatcher
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
@@ -30,8 +29,6 @@ class DataStoreManager(
 		val isLocalLogsEnabled = booleanPreferencesKey("LOCAL_LOGS_ENABLED")
 		val locale = stringPreferencesKey("LOCALE")
 		val theme = stringPreferencesKey("THEME")
-		val isRemoteControlEnabled = booleanPreferencesKey("IS_REMOTE_CONTROL_ENABLED")
-		val remoteKey = stringPreferencesKey("REMOTE_KEY")
 	}
 
 	// preferences
@@ -46,7 +43,7 @@ class DataStoreManager(
 			try {
 				context.dataStore.data.first()
 			} catch (e: IOException) {
-				Timber.Forest.e(e)
+				Timber.e(e)
 			}
 		}
 	}
@@ -56,9 +53,9 @@ class DataStoreManager(
 			try {
 				context.dataStore.edit { it[key] = value }
 			} catch (e: IOException) {
-				Timber.Forest.e(e)
+				Timber.e(e)
 			} catch (e: Exception) {
-				Timber.Forest.e(e)
+				Timber.e(e)
 			}
 		}
 	}
@@ -68,9 +65,9 @@ class DataStoreManager(
 			try {
 				context.dataStore.edit { it.remove(key) }
 			} catch (e: IOException) {
-				Timber.Forest.e(e)
+				Timber.e(e)
 			} catch (e: Exception) {
-				Timber.Forest.e(e)
+				Timber.e(e)
 			}
 		}
 	}
@@ -82,7 +79,7 @@ class DataStoreManager(
 			try {
 				context.dataStore.data.map { it[key] }.first()
 			} catch (e: IOException) {
-				Timber.Forest.e(e)
+				Timber.e(e)
 				null
 			}
 		}
@@ -92,5 +89,5 @@ class DataStoreManager(
 		context.dataStore.data.map { it[key] }.first()
 	}
 
-	val preferencesFlow: Flow<Preferences?> = context.dataStore.data.flowOn(ioDispatcher)
+	val preferencesFlow: Flow<Preferences?> = context.dataStore.data
 }

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

@@ -0,0 +1,21 @@
+package com.zaneschepke.wireguardautotunnel.data.domain
+
+import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
+
+data class GeneralState(
+	val isLocationDisclosureShown: Boolean = LOCATION_DISCLOSURE_SHOWN_DEFAULT,
+	val isBatteryOptimizationDisableShown: Boolean = BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
+	val isPinLockEnabled: Boolean = PIN_LOCK_ENABLED_DEFAULT,
+	val isTunnelStatsExpanded: Boolean = IS_TUNNEL_STATS_EXPANDED,
+	val isLocalLogsEnabled: Boolean = IS_LOGS_ENABLED_DEFAULT,
+	val locale: String? = null,
+	val theme: Theme = Theme.AUTOMATIC,
+) {
+	companion object {
+		const val LOCATION_DISCLOSURE_SHOWN_DEFAULT = false
+		const val BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT = false
+		const val PIN_LOCK_ENABLED_DEFAULT = false
+		const val IS_TUNNEL_STATS_EXPANDED = false
+		const val IS_LOGS_ENABLED_DEFAULT = false
+	}
+}

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

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

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

@@ -0,0 +1,105 @@
+package com.zaneschepke.wireguardautotunnel.data.domain
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.Index
+import androidx.room.PrimaryKey
+import com.wireguard.config.Config
+import com.zaneschepke.wireguardautotunnel.util.extensions.toWgQuickString
+import java.io.InputStream
+
+@Entity(indices = [Index(value = ["name"], unique = true)])
+data class TunnelConfig(
+	@PrimaryKey(autoGenerate = true) val id: Int = 0,
+	@ColumnInfo(name = "name") val name: String,
+	@ColumnInfo(name = "wg_quick") val wgQuick: String,
+	@ColumnInfo(
+		name = "tunnel_networks",
+		defaultValue = "",
+	)
+	val tunnelNetworks: MutableList<String> = mutableListOf(),
+	@ColumnInfo(
+		name = "is_mobile_data_tunnel",
+		defaultValue = "false",
+	)
+	val isMobileDataTunnel: Boolean = false,
+	@ColumnInfo(
+		name = "is_primary_tunnel",
+		defaultValue = "false",
+	)
+	val isPrimaryTunnel: Boolean = false,
+	@ColumnInfo(
+		name = "am_quick",
+		defaultValue = "",
+	)
+	val amQuick: String = AM_QUICK_DEFAULT,
+	@ColumnInfo(
+		name = "is_Active",
+		defaultValue = "false",
+	)
+	val isActive: Boolean = false,
+	@ColumnInfo(
+		name = "is_ping_enabled",
+		defaultValue = "false",
+	)
+	val isPingEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "ping_interval",
+		defaultValue = "null",
+	)
+	val pingInterval: Long? = null,
+	@ColumnInfo(
+		name = "ping_cooldown",
+		defaultValue = "null",
+	)
+	val pingCooldown: Long? = null,
+	@ColumnInfo(
+		name = "ping_ip",
+		defaultValue = "null",
+	)
+	var pingIp: String? = null,
+	@ColumnInfo(
+		name = "is_ethernet_tunnel",
+		defaultValue = "false",
+	)
+	var isEthernetTunnel: Boolean = false,
+) {
+
+	fun toAmConfig(): org.amnezia.awg.config.Config {
+		return configFromAmQuick(if (amQuick != "") amQuick else wgQuick)
+	}
+
+	companion object {
+
+		fun configFromWgQuick(wgQuick: String): Config {
+			val inputStream: InputStream = wgQuick.byteInputStream()
+			return inputStream.bufferedReader(Charsets.UTF_8).use {
+				Config.parse(it)
+			}
+		}
+
+		fun configFromAmQuick(amQuick: String): org.amnezia.awg.config.Config {
+			val inputStream: InputStream = amQuick.byteInputStream()
+			return inputStream.bufferedReader(Charsets.UTF_8).use {
+				org.amnezia.awg.config.Config.parse(it)
+			}
+		}
+
+		fun tunnelConfigFromAmConfig(config: org.amnezia.awg.config.Config, name: String): TunnelConfig {
+			val amQuick = config.toAwgQuickString(true)
+			val wgQuick = config.toWgQuickString()
+			return TunnelConfig(name = name, wgQuick = wgQuick, amQuick = amQuick)
+		}
+
+		const val AM_QUICK_DEFAULT = ""
+
+		val IPV4_PUBLIC_NETWORKS = setOf(
+			"0.0.0.0/5", "8.0.0.0/7", "11.0.0.0/8", "12.0.0.0/6", "16.0.0.0/4", "32.0.0.0/3",
+			"64.0.0.0/2", "128.0.0.0/3", "160.0.0.0/5", "168.0.0.0/6", "172.0.0.0/12",
+			"172.32.0.0/11", "172.64.0.0/10", "172.128.0.0/9", "173.0.0.0/8", "174.0.0.0/7",
+			"176.0.0.0/4", "192.0.0.0/9", "192.128.0.0/11", "192.160.0.0/13", "192.169.0.0/16",
+			"192.170.0.0/15", "192.172.0.0/14", "192.176.0.0/12", "192.192.0.0/10",
+			"193.0.0.0/8", "194.0.0.0/7", "196.0.0.0/6", "200.0.0.0/5", "208.0.0.0/4",
+		)
+	}
+}

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

@@ -1,53 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.model
-
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppState
-import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
-
-data class GeneralState(
-	val isLocationDisclosureShown: Boolean = LOCATION_DISCLOSURE_SHOWN_DEFAULT,
-	val isBatteryOptimizationDisableShown: Boolean = BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT,
-	val isPinLockEnabled: Boolean = PIN_LOCK_ENABLED_DEFAULT,
-	val isTunnelStatsExpanded: Boolean = IS_TUNNEL_STATS_EXPANDED,
-	val isLocalLogsEnabled: Boolean = IS_LOGS_ENABLED_DEFAULT,
-	val isRemoteControlEnabled: Boolean = IS_REMOTE_CONTROL_ENABLED,
-	val remoteKey: String? = null,
-	val locale: String? = null,
-	val theme: Theme = Theme.AUTOMATIC,
-) {
-
-	fun toAppState(): AppState = AppState(
-		isLocationDisclosureShown,
-		isBatteryOptimizationDisableShown,
-		isPinLockEnabled,
-		isTunnelStatsExpanded,
-		isLocationDisclosureShown,
-		isRemoteControlEnabled,
-		remoteKey,
-		locale,
-		theme,
-	)
-
-	companion object {
-		fun from(appState: AppState): GeneralState {
-			return with(appState) {
-				GeneralState(
-					isLocationDisclosureShown,
-					isBatteryOptimizationDisableShown,
-					isPinLockEnabled,
-					isTunnelStatsExpanded,
-					isLocalLogsEnabled,
-					isRemoteControlEnabled,
-					remoteKey,
-					locale,
-					theme,
-				)
-			}
-		}
-		const val LOCATION_DISCLOSURE_SHOWN_DEFAULT = false
-		const val BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT = false
-		const val PIN_LOCK_ENABLED_DEFAULT = false
-		const val IS_TUNNEL_STATS_EXPANDED = false
-		const val IS_LOGS_ENABLED_DEFAULT = false
-		const val IS_REMOTE_CONTROL_ENABLED = false
-	}
-}

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

@@ -1,93 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.model
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.Index
-import androidx.room.PrimaryKey
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-
-@Entity(indices = [Index(value = ["name"], unique = true)])
-data class TunnelConfig(
-	@PrimaryKey(autoGenerate = true) val id: Int = 0,
-	@ColumnInfo(name = "name") val name: String,
-	@ColumnInfo(name = "wg_quick") val wgQuick: String,
-	@ColumnInfo(
-		name = "tunnel_networks",
-		defaultValue = "",
-	)
-	val tunnelNetworks: MutableList<String> = mutableListOf(),
-	@ColumnInfo(
-		name = "is_mobile_data_tunnel",
-		defaultValue = "false",
-	)
-	val isMobileDataTunnel: Boolean = false,
-	@ColumnInfo(
-		name = "is_primary_tunnel",
-		defaultValue = "false",
-	)
-	val isPrimaryTunnel: Boolean = false,
-	@ColumnInfo(
-		name = "am_quick",
-		defaultValue = "",
-	)
-	val amQuick: String = AM_QUICK_DEFAULT,
-	@ColumnInfo(
-		name = "is_Active",
-		defaultValue = "false",
-	)
-	val isActive: Boolean = false,
-	@ColumnInfo(
-		name = "is_ping_enabled",
-		defaultValue = "false",
-	)
-	val isPingEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "ping_interval",
-		defaultValue = "null",
-	)
-	val pingInterval: Long? = null,
-	@ColumnInfo(
-		name = "ping_cooldown",
-		defaultValue = "null",
-	)
-	val pingCooldown: Long? = null,
-	@ColumnInfo(
-		name = "ping_ip",
-		defaultValue = "null",
-	)
-	var pingIp: String? = null,
-	@ColumnInfo(
-		name = "is_ethernet_tunnel",
-		defaultValue = "false",
-	)
-	var isEthernetTunnel: Boolean = false,
-	@ColumnInfo(
-		name = "is_ipv4_preferred",
-		defaultValue = "true",
-	)
-	var isIpv4Preferred: Boolean = true,
-) {
-
-	fun toTunnel(): TunnelConf {
-		return TunnelConf(
-			id, name, wgQuick, tunnelNetworks, isMobileDataTunnel,
-			isPrimaryTunnel, amQuick, isActive, isPingEnabled, pingInterval,
-			pingCooldown, pingIp, isEthernetTunnel, isIpv4Preferred,
-		)
-	}
-
-	companion object {
-
-		const val AM_QUICK_DEFAULT = ""
-
-		fun from(tunnelConf: TunnelConf): TunnelConfig {
-			return with(tunnelConf) {
-				return TunnelConfig(
-					id, tunName, wgQuick, tunnelNetworks.toMutableList(), isMobileDataTunnel,
-					isPrimaryTunnel, amQuick, isActive, isPingEnabled, pingInterval,
-					pingCooldown, pingIp, isEthernetTunnel, isIpv4Preferred,
-				)
-			}
-		}
-	}
-}

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

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

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

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

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

@@ -1,6 +1,6 @@
-package com.zaneschepke.wireguardautotunnel.domain.repository
+package com.zaneschepke.wireguardautotunnel.data.repository
 
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppState
+import com.zaneschepke.wireguardautotunnel.data.domain.GeneralState
 import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 import kotlinx.coroutines.flow.Flow
 
@@ -33,13 +33,5 @@ interface AppStateRepository {
 
 	suspend fun getLocale(): String?
 
-	suspend fun setIsRemoteControlEnabled(enabled: Boolean)
+	val generalStateFlow: Flow<GeneralState>
-
-	suspend fun isRemoteControlEnabled(): Boolean
-
-	suspend fun setRemoteKey(key: String)
-
-	suspend fun getRemoteKey(): String?
-
-	val flow: Flow<AppState>
 }

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

@@ -1,9 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
-import com.zaneschepke.wireguardautotunnel.data.DataStoreManager
+import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
-import com.zaneschepke.wireguardautotunnel.data.model.GeneralState
+import com.zaneschepke.wireguardautotunnel.data.domain.GeneralState
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppState
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -79,23 +77,7 @@ class DataStoreAppStateRepository(
 		return dataStoreManager.getFromStore(DataStoreManager.locale)
 	}
 
-	override suspend fun setIsRemoteControlEnabled(enabled: Boolean) {
+	override val generalStateFlow: Flow<GeneralState> =
-		dataStoreManager.saveToDataStore(DataStoreManager.isRemoteControlEnabled, enabled)
-	}
-
-	override suspend fun isRemoteControlEnabled(): Boolean {
-		return dataStoreManager.getFromStore(DataStoreManager.isRemoteControlEnabled) ?: GeneralState.IS_REMOTE_CONTROL_ENABLED
-	}
-
-	override suspend fun setRemoteKey(key: String) {
-		dataStoreManager.saveToDataStore(DataStoreManager.remoteKey, key)
-	}
-
-	override suspend fun getRemoteKey(): String? {
-		return dataStoreManager.getFromStore(DataStoreManager.remoteKey)
-	}
-
-	override val flow: Flow<AppState> =
 		dataStoreManager.preferencesFlow.map { prefs ->
 			prefs?.let { pref ->
 				try {
@@ -111,8 +93,6 @@ class DataStoreAppStateRepository(
 							?: GeneralState.PIN_LOCK_ENABLED_DEFAULT,
 						isTunnelStatsExpanded = pref[DataStoreManager.tunnelStatsExpanded] ?: GeneralState.IS_TUNNEL_STATS_EXPANDED,
 						isLocalLogsEnabled = pref[DataStoreManager.isLocalLogsEnabled] ?: GeneralState.IS_LOGS_ENABLED_DEFAULT,
-						isRemoteControlEnabled = pref[DataStoreManager.isRemoteControlEnabled] ?: GeneralState.IS_REMOTE_CONTROL_ENABLED,
-						remoteKey = pref[DataStoreManager.remoteKey],
 						locale = pref[DataStoreManager.locale],
 						theme = getTheme(),
 					)
@@ -121,5 +101,5 @@ class DataStoreAppStateRepository(
 					GeneralState()
 				}
 			} ?: GeneralState()
-		}.map { it.toAppState() }
+		}
 }

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

@@ -1,31 +1,30 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
-import com.zaneschepke.wireguardautotunnel.data.dao.SettingsDao
+import com.zaneschepke.wireguardautotunnel.data.SettingsDao
-import com.zaneschepke.wireguardautotunnel.data.model.Settings
+import com.zaneschepke.wireguardautotunnel.data.domain.Settings
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
 
-class RoomSettingsRepository(
+class RoomSettingsRepository(private val settingsDoa: SettingsDao, @IoDispatcher private val ioDispatcher: CoroutineDispatcher) : SettingsRepository {
-	private val settingsDoa: SettingsDao,
+	override suspend fun save(settings: Settings) {
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-) : AppSettingRepository {
-
-	override suspend fun save(appSettings: AppSettings) {
 		withContext(ioDispatcher) {
-			settingsDoa.save(Settings.from(appSettings))
+			settingsDoa.save(settings)
 		}
 	}
 
-	override val flow = settingsDoa.getSettingsFlow().flowOn(ioDispatcher).map { it.toAppSettings() }
+	override fun getSettingsFlow(): Flow<Settings> {
+		return settingsDoa.getSettingsFlow()
+	}
 
-	override suspend fun get(): AppSettings {
+	override suspend fun getSettings(): Settings {
 		return withContext(ioDispatcher) {
-			(settingsDoa.getAll().firstOrNull() ?: Settings()).toAppSettings()
+			settingsDoa.getAll().firstOrNull() ?: Settings()
 		}
 	}
+
+	override suspend fun getAll(): List<Settings> {
+		return withContext(ioDispatcher) { settingsDoa.getAll() }
+	}
 }

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

@@ -0,0 +1,104 @@
+package com.zaneschepke.wireguardautotunnel.data.repository
+
+import com.zaneschepke.wireguardautotunnel.data.TunnelConfigDao
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.withContext
+
+class RoomTunnelConfigRepository(
+	private val tunnelConfigDao: TunnelConfigDao,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) :
+	TunnelConfigRepository {
+	override fun getTunnelConfigsFlow(): Flow<TunnelConfigs> {
+		return tunnelConfigDao.getAllFlow()
+	}
+
+	override suspend fun getAll(): TunnelConfigs {
+		return withContext(ioDispatcher) { tunnelConfigDao.getAll() }
+	}
+
+	override suspend fun save(tunnelConfig: TunnelConfig) {
+		withContext(ioDispatcher) {
+			tunnelConfigDao.save(tunnelConfig)
+		}
+	}
+
+	override suspend fun updatePrimaryTunnel(tunnelConfig: TunnelConfig?) {
+		withContext(ioDispatcher) {
+			tunnelConfigDao.resetPrimaryTunnel()
+			tunnelConfig?.let {
+				save(
+					it.copy(
+						isPrimaryTunnel = true,
+					),
+				)
+			}
+		}
+	}
+
+	override suspend fun updateMobileDataTunnel(tunnelConfig: TunnelConfig?) {
+		withContext(ioDispatcher) {
+			tunnelConfigDao.resetMobileDataTunnel()
+			tunnelConfig?.let {
+				save(
+					it.copy(
+						isMobileDataTunnel = true,
+					),
+				)
+			}
+		}
+	}
+
+	override suspend fun updateEthernetTunnel(tunnelConfig: TunnelConfig?) {
+		withContext(ioDispatcher) {
+			tunnelConfigDao.resetEthernetTunnel()
+			tunnelConfig?.let {
+				save(
+					it.copy(
+						isEthernetTunnel = true,
+					),
+				)
+			}
+		}
+	}
+
+	override suspend fun delete(tunnelConfig: TunnelConfig) {
+		withContext(ioDispatcher) {
+			tunnelConfigDao.delete(tunnelConfig)
+		}
+	}
+
+	override suspend fun getById(id: Int): TunnelConfig? {
+		return withContext(ioDispatcher) { tunnelConfigDao.getById(id.toLong()) }
+	}
+
+	override suspend fun getActive(): TunnelConfigs {
+		return withContext(ioDispatcher) {
+			tunnelConfigDao.getActive()
+		}
+	}
+
+	override suspend fun count(): Int {
+		return withContext(ioDispatcher) { tunnelConfigDao.count().toInt() }
+	}
+
+	override suspend fun findByTunnelName(name: String): TunnelConfig? {
+		return withContext(ioDispatcher) { tunnelConfigDao.getByName(name) }
+	}
+
+	override suspend fun findByTunnelNetworksName(name: String): TunnelConfigs {
+		return withContext(ioDispatcher) { tunnelConfigDao.findByTunnelNetworkName(name) }
+	}
+
+	override suspend fun findByMobileDataTunnel(): TunnelConfigs {
+		return withContext(ioDispatcher) { tunnelConfigDao.findByMobileDataTunnel() }
+	}
+
+	override suspend fun findPrimary(): TunnelConfigs {
+		return withContext(ioDispatcher) { tunnelConfigDao.findByPrimary() }
+	}
+}

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

@@ -1,113 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.repository
-
-import com.zaneschepke.wireguardautotunnel.data.dao.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import com.zaneschepke.wireguardautotunnel.util.extensions.Tunnels
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.withContext
-
-class RoomTunnelRepository(
-	private val tunnelConfigDao: TunnelConfigDao,
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-) : TunnelRepository {
-
-	override val flow = tunnelConfigDao.getAllFlow().flowOn(ioDispatcher).map { it.map { it.toTunnel() } }
-
-	override suspend fun getAll(): Tunnels {
-		return withContext(ioDispatcher) {
-			tunnelConfigDao.getAll().map { it.toTunnel() }
-		}
-	}
-
-	override suspend fun save(tunnelConf: TunnelConf) {
-		withContext(ioDispatcher) {
-			tunnelConfigDao.save(TunnelConfig.from(tunnelConf))
-		}
-	}
-
-	override suspend fun saveAll(tunnelConfList: List<TunnelConf>) {
-		withContext(ioDispatcher) {
-			tunnelConfigDao.saveAll(tunnelConfList.map(TunnelConfig::from))
-		}
-	}
-
-	override suspend fun updatePrimaryTunnel(tunnelConf: TunnelConf?) {
-		withContext(ioDispatcher) {
-			tunnelConfigDao.resetPrimaryTunnel()
-			tunnelConf?.let {
-				save(
-					it.copy(
-						isPrimaryTunnel = true,
-					),
-				)
-			}
-		}
-	}
-
-	override suspend fun updateMobileDataTunnel(tunnelConf: TunnelConf?) {
-		withContext(ioDispatcher) {
-			tunnelConfigDao.resetMobileDataTunnel()
-			tunnelConf?.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 delete(tunnelConf: TunnelConf) {
-		withContext(ioDispatcher) {
-			tunnelConfigDao.delete(TunnelConfig.from(tunnelConf))
-		}
-	}
-
-	override suspend fun getById(id: Int): TunnelConf? {
-		return withContext(ioDispatcher) { tunnelConfigDao.getById(id.toLong())?.toTunnel() }
-	}
-
-	override suspend fun getActive(): Tunnels {
-		return withContext(ioDispatcher) {
-			tunnelConfigDao.getActive().map { it.toTunnel() }
-		}
-	}
-
-	override suspend fun count(): Int {
-		return withContext(ioDispatcher) { tunnelConfigDao.count().toInt() }
-	}
-
-	override suspend fun findByTunnelName(name: String): TunnelConf? {
-		return withContext(ioDispatcher) { tunnelConfigDao.getByName(name)?.toTunnel() }
-	}
-
-	override suspend fun findByTunnelNetworksName(name: String): Tunnels {
-		return withContext(ioDispatcher) { tunnelConfigDao.findByTunnelNetworkName(name).map { it.toTunnel() } }
-	}
-
-	override suspend fun findByMobileDataTunnel(): Tunnels {
-		return withContext(ioDispatcher) { tunnelConfigDao.findByMobileDataTunnel().map { it.toTunnel() } }
-	}
-
-	override suspend fun findPrimary(): Tunnels {
-		return withContext(ioDispatcher) { tunnelConfigDao.findByPrimary().map { it.toTunnel() } }
-	}
-}

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

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

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

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

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

@@ -1,114 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.di
-
-import android.content.Context
-import com.wireguard.android.backend.WgQuickBackend
-import com.wireguard.android.util.RootShell
-import com.wireguard.android.util.ToolsInstaller
-import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
-import com.zaneschepke.networkmonitor.NetworkMonitor
-import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.core.tunnel.KernelTunnel
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider
-import com.zaneschepke.wireguardautotunnel.core.tunnel.UserspaceTunnel
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.components.SingletonComponent
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.runBlocking
-import org.amnezia.awg.backend.Backend
-import org.amnezia.awg.backend.GoBackend
-import org.amnezia.awg.backend.RootTunnelActionHandler
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-class TunnelModule {
-
-	@Provides
-	@Singleton
-	@TunnelShell
-	fun provideTunnelRootShell(@ApplicationContext context: Context): RootShell {
-		return RootShell(context)
-	}
-
-	@Provides
-	@Singleton
-	@AppShell
-	fun provideAppRootShell(@ApplicationContext context: Context): RootShell {
-		return RootShell(context)
-	}
-
-	@Provides
-	@Singleton
-	fun provideAmneziaBackend(@ApplicationContext context: Context): Backend {
-		return GoBackend(context, RootTunnelActionHandler(org.amnezia.awg.util.RootShell(context)))
-	}
-
-	@Provides
-	@Singleton
-	fun provideKernelBackend(@ApplicationContext context: Context, @TunnelShell shell: RootShell): com.wireguard.android.backend.Backend {
-		return WgQuickBackend(context, shell, ToolsInstaller(context, shell), com.wireguard.android.backend.RootTunnelActionHandler(shell)).also {
-			it.setMultipleTunnels(true)
-		}
-	}
-
-	@Provides
-	@Singleton
-	@Kernel
-	fun provideKernelProvider(
-		@ApplicationScope applicationScope: CoroutineScope,
-		serviceManager: ServiceManager,
-		appDataRepository: AppDataRepository,
-		backend: com.wireguard.android.backend.Backend,
-	): TunnelProvider {
-		return KernelTunnel(applicationScope, serviceManager, appDataRepository, backend)
-	}
-
-	@Provides
-	@Singleton
-	@Userspace
-	fun provideUserspaceProvider(
-		@ApplicationScope applicationScope: CoroutineScope,
-		serviceManager: ServiceManager,
-		appDataRepository: AppDataRepository,
-		backend: Backend,
-	): TunnelProvider {
-		return UserspaceTunnel(applicationScope, serviceManager, appDataRepository, backend)
-	}
-
-	@Provides
-	@Singleton
-	fun provideTunnelManager(
-		@Kernel kernelTunnel: TunnelProvider,
-		@Userspace userspaceTunnel: TunnelProvider,
-		appDataRepository: AppDataRepository,
-		@IoDispatcher ioDispatcher: CoroutineDispatcher,
-		@ApplicationScope applicationScope: CoroutineScope,
-	): TunnelManager {
-		return TunnelManager(kernelTunnel, userspaceTunnel, appDataRepository, applicationScope, ioDispatcher)
-	}
-
-	@Provides
-	@Singleton
-	fun provideNetworkMonitor(@ApplicationContext context: Context, settingsRepository: AppSettingRepository): NetworkMonitor {
-		return AndroidNetworkMonitor(context) { runBlocking { settingsRepository.get().isWifiNameByShellEnabled } }
-	}
-
-	@Singleton
-	@Provides
-	fun provideServiceManager(
-		@ApplicationContext context: Context,
-		@IoDispatcher ioDispatcher: CoroutineDispatcher,
-		@MainDispatcher mainCoroutineDispatcher: CoroutineDispatcher,
-		@ApplicationScope applicationScope: CoroutineScope,
-		appDataRepository: AppDataRepository,
-	): ServiceManager {
-		return ServiceManager(context, ioDispatcher, applicationScope, mainCoroutineDispatcher, appDataRepository)
-	}
-}

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

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

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

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

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

@@ -1,184 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.entity
-
-import com.wireguard.android.backend.Tunnel
-import com.wireguard.config.Config
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.defaultName
-import com.zaneschepke.wireguardautotunnel.util.extensions.extractNameAndNumber
-import com.zaneschepke.wireguardautotunnel.util.extensions.hasNumberInParentheses
-import com.zaneschepke.wireguardautotunnel.util.extensions.isReachable
-import com.zaneschepke.wireguardautotunnel.util.extensions.toWgQuickString
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-import java.io.InputStream
-import java.net.InetAddress
-import java.nio.charset.StandardCharsets
-import kotlin.coroutines.CoroutineContext
-
-data class TunnelConf(
-	val id: Int = 0,
-	val tunName: String,
-	val wgQuick: String,
-	val tunnelNetworks: List<String> = emptyList(),
-	val isMobileDataTunnel: Boolean = false,
-	val isPrimaryTunnel: Boolean = false,
-	val amQuick: String,
-	val isActive: Boolean = false,
-	val isPingEnabled: Boolean = false,
-	val pingInterval: Long? = null,
-	val pingCooldown: Long? = null,
-	val pingIp: String? = null,
-	val isEthernetTunnel: Boolean = false,
-	val isIpv4Preferred: Boolean = true,
-	@Transient
-	private var stateChangeCallback: ((Any) -> Unit)? = null,
-) : Tunnel, org.amnezia.awg.backend.Tunnel {
-
-	fun setStateChangeCallback(callback: (Any) -> Unit) {
-		stateChangeCallback = callback
-	}
-
-	override fun equals(other: Any?): Boolean {
-		if (this === other) return true
-		if (other !is TunnelConf) return false
-		return id == other.id && tunName == other.tunName && wgQuick == other.wgQuick && amQuick == other.amQuick &&
-			isPrimaryTunnel == other.isPrimaryTunnel && isMobileDataTunnel == other.isMobileDataTunnel &&
-			isEthernetTunnel == other.isEthernetTunnel && isPingEnabled == other.isPingEnabled && pingIp == other.pingIp &&
-			pingCooldown == other.pingCooldown && pingInterval == other.pingInterval && tunnelNetworks == other.tunnelNetworks &&
-			isIpv4Preferred == other.isIpv4Preferred
-	}
-
-	override fun hashCode(): Int {
-		var result = id
-		result = 31 * result + tunName.hashCode()
-		result = 31 * result + wgQuick.hashCode()
-		result = 31 * result + amQuick.hashCode()
-		return result
-	}
-
-	fun copyWithCallback(
-		id: Int = this.id,
-		tunName: String = this.tunName,
-		wgQuick: String = this.wgQuick,
-		tunnelNetworks: List<String> = this.tunnelNetworks,
-		isMobileDataTunnel: Boolean = this.isMobileDataTunnel,
-		isPrimaryTunnel: Boolean = this.isPrimaryTunnel,
-		amQuick: String = this.amQuick,
-		isActive: Boolean = this.isActive,
-		isPingEnabled: Boolean = this.isPingEnabled,
-		pingInterval: Long? = this.pingInterval,
-		pingCooldown: Long? = this.pingCooldown,
-		pingIp: String? = this.pingIp,
-		isEthernetTunnel: Boolean = this.isEthernetTunnel,
-		isIpv4Preferred: Boolean = this.isIpv4Preferred,
-	): TunnelConf {
-		return TunnelConf(
-			id, tunName, wgQuick, tunnelNetworks, isMobileDataTunnel, isPrimaryTunnel,
-			amQuick, isActive, isPingEnabled, pingInterval, pingCooldown, pingIp,
-			isEthernetTunnel, isIpv4Preferred,
-		).apply {
-			stateChangeCallback = this@TunnelConf.stateChangeCallback
-// 			tunnelStatsCallback = this@TunnelConf.tunnelStatsCallback
-// 			bounceTunnelCallback = this@TunnelConf.bounceTunnelCallback
-		}
-	}
-
-// 	fun onUpdateStatistics() {
-// 		tunnelStatsCallback?.invoke()
-// 	}
-//
-// 	fun bounceTunnel(tunnelConf: TunnelConf, reason: TunnelStatus.StopReason) {
-// 		bounceTunnelCallback?.invoke(tunnelConf, reason)
-// 	}
-
-	fun toAmConfig(): org.amnezia.awg.config.Config {
-		return configFromAmQuick(amQuick.ifBlank { wgQuick })
-	}
-
-	fun toWgConfig(): Config {
-		return configFromWgQuick(wgQuick)
-	}
-
-	override fun getName(): String = tunName
-
-	override fun isIpv4ResolutionPreferred(): Boolean = isIpv4Preferred
-
-	override fun onStateChange(newState: org.amnezia.awg.backend.Tunnel.State) {
-		stateChangeCallback?.invoke(newState)
-	}
-
-	override fun onStateChange(newState: Tunnel.State) {
-		stateChangeCallback?.invoke(newState)
-	}
-
-	fun isTunnelConfigChanged(updatedConf: TunnelConf): Boolean {
-		return updatedConf.wgQuick != wgQuick || updatedConf.amQuick != amQuick || updatedConf.name != name
-	}
-
-	fun generateUniqueName(tunnelNames: List<String>): String {
-		var tunnelName = this.tunName
-		var num = 1
-		while (tunnelNames.any { it == tunnelName }) {
-			tunnelName = if (!tunnelName.hasNumberInParentheses()) {
-				"$name($num)"
-			} else {
-				val pair = tunnelName.extractNameAndNumber()
-				"${pair?.first}($num)"
-			}
-			num++
-		}
-		return tunnelName
-	}
-
-	suspend fun isTunnelPingable(context: CoroutineContext): Boolean {
-		return withContext(context) {
-			val config = toWgConfig()
-			if (pingIp != null) {
-				return@withContext InetAddress.getByName(pingIp)
-					.isReachable(Constants.PING_TIMEOUT.toInt()).also {
-						Timber.i("Ping reachable $pingIp: $it")
-					}
-			}
-			config.peers.map { peer ->
-				peer.isReachable()
-			}.all { true }.also {
-				Timber.i("Ping of all peers reachable: $it")
-			}
-		}
-	}
-
-	companion object {
-		fun configFromWgQuick(wgQuick: String): Config {
-			val inputStream: InputStream = wgQuick.byteInputStream()
-			return inputStream.bufferedReader(StandardCharsets.UTF_8).use {
-				Config.parse(it)
-			}
-		}
-
-		fun configFromAmQuick(amQuick: String): org.amnezia.awg.config.Config {
-			val inputStream: InputStream = amQuick.byteInputStream()
-			return inputStream.bufferedReader(StandardCharsets.UTF_8).use {
-				org.amnezia.awg.config.Config.parse(it)
-			}
-		}
-
-		fun tunnelConfigFromAmConfig(config: org.amnezia.awg.config.Config, name: String? = null): TunnelConf {
-			val amQuick = config.toAwgQuickString(true)
-			val wgQuick = config.toWgQuickString()
-			return TunnelConf(tunName = name ?: config.defaultName(), wgQuick = wgQuick, amQuick = amQuick)
-		}
-
-		private const val IPV6_ALL_NETWORKS = "::/0"
-		private const val IPV4_ALL_NETWORKS = "0.0.0.0/0"
-		val ALL_IPS = listOf(IPV4_ALL_NETWORKS, IPV6_ALL_NETWORKS)
-		private val IPV4_PUBLIC_NETWORKS = listOf(
-			"0.0.0.0/5", "8.0.0.0/7", "11.0.0.0/8", "12.0.0.0/6", "16.0.0.0/4", "32.0.0.0/3",
-			"64.0.0.0/2", "128.0.0.0/3", "160.0.0.0/5", "168.0.0.0/6", "172.0.0.0/12",
-			"172.32.0.0/11", "172.64.0.0/10", "172.128.0.0/9", "173.0.0.0/8", "174.0.0.0/7",
-			"176.0.0.0/4", "192.0.0.0/9", "192.128.0.0/11", "192.160.0.0/13", "192.169.0.0/16",
-			"192.170.0.0/15", "192.172.0.0/14", "192.176.0.0/12", "192.192.0.0/10",
-			"193.0.0.0/8", "194.0.0.0/7", "196.0.0.0/6", "200.0.0.0/5", "208.0.0.0/4",
-		)
-		val LAN_BYPASS_ALLOWED_IPS = listOf(IPV6_ALL_NETWORKS) + IPV4_PUBLIC_NETWORKS
-	}
-}

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

@@ -1,24 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.enums
-
-import com.zaneschepke.wireguardautotunnel.R
-
-sealed class BackendError : Exception() {
-	data object DNS : BackendError()
-	data object Unauthorized : BackendError()
-	data object Config : BackendError()
-	data object KernelModuleName : BackendError()
-	data object InvalidConfig : BackendError()
-	data object NotAuthorized : BackendError()
-	data object ServiceNotRunning : BackendError()
-	data object Unknown : BackendError()
-
-	fun toStringRes() = when (this) {
-		Config -> R.string.config_error
-		DNS -> R.string.dns_resolve_error
-		InvalidConfig -> R.string.invalid_config_error
-		KernelModuleName -> R.string.kernel_name_error
-		NotAuthorized, Unauthorized -> R.string.auth_error
-		ServiceNotRunning -> R.string.service_running_error
-		Unknown -> R.string.unknown_error
-	}
-}

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

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

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

@@ -1,31 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.enums
-
-sealed class TunnelStatus {
-	data class Error(val error: BackendError) : TunnelStatus()
-	data object Up : TunnelStatus()
-	data object Down : TunnelStatus()
-	data class Stopping(val reason: StopReason) : TunnelStatus()
-	data object Starting : TunnelStatus()
-
-	enum class StopReason {
-		USER,
-		PING,
-		CONFIG_CHANGED,
-	}
-
-	fun isDown(): Boolean {
-		return this == Down
-	}
-
-	fun isUp(): Boolean {
-		return this == Up
-	}
-
-	fun isUpOrStarting(): Boolean {
-		return this == Up || this == Starting
-	}
-
-	fun isDownOrStopping(): Boolean {
-		return this == Down || this is Stopping
-	}
-}

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

@@ -1,9 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.events
-
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-
-sealed class AutoTunnelEvent {
-	data class Start(val tunnelConf: TunnelConf? = null) : AutoTunnelEvent()
-	data object Stop : AutoTunnelEvent()
-	data object DoNothing : AutoTunnelEvent()
-}

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

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

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

@@ -1,13 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.repository
-
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-
-interface AppDataRepository {
-	suspend fun getPrimaryOrFirstTunnel(): TunnelConf?
-
-	suspend fun getStartTunnelConfig(): TunnelConf?
-
-	val settings: AppSettingRepository
-	val tunnels: TunnelRepository
-	val appState: AppStateRepository
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/repository/AppSettingRepository.kt

@@ -1,10 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.repository
-
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
-import kotlinx.coroutines.flow.Flow
-
-interface AppSettingRepository {
-	suspend fun save(appSettings: AppSettings)
-	val flow: Flow<AppSettings>
-	suspend fun get(): AppSettings
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/repository/TunnelRepository.kt

@@ -1,37 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.repository
-
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.util.extensions.Tunnels
-import kotlinx.coroutines.flow.Flow
-
-interface TunnelRepository {
-	val flow: Flow<List<TunnelConf>>
-
-	suspend fun getAll(): Tunnels
-
-	suspend fun save(tunnelConf: TunnelConf)
-
-	suspend fun saveAll(tunnelConfList: List<TunnelConf>)
-
-	suspend fun updatePrimaryTunnel(tunnelConf: TunnelConf?)
-
-	suspend fun updateMobileDataTunnel(tunnelConf: TunnelConf?)
-
-	suspend fun updateEthernetTunnel(tunnelConf: TunnelConf?)
-
-	suspend fun delete(tunnelConf: TunnelConf)
-
-	suspend fun getById(id: Int): TunnelConf?
-
-	suspend fun getActive(): Tunnels
-
-	suspend fun count(): Int
-
-	suspend fun findByTunnelName(name: String): TunnelConf?
-
-	suspend fun findByTunnelNetworksName(name: String): Tunnels
-
-	suspend fun findByMobileDataTunnel(): Tunnels
-
-	suspend fun findPrimary(): Tunnels
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/state/ConnectivityState.kt

@@ -1,9 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.state
-
-data class ConnectivityState(
-	val wifiAvailable: Boolean,
-	val ethernetAvailable: Boolean,
-	val cellularAvailable: Boolean,
-) {
-	val allOffline = !wifiAvailable && !ethernetAvailable && !cellularAvailable
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/state/TunnelState.kt

@@ -1,10 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.state
-
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
-import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
-
-data class TunnelState(
-	val status: TunnelStatus = TunnelStatus.Down,
-	val backendState: BackendState = BackendState.INACTIVE,
-	val statistics: TunnelStatistics? = null,
-)

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

@@ -1,12 +1,10 @@
-package com.zaneschepke.wireguardautotunnel.di
+package com.zaneschepke.wireguardautotunnel.module
 
 import android.content.Context
 import com.zaneschepke.logcatter.LogReader
+import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
+import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
 import com.zaneschepke.logcatter.LogcatReader
-import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
-import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
-import com.zaneschepke.wireguardautotunnel.core.shortcut.DynamicShortcutManager
-import com.zaneschepke.wireguardautotunnel.core.shortcut.ShortcutManager
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -34,13 +32,7 @@ class AppModule {
 
 	@Singleton
 	@Provides
-	fun provideNotificationService(@ApplicationContext context: Context): NotificationManager {
+	fun provideNotificationService(@ApplicationContext context: Context): NotificationService {
 		return WireGuardNotification(context)
 	}
-
-	@Singleton
-	@Provides
-	fun provideShortcutManager(@ApplicationContext context: Context, @IoDispatcher ioDispatcher: CoroutineDispatcher): ShortcutManager {
-		return DynamicShortcutManager(context, ioDispatcher)
-	}
 }

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

@@ -1,15 +1,7 @@
-package com.zaneschepke.wireguardautotunnel.di
+package com.zaneschepke.wireguardautotunnel.module
 
 import javax.inject.Qualifier
 
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class TunnelShell
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class AppShell
-
 @Qualifier
 @Retention(AnnotationRetention.BINARY)
 annotation class Kernel
@@ -17,3 +9,11 @@ annotation class Kernel
 @Qualifier
 @Retention(AnnotationRetention.BINARY)
 annotation class Userspace
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class TunnelShell
+
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class AppShell

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.di
+package com.zaneschepke.wireguardautotunnel.module
 
 import javax.inject.Qualifier
 

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.di
+package com.zaneschepke.wireguardautotunnel.module
 
 import dagger.Module
 import dagger.Provides

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

@@ -1,21 +1,21 @@
-package com.zaneschepke.wireguardautotunnel.di
+package com.zaneschepke.wireguardautotunnel.module
 
 import android.content.Context
 import androidx.room.Room
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
-import com.zaneschepke.wireguardautotunnel.data.DataStoreManager
 import com.zaneschepke.wireguardautotunnel.data.DatabaseCallback
-import com.zaneschepke.wireguardautotunnel.data.dao.SettingsDao
+import com.zaneschepke.wireguardautotunnel.data.SettingsDao
-import com.zaneschepke.wireguardautotunnel.data.dao.TunnelConfigDao
+import com.zaneschepke.wireguardautotunnel.data.TunnelConfigDao
+import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRoomRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.DataStoreAppStateRepository
 import com.zaneschepke.wireguardautotunnel.data.repository.RoomSettingsRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.RoomTunnelRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.RoomTunnelConfigRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -54,13 +54,13 @@ class RepositoryModule {
 
 	@Singleton
 	@Provides
-	fun provideTunnelConfigRepository(tunnelConfigDao: TunnelConfigDao, @IoDispatcher ioDispatcher: CoroutineDispatcher): TunnelRepository {
+	fun provideTunnelConfigRepository(tunnelConfigDao: TunnelConfigDao, @IoDispatcher ioDispatcher: CoroutineDispatcher): TunnelConfigRepository {
-		return RoomTunnelRepository(tunnelConfigDao, ioDispatcher)
+		return RoomTunnelConfigRepository(tunnelConfigDao, ioDispatcher)
 	}
 
 	@Singleton
 	@Provides
-	fun provideSettingsRepository(settingsDao: SettingsDao, @IoDispatcher ioDispatcher: CoroutineDispatcher): AppSettingRepository {
+	fun provideSettingsRepository(settingsDao: SettingsDao, @IoDispatcher ioDispatcher: CoroutineDispatcher): SettingsRepository {
 		return RoomSettingsRepository(settingsDao, ioDispatcher)
 	}
 
@@ -79,10 +79,10 @@ class RepositoryModule {
 	@Provides
 	@Singleton
 	fun provideAppDataRepository(
-		settingsRepository: AppSettingRepository,
+		settingsRepository: SettingsRepository,
-		tunnelRepository: TunnelRepository,
+		tunnelConfigRepository: TunnelConfigRepository,
 		appStateRepository: AppStateRepository,
 	): AppDataRepository {
-		return AppDataRoomRepository(settingsRepository, tunnelRepository, appStateRepository)
+		return AppDataRoomRepository(settingsRepository, tunnelConfigRepository, appStateRepository)
 	}
 }

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

@@ -0,0 +1,27 @@
+package com.zaneschepke.wireguardautotunnel.module
+
+import com.zaneschepke.wireguardautotunnel.service.network.EthernetService
+import com.zaneschepke.wireguardautotunnel.service.network.MobileDataService
+import com.zaneschepke.wireguardautotunnel.service.network.NetworkService
+import com.zaneschepke.wireguardautotunnel.service.network.WifiService
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ServiceComponent
+import dagger.hilt.android.scopes.ServiceScoped
+
+@Module
+@InstallIn(ServiceComponent::class)
+abstract class ServiceModule {
+	@Binds
+	@ServiceScoped
+	abstract fun provideWifiService(wifiService: WifiService): NetworkService<WifiService>
+
+	@Binds
+	@ServiceScoped
+	abstract fun provideMobileDataService(mobileDataService: MobileDataService): NetworkService<MobileDataService>
+
+	@Binds
+	@ServiceScoped
+	abstract fun provideEthernetService(ethernetService: EthernetService): NetworkService<EthernetService>
+}

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

@@ -0,0 +1,103 @@
+package com.zaneschepke.wireguardautotunnel.module
+
+import android.content.Context
+import com.wireguard.android.backend.Backend
+import com.wireguard.android.backend.GoBackend
+import com.wireguard.android.backend.RootTunnelActionHandler
+import com.wireguard.android.backend.WgQuickBackend
+import com.wireguard.android.util.RootShell
+import com.wireguard.android.util.ToolsInstaller
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
+import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
+import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import com.zaneschepke.wireguardautotunnel.service.tunnel.WireGuardTunnel
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import javax.inject.Provider
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+class TunnelModule {
+
+	@Provides
+	@Singleton
+	@TunnelShell
+	fun provideTunnelRootShell(@ApplicationContext context: Context): RootShell {
+		return RootShell(context)
+	}
+
+	@Provides
+	@Singleton
+	@AppShell
+	fun provideAppRootShell(@ApplicationContext context: Context): RootShell {
+		return RootShell(context)
+	}
+
+	@Provides
+	@Singleton
+	fun provideRootShellAm(@ApplicationContext context: Context): org.amnezia.awg.util.RootShell {
+		return org.amnezia.awg.util.RootShell(context)
+	}
+
+	@Provides
+	@Singleton
+	@Userspace
+	fun provideUserspaceBackend(@ApplicationContext context: Context, @TunnelShell rootShell: RootShell): Backend {
+		return GoBackend(context, RootTunnelActionHandler(rootShell))
+	}
+
+	@Provides
+	@Singleton
+	@Kernel
+	fun provideKernelBackend(@ApplicationContext context: Context, @TunnelShell rootShell: RootShell): Backend {
+		return WgQuickBackend(context, rootShell, ToolsInstaller(context, rootShell), RootTunnelActionHandler(rootShell))
+	}
+
+	@Provides
+	@Singleton
+	fun provideAmneziaBackend(@ApplicationContext context: Context, rootShell: org.amnezia.awg.util.RootShell): org.amnezia.awg.backend.Backend {
+		return org.amnezia.awg.backend.GoBackend(context, org.amnezia.awg.backend.RootTunnelActionHandler(rootShell))
+	}
+
+	@Provides
+	@Singleton
+	fun provideVpnService(
+		amneziaBackend: Provider<org.amnezia.awg.backend.Backend>,
+		@Kernel kernelBackend: Provider<Backend>,
+		appDataRepository: AppDataRepository,
+		tunnelConfigRepository: TunnelConfigRepository,
+		@ApplicationScope applicationScope: CoroutineScope,
+		@IoDispatcher ioDispatcher: CoroutineDispatcher,
+		serviceManager: ServiceManager,
+		notificationService: NotificationService,
+	): TunnelService {
+		return WireGuardTunnel(
+			amneziaBackend,
+			tunnelConfigRepository,
+			kernelBackend,
+			appDataRepository,
+			applicationScope,
+			ioDispatcher,
+			serviceManager,
+			notificationService,
+		)
+	}
+
+	@Singleton
+	@Provides
+	fun provideServiceManager(
+		@ApplicationContext context: Context,
+		@IoDispatcher ioDispatcher: CoroutineDispatcher,
+		appDataRepository: AppDataRepository,
+	): ServiceManager {
+		return ServiceManager(context, ioDispatcher, appDataRepository)
+	}
+}

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.di
+package com.zaneschepke.wireguardautotunnel.module
 
 import android.content.Context
 import com.zaneschepke.wireguardautotunnel.util.FileUtils

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

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

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

@@ -0,0 +1,52 @@
+package com.zaneschepke.wireguardautotunnel.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Provider
+
+@AndroidEntryPoint
+class BootReceiver : BroadcastReceiver() {
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
+
+	@Inject
+	lateinit var tunnelService: Provider<TunnelService>
+
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
+
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
+	override fun onReceive(context: Context, intent: Intent) {
+		if (Intent.ACTION_BOOT_COMPLETED != intent.action) return
+		applicationScope.launch {
+			with(appDataRepository.settings.getSettings()) {
+				if (isRestoreOnBootEnabled) {
+					val activeTunnels = appDataRepository.tunnels.getActive()
+					val tunState = tunnelService.get().vpnState.value.status
+					if (activeTunnels.isNotEmpty() && tunState != TunnelState.UP) {
+						Timber.i("Starting previously active tunnel")
+						tunnelService.get().startTunnel(activeTunnels.first(), true)
+					}
+					if (isAutoTunnelEnabled) {
+						Timber.i("Starting watcher service from boot")
+						serviceManager.startAutoTunnel(true)
+					}
+				}
+			}
+		}
+	}
+}

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

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

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

@@ -0,0 +1,36 @@
+package com.zaneschepke.wireguardautotunnel.receiver
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
+import com.zaneschepke.wireguardautotunnel.service.notification.NotificationAction
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class NotificationActionReceiver : BroadcastReceiver() {
+
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
+	@Inject
+	lateinit var tunnelService: TunnelService
+
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
+
+	override fun onReceive(context: Context, intent: Intent) {
+		applicationScope.launch {
+			when (intent.action) {
+				NotificationAction.AUTO_TUNNEL_OFF.name -> serviceManager.stopAutoTunnel()
+				NotificationAction.TUNNEL_OFF.name -> tunnelService.stopTunnel()
+			}
+		}
+	}
+}

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

@@ -0,0 +1,118 @@
+package com.zaneschepke.wireguardautotunnel.service.foreground
+
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.AutoTunnelService
+import com.zaneschepke.wireguardautotunnel.service.tile.AutoTunnelControlTile
+import com.zaneschepke.wireguardautotunnel.service.tile.TunnelControlTile
+import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
+import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
+import jakarta.inject.Inject
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+
+@OptIn(ExperimentalCoroutinesApi::class)
+class ServiceManager
+@Inject constructor(private val context: Context, private val ioDispatcher: CoroutineDispatcher, private val appDataRepository: AppDataRepository) {
+
+	private val _autoTunnelActive = MutableStateFlow(false)
+
+	val autoTunnelActive = _autoTunnelActive.asStateFlow()
+
+	var autoTunnelService = CompletableDeferred<AutoTunnelService>()
+	var backgroundService = CompletableDeferred<TunnelBackgroundService>()
+	var autoTunnelTile = CompletableDeferred<AutoTunnelControlTile>()
+	var tunnelControlTile = CompletableDeferred<TunnelControlTile>()
+
+	private fun <T : Service> startService(cls: Class<T>, background: Boolean) {
+		runCatching {
+			val intent = Intent(context, cls)
+			if (background) {
+				context.startForegroundService(intent)
+			} else {
+				context.startService(intent)
+			}
+		}.onFailure { Timber.e(it) }
+	}
+
+	suspend fun startAutoTunnel(background: Boolean) {
+		val settings = appDataRepository.settings.getSettings()
+		appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = true))
+		if (autoTunnelService.isCompleted) return _autoTunnelActive.update { true }
+		kotlin.runCatching {
+			startService(AutoTunnelService::class.java, background)
+			autoTunnelService.await()
+			autoTunnelService.getCompleted().start()
+			_autoTunnelActive.update { true }
+			updateAutoTunnelTile()
+		}.onFailure {
+			Timber.e(it)
+		}
+	}
+
+	suspend fun startBackgroundService() {
+		if (backgroundService.isCompleted) return
+		kotlin.runCatching {
+			startService(TunnelBackgroundService::class.java, true)
+			backgroundService.await()
+			backgroundService.getCompleted().start()
+		}.onFailure {
+			Timber.e(it)
+		}
+	}
+
+	fun stopBackgroundService() {
+		if (!backgroundService.isCompleted) return
+		runCatching {
+			backgroundService.getCompleted().stop()
+		}.onFailure {
+			Timber.e(it)
+		}
+	}
+
+	suspend fun toggleAutoTunnel(background: Boolean) {
+		withContext(ioDispatcher) {
+			if (_autoTunnelActive.value) return@withContext stopAutoTunnel()
+			startAutoTunnel(background)
+		}
+	}
+
+	fun updateAutoTunnelTile() {
+		if (autoTunnelTile.isCompleted) {
+			autoTunnelTile.getCompleted().updateTileState()
+		} else {
+			context.requestAutoTunnelTileServiceUpdate()
+		}
+	}
+
+	fun updateTunnelTile() {
+		if (tunnelControlTile.isCompleted) {
+			tunnelControlTile.getCompleted().updateTileState()
+		} else {
+			context.requestTunnelTileServiceStateUpdate()
+		}
+	}
+
+	suspend fun stopAutoTunnel() {
+		withContext(ioDispatcher) {
+			val settings = appDataRepository.settings.getSettings()
+			appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = false))
+			if (!autoTunnelService.isCompleted) return@withContext
+			runCatching {
+				autoTunnelService.getCompleted().stop()
+				_autoTunnelActive.update { false }
+				updateAutoTunnelTile()
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
+	}
+}

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

@@ -0,0 +1,67 @@
+package com.zaneschepke.wireguardautotunnel.service.foreground
+
+import android.app.Notification
+import android.content.Intent
+import android.os.IBinder
+import androidx.core.app.ServiceCompat
+import androidx.lifecycle.LifecycleService
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
+import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CompletableDeferred
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class TunnelBackgroundService : LifecycleService() {
+
+	@Inject
+	lateinit var notificationService: NotificationService
+
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
+	override fun onCreate() {
+		super.onCreate()
+		start()
+	}
+
+	override fun onBind(intent: Intent): IBinder? {
+		super.onBind(intent)
+		// We don't provide binding, so return null
+		return null
+	}
+
+	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+		serviceManager.backgroundService.complete(this)
+		return super.onStartCommand(intent, flags, startId)
+	}
+
+	fun start() {
+		ServiceCompat.startForeground(
+			this,
+			NotificationService.KERNEL_SERVICE_NOTIFICATION_ID,
+			createNotification(),
+			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+		)
+	}
+
+	fun stop() {
+		stopForeground(STOP_FOREGROUND_REMOVE)
+		stopSelf()
+	}
+
+	override fun onDestroy() {
+		serviceManager.backgroundService = CompletableDeferred()
+		super.onDestroy()
+	}
+
+	private fun createNotification(): Notification {
+		return notificationService.createNotification(
+			WireGuardNotification.NotificationChannels.VPN,
+			getString(R.string.tunnel_running),
+			description = "",
+		)
+	}
+}

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

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

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

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

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

@@ -1,19 +1,17 @@
-package com.zaneschepke.wireguardautotunnel.domain.state
+package com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model
 
-import com.zaneschepke.wireguardautotunnel.core.tunnel.allDown
+import com.zaneschepke.wireguardautotunnel.data.domain.Settings
-import com.zaneschepke.wireguardautotunnel.core.tunnel.hasActive
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.core.tunnel.isUp
+import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnState
-import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
+import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
-import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
-import com.zaneschepke.wireguardautotunnel.domain.events.KillSwitchEvent
 import com.zaneschepke.wireguardautotunnel.util.extensions.isMatchingToWildcardList
+import timber.log.Timber
 
 data class AutoTunnelState(
-	val activeTunnels: Map<TunnelConf, TunnelState> = emptyMap(),
+	val vpnState: VpnState = VpnState(),
 	val networkState: NetworkState = NetworkState(),
-	val settings: AppSettings = AppSettings(),
+	val settings: Settings = Settings(),
-	val tunnels: List<TunnelConf> = emptyList(),
+	val tunnels: TunnelConfigs = emptyList(),
 ) {
 
 	private fun isMobileDataActive(): Boolean {
@@ -23,23 +21,23 @@ data class AutoTunnelState(
 	private fun isMobileTunnelDataChangeNeeded(): Boolean {
 		val preferredTunnel = preferredMobileDataTunnel()
 		return preferredTunnel != null &&
-			activeTunnels.isNotEmpty() && !activeTunnels.isUp(preferredTunnel)
+			vpnState.status.isUp() && preferredTunnel.id != vpnState.tunnelConfig?.id
 	}
 
 	private fun isEthernetTunnelChangeNeeded(): Boolean {
 		val preferredTunnel = preferredEthernetTunnel()
-		return preferredTunnel != null && activeTunnels.isNotEmpty() && !activeTunnels.isUp(preferredTunnel)
+		return preferredTunnel != null && vpnState.status.isUp() && preferredTunnel.id != vpnState.tunnelConfig?.id
 	}
 
-	private fun preferredMobileDataTunnel(): TunnelConf? {
+	private fun preferredMobileDataTunnel(): TunnelConfig? {
 		return tunnels.firstOrNull { it.isMobileDataTunnel } ?: tunnels.firstOrNull { it.isPrimaryTunnel }
 	}
 
-	private fun preferredEthernetTunnel(): TunnelConf? {
+	private fun preferredEthernetTunnel(): TunnelConfig? {
 		return tunnels.firstOrNull { it.isEthernetTunnel } ?: tunnels.firstOrNull { it.isPrimaryTunnel }
 	}
 
-	private fun preferredWifiTunnel(): TunnelConf? {
+	private fun preferredWifiTunnel(): TunnelConfig? {
 		return getTunnelWithMatchingTunnelNetwork() ?: tunnels.firstOrNull { it.isPrimaryTunnel }
 	}
 
@@ -48,33 +46,23 @@ data class AutoTunnelState(
 	}
 
 	private fun startOnEthernet(): Boolean {
-		return networkState.isEthernetConnected && settings.isTunnelOnEthernetEnabled && activeTunnels.allDown()
+		return networkState.isEthernetConnected && settings.isTunnelOnEthernetEnabled && vpnState.status.isDown()
 	}
 
 	private fun stopOnEthernet(): Boolean {
-		return networkState.isEthernetConnected && !settings.isTunnelOnEthernetEnabled && activeTunnels.hasActive()
+		return networkState.isEthernetConnected && !settings.isTunnelOnEthernetEnabled && vpnState.status.isUp()
 	}
 
-	// TODO test removed kill switch state check
+	fun isNoConnectivity(): Boolean {
-	private fun stopKillSwitchOnTrusted(): Boolean {
-		return networkState.isWifiConnected && settings.isVpnKillSwitchEnabled && settings.isDisableKillSwitchOnTrustedEnabled && isCurrentSSIDTrusted()
-	}
-
-	// TODO test, removed kill switch state check
-	private fun startKillSwitch(): Boolean {
-		return settings.isVpnKillSwitchEnabled && (!settings.isDisableKillSwitchOnTrustedEnabled || !isCurrentSSIDTrusted())
-	}
-
-	private fun isNoConnectivity(): Boolean {
 		return !networkState.isEthernetConnected && !networkState.isWifiConnected && !networkState.isMobileDataConnected
 	}
 
 	private fun stopOnMobileData(): Boolean {
-		return isMobileDataActive() && !settings.isTunnelOnMobileDataEnabled && activeTunnels.hasActive()
+		return isMobileDataActive() && !settings.isTunnelOnMobileDataEnabled && vpnState.status.isUp()
 	}
 
 	private fun startOnMobileData(): Boolean {
-		return isMobileDataActive() && settings.isTunnelOnMobileDataEnabled && activeTunnels.allDown()
+		return isMobileDataActive() && settings.isTunnelOnMobileDataEnabled && vpnState.status.isDown()
 	}
 
 	private fun changeOnMobileData(): Boolean {
@@ -86,24 +74,30 @@ data class AutoTunnelState(
 	}
 
 	private fun stopOnWifi(): Boolean {
-		return isWifiActive() && !settings.isTunnelOnWifiEnabled && activeTunnels.hasActive()
+		return isWifiActive() && !settings.isTunnelOnWifiEnabled && vpnState.status.isUp()
 	}
 
 	private fun stopOnTrustedWifi(): Boolean {
-		return isWifiActive() && settings.isTunnelOnWifiEnabled && activeTunnels.hasActive() && isCurrentSSIDTrusted()
+		return isWifiActive() && settings.isTunnelOnWifiEnabled && vpnState.status.isUp() && isCurrentSSIDTrusted()
 	}
 
 	private fun startOnUntrustedWifi(): Boolean {
-		return isWifiActive() && settings.isTunnelOnWifiEnabled && activeTunnels.allDown() && !isCurrentSSIDTrusted()
+		Timber.d("Is tunnel on wifi enabled ${settings.isTunnelOnWifiEnabled}")
+		return isWifiActive() && settings.isTunnelOnWifiEnabled && vpnState.status.isDown() && !isCurrentSSIDTrusted()
 	}
 
 	private fun changeOnUntrustedWifi(): Boolean {
-		return isWifiActive() && settings.isTunnelOnWifiEnabled && activeTunnels.hasActive() && !isCurrentSSIDTrusted() && !isWifiTunnelPreferred()
+		return isWifiActive() && settings.isTunnelOnWifiEnabled && vpnState.status.isUp() && !isCurrentSSIDTrusted() && !isWifiTunnelPreferred()
 	}
 
 	private fun isWifiTunnelPreferred(): Boolean {
 		val preferred = preferredWifiTunnel()
-		return preferred?.let { activeTunnels.isUp(it) } ?: true
+		val vpnTunnel = vpnState.tunnelConfig
+		return if (preferred != null && vpnTunnel != null) {
+			preferred.id == vpnTunnel.id
+		} else {
+			true
+		}
 	}
 
 	fun asAutoTunnelEvent(): AutoTunnelEvent {
@@ -124,17 +118,6 @@ data class AutoTunnelState(
 		}
 	}
 
-	fun asKillSwitchEvent(): KillSwitchEvent {
-		return when {
-			stopKillSwitchOnTrusted() -> KillSwitchEvent.Stop
-			startKillSwitch() -> {
-				val allowedIps = if (settings.isLanOnKillSwitchEnabled) TunnelConf.LAN_BYPASS_ALLOWED_IPS else emptyList()
-				KillSwitchEvent.Start(allowedIps)
-			}
-			else -> KillSwitchEvent.DoNothing
-		}
-	}
-
 	private fun isCurrentSSIDTrusted(): Boolean {
 		return networkState.wifiName?.let {
 			hasTrustedWifiName(it)
@@ -149,11 +132,16 @@ data class AutoTunnelState(
 		}
 	}
 
-	private fun getTunnelWithMatchingTunnelNetwork(): TunnelConf? {
+	private fun getTunnelWithMatchingTunnelNetwork(): TunnelConfig? {
 		return networkState.wifiName?.let { wifiName ->
 			tunnels.firstOrNull {
 				hasTrustedWifiName(wifiName, it.tunnelNetworks)
 			}
 		}
 	}
+
+	fun isPingEnabled(): Boolean {
+		return settings.isPingEnabled ||
+			(vpnState.status.isUp() && vpnState.tunnelConfig != null && tunnels.first { it.id == vpnState.tunnelConfig.id }.isPingEnabled)
+	}
 }

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

@@ -1,12 +1,8 @@
-package com.zaneschepke.wireguardautotunnel.domain.state
+package com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model
 
 data class NetworkState(
 	val isWifiConnected: Boolean = false,
 	val isMobileDataConnected: Boolean = false,
 	val isEthernetConnected: Boolean = false,
 	val wifiName: String? = null,
-) {
+)
-	fun hasNoCapabilities(): Boolean {
-		return !isWifiConnected && !isMobileDataConnected && !isEthernetConnected
-	}
-}

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

@@ -0,0 +1,116 @@
+package com.zaneschepke.wireguardautotunnel.service.network
+
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import android.net.NetworkRequest
+import android.net.wifi.WifiManager
+import android.os.Build
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.conflate
+import kotlinx.coroutines.flow.map
+import timber.log.Timber
+
+abstract class BaseNetworkService<T : BaseNetworkService<T>>(
+	val context: Context,
+	networkCapability: Int,
+) : NetworkService<T> {
+	private val connectivityManager =
+		context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+
+	val wifiManager =
+		context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
+
+	fun checkHasCapability(networkCapability: Int): Boolean {
+		val network = connectivityManager.activeNetwork
+		val networkCapabilities = connectivityManager.getNetworkCapabilities(network)
+		return networkCapabilities?.hasTransport(networkCapability) == true
+	}
+
+	override val networkStatus =
+		callbackFlow {
+			if (!checkHasCapability(networkCapability)) {
+				trySend(NetworkStatus.Unavailable())
+			}
+			val networkStatusCallback =
+				when (Build.VERSION.SDK_INT) {
+					in Build.VERSION_CODES.S..Int.MAX_VALUE -> {
+						object :
+							ConnectivityManager.NetworkCallback(
+								FLAG_INCLUDE_LOCATION_INFO,
+							) {
+							override fun onAvailable(network: Network) {
+								trySend(NetworkStatus.Available(network))
+							}
+
+							override fun onLost(network: Network) {
+								trySend(NetworkStatus.Unavailable())
+							}
+
+							override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
+								trySend(
+									NetworkStatus.CapabilitiesChanged(
+										network,
+										networkCapabilities,
+									),
+								)
+							}
+						}
+					}
+
+					else -> {
+						object : ConnectivityManager.NetworkCallback() {
+							override fun onAvailable(network: Network) {
+								trySend(NetworkStatus.Available(network))
+							}
+
+							override fun onLost(network: Network) {
+								trySend(NetworkStatus.Unavailable())
+							}
+
+							override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
+								trySend(
+									NetworkStatus.CapabilitiesChanged(
+										network,
+										networkCapabilities,
+									),
+								)
+							}
+						}
+					}
+				}
+			val request =
+				NetworkRequest.Builder()
+					.addTransportType(networkCapability)
+					.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+					.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
+					.build()
+			connectivityManager.registerNetworkCallback(request, networkStatusCallback)
+
+			awaitClose { connectivityManager.unregisterNetworkCallback(networkStatusCallback) }
+		}.catch {
+			Timber.e(it)
+			// conflate for backpressure
+		}.conflate()
+}
+
+inline fun <Result> Flow<NetworkStatus>.map(
+	crossinline onUnavailable: suspend () -> Result,
+	crossinline onAvailable: suspend (network: Network) -> Result,
+	crossinline onCapabilitiesChanged:
+	suspend (network: Network, networkCapabilities: NetworkCapabilities) -> Result,
+): Flow<Result> = map { status ->
+	when (status) {
+		is NetworkStatus.Unavailable -> onUnavailable()
+		is NetworkStatus.Available -> onAvailable(status.network)
+		is NetworkStatus.CapabilitiesChanged ->
+			onCapabilitiesChanged(
+				status.network,
+				status.networkCapabilities,
+			)
+	}
+}

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

@@ -0,0 +1,18 @@
+package com.zaneschepke.wireguardautotunnel.service.network
+
+import android.content.Context
+import android.net.NetworkCapabilities
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+
+class EthernetService
+@Inject
+constructor(
+	@ApplicationContext context: Context,
+) :
+	BaseNetworkService<EthernetService>(context, NetworkCapabilities.TRANSPORT_ETHERNET) {
+
+	override fun isNetworkSecure(): Boolean {
+		return true
+	}
+}

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

@@ -0,0 +1,17 @@
+package com.zaneschepke.wireguardautotunnel.service.network
+
+import android.content.Context
+import android.net.NetworkCapabilities
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+
+class MobileDataService
+@Inject
+constructor(
+	@ApplicationContext context: Context,
+) :
+	BaseNetworkService<MobileDataService>(context, NetworkCapabilities.TRANSPORT_CELLULAR) {
+	override fun isNetworkSecure(): Boolean {
+		return false
+	}
+}

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

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

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

@@ -0,0 +1,14 @@
+package com.zaneschepke.wireguardautotunnel.service.network
+
+import android.net.NetworkCapabilities
+import kotlinx.coroutines.flow.Flow
+
+interface NetworkService<T> {
+	fun getNetworkName(networkCapabilities: NetworkCapabilities): String? {
+		return null
+	}
+
+	fun isNetworkSecure(): Boolean
+
+	val networkStatus: Flow<NetworkStatus>
+}

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

@@ -0,0 +1,14 @@
+package com.zaneschepke.wireguardautotunnel.service.network
+
+import android.net.Network
+import android.net.NetworkCapabilities
+
+sealed class NetworkStatus {
+	abstract val isConnected: Boolean
+	class Available(val network: Network, override val isConnected: Boolean = true) : NetworkStatus()
+
+	class Unavailable(override val isConnected: Boolean = false) : NetworkStatus()
+
+	class CapabilitiesChanged(val network: Network, val networkCapabilities: NetworkCapabilities, override val isConnected: Boolean = true) :
+		NetworkStatus()
+}

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

@@ -0,0 +1,32 @@
+package com.zaneschepke.wireguardautotunnel.service.network
+
+import android.content.Context
+import android.net.NetworkCapabilities
+import android.net.wifi.SupplicantState
+import android.os.Build
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+
+class WifiService
+@Inject
+constructor(
+	@ApplicationContext context: Context,
+) :
+	BaseNetworkService<WifiService>(context, NetworkCapabilities.TRANSPORT_WIFI) {
+
+	override fun getNetworkName(networkCapabilities: NetworkCapabilities): String? {
+		var ssid = networkCapabilities.getWifiName()
+		if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S) {
+			val info = wifiManager.connectionInfo
+			if (info.supplicantState === SupplicantState.COMPLETED) {
+				ssid = info.ssid
+			}
+		}
+		return ssid?.trim('"')
+	}
+
+	override fun isNetworkSecure(): Boolean {
+		// TODO
+		return false
+	}
+}

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.domain.enums
+package com.zaneschepke.wireguardautotunnel.service.notification
 
 import android.content.Context
 import com.zaneschepke.wireguardautotunnel.R

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

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

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.core.notification
+package com.zaneschepke.wireguardautotunnel.service.notification
 
 import android.Manifest
 import android.app.Notification
@@ -12,12 +12,8 @@ import android.graphics.Color
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
-import com.zaneschepke.wireguardautotunnel.MainActivity
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.core.broadcast.NotificationActionReceiver
+import com.zaneschepke.wireguardautotunnel.receiver.NotificationActionReceiver
-import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager.Companion.EXTRA_ID
-import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
-import com.zaneschepke.wireguardautotunnel.util.StringValue
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 
@@ -25,7 +21,7 @@ class WireGuardNotification
 @Inject
 constructor(
 	@ApplicationContext override val context: Context,
-) : com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager {
+) : NotificationService {
 
 	enum class NotificationChannels {
 		VPN,
@@ -50,14 +46,6 @@ constructor(
 				addAction(it)
 			}
 			setContentTitle(title)
-			setContentIntent(
-				PendingIntent.getActivity(
-					context,
-					0,
-					Intent(context, MainActivity::class.java),
-					PendingIntent.FLAG_IMMUTABLE,
-				),
-			)
 			setContentText(description)
 			setOnlyAlertOnce(onlyAlertOnce)
 			setOngoing(onGoing)
@@ -67,35 +55,12 @@ constructor(
 		}.build()
 	}
 
-	override fun createNotification(
+	override fun createNotificationAction(notificationAction: NotificationAction): NotificationCompat.Action {
-		channel: NotificationChannels,
-		title: StringValue,
-		actions: Collection<NotificationCompat.Action>,
-		description: StringValue,
-		showTimestamp: Boolean,
-		importance: Int,
-		onGoing: Boolean,
-		onlyAlertOnce: Boolean,
-	): Notification {
-		return createNotification(
-			channel,
-			title.asString(context),
-			actions,
-			description.asString(context),
-			showTimestamp,
-			importance,
-			onGoing,
-			onlyAlertOnce,
-		)
-	}
-
-	override fun createNotificationAction(notificationAction: NotificationAction, extraId: Int?): NotificationCompat.Action {
 		val pendingIntent = PendingIntent.getBroadcast(
 			context,
 			0,
 			Intent(context, NotificationActionReceiver::class.java).apply {
 				action = notificationAction.name
-				if (extraId != null) putExtra(EXTRA_ID, extraId)
 			},
 			PendingIntent.FLAG_IMMUTABLE,
 		)
@@ -119,7 +84,7 @@ constructor(
 		}
 	}
 
-	private fun NotificationChannels.asBuilder(): NotificationCompat.Builder {
+	fun NotificationChannels.asBuilder(): NotificationCompat.Builder {
 		return when (this) {
 			NotificationChannels.AUTO_TUNNEL -> {
 				NotificationCompat.Builder(
@@ -136,7 +101,7 @@ constructor(
 		}
 	}
 
-	private fun NotificationChannels.asChannel(): NotificationChannel {
+	fun NotificationChannels.asChannel(): NotificationChannel {
 		return when (this) {
 			NotificationChannels.VPN -> {
 				NotificationChannel(

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

@@ -1,18 +1,18 @@
-package com.zaneschepke.wireguardautotunnel.core.shortcut
+package com.zaneschepke.wireguardautotunnel.service.shortcut
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
-import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelService
+import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider
+import com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.AutoTunnelService
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
+import javax.inject.Provider
 
 @AndroidEntryPoint
 class ShortcutsActivity : ComponentActivity() {
@@ -20,10 +20,10 @@ class ShortcutsActivity : ComponentActivity() {
 	lateinit var appDataRepository: AppDataRepository
 
 	@Inject
-	lateinit var serviceManager: ServiceManager
+	lateinit var tunnelService: Provider<TunnelService>
 
 	@Inject
-	lateinit var tunnelManager: TunnelManager
+	lateinit var serviceManager: ServiceManager
 
 	@Inject
 	@ApplicationScope
@@ -32,28 +32,28 @@ class ShortcutsActivity : ComponentActivity() {
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		applicationScope.launch {
-			val settings = appDataRepository.settings.get()
+			val settings = appDataRepository.settings.getSettings()
 			if (settings.isShortcutsEnabled) {
 				when (intent.getStringExtra(CLASS_NAME_EXTRA_KEY)) {
-					LEGACY_TUNNEL_SERVICE_NAME, TunnelProvider::class.java.simpleName -> {
+					LEGACY_TUNNEL_SERVICE_NAME, TunnelService::class.java.simpleName -> {
 						val tunnelName = intent.getStringExtra(TUNNEL_NAME_EXTRA_KEY)
 						Timber.d("Tunnel name extra: $tunnelName")
 						val tunnelConfig = tunnelName?.let {
 							appDataRepository.tunnels.getAll()
-								.firstOrNull { it.tunName == tunnelName }
+								.firstOrNull { it.name == tunnelName }
 						} ?: appDataRepository.getStartTunnelConfig()
-						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)
+								Action.START.name -> tunnelService.get().startTunnel(it, true)
-								Action.STOP.name -> tunnelManager.stopTunnel()
+								Action.STOP.name -> tunnelService.get().stopTunnel()
 								else -> Unit
 							}
 						}
 					}
 					AutoTunnelService::class.java.simpleName, LEGACY_AUTO_TUNNEL_SERVICE_NAME -> {
 						when (intent.action) {
-							Action.START.name -> serviceManager.startAutoTunnel()
+							Action.START.name -> serviceManager.startAutoTunnel(true)
 							Action.STOP.name -> serviceManager.stopAutoTunnel()
 						}
 					}

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

@@ -0,0 +1,86 @@
+package com.zaneschepke.wireguardautotunnel.service.tile
+
+import android.service.quicksettings.Tile
+import android.service.quicksettings.TileService
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class AutoTunnelControlTile : TileService() {
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
+
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
+
+	override fun onCreate() {
+		super.onCreate()
+		serviceManager.autoTunnelTile.complete(this)
+	}
+
+	override fun onDestroy() {
+		super.onDestroy()
+		serviceManager.autoTunnelTile = CompletableDeferred()
+	}
+
+	override fun onStartListening() {
+		super.onStartListening()
+		serviceManager.autoTunnelTile.complete(this)
+		applicationScope.launch {
+			if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
+			updateTileState()
+		}
+	}
+
+	fun updateTileState() {
+		serviceManager.autoTunnelActive.value.let {
+			if (it) setActive() else setInactive()
+		}
+	}
+
+	override fun onClick() {
+		super.onClick()
+		unlockAndRun {
+			applicationScope.launch {
+				if (serviceManager.autoTunnelActive.value) {
+					serviceManager.stopAutoTunnel()
+					setInactive()
+				} else {
+					serviceManager.startAutoTunnel(true)
+					setActive()
+				}
+			}
+		}
+	}
+
+	private fun setActive() {
+		kotlin.runCatching {
+			qsTile.state = Tile.STATE_ACTIVE
+			qsTile.updateTile()
+		}
+	}
+
+	private fun setInactive() {
+		kotlin.runCatching {
+			qsTile.state = Tile.STATE_INACTIVE
+			qsTile.updateTile()
+		}
+	}
+
+	private fun setUnavailable() {
+		kotlin.runCatching {
+			qsTile.state = Tile.STATE_UNAVAILABLE
+			qsTile.updateTile()
+		}
+	}
+}

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

@@ -0,0 +1,119 @@
+package com.zaneschepke.wireguardautotunnel.service.tile
+
+import android.os.Build
+import android.service.quicksettings.Tile
+import android.service.quicksettings.TileService
+import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
+import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+import javax.inject.Provider
+
+@AndroidEntryPoint
+class TunnelControlTile : TileService() {
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
+
+	@Inject
+	lateinit var tunnelService: Provider<TunnelService>
+
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
+
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
+	override fun onCreate() {
+		super.onCreate()
+		serviceManager.tunnelControlTile.complete(this)
+	}
+
+	override fun onDestroy() {
+		super.onDestroy()
+		serviceManager.tunnelControlTile = CompletableDeferred()
+	}
+
+	override fun onStartListening() {
+		super.onStartListening()
+		serviceManager.tunnelControlTile.complete(this)
+		applicationScope.launch {
+			if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
+			updateTileState()
+		}
+	}
+
+	fun updateTileState() = applicationScope.launch {
+		val lastActive = appDataRepository.getStartTunnelConfig()
+		lastActive?.let {
+			updateTile(it)
+		}
+	}
+
+	override fun onClick() {
+		super.onClick()
+		unlockAndRun {
+			applicationScope.launch {
+				val lastActive = appDataRepository.getStartTunnelConfig()
+				lastActive?.let { tunnel ->
+					if (tunnel.isActive) {
+						tunnelService.get().stopTunnel()
+					} else {
+						tunnelService.get().startTunnel(tunnel, true)
+					}
+					updateTileState()
+				}
+			}
+		}
+	}
+
+	private fun setActive() {
+		kotlin.runCatching {
+			qsTile.state = Tile.STATE_ACTIVE
+			qsTile.updateTile()
+		}
+	}
+
+	private fun setInactive() {
+		kotlin.runCatching {
+			qsTile.state = Tile.STATE_INACTIVE
+			qsTile.updateTile()
+		}
+	}
+
+	private fun setUnavailable() {
+		kotlin.runCatching {
+			qsTile.state = Tile.STATE_UNAVAILABLE
+			setTileDescription("")
+			qsTile.updateTile()
+		}
+	}
+
+	private fun setTileDescription(description: String) {
+		kotlin.runCatching {
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+				qsTile.subtitle = description
+			}
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+				qsTile.stateDescription = description
+			}
+			qsTile.updateTile()
+		}
+	}
+
+	private fun updateTile(tunnelConfig: TunnelConfig?) {
+		kotlin.runCatching {
+			tunnelConfig?.let {
+				setTileDescription(it.name)
+				if (it.isActive) return setActive()
+				setInactive()
+			}
+		}
+	}
+}

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

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

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.domain.enums
+package com.zaneschepke.wireguardautotunnel.service.tunnel
 
 enum class BackendState {
 	KILL_SWITCH_ACTIVE,

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.domain.enums
+package com.zaneschepke.wireguardautotunnel.service.tunnel
 
 enum class HandshakeStatus {
 	HEALTHY,