chore: bump version with notes

Closes #612

.github/workflows/build.yml

@@ -0,0 +1,125 @@
+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/on-pr.yml

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

.github/workflows/publish.yml

@@ -1,4 +1,4 @@
-name: release-android
+name: publish
 
 on:
   schedule:
@@ -31,6 +31,8 @@ on:
         required: false
         default: nightly
   workflow_call:
+env:
+  UPLOAD_DIR_ANDROID: android_artifacts
 
 jobs:
   check_commits:
@@ -53,17 +55,22 @@ 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:
-    needs: check_commits
+    if: ${{ inputs.release_type != 'none' }}
+    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: Build Signed APK
+    name: publish-github
     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 }}
@@ -71,29 +78,10 @@ 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
@@ -120,51 +108,12 @@ 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
@@ -172,25 +121,14 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           branch: ${{ github.ref }}
 
-      # Save the APK after the Build job is complete to publish it as a Github release in the next job
-      - name: Upload APK
-        uses: actions/upload-artifact@v4.4.3
-        with:
-          name: wgtunnel
-          path: ${{ env.APK_PATH }}
+      - name: Make download dir
+        run: mkdir ${{ github.workspace }}/temp
 
-      - name: Download APK from build
+      - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
-          name: wgtunnel
-
-      - 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
+          name: ${{ env.UPLOAD_DIR_ANDROID }}
+          path: ${{ github.workspace }}/temp
 
       # Setup TAG_NAME, which is used as a general "name"
       - if: github.event_name == 'workflow_dispatch'
@@ -221,7 +159,9 @@ jobs:
 
       - name: Get checksum
         id: checksum
-        run: echo "checksum=$(apksigner verify -print-certs ${{ env.APK_PATH }} | grep -Po "(?<=SHA-256 digest:) .*" | tr -d "[:blank:]")" >> $GITHUB_OUTPUT
+        run: |
+          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
@@ -233,8 +173,15 @@ jobs:
           body: |
             ${{ env.RELEASE_NOTES }}
 
-            SHA256 fingerprint:
-            ```${{ steps.checksum.outputs.checksum }}```
+            SHA-256 fingerprint for the 4096-bit signing certificate:
+            ```sh
+            ${{ steps.checksum.outputs.checksum }}
+            ```
+
+            To verify fingerprint:
+            ```sh
+            apksigner verify --print-certs [path to APK file] | grep SHA-256
+            ```
 
             ### Changelog
             ${{ steps.changelog.outputs.changes }}
@@ -243,7 +190,21 @@ jobs:
           draft: false
           prerelease: ${{ inputs.release_type == 'prerelease' || inputs.release_type == '' || inputs.release_type == 'nightly' }}
           make_latest: ${{ inputs.release_type == 'release' }}
-          files: ${{ github.workspace }}/${{ env.APK_PATH }}
+          files: |
+            ${{ github.workspace }}/temp/*
+
+  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,79 +4,107 @@ WG Tunnel
 
 <div align="center">
 
+An alternative Android client app for [WireGuard®](https://www.wireguard.com/)
+and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/)
+<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)
+
+</div>
+
+<div align="center">
+
 [![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=for-the-badge&logo=discord&logoColor=white)](https://discord.gg/rbRRNh6H7V)
 [![Telegram](https://img.shields.io/badge/Telegram-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)](https://t.me/wgtunnel)
 
 </div>
 
-<div align="center">
+<details open="open">
+<summary>Table of Contents</summary>
 
+- [About](#about)
+- [Acknowledgements](#acknowledgements)
+- [Screenshots](#screenshots)
+- [Features](#features)
+- [Building](#building)
+- [Translation](#translation)
+- [Contributing](#contributing)
 
-[![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/)
+</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;">
 
-<div align="left">
+## Acknowledgements
 
-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.
+Thank you to the following:
 
-</div>
+- 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)
 
-<div align="center">
+- [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) - Amnezia Team (https://github.com/amnezia-vpn/amneziawg-android)
 
 ## Screenshots
 
-<p float="center">
-  <img label="Main" style="padding-right:25px" 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" style="padding-left:25px" src="fastlane/metadata/android/en-US/images/phoneScreenshots/settings_screen.png" width="200" />
-  <img label="Support" style="padding-left:25px" src="fastlane/metadata/android/en-US/images/phoneScreenshots/support_screen.png" width="200" />
-</p>
+</div>
+<div style="display: flex; flex-wrap: wrap; justify-content: center; gap: 10px;">
+ <img label="Main" src="fastlane/metadata/android/en-US/images/phoneScreenshots/main_screen.png" width="200" />
+ <img label="Settings" src="fastlane/metadata/android/en-US/images/phoneScreenshots/settings_screen.png" width="200" />
+  <img label="Auto" src="fastlane/metadata/android/en-US/images/phoneScreenshots/auto_screen.png" width="200" />
+  <img label="Config" src="fastlane/metadata/android/en-US/images/phoneScreenshots/config_screen.png" width="200" />
+</div>
 
-<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.
+<div style="text-align: left;">
 
 ## Features
 
-* Add tunnels via .conf file, zip, manual entry, or QR code
-* Auto connect to tunnels based on Wi-Fi SSID, ethernet, or mobile data
+* Add tunnels via .conf file, zip, manual entry, clipboard, or QR code
+* Auto-tunnel based on Wi-Fi SSID, ethernet, or mobile data
 * Split tunneling by application with search
-* WireGuard support for kernel and userspace modes
+* 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 Amnezia and WireGuard tunnels to zip
+* Export tunnels to zip
 * Quick tile support for tunnel toggling, auto-tunneling
-* Static shortcuts support for tunnel toggling, auto-tunneling
+* Shortcuts support for tunnel toggling, auto-tunneling
 * Intent automation support for all tunnels
+* In app VPN kill switch with LAN bypass
 * Automatic auto-tunneling service and/or tunnel restart after reboot or app update
 * Battery preservation measures
-* Restart tunnel on ping failure (beta)
+* Restart tunnel on ping failure
 
-## Fdroid
+## Building
 
-Want updates faster?
+```sh
+git clone https://github.com/zaneschepke/wgtunnel
+cd wgtunnel
+```
 
-Check out my personal [fdroid repository](https://github.com/zaneschepke/fdroid) to get updates the
-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).
+```sh
+./gradlew assembleDebug
+```
 
 ## Translation
 
@@ -86,19 +114,6 @@ 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().toInt() + 1
+				versionFile.readText().trim().toInt() + 1
 			} else {
 				1
 			}
@@ -31,6 +31,14 @@ 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
@@ -136,8 +144,8 @@ android {
 }
 
 dependencies {
-
 	implementation(project(":logcatter"))
+	implementation(project(":networkmonitor"))
 
 	implementation(libs.androidx.core.ktx)
 	implementation(libs.androidx.lifecycle.runtime.ktx)
@@ -164,8 +172,7 @@ dependencies {
 	debugImplementation(libs.androidx.compose.ui.tooling)
 	debugImplementation(libs.androidx.compose.manifest)
 
-	// get tunnel lib from github packages or mavenLocal
-// 	implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.aar"))))
+	// tunnel
 	implementation(libs.tunnel)
 	implementation(libs.amneziawg.android)
 	coreLibraryDesugaring(libs.desugar.jdk.libs)
@@ -180,10 +187,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
@@ -211,10 +218,13 @@ 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,4 +2,41 @@
 
 -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,4 +21,41 @@
 #-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/12.json

@@ -0,0 +1,246 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 12,
+    "identityHash": "acf79ac5defacda5be6c3f976e777de3",
+    "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)",
+        "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"
+          }
+        ],
+        "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, 'acf79ac5defacda5be6c3f976e777de3')"
+    ]
+  }
+}

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

@@ -0,0 +1,267 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 13,
+    "identityHash": "ff209157b98a641c424f5086818ec585",
+    "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)",
+        "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"
+          }
+        ],
+        "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, 'ff209157b98a641c424f5086818ec585')"
+    ]
+  }
+}

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

@@ -0,0 +1,274 @@
+{
+  "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

@@ -0,0 +1,281 @@
+{
+  "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

@@ -0,0 +1,288 @@
+{
+  "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,13 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <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" />
+	<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
     <!--foreground service exempt android 14-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"
@@ -66,21 +61,20 @@
         android:theme="@style/Theme.App.Start"
         tools:targetApi="tiramisu">
         <activity
-            android:name=".ui.MainActivity"
+            android:name=".MainActivity"
             android:exported="true"
+			android:windowSoftInputMode="adjustResize"
             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"
@@ -88,7 +82,7 @@
             tools:replace="screenOrientation" />
 
         <activity
-            android:name=".service.shortcut.ShortcutsActivity"
+            android:name=".core.shortcut.ShortcutsActivity"
             android:enabled="true"
             android:exported="true"
 			android:noHistory="true"
@@ -107,11 +101,18 @@
 				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=".service.tile.TunnelControlTile"
+            android:name=".core.service.tile.TunnelControlTile"
             android:exported="true"
             android:icon="@drawable/ic_launcher"
-            android:label="Tunnel control"
+            android:label="@string/tunnel_control"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <meta-data
                 android:name="android.service.quicksettings.ACTIVE_TILE"
@@ -125,10 +126,10 @@
             </intent-filter>
         </service>
         <service
-            android:name=".service.tile.AutoTunnelControlTile"
+            android:name=".core.service.tile.AutoTunnelControlTile"
             android:exported="true"
             android:icon="@drawable/ic_launcher"
-            android:label="Auto-tunnel"
+            android:label="@string/auto_tunnel"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <meta-data
                 android:name="android.service.quicksettings.ACTIVE_TILE"
@@ -141,23 +142,8 @@
                 <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=".service.foreground.AutoTunnelService"
+            android:name=".core.service.autotunnel.AutoTunnelService"
             android:enabled="true"
             android:exported="false"
             android:foregroundServiceType="systemExempted"
@@ -166,7 +152,7 @@
             tools:node="merge" />
 
 		<service
-			android:name=".service.foreground.TunnelBackgroundService"
+			android:name=".core.service.TunnelForegroundService"
 			android:exported="false"
 			android:persistent="true"
 			android:foregroundServiceType="systemExempted"
@@ -177,32 +163,29 @@
 		</service>
 
         <receiver
-            android:name=".receiver.BootReceiver"
+            android:name=".core.broadcast.RestartReceiver"
             android:enabled="true"
-            android:exported="false">
+            android:exported="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.MY_PACKAGE_REPLACED" />
             </intent-filter>
         </receiver>
 		<receiver
-			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:name=".core.broadcast.KernelReceiver"
 			android:exported="false"
 			android:permission="${applicationId}.permission.CONTROL_TUNNELS">
 			<intent-filter>
 				<action android:name="com.wireguard.android.action.REFRESH_TUNNEL_STATES" />
 			</intent-filter>
 		</receiver>
+		<receiver
+			android:name=".core.broadcast.NotificationActionReceiver"
+			android:exported="false"
+			android:permission="${applicationId}.permission.CONTROL_TUNNELS">
+		</receiver>
     </application>
 </manifest>

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

@@ -1,8 +1,13 @@
-package com.zaneschepke.wireguardautotunnel.ui
+package com.zaneschepke.wireguardautotunnel
 
 import android.content.Intent
+import android.graphics.Color
+import android.os.Build
 import android.os.Bundle
+import androidx.activity.SystemBarStyle
+import androidx.activity.compose.BackHandler
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.animation.core.tween
@@ -33,30 +38,35 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.toRoute
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import com.zaneschepke.wireguardautotunnel.core.shortcut.ShortcutManager
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
+import com.zaneschepke.wireguardautotunnel.ui.Route
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavBar
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.BottomNavItem
 import com.zaneschepke.wireguardautotunnel.ui.common.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.CustomSnackBar
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarControllerProvider
-import com.zaneschepke.wireguardautotunnel.ui.screens.config.ConfigScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.ConfigScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.MainScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.options.OptionsScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.pinlock.PinLockScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.scanner.ScannerScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.OptionsScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.PinLockScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.ScannerScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.SplitTunnelScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.TunnelAutoTunnelScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.AdvancedScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.AppearanceScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.DisplayScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.KillSwitchScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.LanguageScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.LocationDisclosureScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.SettingsScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.AppearanceScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.display.DisplayScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.language.LanguageScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.autotunnel.AutoTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.disclosure.LocationDisclosureScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.support.LogsScreen
 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.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
+import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlin.system.exitProcess
@@ -68,9 +78,19 @@ class MainActivity : AppCompatActivity() {
 	lateinit var appStateRepository: AppStateRepository
 
 	@Inject
-	lateinit var tunnelService: TunnelService
+	lateinit var tunnelManager: TunnelManager
+
+	@Inject
+	lateinit var shortcutManager: ShortcutManager
 
 	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>()
@@ -95,13 +115,14 @@ class MainActivity : AppCompatActivity() {
 				}
 			}
 
-			LaunchedEffect(appUiState.autoTunnelActive) {
-				requestAutoTunnelTileServiceUpdate()
+			LaunchedEffect(Unit) {
+				viewModel.getEmitSplitTunnelApps(this@MainActivity)
 			}
 
-			with(appUiState.settings) {
-				LaunchedEffect(isAutoTunnelEnabled) {
-					this@MainActivity.requestAutoTunnelTileServiceUpdate()
+			with(appUiState.appSettings) {
+				LaunchedEffect(isShortcutsEnabled) {
+					if (!isShortcutsEnabled) return@LaunchedEffect shortcutManager.removeShortcuts()
+					shortcutManager.addShortcuts()
 				}
 			}
 
@@ -109,7 +130,7 @@ class MainActivity : AppCompatActivity() {
 				SnackbarControllerProvider { host ->
 					WireguardAutoTunnelTheme(theme = appUiState.generalState.theme) {
 						Scaffold(
-							contentWindowInsets = WindowInsets(0.dp),
+							contentWindowInsets = WindowInsets(0),
 							snackbarHost = {
 								SnackbarHost(host) { snackbarData: SnackbarData ->
 									CustomSnackBar(
@@ -144,13 +165,13 @@ class MainActivity : AppCompatActivity() {
 									),
 								)
 							},
-						) {
-							Box(modifier = Modifier.fillMaxSize().padding(it)) {
+						) { padding ->
+							Box(modifier = Modifier.Companion.fillMaxSize().padding(padding)) {
 								NavHost(
 									navController,
 									enterTransition = { fadeIn(tween(Constants.TRANSITION_ANIMATION_TIME)) },
 									exitTransition = { fadeOut(tween(Constants.TRANSITION_ANIMATION_TIME)) },
-									startDestination = (if (appUiState.generalState.isPinLockEnabled == true) Route.Lock else Route.Main),
+									startDestination = (if (appUiState.generalState.isPinLockEnabled) Route.Lock else Route.Main),
 								) {
 									composable<Route.Main> {
 										MainScreen(
@@ -168,7 +189,7 @@ class MainActivity : AppCompatActivity() {
 									}
 									composable<Route.AutoTunnel> {
 										AutoTunnelScreen(
-											appUiState,
+											appUiState.appSettings,
 										)
 									}
 									composable<Route.Appearance> {
@@ -183,30 +204,50 @@ class MainActivity : AppCompatActivity() {
 									composable<Route.Support> {
 										SupportScreen(appUiState, viewModel)
 									}
+									composable<Route.AutoTunnelAdvanced> {
+										AdvancedScreen(appUiState.appSettings, viewModel)
+									}
 									composable<Route.Logs> {
 										LogsScreen()
 									}
-									composable<Route.Config> {
-										val args = it.toRoute<Route.Config>()
-										ConfigScreen(
-											tunnelId = args.id,
-										)
+									composable<Route.Config> { backStack ->
+										val args = backStack.toRoute<Route.Config>()
+										val config =
+											appUiState.tunnels.firstOrNull { it.id == args.id }
+										ConfigScreen(config, viewModel)
 									}
-									composable<Route.Option> {
-										val args = it.toRoute<Route.Option>()
-										OptionsScreen(
-											tunnelId = args.id,
-											appUiState = appUiState,
-										)
+									composable<Route.TunnelOptions> { backStack ->
+										val args = backStack.toRoute<Route.TunnelOptions>()
+										appUiState.tunnels.firstOrNull { it.id == args.id }?.let { config ->
+											OptionsScreen(config, appUiState)
+										}
 									}
 									composable<Route.Lock> {
-										PinLockScreen(
-											appViewModel = viewModel,
-										)
+										PinLockScreen(viewModel)
 									}
 									composable<Route.Scanner> {
 										ScannerScreen()
 									}
+									composable<Route.KillSwitch> {
+										KillSwitchScreen(appUiState, viewModel)
+									}
+									composable<Route.SplitTunnel> { backStack ->
+										val args = backStack.toRoute<Route.SplitTunnel>()
+										appUiState.tunnels.firstOrNull { it.id == args.id }?.let {
+											SplitTunnelScreen(it, viewModel)
+										}
+									}
+									composable<Route.TunnelAutoTunnel> { backStack ->
+										val args = backStack.toRoute<Route.TunnelOptions>()
+										appUiState.tunnels.firstOrNull { it.id == args.id }?.let {
+											TunnelAutoTunnelScreen(it, appUiState.appSettings)
+										}
+									}
+								}
+								BackHandler {
+									if (navController.previousBackStackEntry == null || !navController.popBackStack()) {
+										this@MainActivity.finish()
+									}
 								}
 							}
 						}
@@ -215,9 +256,4 @@ class MainActivity : AppCompatActivity() {
 			}
 		}
 	}
-	override fun onDestroy() {
-		super.onDestroy()
-		// save battery by not polling stats while app is closed
-		tunnelService.cancelStatsJob()
-	}
 }

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

@@ -3,12 +3,20 @@ package com.zaneschepke.wireguardautotunnel
 import android.app.Application
 import android.os.StrictMode
 import android.os.StrictMode.ThreadPolicy
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.os.LocaleListCompat
+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.data.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.core.worker.ServiceWorker
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.di.MainDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
 import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
 import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
@@ -16,11 +24,20 @@ import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import timber.log.Timber
 import javax.inject.Inject
 
 @HiltAndroidApp
-class WireGuardAutoTunnel : Application() {
+class WireGuardAutoTunnel : Application(), Configuration.Provider {
+
+	@Inject
+	lateinit var workerFactory: HiltWorkerFactory
+
+	override val workManagerConfiguration: Configuration
+		get() = Configuration.Builder()
+			.setWorkerFactory(workerFactory)
+			.build()
 
 	@Inject
 	@ApplicationScope
@@ -30,15 +47,23 @@ class WireGuardAutoTunnel : Application() {
 	lateinit var logReader: LogReader
 
 	@Inject
-	lateinit var appStateRepository: AppStateRepository
+	lateinit var appDataRepository: AppDataRepository
 
 	@Inject
 	@IoDispatcher
 	lateinit var ioDispatcher: CoroutineDispatcher
 
+	@Inject
+	@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(
@@ -52,24 +77,64 @@ class WireGuardAutoTunnel : Application() {
 		} else {
 			Timber.plant(ReleaseTree())
 		}
-		applicationScope.launch {
-			appStateRepository.getLocale()?.let {
-				val locale = LocaleUtil.getLocaleFromPrefCode(it)
-				val appLocale: LocaleListCompat = LocaleListCompat.forLanguageTags(locale)
-				AppCompatDelegate.setApplicationLocales(appLocale)
+
+		GoBackend.setAlwaysOnCallback {
+			applicationScope.launch {
+				val settings = appDataRepository.settings.get()
+				if (settings.isAlwaysOnVpnEnabled) {
+					val tunnel = appDataRepository.getPrimaryOrFirstTunnel()
+					tunnel?.let {
+						tunnelManager.startTunnel(it)
+					}
+				} else {
+					Timber.Forest.w("Always-on VPN is not enabled in app settings")
+				}
 			}
 		}
-		if (!isRunningOnTv()) {
-			applicationScope.launch(ioDispatcher) {
-				if (appStateRepository.isLocalLogsEnabled()) {
-					Timber.d("Starting logger")
-					logReader.start()
+
+		ServiceWorker.start(this)
+
+		applicationScope.launch {
+			withContext(mainDispatcher) {
+				if (appDataRepository.appState.isLocalLogsEnabled() && !isRunningOnTv()) logReader.start()
+			}
+			if (!appDataRepository.settings.get().isKernelEnabled) {
+				tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
+			}
+			appDataRepository.appState.getLocale()?.let {
+				withContext(mainDispatcher) {
+					LocaleUtil.changeLocale(it)
 				}
 			}
 		}
 	}
 
+	override fun onTerminate() {
+		applicationScope.launch {
+			tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, 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
+		}
+
 		lateinit var instance: WireGuardAutoTunnel
 			private set
 	}

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

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

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

@@ -0,0 +1,46 @@
+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.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+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 == 0) return@launch tunnelManager.stopTunnel()
+					val tunnel = tunnelRepository.getById(tunnelId)
+					tunnelManager.stopTunnel(tunnel)
+				}
+			}
+		}
+	}
+}

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

@@ -0,0 +1,64 @@
+package com.zaneschepke.wireguardautotunnel.core.broadcast
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+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) {
+		val action = intent.action ?: return
+		if (action != Intent.ACTION_BOOT_COMPLETED &&
+			action != Intent.ACTION_MY_PACKAGE_REPLACED &&
+			action != "com.htc.intent.action.QUICKBOOT_POWERON"
+		) {
+			return
+		}
+
+		Timber.d("RestartReceiver triggered with action: ${intent.action}")
+		applicationScope.launch(ioDispatcher) {
+			serviceManager.updateTunnelTile()
+			serviceManager.updateAutoTunnelTile()
+			val settings = appDataRepository.settings.get()
+			if (settings.isRestoreOnBootEnabled) {
+				if (settings.isAutoTunnelEnabled && !serviceManager.autoTunnelActive.value) {
+					Timber.d("Starting auto-tunnel on boot/update")
+					serviceManager.startAutoTunnel(true)
+				} 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

@@ -0,0 +1,47 @@
+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.domain.enums.NotificationAction
+import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification.NotificationChannels
+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 KERNEL_SERVICE_NOTIFICATION_ID = 123
+		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/notification/WireGuardNotification.kt

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

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

@@ -0,0 +1,160 @@
+package com.zaneschepke.wireguardautotunnel.core.service
+
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelService
+import com.zaneschepke.wireguardautotunnel.core.service.tile.AutoTunnelControlTile
+import com.zaneschepke.wireguardautotunnel.core.service.tile.TunnelControlTile
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
+import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
+import jakarta.inject.Inject
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeoutOrNull
+import timber.log.Timber
+
+class ServiceManager @Inject constructor(
+	private val context: Context,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+	@ApplicationScope private val applicationScope: CoroutineScope,
+	private val appDataRepository: AppDataRepository,
+) {
+
+	private val _autoTunnelActive = MutableStateFlow(false)
+	val autoTunnelActive = _autoTunnelActive.asStateFlow()
+
+	var autoTunnelService = CompletableDeferred<AutoTunnelService>()
+	var backgroundService = CompletableDeferred<TunnelForegroundService>()
+	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) }
+	}
+
+	fun startAutoTunnel(background: Boolean) {
+		applicationScope.launch(ioDispatcher) {
+			val settings = appDataRepository.settings.get()
+			appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = true))
+			if (autoTunnelService.isCompleted) {
+				_autoTunnelActive.update { true }
+				return@launch
+			}
+			runCatching {
+				autoTunnelService = CompletableDeferred()
+				startService(AutoTunnelService::class.java, background)
+				val service = withTimeoutOrNull(SERVICE_START_TIMEOUT) { autoTunnelService.await() }
+					?: throw IllegalStateException("AutoTunnelService start timed out")
+				service.start()
+				_autoTunnelActive.update { true }
+				updateAutoTunnelTile()
+			}.onFailure {
+				Timber.e(it)
+				_autoTunnelActive.update { false }
+			}
+		}
+	}
+
+	fun startBackgroundService(tunnelConf: TunnelConf) {
+		applicationScope.launch(ioDispatcher) {
+			if (backgroundService.isCompleted) return@launch
+			runCatching {
+				backgroundService = CompletableDeferred()
+				startService(TunnelForegroundService::class.java, true)
+				val service = withTimeoutOrNull(SERVICE_START_TIMEOUT) { backgroundService.await() }
+					?: throw IllegalStateException("Background service start timed out")
+				service.start(tunnelConf)
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
+	}
+
+	fun stopBackgroundService() {
+		applicationScope.launch(ioDispatcher) {
+			if (!backgroundService.isCompleted) return@launch
+			runCatching {
+				val service = backgroundService.await()
+				service.stop()
+				backgroundService = CompletableDeferred()
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
+	}
+
+	fun toggleAutoTunnel(background: Boolean) {
+		applicationScope.launch(ioDispatcher) {
+			if (_autoTunnelActive.value) stopAutoTunnel() else startAutoTunnel(background)
+		}
+	}
+
+	suspend fun updateAutoTunnelTile() {
+		withContext(ioDispatcher) {
+			runCatching {
+				val service = withTimeoutOrNull(SERVICE_START_TIMEOUT) { autoTunnelTile.await() }
+					?: run {
+						context.requestAutoTunnelTileServiceUpdate()
+						return@withContext
+					}
+				service.updateTileState()
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
+	}
+
+	suspend fun updateTunnelTile() {
+		withContext(ioDispatcher) {
+			runCatching {
+				val service = withTimeoutOrNull(SERVICE_START_TIMEOUT) { tunnelControlTile.await() }
+					?: run {
+						context.requestTunnelTileServiceStateUpdate()
+						return@withContext
+					}
+				service.updateTileState()
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
+	}
+
+	fun stopAutoTunnel() {
+		applicationScope.launch(ioDispatcher) {
+			val settings = appDataRepository.settings.get()
+			appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = false))
+			if (!autoTunnelService.isCompleted) return@launch
+			runCatching {
+				val service = autoTunnelService.await()
+				service.stop()
+				_autoTunnelActive.update { false }
+				autoTunnelService = CompletableDeferred()
+				updateAutoTunnelTile()
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
+	}
+
+	companion object {
+		const val SERVICE_START_TIMEOUT = 5_000L
+	}
+}

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground
+package com.zaneschepke.wireguardautotunnel.core.service
 
 import android.app.Notification
 import android.content.Intent
@@ -6,31 +6,31 @@ 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.domain.enums.NotificationAction
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
+import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CompletableDeferred
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class TunnelBackgroundService : LifecycleService() {
+class TunnelForegroundService : LifecycleService() {
 
 	@Inject
-	lateinit var notificationService: NotificationService
+	lateinit var notificationManager: NotificationManager
 
 	@Inject
 	lateinit var serviceManager: ServiceManager
 
-	private val foregroundId = 123
-
 	override fun onCreate() {
 		super.onCreate()
-		start()
+		serviceManager.backgroundService.complete(this)
 	}
 
 	override fun onBind(intent: Intent): IBinder? {
 		super.onBind(intent)
-		// We don't provide binding, so return null
 		return null
 	}
 
@@ -39,11 +39,11 @@ class TunnelBackgroundService : LifecycleService() {
 		return super.onStartCommand(intent, flags, startId)
 	}
 
-	fun start() {
+	fun start(tunnelConf: TunnelConf) {
 		ServiceCompat.startForeground(
-			this,
-			foregroundId,
-			createNotification(),
+			this@TunnelForegroundService,
+			NotificationManager.KERNEL_SERVICE_NOTIFICATION_ID,
+			createNotification(tunnelConf),
 			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
 		)
 	}
@@ -58,12 +58,13 @@ class TunnelBackgroundService : LifecycleService() {
 		super.onDestroy()
 	}
 
-	private fun createNotification(): Notification {
-		return notificationService.createNotification(
-			getString(R.string.vpn_channel_id),
-			getString(R.string.vpn_channel_name),
-			getString(R.string.tunnel_running),
-			description = "",
+	private fun createNotification(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),
+			),
 		)
 	}
 }

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

@@ -0,0 +1,253 @@
+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.di.MainImmediateDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
+import com.zaneschepke.wireguardautotunnel.domain.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.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
+	@MainImmediateDispatcher
+	lateinit var mainImmediateDispatcher: CoroutineDispatcher
+
+	@Inject
+	lateinit var tunnelManager: TunnelManager
+
+	private val defaultState = AutoTunnelState()
+
+	private val autoTunnelStateFlow = MutableStateFlow(defaultState)
+
+	private var wakeLock: PowerManager.WakeLock? = null
+
+	override fun onCreate() {
+		super.onCreate()
+		serviceManager.autoTunnelService.complete(this)
+		lifecycleScope.launch(mainImmediateDispatcher) {
+			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()
+			startKillSwitchJob()
+		}.onFailure {
+			Timber.e(it)
+		}
+	}
+
+	fun stop() {
+		wakeLock?.let { if (it.isHeld) it.release() }
+		stopSelf()
+	}
+
+	override fun onDestroy() {
+		serviceManager.autoTunnelService = CompletableDeferred()
+		super.onDestroy()
+	}
+
+	private fun launchWatcherNotification(description: String = getString(R.string.monitoring_state_changes)) {
+		val notification =
+			notificationManager.createNotification(
+				WireGuardNotification.NotificationChannels.AUTO_TUNNEL,
+				title = getString(R.string.auto_tunnel_title),
+				description = description,
+				actions = listOf(
+					notificationManager.createNotificationAction(NotificationAction.AUTO_TUNNEL_OFF),
+				),
+			)
+		ServiceCompat.startForeground(
+			this,
+			NotificationManager.AUTO_TUNNEL_NOTIFICATION_ID,
+			notification,
+			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+		)
+	}
+
+	private fun 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 { settings ->
+					networkMonitor.getNetworkStatusFlow(true, settings.isKernelEnabled)
+						.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,24 +1,21 @@
-package com.zaneschepke.wireguardautotunnel.service.tile
+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.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class AutoTunnelControlTile : TileService(), LifecycleOwner {
+class AutoTunnelControlTile : TileService() {
 	@Inject
 	lateinit var appDataRepository: AppDataRepository
 
@@ -29,32 +26,26 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
 	@ApplicationScope
 	lateinit var applicationScope: CoroutineScope
 
-	private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
-
 	override fun onCreate() {
 		super.onCreate()
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
-	}
-
-	override fun onStopListening() {
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
+		serviceManager.autoTunnelTile.complete(this)
 	}
 
 	override fun onDestroy() {
 		super.onDestroy()
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+		serviceManager.autoTunnelTile = CompletableDeferred()
 	}
 
 	override fun onStartListening() {
 		super.onStartListening()
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
-		lifecycleScope.launch {
+		serviceManager.autoTunnelTile.complete(this)
+		applicationScope.launch {
 			if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
 			updateTileState()
 		}
 	}
 
-	private fun updateTileState() {
+	fun updateTileState() {
 		serviceManager.autoTunnelActive.value.let {
 			if (it) setActive() else setInactive()
 		}
@@ -63,7 +54,7 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
 	override fun onClick() {
 		super.onClick()
 		unlockAndRun {
-			lifecycleScope.launch {
+			applicationScope.launch {
 				if (serviceManager.autoTunnelActive.value) {
 					serviceManager.stopAutoTunnel()
 					setInactive()
@@ -76,26 +67,19 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
 	}
 
 	private fun setActive() {
-		kotlin.runCatching {
+		runCatching {
 			qsTile.state = Tile.STATE_ACTIVE
 			qsTile.updateTile()
 		}
 	}
 
 	private fun setInactive() {
-		kotlin.runCatching {
+		runCatching {
 			qsTile.state = Tile.STATE_INACTIVE
 			qsTile.updateTile()
 		}
 	}
 
-	private fun setUnavailable() {
-		kotlin.runCatching {
-			qsTile.state = Tile.STATE_UNAVAILABLE
-			qsTile.updateTile()
-		}
-	}
-
 	/* This works around an annoying unsolved frameworks bug some people are hitting. */
 	override fun onBind(intent: Intent): IBinder? {
 		var ret: IBinder? = null
@@ -107,6 +91,10 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
 		return ret
 	}
 
-	override val lifecycle: Lifecycle
-		get() = lifecycleRegistry
+	private fun setUnavailable() {
+		runCatching {
+			qsTile.state = Tile.STATE_UNAVAILABLE
+			qsTile.updateTile()
+		}
+	}
 }

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

@@ -0,0 +1,135 @@
+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 com.zaneschepke.wireguardautotunnel.R
+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 dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class TunnelControlTile : TileService() {
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
+
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
+
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
+	@Inject
+	lateinit var tunnelManager: TunnelManager
+
+	override fun onCreate() {
+		super.onCreate()
+		serviceManager.tunnelControlTile.complete(this)
+	}
+
+	override fun onDestroy() {
+		super.onDestroy()
+		serviceManager.tunnelControlTile = CompletableDeferred()
+	}
+
+	override fun onStartListening() {
+		super.onStartListening()
+		Timber.d("Start listening called")
+		serviceManager.tunnelControlTile.complete(this)
+		applicationScope.launch {
+			updateTileState()
+		}
+	}
+
+	fun updateTileState() = applicationScope.launch {
+		val tunnels = appDataRepository.tunnels.getAll()
+		if (tunnels.isEmpty()) return@launch setUnavailable()
+		with(tunnelManager.activeTunnels.value) {
+			if (isNotEmpty()) if (size == 1) {
+				tunnels.firstOrNull { it.id == keys.first() }?.let { return@launch updateTile(it.tunName, true) }
+			} else {
+				return@launch updateTile(getString(R.string.multiple), true)
+			}
+		}
+		appDataRepository.getStartTunnelConfig()?.let {
+			updateTile(it.tunName, false)
+		}
+	}
+
+	override fun onClick() {
+		super.onClick()
+		unlockAndRun {
+			applicationScope.launch {
+				if (tunnelManager.activeTunnels.value.isNotEmpty()) return@launch tunnelManager.stopTunnel()
+				appDataRepository.getStartTunnelConfig()?.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)
+		}
+	}
+}

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

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

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

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

@@ -1,19 +1,18 @@
-package com.zaneschepke.wireguardautotunnel.service.shortcut
+package com.zaneschepke.wireguardautotunnel.core.shortcut
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.service.foreground.Action
-import com.zaneschepke.wireguardautotunnel.service.foreground.AutoTunnelService
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelService
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider
 import 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() {
@@ -21,10 +20,10 @@ class ShortcutsActivity : ComponentActivity() {
 	lateinit var appDataRepository: AppDataRepository
 
 	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
+	lateinit var serviceManager: ServiceManager
 
 	@Inject
-	lateinit var serviceManager: ServiceManager
+	lateinit var tunnelManager: TunnelManager
 
 	@Inject
 	@ApplicationScope
@@ -33,21 +32,21 @@ class ShortcutsActivity : ComponentActivity() {
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
 		applicationScope.launch {
-			val settings = appDataRepository.settings.getSettings()
+			val settings = appDataRepository.settings.get()
 			if (settings.isShortcutsEnabled) {
 				when (intent.getStringExtra(CLASS_NAME_EXTRA_KEY)) {
-					LEGACY_TUNNEL_SERVICE_NAME, TunnelService::class.java.simpleName -> {
+					LEGACY_TUNNEL_SERVICE_NAME, TunnelProvider::class.java.simpleName -> {
 						val tunnelName = intent.getStringExtra(TUNNEL_NAME_EXTRA_KEY)
 						Timber.d("Tunnel name extra: $tunnelName")
 						val tunnelConfig = tunnelName?.let {
 							appDataRepository.tunnels.getAll()
-								.firstOrNull { it.name == tunnelName }
+								.firstOrNull { it.tunName == tunnelName }
 						} ?: appDataRepository.getStartTunnelConfig()
-						Timber.d("Shortcut action on name: ${tunnelConfig?.name}")
+						Timber.d("Shortcut action on name: ${tunnelConfig?.tunName}")
 						tunnelConfig?.let {
 							when (intent.action) {
-								Action.START.name -> tunnelService.get().startTunnel(it, true)
-								Action.STOP.name -> tunnelService.get().stopTunnel(it)
+								Action.START.name -> tunnelManager.startTunnel(it)
+								Action.STOP.name -> tunnelManager.stopTunnel()
 								else -> Unit
 							}
 						}
@@ -64,6 +63,11 @@ class ShortcutsActivity : ComponentActivity() {
 		finish()
 	}
 
+	enum class Action {
+		START,
+		STOP,
+	}
+
 	companion object {
 		const val LEGACY_TUNNEL_SERVICE_NAME = "WireGuardTunnelService"
 		const val LEGACY_AUTO_TUNNEL_SERVICE_NAME = "WireGuardConnectivityWatcherService"

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

@@ -0,0 +1,256 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel
+
+import com.wireguard.android.backend.Tunnel
+import com.zaneschepke.networkmonitor.NetworkMonitor
+import com.zaneschepke.networkmonitor.NetworkStatus
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
+import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider.Companion.CHECK_INTERVAL
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendError
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
+import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.SnackbarController
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.StringValue
+import com.zaneschepke.wireguardautotunnel.util.extensions.asTunnelState
+import com.zaneschepke.wireguardautotunnel.util.extensions.cancelWithMessage
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.atomic.AtomicBoolean
+
+open class BaseTunnel(
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+	@ApplicationScope private val applicationScope: CoroutineScope,
+	private val networkMonitor: NetworkMonitor,
+	private val appDataRepository: AppDataRepository,
+	private val serviceManager: ServiceManager,
+	private val notificationManager: NotificationManager,
+) : TunnelProvider {
+
+	internal val tunnels = MutableStateFlow<List<TunnelConf>>(emptyList())
+
+	private val _tunnelStates = MutableStateFlow<Map<Int, TunnelState>>(emptyMap())
+
+	private val tunnelJobs = ConcurrentHashMap<Int, Job>()
+
+	private val isNetworkAvailable = AtomicBoolean(false)
+
+	init {
+		applicationScope.launch(ioDispatcher) {
+			launch { startNetworkJob() }
+			launch { monitorTunnelConfigChanges() }
+			tunnels.collect { tuns ->
+				val previousTunIds = tunnelJobs.keys.toSet()
+				val currentTunIds = tuns.map { it.id }.toSet()
+				val newTuns = tuns.filter { it.id !in previousTunIds }
+				val removedTunIds = previousTunIds - currentTunIds
+
+				newTuns.forEach { tun ->
+					Timber.d("Starting tunnel jobs for tun ${tun.name} (ID: ${tun.id})")
+					tunnelJobs[tun.id] = startTunnelJobs(tun)
+				}
+
+				removedTunIds.forEach { tunId ->
+					tunnelJobs[tunId]?.cancelWithMessage("Canceling tunnel jobs for tunnel ID: $tunId")
+					tunnelJobs.remove(tunId)
+					_tunnelStates.update { it - tunId }
+					serviceManager.updateTunnelTile()
+				}
+			}
+		}
+	}
+
+	private fun startTunnelJobs(tunnel: TunnelConf) = applicationScope.launch(ioDispatcher) {
+		launch { startTunnelStatisticsJob(tunnel) }
+		if (tunnel.isPingEnabled) launch { startPingJob(tunnel) }
+	}
+
+	private fun updateTunnelState(tunnelId: Int, newState: TunnelStatus) {
+		Timber.d("Updating tunnel state for ID $tunnelId to $newState")
+		_tunnelStates.update { current ->
+			val currentState = current[tunnelId]
+			val updatedState = currentState?.copy(state = newState) ?: TunnelState(state = newState)
+			val newMap = current + (tunnelId to updatedState)
+			Timber.d("New tunnel states: $newMap")
+			newMap
+		}
+	}
+
+	internal fun beforeStartTunnel(tunnelConf: TunnelConf) {
+		tunnelConf.setStateChangeCallback { state ->
+			Timber.d("New tunnel state $state")
+			when (state) {
+				is Tunnel.State -> updateTunnelState(tunnelConf.id, state.asTunnelState())
+				is org.amnezia.awg.backend.Tunnel.State -> updateTunnelState(tunnelConf.id, state.asTunnelState())
+			}
+			applicationScope.launch(ioDispatcher) {
+				serviceManager.updateTunnelTile()
+			}
+		}
+	}
+
+	override fun startTunnel(tunnelConf: TunnelConf) {
+		applicationScope.launch(ioDispatcher) {
+			serviceManager.startBackgroundService(tunnelConf)
+			appDataRepository.tunnels.save(tunnelConf.copy(isActive = true))
+			addToActiveTunnels(tunnelConf)
+		}
+	}
+
+	override fun stopTunnel(tunnelConf: TunnelConf?) {
+		// Default empty implementation; subclasses override
+	}
+
+	override suspend fun bounceTunnel(tunnelConf: TunnelConf) {
+		stopTunnel(tunnelConf)
+		delay(1000)
+		startTunnel(tunnelConf)
+	}
+
+	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
+		// Default empty implementation
+	}
+
+	override suspend fun runningTunnelNames(): Set<String> {
+		return emptySet()
+	}
+
+	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
+		throw NotImplementedError("Get statistics not implemented in base class")
+	}
+
+	override val activeTunnels: StateFlow<Map<Int, TunnelState>>
+		get() = _tunnelStates.asStateFlow()
+
+	internal suspend fun onTunnelStop(tunnelConf: TunnelConf) {
+		appDataRepository.tunnels.save(tunnelConf.copy(isActive = false))
+		removeFromActiveTunnels(tunnelConf)
+		if (tunnels.value.isEmpty()) serviceManager.stopBackgroundService()
+	}
+
+	internal fun stopAllTunnels() {
+		tunnels.value.forEach {
+			stopTunnel(it)
+		}
+	}
+
+	private fun addToActiveTunnels(conf: TunnelConf) {
+		tunnels.update {
+			it.toMutableList().apply {
+				add(conf)
+			}
+		}
+	}
+
+	private fun removeFromActiveTunnels(conf: TunnelConf) {
+		tunnels.update {
+			it.toMutableList().apply {
+				remove(conf)
+			}
+		}
+	}
+
+	private suspend fun startNetworkJob() = coroutineScope {
+		networkMonitor.getNetworkStatusFlow(includeWifiSsid = false, useRootShell = false)
+			.flowOn(ioDispatcher).collect {
+				isNetworkAvailable.set(it !is NetworkStatus.Disconnected)
+			}
+	}
+
+	private suspend fun startPingJob(tunnel: TunnelConf) = coroutineScope {
+		while (isActive) {
+			runCatching {
+				if (isNetworkAvailable.get() && tunnel.isActive) {
+					val pingSuccess = tunnel.isTunnelPingable(ioDispatcher)
+					handlePingResult(tunnel, pingSuccess)
+				}
+				delay(tunnel.pingInterval ?: Constants.PING_INTERVAL)
+			}
+		}
+	}
+
+	private suspend fun handlePingResult(tunnel: TunnelConf, pingSuccess: Boolean) {
+		if (!pingSuccess) {
+			if (isNetworkAvailable.get()) {
+				Timber.i("Ping result: target was not reachable, bouncing the tunnel")
+				bounceTunnel(tunnel)
+				delay(tunnel.pingCooldown ?: Constants.PING_COOLDOWN)
+			} else {
+				Timber.i("Ping result: target was not reachable, but no network available")
+			}
+		} else {
+			Timber.i("Ping result: all ping targets were reached successfully")
+		}
+	}
+
+	internal fun handleBackendThrowable(backendError: BackendError) {
+		val message = when (backendError) {
+			BackendError.Config -> StringValue.StringResource(R.string.start_failed_config)
+			BackendError.DNS -> StringValue.StringResource(R.string.dns_error)
+			BackendError.Unauthorized -> StringValue.StringResource(R.string.unauthorized)
+		}
+		if (WireGuardAutoTunnel.isForeground()) {
+			SnackbarController.showMessage(message)
+		} else {
+			notificationManager.show(
+				NotificationManager.VPN_NOTIFICATION_ID,
+				notificationManager.createNotification(
+					WireGuardNotification.NotificationChannels.VPN,
+					title = StringValue.StringResource(R.string.tunne_start_failed_title),
+					description = message,
+				),
+			)
+		}
+	}
+
+	private suspend fun monitorTunnelConfigChanges() = coroutineScope {
+		appDataRepository.tunnels.flow.collect { storageTuns ->
+			storageTuns.forEach { storageTun ->
+				val currentTun = tunnels.value.firstOrNull { it.id == storageTun.id }
+				if (currentTun != null) {
+					if (!currentTun.isQuickConfigMatching(storageTun)) {
+						Timber.d("Tunnel config changed for ID $storageTun, bouncing tunnel")
+						bounceTunnel(storageTun)
+					}
+				}
+			}
+		}
+	}
+
+	private suspend fun startTunnelStatisticsJob(tunnel: TunnelConf) = coroutineScope {
+		while (this.isActive) {
+			runCatching {
+				val stats = getStatistics(tunnel)
+				_tunnelStates.update { currentStates ->
+					val updatedState = currentStates[tunnel.id]?.copy(statistics = stats)
+						?: TunnelState(statistics = stats)
+					currentStates + (tunnel.id to updatedState)
+				}
+				delay(CHECK_INTERVAL)
+			}.onFailure { exception ->
+				Timber.e(exception, "Failed to update tunnel statistics for ${tunnel.tunName}")
+			}
+		}
+	}
+}

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

@@ -0,0 +1,79 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel
+
+import com.wireguard.android.backend.Backend
+import com.wireguard.android.backend.BackendException
+import com.wireguard.android.backend.Tunnel
+import com.zaneschepke.networkmonitor.NetworkMonitor
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
+import com.zaneschepke.wireguardautotunnel.domain.state.WireGuardStatistics
+import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import timber.log.Timber
+import javax.inject.Inject
+
+class KernelTunnel @Inject constructor(
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+	@ApplicationScope private val applicationScope: CoroutineScope,
+	serviceManager: ServiceManager,
+	appDataRepository: AppDataRepository,
+	notificationManager: NotificationManager,
+	private val backend: Backend,
+	networkMonitor: NetworkMonitor,
+) : BaseTunnel(ioDispatcher, applicationScope, networkMonitor, appDataRepository, serviceManager, notificationManager) {
+
+	override fun startTunnel(tunnelConf: TunnelConf) {
+		Timber.d("Starting tunnel ${tunnelConf.id} kernel")
+		applicationScope.launch(ioDispatcher) {
+			if (tunnels.value.any { it.id == tunnelConf.id }) return@launch Timber.w("Tunnel already running")
+			runCatching {
+				Timber.d("Setting backend state UP")
+				super.beforeStartTunnel(tunnelConf)
+				backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toWgConfig())
+				Timber.d("Calling super.startTunnel")
+				super.startTunnel(tunnelConf)
+			}.onFailure {
+				Timber.e(it, "Failed to start tunnel ${tunnelConf.id} kernel")
+				onTunnelStop(tunnelConf)
+				if (it is BackendException) {
+					handleBackendThrowable(it.toBackendError())
+				} else {
+					Timber.e(it)
+				}
+			}
+		}
+	}
+
+	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
+		return WireGuardStatistics(backend.getStatistics(tunnelConf))
+	}
+
+	override fun stopTunnel(tunnelConf: TunnelConf?) {
+		applicationScope.launch(ioDispatcher) {
+			runCatching {
+				tunnels.value.firstOrNull { it.id == tunnelConf?.id }?.let {
+					backend.setState(it, Tunnel.State.DOWN, it.toWgConfig())
+					onTunnelStop(it)
+				} ?: stopAllTunnels()
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
+	}
+
+	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
+		Timber.w("Not yet implemented for kernel")
+	}
+
+	override suspend fun runningTunnelNames(): Set<String> {
+		return backend.runningTunnelNames
+	}
+}

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

@@ -0,0 +1,97 @@
+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.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 startTunnel(tunnelConf: TunnelConf) {
+		tunnelProviderFlow.value.startTunnel(tunnelConf)
+	}
+
+	override fun stopTunnel(tunnelConf: TunnelConf?) {
+		tunnelProviderFlow.value.stopTunnel(tunnelConf)
+	}
+
+	override suspend fun bounceTunnel(tunnelConf: TunnelConf) {
+		tunnelProviderFlow.value.bounceTunnel(tunnelConf)
+	}
+
+	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
+		tunnelProviderFlow.value.setBackendState(backendState, allowedIps)
+	}
+
+	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 } }
+			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

@@ -0,0 +1,21 @@
+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.state.TunnelState
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
+import kotlinx.coroutines.flow.StateFlow
+
+interface TunnelProvider {
+	companion object {
+		const val CHECK_INTERVAL = 1000L
+	}
+
+	fun startTunnel(tunnelConf: TunnelConf)
+	fun stopTunnel(tunnelConf: TunnelConf? = null)
+	suspend fun bounceTunnel(tunnelConf: TunnelConf)
+	suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>)
+	suspend fun runningTunnelNames(): Set<String>
+	fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics
+	val activeTunnels: StateFlow<Map<Int, TunnelState>>
+}

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

@@ -0,0 +1,84 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel
+
+import com.wireguard.android.backend.BackendException
+import com.zaneschepke.networkmonitor.NetworkMonitor
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+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.toBackendError
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import org.amnezia.awg.backend.Backend
+import org.amnezia.awg.backend.Tunnel
+import timber.log.Timber
+import javax.inject.Inject
+
+class UserspaceTunnel @Inject constructor(
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+	@ApplicationScope private val applicationScope: CoroutineScope,
+	serviceManager: ServiceManager,
+	appDataRepository: AppDataRepository,
+	notificationManager: NotificationManager,
+	private val backend: Backend,
+	networkMonitor: NetworkMonitor,
+) : BaseTunnel(ioDispatcher, applicationScope, networkMonitor, appDataRepository, serviceManager, notificationManager) {
+
+	override fun startTunnel(tunnelConf: TunnelConf) {
+		applicationScope.launch(ioDispatcher) {
+			Timber.d("Starting tunnel ${tunnelConf.id} userspace")
+			if (tunnels.value.any { it.id == tunnelConf.id }) return@launch Timber.w("Tunnel already running")
+			if (tunnels.value.isNotEmpty()) {
+				Timber.d("Stopping all tunnels")
+				stopAllTunnels()
+			}
+			runCatching {
+				Timber.d("Setting backend state UP")
+				super.beforeStartTunnel(tunnelConf)
+				backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toAmConfig())
+				Timber.d("Calling super.startTunnel")
+				super.startTunnel(tunnelConf)
+			}.onFailure {
+				Timber.e(it, "Failed to start tunnel ${tunnelConf.id} userspace")
+				onTunnelStop(tunnelConf)
+				if (it is BackendException) {
+					handleBackendThrowable(it.toBackendError())
+				} else {
+					Timber.e(it)
+				}
+			}
+		}
+	}
+
+	override fun stopTunnel(tunnelConf: TunnelConf?) {
+		applicationScope.launch(ioDispatcher) {
+			runCatching {
+				tunnels.value.firstOrNull { it.id == tunnelConf?.id }?.let {
+					backend.setState(it, Tunnel.State.DOWN, it.toAmConfig())
+					onTunnelStop(it)
+				} ?: stopAllTunnels()
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
+	}
+
+	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
+		backend.setBackendState(backendState.asAmBackendState(), allowedIps)
+	}
+
+	override suspend fun runningTunnelNames(): Set<String> {
+		return backend.runningTunnelNames
+	}
+
+	override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
+		return AmneziaStatistics(backend.getStatistics(tunnelConf))
+	}
+}

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

@@ -0,0 +1,60 @@
+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(true)
+			if (tunnelManager.activeTunnels.value.isEmpty()) tunnelManager.restorePreviousState()
+		}
+		Result.success()
+	}
+}

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

@@ -6,12 +6,14 @@ import androidx.room.DeleteColumn
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
 import androidx.room.migration.AutoMigrationSpec
-import com.zaneschepke.wireguardautotunnel.data.domain.Settings
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.dao.SettingsDao
+import com.zaneschepke.wireguardautotunnel.data.dao.TunnelConfigDao
+import com.zaneschepke.wireguardautotunnel.data.model.Settings
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 
 @Database(
 	entities = [Settings::class, TunnelConfig::class],
-	version = 11,
+	version = 16,
 	autoMigrations =
 	[
 		AutoMigration(from = 1, to = 2),
@@ -41,6 +43,26 @@ import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 			to = 11,
 			spec = RemoveTunnelPauseMigration::class,
 		),
+		AutoMigration(
+			from = 11,
+			to = 12,
+		),
+		AutoMigration(
+			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/DataStoreManager.kt

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.data.datastore
+package com.zaneschepke.wireguardautotunnel.data
 
 import android.content.Context
 import androidx.datastore.preferences.core.Preferences
@@ -6,10 +6,11 @@ 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.module.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.di.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
@@ -43,7 +44,7 @@ class DataStoreManager(
 			try {
 				context.dataStore.data.first()
 			} catch (e: IOException) {
-				Timber.e(e)
+				Timber.Forest.e(e)
 			}
 		}
 	}
@@ -53,9 +54,9 @@ class DataStoreManager(
 			try {
 				context.dataStore.edit { it[key] = value }
 			} catch (e: IOException) {
-				Timber.e(e)
+				Timber.Forest.e(e)
 			} catch (e: Exception) {
-				Timber.e(e)
+				Timber.Forest.e(e)
 			}
 		}
 	}
@@ -65,9 +66,9 @@ class DataStoreManager(
 			try {
 				context.dataStore.edit { it.remove(key) }
 			} catch (e: IOException) {
-				Timber.e(e)
+				Timber.Forest.e(e)
 			} catch (e: Exception) {
-				Timber.e(e)
+				Timber.Forest.e(e)
 			}
 		}
 	}
@@ -79,7 +80,7 @@ class DataStoreManager(
 			try {
 				context.dataStore.data.map { it[key] }.first()
 			} catch (e: IOException) {
-				Timber.e(e)
+				Timber.Forest.e(e)
 				null
 			}
 		}
@@ -89,5 +90,5 @@ class DataStoreManager(
 		context.dataStore.data.map { it[key] }.first()
 	}
 
-	val preferencesFlow: Flow<Preferences?> = context.dataStore.data
+	val preferencesFlow: Flow<Preferences?> = context.dataStore.data.flowOn(ioDispatcher)
 }

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

@@ -16,7 +16,7 @@ object Queries {
 		        VALUES
 		        ('false',
 		        'false',
-		        'sampleSSID1,sampleSSID2',
+		        '',
 		        'false',
 		        'false',
 		        'false',

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

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

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

@@ -1,11 +1,11 @@
-package com.zaneschepke.wireguardautotunnel.data
+package com.zaneschepke.wireguardautotunnel.data.dao
 
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
 import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
 import kotlinx.coroutines.flow.Flow
 
@@ -44,6 +44,9 @@ interface TunnelConfigDao {
 	@Query("UPDATE TunnelConfig SET is_mobile_data_tunnel = 0 WHERE is_mobile_data_tunnel =1")
 	suspend fun resetMobileDataTunnel()
 
+	@Query("UPDATE TunnelConfig SET is_ethernet_tunnel = 0 WHERE is_ethernet_tunnel =1")
+	suspend fun resetEthernetTunnel()
+
 	@Query("SELECT * FROM TUNNELCONFIG WHERE is_primary_tunnel=1")
 	suspend fun findByPrimary(): TunnelConfigs
 

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

@@ -1,63 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.domain
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity
-data class Settings(
-	@PrimaryKey(autoGenerate = true) val id: Int = 0,
-	@ColumnInfo(name = "is_tunnel_enabled") val isAutoTunnelEnabled: Boolean = false,
-	@ColumnInfo(name = "is_tunnel_on_mobile_data_enabled")
-	val isTunnelOnMobileDataEnabled: Boolean = false,
-	@ColumnInfo(name = "trusted_network_ssids")
-	val trustedNetworkSSIDs: MutableList<String> = mutableListOf(),
-	@ColumnInfo(name = "is_always_on_vpn_enabled") val isAlwaysOnVpnEnabled: Boolean = false,
-	@ColumnInfo(name = "is_tunnel_on_ethernet_enabled")
-	val isTunnelOnEthernetEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_shortcuts_enabled",
-		defaultValue = "false",
-	)
-	val isShortcutsEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_tunnel_on_wifi_enabled",
-		defaultValue = "false",
-	)
-	val isTunnelOnWifiEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_kernel_enabled",
-		defaultValue = "false",
-	)
-	val isKernelEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_restore_on_boot_enabled",
-		defaultValue = "false",
-	)
-	val isRestoreOnBootEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_multi_tunnel_enabled",
-		defaultValue = "false",
-	)
-	val isMultiTunnelEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_ping_enabled",
-		defaultValue = "false",
-	)
-	val isPingEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_amnezia_enabled",
-		defaultValue = "false",
-	)
-	val isAmneziaEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_wildcards_enabled",
-		defaultValue = "false",
-	)
-	val isWildcardsEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "is_wifi_by_shell_enabled",
-		defaultValue = "false",
-	)
-	val isWifiNameByShellEnabled: Boolean = false,
-)

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

@@ -1,5 +1,6 @@
-package com.zaneschepke.wireguardautotunnel.data.domain
+package com.zaneschepke.wireguardautotunnel.data.model
 
+import com.zaneschepke.wireguardautotunnel.domain.entity.AppState
 import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 
 data class GeneralState(
@@ -11,7 +12,31 @@ data class GeneralState(
 	val locale: String? = null,
 	val theme: Theme = Theme.AUTOMATIC,
 ) {
+
+	fun toAppState(): AppState = AppState(
+		isLocationDisclosureShown,
+		isBatteryOptimizationDisableShown,
+		isPinLockEnabled,
+		isTunnelStatsExpanded,
+		isLocationDisclosureShown,
+		locale,
+		theme,
+	)
+
 	companion object {
+		fun from(appState: AppState): GeneralState {
+			return with(appState) {
+				GeneralState(
+					isLocationDisclosureShown,
+					isBatteryOptimizationDisableShown,
+					isPinLockEnabled,
+					isTunnelStatsExpanded,
+					isLocationDisclosureShown,
+					locale,
+					theme,
+				)
+			}
+		}
 		const val LOCATION_DISCLOSURE_SHOWN_DEFAULT = false
 		const val BATTERY_OPTIMIZATION_DISABLE_SHOWN_DEFAULT = false
 		const val PIN_LOCK_ENABLED_DEFAULT = false

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

@@ -0,0 +1,118 @@
+package com.zaneschepke.wireguardautotunnel.data.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
+
+@Entity
+data class Settings(
+	@PrimaryKey(autoGenerate = true) val id: Int = 0,
+	@ColumnInfo(name = "is_tunnel_enabled") val isAutoTunnelEnabled: Boolean = false,
+	@ColumnInfo(name = "is_tunnel_on_mobile_data_enabled")
+	val isTunnelOnMobileDataEnabled: Boolean = false,
+	@ColumnInfo(name = "trusted_network_ssids")
+	val trustedNetworkSSIDs: MutableList<String> = mutableListOf(),
+	@ColumnInfo(name = "is_always_on_vpn_enabled") val isAlwaysOnVpnEnabled: Boolean = false,
+	@ColumnInfo(name = "is_tunnel_on_ethernet_enabled")
+	val isTunnelOnEthernetEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_shortcuts_enabled",
+		defaultValue = "false",
+	)
+	val isShortcutsEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_tunnel_on_wifi_enabled",
+		defaultValue = "false",
+	)
+	val isTunnelOnWifiEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_kernel_enabled",
+		defaultValue = "false",
+	)
+	val isKernelEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_restore_on_boot_enabled",
+		defaultValue = "false",
+	)
+	val isRestoreOnBootEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_multi_tunnel_enabled",
+		defaultValue = "false",
+	)
+	val isMultiTunnelEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_ping_enabled",
+		defaultValue = "false",
+	)
+	val isPingEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_amnezia_enabled",
+		defaultValue = "false",
+	)
+	val isAmneziaEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_wildcards_enabled",
+		defaultValue = "false",
+	)
+	val isWildcardsEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_wifi_by_shell_enabled",
+		defaultValue = "false",
+	)
+	val isWifiNameByShellEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_stop_on_no_internet_enabled",
+		defaultValue = "false",
+	)
+	val isStopOnNoInternetEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_vpn_kill_switch_enabled",
+		defaultValue = "false",
+	)
+	val isVpnKillSwitchEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_kernel_kill_switch_enabled",
+		defaultValue = "false",
+	)
+	val isKernelKillSwitchEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "is_lan_on_kill_switch_enabled",
+		defaultValue = "false",
+	)
+	val isLanOnKillSwitchEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "debounce_delay_seconds",
+		defaultValue = "3",
+	)
+	val debounceDelaySeconds: Int = 3,
+	@ColumnInfo(
+		name = "is_disable_kill_switch_on_trusted_enabled",
+		defaultValue = "false",
+	)
+	val isDisableKillSwitchOnTrustedEnabled: Boolean = false,
+) {
+
+	fun toAppSettings(): AppSettings {
+		return AppSettings(
+			id, isAutoTunnelEnabled, isTunnelOnMobileDataEnabled, trustedNetworkSSIDs, isAlwaysOnVpnEnabled, isTunnelOnEthernetEnabled,
+			isShortcutsEnabled, isTunnelOnWifiEnabled, isKernelEnabled, isRestoreOnBootEnabled, isMultiTunnelEnabled, isPingEnabled,
+			isAmneziaEnabled, isWildcardsEnabled, isWifiNameByShellEnabled, isStopOnNoInternetEnabled, isVpnKillSwitchEnabled,
+			isKernelKillSwitchEnabled, isLanOnKillSwitchEnabled, debounceDelaySeconds, isDisableKillSwitchOnTrustedEnabled,
+		)
+	}
+
+	companion object {
+		fun from(appSettings: AppSettings): Settings {
+			return with(appSettings) {
+				Settings(
+					id, isAutoTunnelEnabled, isTunnelOnMobileDataEnabled, trustedNetworkSSIDs.toMutableList(), isAlwaysOnVpnEnabled,
+					isTunnelOnEthernetEnabled, isShortcutsEnabled, isTunnelOnWifiEnabled, isKernelEnabled, isRestoreOnBootEnabled,
+					isMultiTunnelEnabled, isPingEnabled, isAmneziaEnabled, isWildcardsEnabled, isWifiNameByShellEnabled,
+					isStopOnNoInternetEnabled, isVpnKillSwitchEnabled, isKernelKillSwitchEnabled, isLanOnKillSwitchEnabled,
+					debounceDelaySeconds, isDisableKillSwitchOnTrustedEnabled,
+				)
+			}
+		}
+	}
+}

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

@@ -1,12 +1,10 @@
-package com.zaneschepke.wireguardautotunnel.data.domain
+package com.zaneschepke.wireguardautotunnel.data.model
 
 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
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 
 @Entity(indices = [Index(value = ["name"], unique = true)])
 data class TunnelConfig(
@@ -58,34 +56,38 @@ data class TunnelConfig(
 		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 toAmConfig(): org.amnezia.awg.config.Config {
-		return configFromAmQuick(if (amQuick != "") amQuick else wgQuick)
+	fun toTunnel(): TunnelConf {
+		return TunnelConf(
+			id, name, wgQuick, tunnelNetworks, isMobileDataTunnel,
+			isPrimaryTunnel, amQuick, isActive, isPingEnabled, pingInterval,
+			pingCooldown, pingIp, isEthernetTunnel, isIpv4Preferred,
+		)
 	}
 
 	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 = ""
+
+		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

@@ -1,13 +0,0 @@
-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,20 +1,25 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
 import javax.inject.Inject
 
 class AppDataRoomRepository
 @Inject
 constructor(
-	override val settings: SettingsRepository,
-	override val tunnels: TunnelConfigRepository,
+	override val settings: AppSettingRepository,
+	override val tunnels: TunnelRepository,
 	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(): TunnelConfig? {
+	override suspend fun getStartTunnelConfig(): TunnelConf? {
 		tunnels.getActive().let {
 			if (it.isNotEmpty()) return it.first()
 			return getPrimaryOrFirstTunnel()

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

@@ -1,7 +1,8 @@
 package com.zaneschepke.wireguardautotunnel.data.repository
 
-import com.zaneschepke.wireguardautotunnel.data.datastore.DataStoreManager
-import com.zaneschepke.wireguardautotunnel.data.domain.GeneralState
+import com.zaneschepke.wireguardautotunnel.data.DataStoreManager
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
+import com.zaneschepke.wireguardautotunnel.data.model.GeneralState
 import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
@@ -38,14 +39,6 @@ class DataStoreAppStateRepository(
 		dataStoreManager.saveToDataStore(DataStoreManager.batteryDisableShown, shown)
 	}
 
-	override suspend fun getCurrentSsid(): String? {
-		return dataStoreManager.getFromStore(DataStoreManager.currentSSID)
-	}
-
-	override suspend fun setCurrentSsid(ssid: String) {
-		dataStoreManager.saveToDataStore(DataStoreManager.currentSSID, ssid)
-	}
-
 	override suspend fun isTunnelStatsExpanded(): Boolean {
 		return dataStoreManager.getFromStore(DataStoreManager.tunnelStatsExpanded)
 			?: GeneralState.IS_TUNNEL_STATS_EXPANDED
@@ -85,7 +78,7 @@ class DataStoreAppStateRepository(
 		return dataStoreManager.getFromStore(DataStoreManager.locale)
 	}
 
-	override val generalStateFlow: Flow<GeneralState> =
+	override val flow: Flow<GeneralState> =
 		dataStoreManager.preferencesFlow.map { prefs ->
 			prefs?.let { pref ->
 				try {

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

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

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

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

@@ -0,0 +1,107 @@
+package com.zaneschepke.wireguardautotunnel.data.repository
+
+import com.zaneschepke.wireguardautotunnel.data.dao.TunnelConfigDao
+import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import com.zaneschepke.wireguardautotunnel.data.model.TunnelConfig
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+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 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

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

@@ -1,33 +0,0 @@
-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 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/AppModule.kt

@@ -0,0 +1,46 @@
+package com.zaneschepke.wireguardautotunnel.di
+
+import android.content.Context
+import com.zaneschepke.logcatter.LogReader
+import com.zaneschepke.logcatter.LogcatReader
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
+import com.zaneschepke.wireguardautotunnel.core.notification.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
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+class AppModule {
+	@Singleton
+	@ApplicationScope
+	@Provides
+	fun providesApplicationScope(@DefaultDispatcher defaultDispatcher: CoroutineDispatcher): CoroutineScope =
+		CoroutineScope(SupervisorJob() + defaultDispatcher)
+
+	@Singleton
+	@Provides
+	fun provideLogCollect(@ApplicationContext context: Context): LogReader {
+		return LogcatReader.init(storageDir = context.filesDir.absolutePath)
+	}
+
+	@Singleton
+	@Provides
+	fun provideNotificationService(@ApplicationContext context: Context): NotificationManager {
+		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/di/BackendQualifiers.kt

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

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

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

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

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

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

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

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

@@ -0,0 +1,118 @@
+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.notification.NotificationManager
+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 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 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(
+		@IoDispatcher ioDispatcher: CoroutineDispatcher,
+		@ApplicationScope applicationScope: CoroutineScope,
+		serviceManager: ServiceManager,
+		appDataRepository: AppDataRepository,
+		networkMonitor: NetworkMonitor,
+		notificationManager: NotificationManager,
+		backend: com.wireguard.android.backend.Backend,
+	): TunnelProvider {
+		return KernelTunnel(ioDispatcher, applicationScope, serviceManager, appDataRepository, notificationManager, backend, networkMonitor)
+	}
+
+	@Provides
+	@Singleton
+	@Userspace
+	fun provideUserspaceProvider(
+		@IoDispatcher ioDispatcher: CoroutineDispatcher,
+		@ApplicationScope applicationScope: CoroutineScope,
+		serviceManager: ServiceManager,
+		appDataRepository: AppDataRepository,
+		notificationManager: NotificationManager,
+		networkMonitor: NetworkMonitor,
+		backend: Backend,
+	): TunnelProvider {
+		return UserspaceTunnel(ioDispatcher, applicationScope, serviceManager, appDataRepository, notificationManager, backend, networkMonitor)
+	}
+
+	@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): NetworkMonitor {
+		return AndroidNetworkMonitor(context)
+	}
+
+	@Singleton
+	@Provides
+	fun provideServiceManager(
+		@ApplicationContext context: Context,
+		@IoDispatcher ioDispatcher: CoroutineDispatcher,
+		@ApplicationScope applicationScope: CoroutineScope,
+		appDataRepository: AppDataRepository,
+	): ServiceManager {
+		return ServiceManager(context, ioDispatcher, applicationScope, appDataRepository)
+	}
+}

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,7 @@
+package com.zaneschepke.wireguardautotunnel.domain.enums
+
+enum class BackendState {
+	KILL_SWITCH_ACTIVE,
+	SERVICE_ACTIVE,
+	INACTIVE,
+}

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

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

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

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

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

@@ -0,0 +1,17 @@
+package com.zaneschepke.wireguardautotunnel.domain.enums
+
+import android.content.Context
+import com.zaneschepke.wireguardautotunnel.R
+
+enum class NotificationAction {
+	TUNNEL_OFF,
+	AUTO_TUNNEL_OFF,
+	;
+
+	fun title(context: Context): String {
+		return when (this) {
+			TUNNEL_OFF -> context.getString(R.string.stop)
+			AUTO_TUNNEL_OFF -> context.getString(R.string.stop)
+		}
+	}
+}

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

@@ -0,0 +1,15 @@
+package com.zaneschepke.wireguardautotunnel.domain.enums
+
+enum class TunnelStatus {
+	UP,
+	DOWN,
+	;
+
+	fun isDown(): Boolean {
+		return this == DOWN
+	}
+
+	fun isUp(): Boolean {
+		return this == UP
+	}
+}

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

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

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

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

@@ -0,0 +1,10 @@
+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/AppStateRepository.kt

@@ -1,6 +1,6 @@
-package com.zaneschepke.wireguardautotunnel.data.repository
+package com.zaneschepke.wireguardautotunnel.domain.repository
 
-import com.zaneschepke.wireguardautotunnel.data.domain.GeneralState
+import com.zaneschepke.wireguardautotunnel.data.model.GeneralState
 import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 import kotlinx.coroutines.flow.Flow
 
@@ -17,10 +17,6 @@ interface AppStateRepository {
 
 	suspend fun setBatteryOptimizationDisableShown(shown: Boolean)
 
-	suspend fun getCurrentSsid(): String?
-
-	suspend fun setCurrentSsid(ssid: String)
-
 	suspend fun isTunnelStatsExpanded(): Boolean
 
 	suspend fun setTunnelStatsExpanded(expanded: Boolean)
@@ -37,5 +33,5 @@ interface AppStateRepository {
 
 	suspend fun getLocale(): String?
 
-	val generalStateFlow: Flow<GeneralState>
+	val flow: Flow<GeneralState>
 }

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

@@ -0,0 +1,35 @@
+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 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/AmneziaStatistics.kt

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.service.tunnel.statistics
+package com.zaneschepke.wireguardautotunnel.domain.state
 
 import org.amnezia.awg.backend.Statistics
 import org.amnezia.awg.crypto.Key

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

@@ -0,0 +1,156 @@
+package com.zaneschepke.wireguardautotunnel.domain.state
+
+import com.zaneschepke.wireguardautotunnel.domain.events.KillSwitchEvent
+import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
+import com.zaneschepke.wireguardautotunnel.util.extensions.isMatchingToWildcardList
+
+data class AutoTunnelState(
+	val activeTunnels: Map<Int, TunnelState> = emptyMap(),
+	val networkState: NetworkState = NetworkState(),
+	val settings: AppSettings = AppSettings(),
+	val tunnels: List<TunnelConf> = emptyList(),
+) {
+
+	private fun isMobileDataActive(): Boolean {
+		return !networkState.isEthernetConnected && !networkState.isWifiConnected && networkState.isMobileDataConnected
+	}
+
+	private fun isMobileTunnelDataChangeNeeded(): Boolean {
+		val preferredTunnel = preferredMobileDataTunnel()
+		return preferredTunnel != null &&
+			activeTunnels.isNotEmpty() && !activeTunnels.any { it.key == preferredTunnel.id }
+	}
+
+	private fun isEthernetTunnelChangeNeeded(): Boolean {
+		val preferredTunnel = preferredEthernetTunnel()
+		return preferredTunnel != null && activeTunnels.isNotEmpty() && !activeTunnels.any { it.key == preferredTunnel.id }
+	}
+
+	private fun preferredMobileDataTunnel(): TunnelConf? {
+		return tunnels.firstOrNull { it.isMobileDataTunnel } ?: tunnels.firstOrNull { it.isPrimaryTunnel }
+	}
+
+	private fun preferredEthernetTunnel(): TunnelConf? {
+		return tunnels.firstOrNull { it.isEthernetTunnel } ?: tunnels.firstOrNull { it.isPrimaryTunnel }
+	}
+
+	private fun preferredWifiTunnel(): TunnelConf? {
+		return getTunnelWithMatchingTunnelNetwork() ?: tunnels.firstOrNull { it.isPrimaryTunnel }
+	}
+
+	private fun isWifiActive(): Boolean {
+		return !networkState.isEthernetConnected && networkState.isWifiConnected
+	}
+
+	private fun startOnEthernet(): Boolean {
+		return networkState.isEthernetConnected && settings.isTunnelOnEthernetEnabled && activeTunnels.isEmpty()
+	}
+
+	private fun stopOnEthernet(): Boolean {
+		return networkState.isEthernetConnected && !settings.isTunnelOnEthernetEnabled && activeTunnels.isNotEmpty()
+	}
+
+	// TODO test removed kill switch state check
+	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.isNotEmpty()
+	}
+
+	private fun startOnMobileData(): Boolean {
+		return isMobileDataActive() && settings.isTunnelOnMobileDataEnabled && activeTunnels.isEmpty()
+	}
+
+	private fun changeOnMobileData(): Boolean {
+		return isMobileDataActive() && settings.isTunnelOnMobileDataEnabled && isMobileTunnelDataChangeNeeded()
+	}
+
+	private fun changeOnEthernet(): Boolean {
+		return networkState.isEthernetConnected && settings.isTunnelOnEthernetEnabled && isEthernetTunnelChangeNeeded()
+	}
+
+	private fun stopOnWifi(): Boolean {
+		return isWifiActive() && !settings.isTunnelOnWifiEnabled && activeTunnels.isNotEmpty()
+	}
+
+	private fun stopOnTrustedWifi(): Boolean {
+		return isWifiActive() && settings.isTunnelOnWifiEnabled && activeTunnels.isNotEmpty() && isCurrentSSIDTrusted()
+	}
+
+	private fun startOnUntrustedWifi(): Boolean {
+		return isWifiActive() && settings.isTunnelOnWifiEnabled && activeTunnels.isEmpty() && !isCurrentSSIDTrusted()
+	}
+
+	private fun changeOnUntrustedWifi(): Boolean {
+		return isWifiActive() && settings.isTunnelOnWifiEnabled && activeTunnels.isNotEmpty() && !isCurrentSSIDTrusted() && !isWifiTunnelPreferred()
+	}
+
+	private fun isWifiTunnelPreferred(): Boolean {
+		val preferred = preferredWifiTunnel()
+		return activeTunnels.any { it.key == preferred?.id }
+	}
+
+	fun asAutoTunnelEvent(): AutoTunnelEvent {
+		return when {
+			// ethernet scenarios
+			stopOnEthernet() -> AutoTunnelEvent.Stop
+			startOnEthernet() || changeOnEthernet() -> AutoTunnelEvent.Start(preferredEthernetTunnel())
+			// mobile data scenarios
+			stopOnMobileData() -> AutoTunnelEvent.Stop
+			startOnMobileData() || changeOnMobileData() -> AutoTunnelEvent.Start(preferredMobileDataTunnel())
+			// wifi scenarios
+			stopOnWifi() -> AutoTunnelEvent.Stop
+			stopOnTrustedWifi() -> AutoTunnelEvent.Stop
+			startOnUntrustedWifi() || changeOnUntrustedWifi() -> AutoTunnelEvent.Start(preferredWifiTunnel())
+			// no connectivity
+			isNoConnectivity() && settings.isStopOnNoInternetEnabled -> AutoTunnelEvent.Stop
+			else -> AutoTunnelEvent.DoNothing
+		}
+	}
+
+	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)
+		} == true
+	}
+
+	private fun hasTrustedWifiName(wifiName: String, wifiNames: List<String> = settings.trustedNetworkSSIDs): Boolean {
+		return if (settings.isWildcardsEnabled) {
+			wifiNames.isMatchingToWildcardList(wifiName)
+		} else {
+			wifiNames.contains(wifiName)
+		}
+	}
+
+	private fun getTunnelWithMatchingTunnelNetwork(): TunnelConf? {
+		return networkState.wifiName?.let { wifiName ->
+			tunnels.firstOrNull {
+				hasTrustedWifiName(wifiName, it.tunnelNetworks)
+			}
+		}
+	}
+}

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

@@ -0,0 +1,9 @@
+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/NetworkState.kt

@@ -0,0 +1,12 @@
+package com.zaneschepke.wireguardautotunnel.domain.state
+
+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/domain/state/TunnelState.kt

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

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.service.tunnel.statistics
+package com.zaneschepke.wireguardautotunnel.domain.state
 
 import org.amnezia.awg.crypto.Key
 

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

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.service.tunnel.statistics
+package com.zaneschepke.wireguardautotunnel.domain.state
 
 import com.wireguard.android.backend.Statistics
 import org.amnezia.awg.crypto.Key

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

@@ -1,30 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.module
-
-import android.content.Context
-import com.zaneschepke.logcatter.LogReader
-import com.zaneschepke.logcatter.LogcatCollector
-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.SupervisorJob
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-class AppModule {
-	@Singleton
-	@ApplicationScope
-	@Provides
-	fun providesApplicationScope(@DefaultDispatcher defaultDispatcher: CoroutineDispatcher): CoroutineScope =
-		CoroutineScope(SupervisorJob() + defaultDispatcher)
-
-	@Singleton
-	@Provides
-	fun provideLogCollect(@ApplicationContext context: Context): LogReader {
-		return LogcatCollector.init(context = context)
-	}
-}

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

@@ -1,33 +0,0 @@
-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 com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
-import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
-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 provideNotificationService(wireGuardNotification: WireGuardNotification): NotificationService
-
-	@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

@@ -1,96 +0,0 @@
-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.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,
-	): TunnelService {
-		return WireGuardTunnel(
-			amneziaBackend,
-			tunnelConfigRepository,
-			kernelBackend,
-			appDataRepository,
-			applicationScope,
-			ioDispatcher,
-			serviceManager,
-		)
-	}
-
-	@Singleton
-	@Provides
-	fun provideServiceManager(@ApplicationContext context: Context): ServiceManager {
-		return ServiceManager.getInstance(context)
-	}
-}

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

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

@@ -1,52 +0,0 @@
-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,48 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
-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 tunnelConfigRepository: TunnelConfigRepository
-
-	override fun onReceive(context: Context, intent: Intent) {
-		val action = intent.action ?: return
-		applicationScope.launch {
-			if (action == REFRESH_TUNNELS_ACTION) {
-				tunnelService.get().runningTunnelNames().forEach { name ->
-					// TODO can optimize later
-					val tunnel = tunnelConfigRepository.findByTunnelName(name)
-					tunnel?.let {
-						tunnelConfigRepository.save(it.copy(isActive = true))
-					}
-				}
-				context.requestTunnelTileServiceStateUpdate()
-			}
-		}
-	}
-
-	companion object {
-		const val REFRESH_TUNNELS_ACTION = "com.wireguard.android.action.REFRESH_TUNNEL_STATES"
-	}
-}

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

@@ -1,8 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground
-
-enum class Action {
-	START,
-	START_FOREGROUND,
-	STOP,
-	STOP_FOREGROUND,
-}

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

@@ -1,556 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground
-
-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.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.NotificationService
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelState
-import com.zaneschepke.wireguardautotunnel.util.Constants
-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.MutableStateFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-import java.net.InetAddress
-import javax.inject.Inject
-import javax.inject.Provider
-
-@AndroidEntryPoint
-class AutoTunnelService : LifecycleService() {
-	private val foregroundId = 122
-
-	@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: 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 var wifiJob: Job? = null
-	private var mobileDataJob: Job? = null
-	private var ethernetJob: Job? = null
-	private var pingJob: Job? = null
-	private var networkEventJob: Job? = null
-
-	override fun onCreate() {
-		super.onCreate()
-		lifecycleScope.launch(mainImmediateDispatcher) {
-			kotlin.runCatching {
-				launchWatcherNotification()
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
-	}
-
-	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 {
-		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()
-			}
-			startSettingsJob()
-			startVpnStateJob()
-		}.onFailure {
-			Timber.e(it)
-		}
-	}
-
-	fun stop() {
-		wakeLock?.let {
-			if (it.isHeld) {
-				it.release()
-			}
-		}
-		stopSelf()
-	}
-
-	override fun onDestroy() {
-		cancelAndResetNetworkJobs()
-		cancelAndResetPingJob()
-		serviceManager.autoTunnelService = CompletableDeferred()
-		super.onDestroy()
-	}
-
-	private fun launchWatcherNotification(description: String = getString(R.string.monitoring_state_changes)) {
-		val notification =
-			notificationService.createNotification(
-				channelId = getString(R.string.watcher_channel_id),
-				channelName = getString(R.string.watcher_channel_name),
-				title = getString(R.string.auto_tunnel_title),
-				description = description,
-			)
-		ServiceCompat.startForeground(
-			this,
-			foregroundId,
-			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 startSettingsJob() = lifecycleScope.launch {
-		watchForSettingsChanges()
-	}
-
-	private fun startVpnStateJob() = lifecycleScope.launch {
-		watchForVpnStateChanges()
-	}
-
-	private fun startWifiJob() = lifecycleScope.launch {
-		watchForWifiConnectivityChanges()
-	}
-
-	private fun startMobileDataJob() = lifecycleScope.launch {
-		watchForMobileDataConnectivityChanges()
-	}
-
-	private fun startEthernetJob() = lifecycleScope.launch {
-		watchForEthernetConnectivityChanges()
-	}
-
-	private fun startPingJob() = lifecycleScope.launch {
-		watchForPingFailure()
-	}
-
-	private fun startNetworkEventJob() = lifecycleScope.launch {
-		handleNetworkEventChanges()
-	}
-
-	private suspend fun watchForMobileDataConnectivityChanges() {
-		withContext(ioDispatcher) {
-			Timber.i("Starting mobile data watcher")
-			mobileDataService.networkStatus.collect { status ->
-				when (status) {
-					is NetworkStatus.Available -> {
-						Timber.i("Gained Mobile data connection")
-						emitMobileDataConnected(true)
-					}
-
-					is NetworkStatus.CapabilitiesChanged -> {
-						emitMobileDataConnected(true)
-						Timber.i("Mobile data capabilities changed")
-					}
-
-					is NetworkStatus.Unavailable -> {
-						emitMobileDataConnected(false)
-						Timber.i("Lost mobile data connection")
-					}
-				}
-			}
-		}
-	}
-
-	private suspend fun watchForPingFailure() {
-		withContext(ioDispatcher) {
-			Timber.i("Starting ping watcher")
-			runCatching {
-				do {
-					val vpnState = tunnelService.get().vpnState.value
-					if (vpnState.status == TunnelState.UP) {
-						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
-								tunnelService.get().bounceTunnel(vpnState.tunnelConfig)
-								delay(cooldown ?: Constants.PING_COOLDOWN)
-								continue
-							}
-						}
-					}
-					delay(vpnState.tunnelConfig?.pingInterval ?: Constants.PING_INTERVAL)
-				} while (true)
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
-	}
-
-	private suspend fun watchForSettingsChanges() {
-		Timber.i("Starting settings watcher")
-		withContext(ioDispatcher) {
-			appDataRepository.settings.getSettingsFlow().combine(
-				// ignore isActive changes to allow manual tunnel overrides
-				appDataRepository.tunnels.getTunnelConfigsFlow().distinctUntilChanged { old, new ->
-					old.map { it.isActive } != new.map { it.isActive }
-				},
-			) { settings, tunnels ->
-				Timber.d("Tunnels or settings changed!")
-				autoTunnelStateFlow.value.copy(
-					settings = settings,
-					tunnels = tunnels,
-				)
-			}.collect {
-				Timber.d("got new settings: ${it.settings}")
-				manageJobsBySettings(it.settings)
-				autoTunnelStateFlow.emit(it)
-			}
-		}
-	}
-
-	private suspend fun watchForVpnStateChanges() {
-		Timber.i("Starting vpn state watcher")
-		withContext(ioDispatcher) {
-			tunnelService.get().vpnState.distinctUntilChanged { old, new ->
-				old.tunnelConfig?.id == new.tunnelConfig?.id
-			}.collect { state ->
-				autoTunnelStateFlow.update {
-					it.copy(vpnState = state)
-				}
-				state.tunnelConfig?.let {
-					val settings = appDataRepository.settings.getSettings()
-					if (it.isPingEnabled && !settings.isPingEnabled) {
-						pingJob.onNotRunning { pingJob = startPingJob() }
-					}
-					if (!it.isPingEnabled && !settings.isPingEnabled) {
-						cancelAndResetPingJob()
-					}
-				}
-			}
-		}
-	}
-
-	private fun manageJobsBySettings(settings: Settings) {
-		with(settings) {
-			if (isPingEnabled) {
-				pingJob.onNotRunning { pingJob = startPingJob() }
-			} else {
-				cancelAndResetPingJob()
-			}
-			if (isTunnelOnWifiEnabled || isTunnelOnEthernetEnabled || isTunnelOnMobileDataEnabled) {
-				startNetworkJobs()
-			} else {
-				cancelAndResetNetworkJobs()
-			}
-		}
-	}
-
-	private fun startNetworkJobs() {
-		wifiJob.onNotRunning {
-			Timber.i("Wifi job starting")
-			wifiJob = startWifiJob()
-		}
-		ethernetJob.onNotRunning {
-			ethernetJob = startEthernetJob()
-			Timber.i("Ethernet job starting")
-		}
-		mobileDataJob.onNotRunning {
-			mobileDataJob = startMobileDataJob()
-			Timber.i("Mobile data job starting")
-		}
-		networkEventJob.onNotRunning {
-			Timber.i("Network event job starting")
-			networkEventJob = startNetworkEventJob()
-		}
-	}
-
-	private fun cancelAndResetPingJob() {
-		pingJob?.cancelWithMessage("Ping job canceled")
-		pingJob = null
-	}
-
-	private fun cancelAndResetNetworkJobs() {
-		networkEventJob?.cancelWithMessage("Network event job canceled")
-		wifiJob?.cancelWithMessage("Wifi job canceled")
-		ethernetJob?.cancelWithMessage("Ethernet job canceled")
-		mobileDataJob?.cancelWithMessage("Mobile data job canceled")
-		networkEventJob = null
-		wifiJob = null
-		ethernetJob = null
-		mobileDataJob = null
-	}
-
-	private fun emitEthernetConnected(connected: Boolean) {
-		autoTunnelStateFlow.update {
-			it.copy(
-				isEthernetConnected = connected,
-			)
-		}
-	}
-
-	private fun emitWifiConnected(connected: Boolean) {
-		autoTunnelStateFlow.update {
-			it.copy(
-				isWifiConnected = connected,
-			)
-		}
-	}
-
-	private fun emitWifiSSID(ssid: String) {
-		autoTunnelStateFlow.update {
-			it.copy(
-				currentNetworkSSID = ssid,
-			)
-		}
-	}
-
-	private fun emitMobileDataConnected(connected: Boolean) {
-		autoTunnelStateFlow.update {
-			it.copy(
-				isMobileDataConnected = connected,
-			)
-		}
-	}
-
-	private suspend fun watchForEthernetConnectivityChanges() {
-		withContext(ioDispatcher) {
-			Timber.i("Starting ethernet data watcher")
-			ethernetService.networkStatus.collect { status ->
-				when (status) {
-					is NetworkStatus.Available -> {
-						Timber.i("Gained Ethernet connection")
-						emitEthernetConnected(true)
-					}
-
-					is NetworkStatus.CapabilitiesChanged -> {
-						Timber.i("Ethernet capabilities changed")
-						emitEthernetConnected(true)
-					}
-
-					is NetworkStatus.Unavailable -> {
-						emitEthernetConnected(false)
-						Timber.i("Lost Ethernet connection")
-					}
-				}
-			}
-		}
-	}
-
-	private suspend fun watchForWifiConnectivityChanges() {
-		withContext(ioDispatcher) {
-			Timber.i("Starting wifi watcher")
-			wifiService.networkStatus.collect { status ->
-				when (status) {
-					is NetworkStatus.Available -> {
-						Timber.i("Gained Wi-Fi connection")
-						emitWifiConnected(true)
-					}
-
-					is NetworkStatus.CapabilitiesChanged -> {
-						Timber.i("Wifi capabilities changed")
-						emitWifiConnected(true)
-						val ssid = getWifiSSID(status.networkCapabilities)
-						ssid?.let { name ->
-							if (name.contains(Constants.UNREADABLE_SSID)) {
-								Timber.w("SSID unreadable: missing permissions")
-							} else {
-								Timber.i("Detected valid SSID")
-							}
-							appDataRepository.appState.setCurrentSsid(name)
-							emitWifiSSID(name)
-						} ?: Timber.w("Failed to read ssid")
-					}
-
-					is NetworkStatus.Unavailable -> {
-						emitWifiConnected(false)
-						Timber.i("Lost Wi-Fi connection")
-					}
-				}
-			}
-		}
-	}
-
-	private suspend fun getWifiSSID(networkCapabilities: NetworkCapabilities): String? {
-		return withContext(ioDispatcher) {
-			with(autoTunnelStateFlow.value.settings) {
-				if (isWifiNameByShellEnabled) return@withContext rootShell.get().getCurrentWifiName()
-				wifiService.getNetworkName(networkCapabilities)
-			}
-		}
-	}
-
-	private suspend fun getMobileDataTunnel(): TunnelConfig? {
-		return appDataRepository.tunnels.findByMobileDataTunnel().firstOrNull()
-	}
-
-	private suspend fun handleNetworkEventChanges() {
-		withContext(ioDispatcher) {
-			Timber.i("Starting network event watcher")
-			autoTunnelStateFlow.collect { watcherState ->
-				val autoTunnel = "Auto-tunnel watcher"
-				// delay for rapid network state changes and then collect latest
-				delay(Constants.WATCHER_COLLECTION_DELAY)
-				val activeTunnel = watcherState.vpnState.tunnelConfig
-				val defaultTunnel = appDataRepository.getPrimaryOrFirstTunnel()
-				val isTunnelDown = tunnelService.get().getState() == TunnelState.DOWN
-				when {
-					watcherState.isEthernetConditionMet() -> {
-						Timber.i("$autoTunnel - tunnel on on ethernet condition met")
-						if (isTunnelDown) {
-							defaultTunnel?.let {
-								tunnelService.get().startTunnel(it)
-							}
-						}
-					}
-
-					watcherState.isMobileDataConditionMet() -> {
-						Timber.i("$autoTunnel - tunnel on mobile data condition met")
-						val mobileDataTunnel = getMobileDataTunnel()
-						val tunnel =
-							mobileDataTunnel ?: defaultTunnel
-						if (isTunnelDown || activeTunnel?.isMobileDataTunnel == false) {
-							tunnel?.let {
-								tunnelService.get().startTunnel(it)
-							}
-						}
-					}
-
-					watcherState.isTunnelOffOnMobileDataConditionMet() -> {
-						Timber.i("$autoTunnel - tunnel off on mobile data met, turning vpn off")
-						if (!isTunnelDown) {
-							activeTunnel?.let {
-								tunnelService.get().stopTunnel(it)
-							}
-						}
-					}
-
-					watcherState.isUntrustedWifiConditionMet() -> {
-						Timber.i("Untrusted wifi condition met")
-						if (activeTunnel == null || watcherState.isCurrentSSIDActiveTunnelNetwork() == false ||
-							isTunnelDown
-						) {
-							Timber.i(
-								"$autoTunnel - tunnel on ssid not associated with current tunnel condition met",
-							)
-							watcherState.getTunnelWithMatchingTunnelNetwork()?.let {
-								Timber.i("Found tunnel associated with this SSID, bringing tunnel up: ${it.name}")
-								if (isTunnelDown || activeTunnel?.id != it.id) {
-									tunnelService.get().startTunnel(it)
-								}
-							} ?: suspend {
-								Timber.i("No tunnel associated with this SSID, using defaults")
-								val default = appDataRepository.getPrimaryOrFirstTunnel()
-								if (default?.name != tunnelService.get().name || isTunnelDown) {
-									default?.let {
-										tunnelService.get().startTunnel(it)
-									}
-								}
-							}.invoke()
-						}
-					}
-
-					watcherState.isTrustedWifiConditionMet() -> {
-						Timber.i(
-							"$autoTunnel - tunnel off on trusted wifi condition met, turning vpn off",
-						)
-						if (!isTunnelDown) activeTunnel?.let { tunnelService.get().stopTunnel(it) }
-					}
-
-					watcherState.isTunnelOffOnWifiConditionMet() -> {
-						Timber.i(
-							"$autoTunnel - tunnel off on wifi condition met, turning vpn off",
-						)
-						if (!isTunnelDown) activeTunnel?.let { tunnelService.get().stopTunnel(it) }
-					}
-// TODO disable for this now
-// 					watcherState.isTunnelOffOnNoConnectivityMet() -> {
-// 						Timber.i(
-// 							"$autoTunnel - tunnel off on no connectivity met, turning vpn off",
-// 						)
-// 						if (!isTunnelDown) activeTunnel?.let { tunnelService.get().stopTunnel(it) }
-// 					}
-
-					else -> {
-						Timber.i("$autoTunnel - no condition met")
-					}
-				}
-			}
-		}
-	}
-}

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

@@ -1,107 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground
-
-import com.zaneschepke.wireguardautotunnel.data.domain.Settings
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnState
-import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
-import com.zaneschepke.wireguardautotunnel.util.extensions.isMatchingToWildcardList
-
-data class AutoTunnelState(
-	val vpnState: VpnState = VpnState(),
-	val isWifiConnected: Boolean = false,
-	val isEthernetConnected: Boolean = false,
-	val isMobileDataConnected: Boolean = false,
-	val currentNetworkSSID: String = "",
-	val settings: Settings = Settings(),
-	val tunnels: TunnelConfigs = emptyList(),
-) {
-	fun isEthernetConditionMet(): Boolean {
-		return (
-			isEthernetConnected &&
-				settings.isTunnelOnEthernetEnabled
-			)
-	}
-
-	fun isMobileDataConditionMet(): Boolean {
-		return (
-			!isEthernetConnected &&
-				settings.isTunnelOnMobileDataEnabled &&
-				!isWifiConnected &&
-				isMobileDataConnected
-			)
-	}
-
-	fun isTunnelOffOnMobileDataConditionMet(): Boolean {
-		return (
-			!isEthernetConnected &&
-				!settings.isTunnelOnMobileDataEnabled &&
-				isMobileDataConnected &&
-				!isWifiConnected
-			)
-	}
-
-	fun isUntrustedWifiConditionMet(): Boolean {
-		return (
-			!isEthernetConnected &&
-				isWifiConnected &&
-				!isCurrentSSIDTrusted() &&
-				settings.isTunnelOnWifiEnabled
-			)
-	}
-
-	fun isTrustedWifiConditionMet(): Boolean {
-		return (
-			!isEthernetConnected &&
-				(
-					isWifiConnected &&
-						isCurrentSSIDTrusted()
-					)
-			)
-	}
-
-	fun isTunnelOffOnWifiConditionMet(): Boolean {
-		return (
-			!isEthernetConnected &&
-				(
-					isWifiConnected &&
-						!settings.isTunnelOnWifiEnabled
-					)
-			)
-	}
-
-	fun isTunnelOffOnNoConnectivityMet(): Boolean {
-		return (
-			!isEthernetConnected &&
-				!isWifiConnected &&
-				!isMobileDataConnected
-			)
-	}
-
-	fun isCurrentSSIDTrusted(): Boolean {
-		return if (settings.isWildcardsEnabled) {
-			settings.trustedNetworkSSIDs.isMatchingToWildcardList(currentNetworkSSID)
-		} else {
-			settings.trustedNetworkSSIDs.contains(currentNetworkSSID)
-		}
-	}
-	fun isCurrentSSIDActiveTunnelNetwork(): Boolean {
-		val currentTunnelNetworks = vpnState.tunnelConfig?.tunnelNetworks
-		return (
-			if (settings.isWildcardsEnabled) {
-				currentTunnelNetworks?.isMatchingToWildcardList(currentNetworkSSID)
-			} else {
-				currentTunnelNetworks?.contains(currentNetworkSSID)
-			}
-			) == true
-	}
-
-	fun getTunnelWithMatchingTunnelNetwork(): TunnelConfig? {
-		return tunnels.firstOrNull {
-			if (settings.isWildcardsEnabled) {
-				it.tunnelNetworks.isMatchingToWildcardList(currentNetworkSSID)
-			} else {
-				it.tunnelNetworks.contains(currentNetworkSSID)
-			}
-		}
-	}
-}

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

@@ -1,85 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground
-
-import android.app.Service
-import android.content.Context
-import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.util.SingletonHolder
-import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
-import jakarta.inject.Inject
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
-import timber.log.Timber
-
-@OptIn(ExperimentalCoroutinesApi::class)
-class ServiceManager
-@Inject constructor(private val context: Context) {
-
-	private val _autoTunnelActive = MutableStateFlow(false)
-
-	val autoTunnelActive = _autoTunnelActive.asStateFlow()
-
-	var autoTunnelService = CompletableDeferred<AutoTunnelService>()
-	var backgroundService = CompletableDeferred<TunnelBackgroundService>()
-
-	companion object : SingletonHolder<ServiceManager, Context>(::ServiceManager)
-
-	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) {
-		if (autoTunnelService.isCompleted) return _autoTunnelActive.update { true }
-		kotlin.runCatching {
-			startService(AutoTunnelService::class.java, background)
-			autoTunnelService.await()
-			autoTunnelService.getCompleted().start()
-			_autoTunnelActive.update { true }
-		}.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)
-		}
-	}
-
-	fun stopAutoTunnel() {
-		if (!autoTunnelService.isCompleted) return
-		runCatching {
-			autoTunnelService.getCompleted().stop()
-			_autoTunnelActive.update { false }
-		}.onFailure {
-			Timber.e(it)
-		}
-	}
-
-	fun requestTunnelTileUpdate() {
-		context.requestTunnelTileServiceStateUpdate()
-	}
-}

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

@@ -1,101 +0,0 @@
-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.map
-
-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
-
-	override val networkStatus =
-		callbackFlow {
-			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(network))
-							}
-
-							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(network))
-							}
-
-							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) }
-		}
-}
-
-inline fun <Result> Flow<NetworkStatus>.map(
-	crossinline onUnavailable: suspend (network: Network) -> 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(status.network)
-		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

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

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

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

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

@@ -1,13 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.network
-
-import android.net.Network
-import android.net.NetworkCapabilities
-
-sealed class NetworkStatus {
-	class Available(val network: Network) : NetworkStatus()
-
-	class Unavailable(val network: Network) : NetworkStatus()
-
-	class CapabilitiesChanged(val network: Network, val networkCapabilities: NetworkCapabilities) :
-		NetworkStatus()
-}

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

@@ -1,32 +0,0 @@
-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/NotificationService.kt

@@ -1,22 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.notification
-
-import android.app.Notification
-import android.app.NotificationManager
-import android.app.PendingIntent
-
-interface NotificationService {
-	fun createNotification(
-		channelId: String,
-		channelName: String,
-		title: String = "",
-		action: PendingIntent? = null,
-		actionText: String? = null,
-		description: String,
-		showTimestamp: Boolean = false,
-		importance: Int = NotificationManager.IMPORTANCE_HIGH,
-		vibration: Boolean = false,
-		onGoing: Boolean = true,
-		lights: Boolean = true,
-		onlyAlertOnce: Boolean = true,
-	): Notification
-}

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

@@ -1,105 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.notification
-
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import android.graphics.Color
-import androidx.core.app.NotificationCompat
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.ui.MainActivity
-import dagger.hilt.android.qualifiers.ApplicationContext
-import javax.inject.Inject
-
-class WireGuardNotification
-@Inject
-constructor(
-	@ApplicationContext private val context: Context,
-) :
-	NotificationService {
-	private val notificationManager =
-		context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-
-	private val watcherBuilder: NotificationCompat.Builder =
-		NotificationCompat.Builder(
-			context,
-			context.getString(R.string.watcher_channel_id),
-		)
-	private val tunnelBuilder: NotificationCompat.Builder =
-		NotificationCompat.Builder(
-			context,
-			context.getString(R.string.vpn_channel_id),
-		)
-
-	override fun createNotification(
-		channelId: String,
-		channelName: String,
-		title: String,
-		action: PendingIntent?,
-		actionText: String?,
-		description: String,
-		showTimestamp: Boolean,
-		importance: Int,
-		vibration: Boolean,
-		onGoing: Boolean,
-		lights: Boolean,
-		onlyAlertOnce: Boolean,
-	): Notification {
-		val channel =
-			NotificationChannel(
-				channelId,
-				channelName,
-				importance,
-			)
-				.let {
-					it.description = title
-					it.enableLights(lights)
-					it.lightColor = Color.RED
-					it.enableVibration(vibration)
-					it.vibrationPattern = longArrayOf(100, 200, 300)
-					it
-				}
-		notificationManager.createNotificationChannel(channel)
-		val pendingIntent: PendingIntent =
-			Intent(context, MainActivity::class.java).let { notificationIntent ->
-				PendingIntent.getActivity(
-					context,
-					0,
-					notificationIntent,
-					PendingIntent.FLAG_IMMUTABLE,
-				)
-			}
-
-		val builder =
-			when (channelId) {
-				context.getString(R.string.watcher_channel_id) -> watcherBuilder
-				context.getString(R.string.vpn_channel_id) -> tunnelBuilder
-				else -> {
-					NotificationCompat.Builder(
-						context,
-						channelId,
-					)
-				}
-			}
-
-		return builder.let {
-			if (action != null && actionText != null) {
-				it.addAction(
-					NotificationCompat.Action.Builder(0, actionText, action).build(),
-				)
-				it.setAutoCancel(true)
-			}
-			it.setContentTitle(title)
-				.setContentText(description)
-				.setOnlyAlertOnce(onlyAlertOnce)
-				.setContentIntent(pendingIntent)
-				.setOngoing(onGoing)
-				.setPriority(NotificationCompat.PRIORITY_HIGH)
-				.setShowWhen(showTimestamp)
-				.setSmallIcon(R.drawable.ic_launcher)
-				.build()
-		}
-	}
-}

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

@@ -1,142 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.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.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-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 TunnelControlTile : TileService(), LifecycleOwner {
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
-
-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
-
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
-
-	private val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
-
-	override fun onCreate() {
-		super.onCreate()
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE)
-	}
-
-	override fun onStopListening() {
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP)
-	}
-
-	override fun onDestroy() {
-		super.onDestroy()
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY)
-	}
-
-	override fun onStartListening() {
-		super.onStartListening()
-		lifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START)
-		Timber.d("Updating tile!")
-		lifecycleScope.launch {
-			if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
-			updateTileState()
-		}
-	}
-
-	private suspend fun updateTileState() {
-		val lastActive = appDataRepository.getStartTunnelConfig()
-		lastActive?.let {
-			updateTile(it)
-		}
-	}
-
-	override fun onClick() {
-		super.onClick()
-		unlockAndRun {
-			lifecycleScope.launch {
-				val lastActive = appDataRepository.getStartTunnelConfig()
-				lastActive?.let { tunnel ->
-					if (tunnel.isActive) {
-						tunnelService.get().stopTunnel(tunnel)
-					} 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()
-			}
-		}
-	}
-
-	/* 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
-	}
-
-	override val lifecycle: Lifecycle
-		get() = lifecycleRegistry
-}