start sticky

feat: add worker to restart killed services
feat: add export as amnezia or wg
2026-07-03 14:07:49 +02:00 · 2025-02-22 07:52:16 -05:00 · 2025-02-21 21:16:10 -05:00 · 2025-02-21 17:26:51 -05:00 · 2025-02-14 19:05:02 -05:00 · 2025-02-14 17:11:26 -05:00
242 changed files with 5831 additions and 3389 deletions
@@ -104,6 +104,15 @@ jobs:
        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
@@ -68,7 +68,7 @@ jobs:
      - 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:
      GH_USER: ${{ secrets.GH_USER }}
@@ -77,6 +77,7 @@ jobs:
      GH_REPO: ${{ github.repository }}

    steps:
+      - uses: actions/checkout@v4
      - name: Install system dependencies
        run: |
          sudo apt update && sudo apt install -y gh apksigner
@@ -113,14 +114,6 @@ jobs:
          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
@@ -180,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 }}
@@ -190,18 +190,19 @@ 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:
-      - publish-github
+      - build
    if: inputs.release_type == 'release'
    steps:
      - name: Dispatch update for fdroid repo
        uses: peter-evans/repository-dispatch@v3
        with:
-          token: ${{ secrets.ANDROID_PAT }}
+          token: ${{ secrets.PAT }}
          repository: zaneschepke/fdroid
          event-type: fdroid-update

@@ -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
@@ -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,7 +31,7 @@ android {
 		generateLocaleConfig = true
 	}

-	//reproducibility
+	// reproducibility
 	dependenciesInfo {
 		// Disables dependency metadata when building APKs.
 		includeInApk = false
@@ -172,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)
@@ -188,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
@@ -219,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 {
@@ -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')"
+    ]
+  }
+}
@@ -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')"
+    ]
+  }
+}
@@ -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')"
+    ]
+  }
+}
@@ -66,7 +66,7 @@
        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"
@@ -74,7 +74,8 @@
 			>
            <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" />
@@ -86,7 +87,7 @@
            tools:replace="screenOrientation" />

        <activity
-            android:name=".service.shortcut.ShortcutsActivity"
+            android:name=".core.shortcut.ShortcutsActivity"
            android:enabled="true"
            android:exported="true"
 			android:noHistory="true"
@@ -105,11 +106,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"
@@ -123,10 +131,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"
@@ -139,23 +147,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.autotunnel.AutoTunnelService"
+            android:name=".core.service.autotunnel.AutoTunnelService"
            android:enabled="true"
            android:exported="false"
            android:foregroundServiceType="systemExempted"
@@ -164,7 +157,7 @@
            tools:node="merge" />

 		<service
-			android:name=".service.foreground.TunnelBackgroundService"
+			android:name=".core.service.TunnelForegroundService"
 			android:exported="false"
 			android:persistent="true"
 			android:foregroundServiceType="systemExempted"
@@ -175,7 +168,7 @@
 		</service>

        <receiver
-            android:name=".receiver.BootReceiver"
+            android:name=".core.broadcast.BootReceiver"
            android:enabled="true"
            android:exported="false">
            <intent-filter>
@@ -188,14 +181,14 @@
            </intent-filter>
        </receiver>
 		<receiver
-			android:name=".receiver.AppUpdateReceiver"
+			android:name=".core.broadcast.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>
@@ -203,7 +196,7 @@
 			</intent-filter>
 		</receiver>
 		<receiver
-			android:name=".receiver.NotificationActionReceiver"
+			android:name=".core.broadcast.NotificationActionReceiver"
 			android:exported="false"
 			android:permission="${applicationId}.permission.CONTROL_TUNNELS">
 		</receiver>
@@ -1,10 +1,11 @@
-package com.zaneschepke.wireguardautotunnel.ui
+package com.zaneschepke.wireguardautotunnel

 import android.content.Intent
-import android.graphics.Color.TRANSPARENT
+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
@@ -13,7 +14,6 @@ import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
@@ -38,34 +38,37 @@ 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.shortcut.ShortcutManager
-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.core.worker.ServiceWorker
+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.main.ConfigScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.main.MainScreen
-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.settings.killswitch.KillSwitchScreen
+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.screens.tunneloptions.OptionsScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.tunneloptions.config.ConfigScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.tunneloptions.splittunnel.SplitTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.tunneloptions.tunnelautotunnel.TunnelAutoTunnelScreen
 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
@@ -77,16 +80,15 @@ class MainActivity : AppCompatActivity() {
 	lateinit var appStateRepository: AppStateRepository

 	@Inject
-	lateinit var tunnelService: TunnelService
+	lateinit var tunnelManager: TunnelManager

 	@Inject
 	lateinit var shortcutManager: ShortcutManager

-	@OptIn(ExperimentalLayoutApi::class)
 	override fun onCreate(savedInstanceState: Bundle?) {
 		enableEdgeToEdge(
-			statusBarStyle = SystemBarStyle.auto(TRANSPARENT, TRANSPARENT),
-			navigationBarStyle = SystemBarStyle.auto(TRANSPARENT, TRANSPARENT),
+			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
@@ -123,7 +125,7 @@ class MainActivity : AppCompatActivity() {
 				requestAutoTunnelTileServiceUpdate()
 			}

-			with(appUiState.settings) {
+			with(appUiState.appSettings) {
 				LaunchedEffect(isAutoTunnelEnabled) {
 					this@MainActivity.requestAutoTunnelTileServiceUpdate()
 				}
@@ -133,6 +135,8 @@ class MainActivity : AppCompatActivity() {
 				}
 			}

+			ServiceWorker.start(this)
+
 			CompositionLocalProvider(LocalNavController provides navController) {
 				SnackbarControllerProvider { host ->
 					WireguardAutoTunnelTheme(theme = appUiState.generalState.theme) {
@@ -173,7 +177,7 @@ class MainActivity : AppCompatActivity() {
 								)
 							},
 						) { padding ->
-							Box(modifier = Modifier.fillMaxSize().padding(padding)) {
+							Box(modifier = Modifier.Companion.fillMaxSize().padding(padding)) {
 								NavHost(
 									navController,
 									enterTransition = { fadeIn(tween(Constants.TRANSITION_ANIMATION_TIME)) },
@@ -196,7 +200,7 @@ class MainActivity : AppCompatActivity() {
 									}
 									composable<Route.AutoTunnel> {
 										AutoTunnelScreen(
-											appUiState,
+											appUiState.appSettings,
 										)
 									}
 									composable<Route.Appearance> {
@@ -211,28 +215,25 @@ 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(
-											appUiState,
-											tunnelId = args.id,
-											appViewModel = viewModel,
-										)
+										val config =
+											appUiState.tunnels.firstOrNull { it.id == args.id }
+										ConfigScreen(config, viewModel)
 									}
 									composable<Route.TunnelOptions> {
 										val args = it.toRoute<Route.TunnelOptions>()
-										OptionsScreen(
-											tunnelId = args.id,
-											appUiState = appUiState,
-										)
+										val config = appUiState.tunnels.first { it.id == args.id }
+										OptionsScreen(config)
 									}
 									composable<Route.Lock> {
-										PinLockScreen(
-											appViewModel = viewModel,
-										)
+										PinLockScreen(viewModel)
 									}
 									composable<Route.Scanner> {
 										ScannerScreen()
@@ -242,11 +243,18 @@ class MainActivity : AppCompatActivity() {
 									}
 									composable<Route.SplitTunnel> {
 										val args = it.toRoute<Route.SplitTunnel>()
-										SplitTunnelScreen(appUiState, args.id, viewModel)
+										val config = appUiState.tunnels.first { it.id == args.id }
+										SplitTunnelScreen(config, viewModel)
 									}
 									composable<Route.TunnelAutoTunnel> {
-										val args = it.toRoute<Route.SplitTunnel>()
-										TunnelAutoTunnelScreen(appUiState, args.id)
+										val args = it.toRoute<Route.TunnelOptions>()
+										val config = appUiState.tunnels.first { it.id == args.id }
+										TunnelAutoTunnelScreen(config, appUiState.appSettings)
+									}
+								}
+								BackHandler {
+									if (navController.previousBackStackEntry == null || !navController.popBackStack()) {
+										this@MainActivity.finish()
 									}
 								}
 							}
@@ -256,9 +264,4 @@ class MainActivity : AppCompatActivity() {
 			}
 		}
 	}
-	override fun onDestroy() {
-		super.onDestroy()
-		// save battery by not polling stats while app is closed
-		tunnelService.cancelActiveTunnelJobs()
-	}
 }
@@ -3,14 +3,19 @@ package com.zaneschepke.wireguardautotunnel
 import android.app.Application
 import android.os.StrictMode
 import android.os.StrictMode.ThreadPolicy
+import androidx.hilt.work.HiltWorkerFactory
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.ProcessLifecycleOwner
+import androidx.work.Configuration
+import com.wireguard.android.backend.GoBackend
 import com.zaneschepke.logcatter.LogReader
-import com.zaneschepke.wireguardautotunnel.data.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.module.MainDispatcher
-import com.zaneschepke.wireguardautotunnel.service.tunnel.BackendState
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+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
@@ -23,7 +28,15 @@ 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
@@ -33,13 +46,7 @@ class WireGuardAutoTunnel : Application() {
 	lateinit var logReader: LogReader

 	@Inject
-	lateinit var appStateRepository: AppStateRepository
-
-	@Inject
-	lateinit var settingsRepository: SettingsRepository
-
-	@Inject
-	lateinit var tunnelService: TunnelService
+	lateinit var appDataRepository: AppDataRepository

 	@Inject
 	@IoDispatcher
@@ -49,9 +56,13 @@ class WireGuardAutoTunnel : Application() {
 	@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(
@@ -66,27 +77,61 @@ class WireGuardAutoTunnel : Application() {
 			Timber.plant(ReleaseTree())
 		}

+		GoBackend.setAlwaysOnCallback {
+			applicationScope.launch {
+				val settings = appDataRepository.settings.get()
+				if (settings.isAlwaysOnVpnEnabled) {
+					val tunnel = appDataRepository.getPrimaryOrFirstTunnel()
+					tunnel?.let {
+						tunnelManager.startTunnel(it)
+					}
+				} else {
+					Timber.Forest.w("Always-on VPN is not enabled in app settings")
+				}
+			}
+		}
+
 		applicationScope.launch {
 			withContext(mainDispatcher) {
-				if (appStateRepository.isLocalLogsEnabled() && !isRunningOnTv()) logReader.initialize()
+				if (appDataRepository.appState.isLocalLogsEnabled() && !isRunningOnTv()) logReader.initialize()
 			}
-			if (!settingsRepository.getSettings().isKernelEnabled) {
-				tunnelService.setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
+			if (!appDataRepository.settings.get().isKernelEnabled) {
+				tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
 			}
-			appStateRepository.getLocale()?.let {
-				LocaleUtil.changeLocale(it)
+			appDataRepository.appState.getLocale()?.let {
+				withContext(mainDispatcher) {
+					LocaleUtil.changeLocale(it)
+				}
 			}
 		}
 	}

 	override fun onTerminate() {
 		applicationScope.launch {
-			tunnelService.setBackendState(BackendState.INACTIVE, emptyList())
+			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
 	}
@@ -0,0 +1,45 @@
+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 dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class AppUpdateReceiver : BroadcastReceiver() {
+
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
+
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
+
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
+	@Inject
+	lateinit var tunnelManager: TunnelManager
+
+	override fun onReceive(context: Context, intent: Intent) {
+		if (intent.action != Intent.ACTION_MY_PACKAGE_REPLACED) return
+		serviceManager.updateTunnelTile()
+		serviceManager.updateAutoTunnelTile()
+		applicationScope.launch {
+			with(appDataRepository.settings.get()) {
+				if (isRestoreOnBootEnabled) {
+					// If auto tunnel is enabled, just start it and let auto tunnel start appropriate tun
+					if (isAutoTunnelEnabled && !serviceManager.autoTunnelActive.value) return@launch serviceManager.startAutoTunnel(true)
+					tunnelManager.restorePreviousState()
+				}
+			}
+		}
+	}
+}
@@ -0,0 +1,44 @@
+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 dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class BootReceiver : BroadcastReceiver() {
+	@Inject
+	lateinit var appDataRepository: AppDataRepository
+
+	@Inject
+	@ApplicationScope
+	lateinit var applicationScope: CoroutineScope
+
+	@Inject
+	lateinit var serviceManager: ServiceManager
+
+	@Inject
+	lateinit var tunnelManager: TunnelManager
+
+	override fun onReceive(context: Context, intent: Intent) {
+		if (Intent.ACTION_BOOT_COMPLETED != intent.action) return
+		serviceManager.updateTunnelTile()
+		serviceManager.updateAutoTunnelTile()
+		applicationScope.launch {
+			with(appDataRepository.settings.get()) {
+				if (isRestoreOnBootEnabled) {
+					// If auto tunnel is enabled, just start it and let auto tunnel start appropriate tun
+					if (isAutoTunnelEnabled && !serviceManager.autoTunnelActive.value) return@launch serviceManager.startAutoTunnel(true)
+					tunnelManager.restorePreviousState()
+				}
+			}
+		}
+	}
+}
@@ -1,43 +1,41 @@
-package com.zaneschepke.wireguardautotunnel.receiver
+package com.zaneschepke.wireguardautotunnel.core.broadcast

 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.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+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
-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
+	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) {
-				tunnelService.get().runningTunnelNames().forEach { name ->
-					// TODO can optimize later
-					val tunnel = tunnelConfigRepository.findByTunnelName(name)
+				tunnelManager.runningTunnelNames().forEach {
+					val tunnel = tunnelRepository.findByTunnelName(it)
 					tunnel?.let {
-						tunnelConfigRepository.save(it.copy(isActive = true))
+						tunnelRepository.save(it.copy(isActive = true))
 					}
 				}
 				serviceManager.updateTunnelTile()
@@ -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)
+				}
+			}
+		}
+	}
+}
@@ -0,0 +1,161 @@
+package com.zaneschepke.wireguardautotunnel.core.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.SupplicantState
+import android.net.wifi.WifiManager
+import android.os.Build
+import com.zaneschepke.wireguardautotunnel.domain.state.ConnectivityState
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.flowOn
+import javax.inject.Inject
+
+class InternetConnectivityMonitor
+@Inject
+constructor(
+	@ApplicationContext private val context: Context,
+	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+) : NetworkMonitor {
+
+	private val connectivityManager =
+		context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+
+	@get:Synchronized @set:Synchronized
+	private var wifiCapabilities: NetworkCapabilities? = null
+
+	@get:Synchronized @set:Synchronized
+	private var wifiNetworkChanged: Boolean = false
+
+	override val didWifiChangeSinceLastCapabilitiesQuery: Boolean
+		get() = wifiNetworkChanged
+
+	override val status = callbackFlow {
+
+		var wifiState: Boolean = false
+		var ethernetState: Boolean = false
+		var cellularState: Boolean = false
+
+		fun emitState() {
+			trySend(ConnectivityState(wifiState, ethernetState, cellularState))
+		}
+
+		val currentNetwork = connectivityManager.activeNetwork
+		if (currentNetwork == null) {
+			emitState()
+		}
+
+		fun updateCapabilityState(up: Boolean, network: Network) {
+			with(connectivityManager.getNetworkCapabilities(network)) {
+				when {
+					this == null -> return
+					hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> wifiState = up
+					hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) ->
+						cellularState = up
+
+					hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) ->
+						ethernetState = up
+				}
+			}
+		}
+
+		fun onWifiChange(network: Network, callback: () -> Unit) {
+			if (connectivityManager.getNetworkCapabilities(network)?.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) == true) {
+				callback()
+			}
+		}
+
+		fun onAvailable(network: Network) {
+			onWifiChange(network) {
+				wifiNetworkChanged = true
+			}
+		}
+
+		fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
+			onWifiChange(network) {
+				wifiCapabilities = networkCapabilities
+			}
+			updateCapabilityState(true, network)
+			emitState()
+		}
+
+		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) {
+							onAvailable(network)
+						}
+
+						override fun onLost(network: Network) {
+							updateCapabilityState(false, network)
+							emitState()
+						}
+
+						override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
+							onCapabilitiesChanged(network, networkCapabilities)
+						}
+					}
+				}
+
+				else -> {
+					object : ConnectivityManager.NetworkCallback() {
+						override fun onAvailable(network: Network) {
+							onAvailable(network)
+						}
+
+						override fun onLost(network: Network) {
+							updateCapabilityState(false, network)
+							emitState()
+						}
+
+						override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
+							onCapabilitiesChanged(network, networkCapabilities)
+						}
+					}
+				}
+			}
+		val request =
+			NetworkRequest.Builder()
+				.addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
+				.addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET)
+				.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
+				.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+				.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
+				.build()
+		connectivityManager.registerNetworkCallback(request, networkStatusCallback)
+
+		awaitClose { connectivityManager.unregisterNetworkCallback(networkStatusCallback) }
+	}.flowOn(ioDispatcher)
+
+	override fun getWifiCapabilities(): NetworkCapabilities? {
+		wifiNetworkChanged = false
+		return wifiCapabilities
+	}
+
+	companion object {
+		fun getNetworkName(networkCapabilities: NetworkCapabilities, context: Context): String? {
+			var ssid = networkCapabilities.getWifiName()
+			if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S) {
+				val wifiManager =
+					context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
+
+				@Suppress("DEPRECATION")
+				val info = wifiManager.connectionInfo
+				if (info.supplicantState === SupplicantState.COMPLETED) {
+					ssid = info.ssid
+				}
+			}
+			return ssid?.trim('"')
+		}
+	}
+}
@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.service.network
+package com.zaneschepke.wireguardautotunnel.core.network

 import android.net.NetworkCapabilities
 import android.net.wifi.WifiInfo
@@ -0,0 +1,13 @@
+package com.zaneschepke.wireguardautotunnel.core.network
+
+import android.net.NetworkCapabilities
+import com.zaneschepke.wireguardautotunnel.domain.state.ConnectivityState
+import kotlinx.coroutines.flow.Flow
+
+interface NetworkMonitor {
+	val status: Flow<ConnectivityState>
+
+	// util to help limit location queries
+	val didWifiChangeSinceLastCapabilitiesQuery: Boolean
+	fun getWifiCapabilities(): NetworkCapabilities?
+}
@@ -1,12 +1,14 @@
-package com.zaneschepke.wireguardautotunnel.service.notification
+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.service.notification.WireGuardNotification.NotificationChannels
+import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
+import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification.NotificationChannels
+import com.zaneschepke.wireguardautotunnel.util.StringValue

-interface NotificationService {
+interface NotificationManager {
 	val context: Context
 	fun createNotification(
 		channel: NotificationChannels,
@@ -19,7 +21,18 @@ interface NotificationService {
 		onlyAlertOnce: Boolean = true,
 	): Notification

-	fun createNotificationAction(notificationAction: NotificationAction): NotificationCompat.Action
+	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)

@@ -29,5 +42,6 @@ interface NotificationService {
 		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"
 	}
 }
@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.service.notification
+package com.zaneschepke.wireguardautotunnel.core.notification

 import android.Manifest
 import android.app.Notification
@@ -13,8 +13,11 @@ import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.receiver.NotificationActionReceiver
-import com.zaneschepke.wireguardautotunnel.ui.MainActivity
+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

@@ -22,7 +25,7 @@ class WireGuardNotification
@Inject
 constructor(
 	@ApplicationContext override val context: Context,
-) : NotificationService {
+) : com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager {

 	enum class NotificationChannels {
 		VPN,
@@ -64,12 +67,35 @@ constructor(
 		}.build()
 	}

-	override fun createNotificationAction(notificationAction: NotificationAction): NotificationCompat.Action {
+	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,
 		)
@@ -1,13 +1,13 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground
+package com.zaneschepke.wireguardautotunnel.core.service

 import android.app.Service
 import android.content.Context
 import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.AutoTunnelService
-import com.zaneschepke.wireguardautotunnel.service.tile.AutoTunnelControlTile
-import com.zaneschepke.wireguardautotunnel.service.tile.TunnelControlTile
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+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.domain.entity.TunnelConf
 import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
 import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
 import jakarta.inject.Inject
@@ -29,7 +29,7 @@ class ServiceManager
 	val autoTunnelActive = _autoTunnelActive.asStateFlow()

 	var autoTunnelService = CompletableDeferred<AutoTunnelService>()
-	var backgroundService = CompletableDeferred<TunnelBackgroundService>()
+	var backgroundService = CompletableDeferred<TunnelForegroundService>()
 	var autoTunnelTile = CompletableDeferred<AutoTunnelControlTile>()
 	var tunnelControlTile = CompletableDeferred<TunnelControlTile>()

@@ -45,10 +45,10 @@ class ServiceManager
 	}

 	suspend fun startAutoTunnel(background: Boolean) {
-		val settings = appDataRepository.settings.getSettings()
+		val settings = appDataRepository.settings.get()
 		appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = true))
 		if (autoTunnelService.isCompleted) return _autoTunnelActive.update { true }
-		kotlin.runCatching {
+		runCatching {
 			startService(AutoTunnelService::class.java, background)
 			autoTunnelService.await()
 			autoTunnelService.getCompleted().start()
@@ -59,12 +59,12 @@ class ServiceManager
 		}
 	}

-	suspend fun startBackgroundService(tunnelConfig: TunnelConfig?) {
+	suspend fun startBackgroundService(tunnelConf: TunnelConf) {
 		if (backgroundService.isCompleted) return
-		kotlin.runCatching {
-			startService(TunnelBackgroundService::class.java, true)
+		runCatching {
+			startService(TunnelForegroundService::class.java, true)
 			backgroundService.await()
-			backgroundService.getCompleted().start(tunnelConfig)
+			backgroundService.getCompleted().start(tunnelConf)
 		}.onFailure {
 			Timber.e(it)
 		}
@@ -86,7 +86,7 @@ class ServiceManager
 		}
 	}

-	private fun updateAutoTunnelTile() {
+	fun updateAutoTunnelTile() {
 		if (autoTunnelTile.isCompleted) {
 			autoTunnelTile.getCompleted().updateTileState()
 		} else {
@@ -104,7 +104,7 @@ class ServiceManager

 	suspend fun stopAutoTunnel() {
 		withContext(ioDispatcher) {
-			val settings = appDataRepository.settings.getSettings()
+			val settings = appDataRepository.settings.get()
 			appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = false))
 			if (!autoTunnelService.isCompleted) return@withContext
 			runCatching {
@@ -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,20 +6,20 @@ import android.os.IBinder
 import androidx.core.app.ServiceCompat
 import androidx.lifecycle.LifecycleService
 import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationAction
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
-import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
+import com.zaneschepke.wireguardautotunnel.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
@@ -35,15 +35,16 @@ class TunnelBackgroundService : LifecycleService() {
 	}

 	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+		super.onStartCommand(intent, flags, startId)
 		serviceManager.backgroundService.complete(this)
-		return super.onStartCommand(intent, flags, startId)
+		return START_NOT_STICKY
 	}

-	fun start(tunnelConfig: TunnelConfig?) {
+	fun start(tunnelConf: TunnelConf) {
 		ServiceCompat.startForeground(
-			this,
-			NotificationService.KERNEL_SERVICE_NOTIFICATION_ID,
-			createNotification(tunnelConfig),
+			this@TunnelForegroundService,
+			NotificationManager.KERNEL_SERVICE_NOTIFICATION_ID,
+			createNotification(tunnelConf),
 			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
 		)
 	}
@@ -58,12 +59,12 @@ class TunnelBackgroundService : LifecycleService() {
 		super.onDestroy()
 	}

-	private fun createNotification(tunnelConfig: TunnelConfig?): Notification {
-		return notificationService.createNotification(
+	private fun createNotification(tunnelConf: TunnelConf): Notification {
+		return notificationManager.createNotification(
 			WireGuardNotification.NotificationChannels.VPN,
-			title = "${getString(R.string.tunnel_running)} - ${tunnelConfig?.name}",
+			title = "${getString(R.string.tunnel_running)} - ${tunnelConf.tunName}",
 			actions = listOf(
-				notificationService.createNotificationAction(NotificationAction.TUNNEL_OFF),
+				notificationManager.createNotificationAction(NotificationAction.TUNNEL_OFF, tunnelConf.id),
 			),
 		)
 	}
@@ -0,0 +1,255 @@
+package com.zaneschepke.wireguardautotunnel.core.service.autotunnel
+
+import android.content.Intent
+import android.net.NetworkCapabilities
+import android.os.IBinder
+import android.os.PowerManager
+import androidx.core.app.ServiceCompat
+import androidx.lifecycle.LifecycleService
+import androidx.lifecycle.lifecycleScope
+import com.wireguard.android.util.RootShell
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.di.AppShell
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.di.MainImmediateDispatcher
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.domain.state.AutoTunnelState
+import com.zaneschepke.wireguardautotunnel.domain.state.NetworkState
+import com.zaneschepke.wireguardautotunnel.core.network.InternetConnectivityMonitor
+import com.zaneschepke.wireguardautotunnel.core.network.NetworkMonitor
+import com.zaneschepke.wireguardautotunnel.domain.state.ConnectivityState
+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.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.domain.entity.AppSettings
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
+import com.zaneschepke.wireguardautotunnel.domain.events.KillSwitchEvent
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.extensions.Tunnels
+import com.zaneschepke.wireguardautotunnel.util.extensions.getCurrentWifiName
+import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineDispatcher
+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.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
+	@AppShell
+	lateinit var rootShell: Provider<RootShell>
+
+	@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 {
+		super.onStartCommand(intent, flags, startId)
+		Timber.d("onStartCommand executed with startId: $startId")
+		serviceManager.autoTunnelService.complete(this)
+		return START_NOT_STICKY
+	}
+
+	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 suspend fun buildNetworkState(connectivityState: ConnectivityState): NetworkState {
+		return with(autoTunnelStateFlow.value.networkState) {
+			val wifiName = when {
+				connectivityState.wifiAvailable &&
+					(wifiName == null || wifiName == Constants.UNREADABLE_SSID || networkMonitor.didWifiChangeSinceLastCapabilitiesQuery) -> {
+					networkMonitor.getWifiCapabilities()?.let { getWifiName(it) } ?: wifiName
+				}
+				!connectivityState.wifiAvailable -> null
+				else -> wifiName
+			}
+			copy(
+				isWifiConnected = connectivityState.wifiAvailable,
+				isMobileDataConnected = connectivityState.cellularAvailable,
+				isEthernetConnected = isEthernetConnected,
+				wifiName = wifiName,
+			)
+		}
+	}
+
+	private fun startAutoTunnelStateJob() = lifecycleScope.launch(ioDispatcher) {
+		combine(
+			combineSettings(),
+			networkMonitor.status.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 suspend fun getWifiName(wifiCapabilities: NetworkCapabilities): String? {
+		val setting = appDataRepository.get().settings.get()
+		return if (setting.isWifiNameByShellEnabled) {
+			rootShell.get().getCurrentWifiName()
+		} else {
+			InternetConnectivityMonitor.getNetworkName(wifiCapabilities, this@AutoTunnelService)
+		}
+	}
+
+	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")
+			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")
+			}
+		}
+	}
+}
@@ -1,14 +1,17 @@
-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 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
@@ -64,21 +67,32 @@ class AutoTunnelControlTile : TileService() {
 	}

 	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()
 		}
 	}

+	/* This works around an annoying unsolved frameworks bug some people are hitting. */
+	override fun onBind(intent: Intent): IBinder? {
+		var ret: IBinder? = null
+		try {
+			ret = super.onBind(intent)
+		} catch (_: Throwable) {
+			Timber.e("Failed to bind to TunnelControlTile")
+		}
+		return ret
+	}
+
 	private fun setUnavailable() {
-		kotlin.runCatching {
+		runCatching {
 			qsTile.state = Tile.STATE_UNAVAILABLE
 			qsTile.updateTile()
 		}
@@ -1,28 +1,27 @@
-package com.zaneschepke.wireguardautotunnel.service.tile
+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.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
+import 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
-import javax.inject.Provider

@AndroidEntryPoint
 class TunnelControlTile : TileService() {
 	@Inject
 	lateinit var appDataRepository: AppDataRepository

-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
-
 	@Inject
 	@ApplicationScope
 	lateinit var applicationScope: CoroutineScope
@@ -30,6 +29,9 @@ class TunnelControlTile : TileService() {
 	@Inject
 	lateinit var serviceManager: ServiceManager

+	@Inject
+	lateinit var tunnelManager: TunnelManager
+
 	override fun onCreate() {
 		super.onCreate()
 		serviceManager.tunnelControlTile.complete(this)
@@ -42,17 +44,20 @@ class TunnelControlTile : TileService() {

 	override fun onStartListening() {
 		super.onStartListening()
+		Timber.d("Start listening called")
 		serviceManager.tunnelControlTile.complete(this)
 		applicationScope.launch {
-			if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
 			updateTileState()
 		}
 	}

 	fun updateTileState() = applicationScope.launch {
-		val lastActive = appDataRepository.getStartTunnelConfig()
-		lastActive?.let {
-			updateTile(it)
+		if (appDataRepository.tunnels.getAll().isEmpty()) return@launch setUnavailable()
+		with(tunnelManager.activeTunnels().value) {
+			if (isNotEmpty()) return@launch updateTile(if (size == 1) first().tunName else getString(R.string.multiple), true)
+		}
+		appDataRepository.getStartTunnelConfig()?.let {
+			updateTile(it.tunName, false)
 		}
 	}

@@ -60,35 +65,30 @@ class TunnelControlTile : TileService() {
 		super.onClick()
 		unlockAndRun {
 			applicationScope.launch {
-				val lastActive = appDataRepository.getStartTunnelConfig()
-				lastActive?.let { tunnel ->
-					if (tunnel.isActive) {
-						tunnelService.get().stopTunnel()
-					} else {
-						tunnelService.get().startTunnel(tunnel, true)
-					}
-					updateTileState()
+				if (tunnelManager.activeTunnels().value.isNotEmpty()) return@launch tunnelManager.stopTunnel()
+				appDataRepository.getStartTunnelConfig()?.let {
+					tunnelManager.startTunnel(it)
 				}
 			}
 		}
 	}

 	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 {
+		runCatching {
 			qsTile.state = Tile.STATE_UNAVAILABLE
 			setTileDescription("")
 			qsTile.updateTile()
@@ -96,7 +96,7 @@ class TunnelControlTile : TileService() {
 	}

 	private fun setTileDescription(description: String) {
-		kotlin.runCatching {
+		runCatching {
 			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
 				qsTile.subtitle = description
 			}
@@ -107,13 +107,24 @@ class TunnelControlTile : TileService() {
 		}
 	}

-	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
+	}
+
+	private fun updateTile(name: String, active: Boolean) {
+		runCatching {
+			setTileDescription(name)
+			if (active) return setActive()
+			setInactive()
+		}.onFailure {
+			Timber.e(it)
 		}
 	}
 }
@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.service.shortcut
+package com.zaneschepke.wireguardautotunnel.core.shortcut

 import android.content.Context
 import android.content.Intent
@@ -6,7 +6,7 @@ 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.module.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.service.shortcut
+package com.zaneschepke.wireguardautotunnel.core.shortcut

 interface ShortcutManager {
 	suspend fun addShortcuts()
@@ -1,27 +1,23 @@
-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.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.AutoTunnelService
-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.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() {
 	@Inject
 	lateinit var appDataRepository: AppDataRepository

-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
-
 	@Inject
 	lateinit var serviceManager: ServiceManager

@@ -32,24 +28,24 @@ 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}")
-						tunnelConfig?.let {
-							when (intent.action) {
-								Action.START.name -> tunnelService.get().startTunnel(it, true)
-								Action.STOP.name -> tunnelService.get().stopTunnel()
-								else -> Unit
-							}
-						}
+						Timber.d("Shortcut action on name: ${tunnelConfig?.tunName}")
+// 						tunnelConfig?.let {
+// 							when (intent.action) {
+// 								Action.START.name -> tunnelService.get().startTunnel(it)
+// 								Action.STOP.name -> tunnelService.get().stopTunnel()
+// 								else -> Unit
+// 							}
+// 						}
 					}
 					AutoTunnelService::class.java.simpleName, LEGACY_AUTO_TUNNEL_SERVICE_NAME -> {
 						when (intent.action) {
@@ -0,0 +1,219 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel
+
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
+import com.zaneschepke.wireguardautotunnel.core.network.NetworkMonitor
+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.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.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.distinctUntilChanged
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.isActive
+import kotlinx.coroutines.launch
+import timber.log.Timber
+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 tunnelJobs = mutableMapOf<TunnelConf, Job>()
+
+	private val isNetworkAvailable = AtomicBoolean(false)
+
+	init {
+		applicationScope.launch(ioDispatcher) {
+			launch {
+				startNetworkJob()
+			}
+			tunnels.collect { tuns ->
+				val previousTuns = tunnelJobs.keys.toSet()
+				val newTuns = tuns - previousTuns
+				val removedItems = previousTuns - tuns.toSet()
+
+				newTuns.forEach { tun ->
+					Timber.d("Starting tunnel jobs for tun ${tun.name}")
+					tunnelJobs[tun] = startTunnelJobs(tun)
+				}
+
+				removedItems.forEach { tun ->
+					tunnelJobs[tun]?.cancelWithMessage("Canceling tunnel jobs for tunnel: ${tun.name}")
+					tunnelJobs.remove(tun)
+				}
+				serviceManager.updateTunnelTile()
+			}
+		}
+	}
+
+	private fun startTunnelJobs(tunnel: TunnelConf) = applicationScope.launch(ioDispatcher) {
+		launch {
+			startTunnelStatisticsJob(tunnel)
+		}
+		launch {
+			startPingJob(tunnel)
+		}
+		launch {
+			startTunnelConfigChangeJob(tunnel)
+		}
+	}
+
+	override suspend fun bounceTunnel(tunnelConf: TunnelConf) {
+		if (tunnels.value.any { it.id == tunnelConf.id }) {
+			toggleTunnel(tunnelConf, TunnelStatus.DOWN)
+			toggleTunnel(tunnelConf, TunnelStatus.UP)
+		}
+	}
+
+	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
+	}
+
+	override suspend fun runningTunnelNames(): Set<String> {
+		return emptySet()
+	}
+
+	override suspend fun activeTunnels(): StateFlow<List<TunnelConf>> {
+		return tunnels.asStateFlow()
+	}
+
+	override suspend fun startTunnel(tunnelConf: TunnelConf) {
+		if (tunnels.value.any { it.id == tunnelConf.id }) return Timber.w("Tunnel already running")
+		serviceManager.startBackgroundService(tunnelConf)
+		appDataRepository.tunnels.save(tunnelConf.copy(isActive = true))
+	}
+
+	override suspend fun stopTunnel(tunnelConf: TunnelConf?) {
+	}
+
+	open suspend fun toggleTunnel(tunnelConf: TunnelConf, state: TunnelStatus) {
+	}
+
+	open suspend fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
+		throw NotImplementedError("Get statistics not implemented in base class")
+	}
+
+	internal suspend fun onTunnelStop(tunnelConf: TunnelConf) {
+		appDataRepository.tunnels.save(tunnelConf.copy(isActive = false))
+		removeFromActiveTunnels(tunnelConf)
+		if (tunnels.value.isEmpty()) serviceManager.stopBackgroundService()
+	}
+
+	internal suspend fun stopAllTunnels() {
+		tunnels.value.forEach {
+			stopTunnel(it)
+		}
+	}
+
+	internal 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.status.distinctUntilChanged().collect {
+			isNetworkAvailable.set(!it.allOffline)
+		}
+	}
+
+	private suspend fun startPingJob(tunnel: TunnelConf) = coroutineScope {
+		while (isActive) {
+			if (isNetworkAvailable.get() && tunnel.isActive) {
+				val pingResult = tunnel.pingTunnel(ioDispatcher)
+				handlePingResult(tunnel, pingResult)
+			}
+			delay(CHECK_INTERVAL)
+		}
+	}
+
+	private suspend fun handlePingResult(tunnel: TunnelConf, pingResult: List<Boolean>) {
+		if (pingResult.contains(false)) {
+			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 startTunnelConfigChangeJob(tunnel: TunnelConf) = coroutineScope {
+		appDataRepository.tunnels.flow.collect { storageTuns ->
+			storageTuns.firstOrNull { it.id == tunnel.id }?.let { storageTun ->
+				if (tunnel.isQuickConfigChanged(storageTun) || tunnel.isPingConfigMatching(storageTun)) {
+					bounceTunnel(tunnel)
+				}
+			}
+		}
+	}
+
+	private suspend fun startTunnelStatisticsJob(tunnel: TunnelConf) = coroutineScope {
+		while (isActive) {
+			val stats = getStatistics(tunnel)
+			tunnel.state.update {
+				it.copy(statistics = stats)
+			}
+			delay(CHECK_INTERVAL)
+		}
+	}
+}
@@ -0,0 +1,83 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel
+
+import com.wireguard.android.backend.Backend
+import com.wireguard.android.backend.BackendException
+import com.wireguard.android.backend.Tunnel
+import com.zaneschepke.wireguardautotunnel.core.network.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.enums.TunnelStatus
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
+import com.zaneschepke.wireguardautotunnel.domain.state.WireGuardStatistics
+import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.withContext
+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 suspend fun startTunnel(tunnelConf: TunnelConf) {
+		withContext(ioDispatcher) {
+			super.startTunnel(tunnelConf)
+			runCatching {
+				backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toWgConfig())
+				addToActiveTunnels(tunnelConf)
+			}.onFailure {
+				onTunnelStop(tunnelConf)
+				if (it is BackendException) {
+					handleBackendThrowable(it.toBackendError())
+				} else {
+					Timber.e(it)
+				}
+			}
+		}
+	}
+
+	override suspend fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
+		return WireGuardStatistics(backend.getStatistics(tunnelConf))
+	}
+
+	override suspend fun stopTunnel(tunnelConf: TunnelConf?) {
+		withContext(ioDispatcher) {
+			val tunnel = tunnels.value.firstOrNull { it.id == tunnelConf?.id }
+			runCatching {
+				tunnel?.let {
+					backend.setState(it, Tunnel.State.DOWN, it.toWgConfig())
+					onTunnelStop(it)
+				} ?: stopAllTunnels()
+			}.onFailure {
+				Timber.e(it)
+			}
+		}
+	}
+
+	override suspend fun toggleTunnel(tunnelConf: TunnelConf, status: TunnelStatus) {
+		when (status) {
+			TunnelStatus.UP -> backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toWgConfig())
+			TunnelStatus.DOWN -> backend.setState(tunnelConf, Tunnel.State.DOWN, tunnelConf.toWgConfig())
+		}
+	}
+
+	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
+	}
+}
@@ -0,0 +1,99 @@
+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.AppSettings
+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.util.extensions.withData
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.filterNotNull
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.plus
+import kotlinx.coroutines.withContext
+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 {
+
+	val appSettings: StateFlow<AppSettings?> = appDataRepository.settings.flow.stateIn(
+		scope = applicationScope.plus(ioDispatcher),
+		started = SharingStarted.Eagerly,
+		initialValue = null,
+	)
+
+	override suspend fun activeTunnels(): StateFlow<List<TunnelConf>> {
+		return withContext(ioDispatcher) {
+			appSettings.filterNotNull().first().let {
+				if (it.isKernelEnabled) return@withContext kernelTunnel.activeTunnels()
+				userspaceTunnel.activeTunnels()
+			}
+		}
+	}
+
+	override suspend fun startTunnel(tunnelConf: TunnelConf) {
+		appSettings.withData {
+			if (it.isKernelEnabled) return@withData kernelTunnel.startTunnel(tunnelConf)
+			userspaceTunnel.startTunnel(tunnelConf)
+		}
+	}
+
+	override suspend fun stopTunnel(tunnelConf: TunnelConf?) {
+		appSettings.withData {
+			if (it.isKernelEnabled) return@withData kernelTunnel.stopTunnel(tunnelConf)
+			userspaceTunnel.stopTunnel(tunnelConf)
+		}
+	}
+
+	override suspend fun bounceTunnel(tunnelConf: TunnelConf) {
+		appSettings.withData {
+			if (it.isKernelEnabled) return@withData kernelTunnel.stopTunnel(tunnelConf)
+			userspaceTunnel.stopTunnel(tunnelConf)
+		}
+	}
+
+	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
+		appSettings.withData {
+			if (it.isKernelEnabled) return@withData kernelTunnel.setBackendState(backendState, allowedIps)
+			userspaceTunnel.setBackendState(backendState, allowedIps)
+		}
+	}
+
+	override suspend fun runningTunnelNames(): Set<String> {
+		appSettings.filterNotNull().first().let {
+			if (it.isKernelEnabled) return kernelTunnel.runningTunnelNames()
+			return userspaceTunnel.runningTunnelNames()
+		}
+	}
+
+	suspend fun restorePreviousState() {
+		withContext(ioDispatcher) {
+			with(appDataRepository.settings.get()) {
+				if (isRestoreOnBootEnabled) {
+					val previouslyActiveTuns = appDataRepository.tunnels.getActive()
+					// handle kernel mode
+					val tunsToStart = previouslyActiveTuns.filterNot { tun -> activeTunnels().value.any { tun.id == it.id } }
+					if (isKernelEnabled) {
+						return@withContext tunsToStart.forEach {
+							startTunnel(it)
+						}
+					}
+					// handle userspace
+					if (activeTunnels().value.isEmpty()) tunsToStart.firstOrNull()?.let { startTunnel(it) }
+				}
+			}
+		}
+	}
+}
@@ -0,0 +1,24 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel
+
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
+import kotlinx.coroutines.flow.StateFlow
+
+interface TunnelProvider {
+
+	suspend fun activeTunnels(): StateFlow<List<TunnelConf>>
+
+	suspend fun startTunnel(tunnelConf: TunnelConf)
+
+	suspend fun stopTunnel(tunnelConf: TunnelConf? = null)
+
+	suspend fun bounceTunnel(tunnelConf: TunnelConf)
+
+	suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>)
+
+	suspend fun runningTunnelNames(): Set<String>
+
+	companion object {
+		const val CHECK_INTERVAL = 1_000L
+	}
+}
@@ -0,0 +1,83 @@
+package com.zaneschepke.wireguardautotunnel.core.tunnel
+
+import com.wireguard.android.backend.BackendException
+import com.zaneschepke.wireguardautotunnel.core.network.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.enums.TunnelStatus
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.domain.state.AmneziaStatistics
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
+import com.zaneschepke.wireguardautotunnel.util.extensions.asAmBackendState
+import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.withContext
+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,
+) : TunnelProvider, BaseTunnel(ioDispatcher, applicationScope, networkMonitor, appDataRepository, serviceManager, notificationManager) {
+
+	override suspend fun startTunnel(tunnelConf: TunnelConf) {
+		withContext(ioDispatcher) {
+			super.startTunnel(tunnelConf)
+			runCatching {
+				backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toAmConfig())
+				addToActiveTunnels(tunnelConf)
+			}.onFailure {
+				onTunnelStop(tunnelConf)
+				if (it is BackendException) {
+					handleBackendThrowable(it.toBackendError())
+				} else {
+					Timber.e(it)
+				}
+			}
+		}
+	}
+
+	override suspend fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics {
+		return AmneziaStatistics(backend.getStatistics(tunnelConf))
+	}
+
+	override suspend fun toggleTunnel(tunnelConf: TunnelConf, status: TunnelStatus) {
+		when (status) {
+			TunnelStatus.UP -> backend.setState(tunnelConf, Tunnel.State.UP, tunnelConf.toAmConfig())
+			TunnelStatus.DOWN -> backend.setState(tunnelConf, Tunnel.State.DOWN, tunnelConf.toAmConfig())
+		}
+	}
+
+	override suspend fun stopTunnel(tunnelConf: TunnelConf?) {
+		withContext(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
+	}
+}
@@ -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()
+	}
+}
@@ -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 = 13,
+	version = 16,
 	autoMigrations =
 	[
 		AutoMigration(from = 1, to = 2),
@@ -49,6 +51,18 @@ import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
 			from = 12,
 			to = 13,
 		),
+		AutoMigration(
+			from = 13,
+			to = 14,
+		),
+		AutoMigration(
+			from = 14,
+			to = 15,
+		),
+		AutoMigration(
+			from = 15,
+			to = 16,
+		),
 	],
 	exportSchema = true,
 )
@@ -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)
 }
@@ -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
@@ -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

@@ -1,109 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.domain
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.Index
-import androidx.room.PrimaryKey
-import com.wireguard.config.Config
-import com.zaneschepke.wireguardautotunnel.util.extensions.toWgQuickString
-import java.io.InputStream
-
-@Entity(indices = [Index(value = ["name"], unique = true)])
-data class TunnelConfig(
-	@PrimaryKey(autoGenerate = true) val id: Int = 0,
-	@ColumnInfo(name = "name") val name: String,
-	@ColumnInfo(name = "wg_quick") val wgQuick: String,
-	@ColumnInfo(
-		name = "tunnel_networks",
-		defaultValue = "",
-	)
-	val tunnelNetworks: MutableList<String> = mutableListOf(),
-	@ColumnInfo(
-		name = "is_mobile_data_tunnel",
-		defaultValue = "false",
-	)
-	val isMobileDataTunnel: Boolean = false,
-	@ColumnInfo(
-		name = "is_primary_tunnel",
-		defaultValue = "false",
-	)
-	val isPrimaryTunnel: Boolean = false,
-	@ColumnInfo(
-		name = "am_quick",
-		defaultValue = "",
-	)
-	val amQuick: String = AM_QUICK_DEFAULT,
-	@ColumnInfo(
-		name = "is_Active",
-		defaultValue = "false",
-	)
-	val isActive: Boolean = false,
-	@ColumnInfo(
-		name = "is_ping_enabled",
-		defaultValue = "false",
-	)
-	val isPingEnabled: Boolean = false,
-	@ColumnInfo(
-		name = "ping_interval",
-		defaultValue = "null",
-	)
-	val pingInterval: Long? = null,
-	@ColumnInfo(
-		name = "ping_cooldown",
-		defaultValue = "null",
-	)
-	val pingCooldown: Long? = null,
-	@ColumnInfo(
-		name = "ping_ip",
-		defaultValue = "null",
-	)
-	var pingIp: String? = null,
-	@ColumnInfo(
-		name = "is_ethernet_tunnel",
-		defaultValue = "false",
-	)
-	var isEthernetTunnel: Boolean = false,
-) {
-
-	fun toAmConfig(): org.amnezia.awg.config.Config {
-		return configFromAmQuick(if (amQuick != "") amQuick else wgQuick)
-	}
-
-	fun toWgConfig(): Config {
-		return configFromWgQuick(wgQuick)
-	}
-
-	companion object {
-
-		fun configFromWgQuick(wgQuick: String): Config {
-			val inputStream: InputStream = wgQuick.byteInputStream()
-			return inputStream.bufferedReader(Charsets.UTF_8).use {
-				Config.parse(it)
-			}
-		}
-
-		fun configFromAmQuick(amQuick: String): org.amnezia.awg.config.Config {
-			val inputStream: InputStream = amQuick.byteInputStream()
-			return inputStream.bufferedReader(Charsets.UTF_8).use {
-				org.amnezia.awg.config.Config.parse(it)
-			}
-		}
-
-		fun tunnelConfigFromAmConfig(config: org.amnezia.awg.config.Config, name: String): TunnelConfig {
-			val amQuick = config.toAwgQuickString(true)
-			val wgQuick = config.toWgQuickString()
-			return TunnelConfig(name = name, wgQuick = wgQuick, amQuick = amQuick)
-		}
-
-		const val AM_QUICK_DEFAULT = ""
-
-		val IPV4_PUBLIC_NETWORKS = setOf(
-			"0.0.0.0/5", "8.0.0.0/7", "11.0.0.0/8", "12.0.0.0/6", "16.0.0.0/4", "32.0.0.0/3",
-			"64.0.0.0/2", "128.0.0.0/3", "160.0.0.0/5", "168.0.0.0/6", "172.0.0.0/12",
-			"172.32.0.0/11", "172.64.0.0/10", "172.128.0.0/9", "173.0.0.0/8", "174.0.0.0/7",
-			"176.0.0.0/4", "192.0.0.0/9", "192.128.0.0/11", "192.160.0.0/13", "192.169.0.0/16",
-			"192.170.0.0/15", "192.172.0.0/14", "192.176.0.0/12", "192.192.0.0/10",
-			"193.0.0.0/8", "194.0.0.0/7", "196.0.0.0/6", "200.0.0.0/5", "208.0.0.0/4",
-		)
-	}
-}
@@ -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
@@ -1,8 +1,9 @@
-package com.zaneschepke.wireguardautotunnel.data.domain
+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(
@@ -80,4 +81,38 @@ data class Settings(
 		defaultValue = "false",
 	)
 	val isLanOnKillSwitchEnabled: Boolean = false,
-)
+	@ColumnInfo(
+		name = "debounce_delay_seconds",
+		defaultValue = "3",
+	)
+	val debounceDelaySeconds: Int = 3,
+	@ColumnInfo(
+		name = "is_disable_kill_switch_on_trusted_enabled",
+		defaultValue = "false",
+	)
+	val isDisableKillSwitchOnTrustedEnabled: Boolean = false,
+) {
+
+	fun toAppSettings(): AppSettings {
+		return AppSettings(
+			id, isAutoTunnelEnabled, isTunnelOnMobileDataEnabled, trustedNetworkSSIDs, isAlwaysOnVpnEnabled, isTunnelOnEthernetEnabled,
+			isShortcutsEnabled, isTunnelOnWifiEnabled, isKernelEnabled, isRestoreOnBootEnabled, isMultiTunnelEnabled, isPingEnabled,
+			isAmneziaEnabled, isWildcardsEnabled, isWifiNameByShellEnabled, isStopOnNoInternetEnabled, isVpnKillSwitchEnabled,
+			isKernelKillSwitchEnabled, isLanOnKillSwitchEnabled, debounceDelaySeconds, isDisableKillSwitchOnTrustedEnabled,
+		)
+	}
+
+	companion object {
+		fun from(appSettings: AppSettings): Settings {
+			return with(appSettings) {
+				Settings(
+					id, isAutoTunnelEnabled, isTunnelOnMobileDataEnabled, trustedNetworkSSIDs.toMutableList(), isAlwaysOnVpnEnabled,
+					isTunnelOnEthernetEnabled, isShortcutsEnabled, isTunnelOnWifiEnabled, isKernelEnabled, isRestoreOnBootEnabled,
+					isMultiTunnelEnabled, isPingEnabled, isAmneziaEnabled, isWildcardsEnabled, isWifiNameByShellEnabled,
+					isStopOnNoInternetEnabled, isVpnKillSwitchEnabled, isKernelKillSwitchEnabled, isLanOnKillSwitchEnabled,
+					debounceDelaySeconds, isDisableKillSwitchOnTrustedEnabled,
+				)
+			}
+		}
+	}
+}
@@ -0,0 +1,93 @@
+package com.zaneschepke.wireguardautotunnel.data.model
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.Index
+import androidx.room.PrimaryKey
+import com.zaneschepke.wireguardautotunnel.domain.entity.TunnelConf
+
+@Entity(indices = [Index(value = ["name"], unique = true)])
+data class TunnelConfig(
+	@PrimaryKey(autoGenerate = true) val id: Int = 0,
+	@ColumnInfo(name = "name") val name: String,
+	@ColumnInfo(name = "wg_quick") val wgQuick: String,
+	@ColumnInfo(
+		name = "tunnel_networks",
+		defaultValue = "",
+	)
+	val tunnelNetworks: MutableList<String> = mutableListOf(),
+	@ColumnInfo(
+		name = "is_mobile_data_tunnel",
+		defaultValue = "false",
+	)
+	val isMobileDataTunnel: Boolean = false,
+	@ColumnInfo(
+		name = "is_primary_tunnel",
+		defaultValue = "false",
+	)
+	val isPrimaryTunnel: Boolean = false,
+	@ColumnInfo(
+		name = "am_quick",
+		defaultValue = "",
+	)
+	val amQuick: String = AM_QUICK_DEFAULT,
+	@ColumnInfo(
+		name = "is_Active",
+		defaultValue = "false",
+	)
+	val isActive: Boolean = false,
+	@ColumnInfo(
+		name = "is_ping_enabled",
+		defaultValue = "false",
+	)
+	val isPingEnabled: Boolean = false,
+	@ColumnInfo(
+		name = "ping_interval",
+		defaultValue = "null",
+	)
+	val pingInterval: Long? = null,
+	@ColumnInfo(
+		name = "ping_cooldown",
+		defaultValue = "null",
+	)
+	val pingCooldown: Long? = null,
+	@ColumnInfo(
+		name = "ping_ip",
+		defaultValue = "null",
+	)
+	var pingIp: String? = null,
+	@ColumnInfo(
+		name = "is_ethernet_tunnel",
+		defaultValue = "false",
+	)
+	var isEthernetTunnel: Boolean = false,
+	@ColumnInfo(
+		name = "is_ipv4_preferred",
+		defaultValue = "true",
+	)
+	var isIpv4Preferred: Boolean = true,
+) {
+
+	fun toTunnel(): TunnelConf {
+		return TunnelConf(
+			id, name, wgQuick, tunnelNetworks, isMobileDataTunnel,
+			isPrimaryTunnel, amQuick, isActive, isPingEnabled, pingInterval,
+			pingCooldown, pingIp, isEthernetTunnel, isIpv4Preferred,
+		)
+	}
+
+	companion object {
+
+		const val AM_QUICK_DEFAULT = ""
+
+		fun from(tunnelConf: TunnelConf): TunnelConfig {
+			return with(tunnelConf) {
+				return TunnelConfig(
+					id, tunName, wgQuick, tunnelNetworks.toMutableList(), isMobileDataTunnel,
+					isPrimaryTunnel, amQuick, isActive, isPingEnabled, pingInterval,
+					pingCooldown, pingIp, isEthernetTunnel, isIpv4Preferred,
+				)
+			}
+		}
+	}
+}
@@ -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
-}
@@ -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()
@@ -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
@@ -77,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 {
@@ -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() }
-	}
 }
@@ -1,104 +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 updateEthernetTunnel(tunnelConfig: TunnelConfig?) {
-		withContext(ioDispatcher) {
-			tunnelConfigDao.resetEthernetTunnel()
-			tunnelConfig?.let {
-				save(
-					it.copy(
-						isEthernetTunnel = true,
-					),
-				)
-			}
-		}
-	}
-
-	override suspend fun delete(tunnelConfig: TunnelConfig) {
-		withContext(ioDispatcher) {
-			tunnelConfigDao.delete(tunnelConfig)
-		}
-	}
-
-	override suspend fun getById(id: Int): TunnelConfig? {
-		return withContext(ioDispatcher) { tunnelConfigDao.getById(id.toLong()) }
-	}
-
-	override suspend fun getActive(): TunnelConfigs {
-		return withContext(ioDispatcher) {
-			tunnelConfigDao.getActive()
-		}
-	}
-
-	override suspend fun count(): Int {
-		return withContext(ioDispatcher) { tunnelConfigDao.count().toInt() }
-	}
-
-	override suspend fun findByTunnelName(name: String): TunnelConfig? {
-		return withContext(ioDispatcher) { tunnelConfigDao.getByName(name) }
-	}
-
-	override suspend fun findByTunnelNetworksName(name: String): TunnelConfigs {
-		return withContext(ioDispatcher) { tunnelConfigDao.findByTunnelNetworkName(name) }
-	}
-
-	override suspend fun findByMobileDataTunnel(): TunnelConfigs {
-		return withContext(ioDispatcher) { tunnelConfigDao.findByMobileDataTunnel() }
-	}
-
-	override suspend fun findPrimary(): TunnelConfigs {
-		return withContext(ioDispatcher) { tunnelConfigDao.findByPrimary() }
-	}
-}
@@ -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() } }
+	}
+}
@@ -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>
-}
@@ -1,35 +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 updateEthernetTunnel(tunnelConfig: TunnelConfig?)
-
-	suspend fun delete(tunnelConfig: TunnelConfig)
-
-	suspend fun getById(id: Int): TunnelConfig?
-
-	suspend fun getActive(): TunnelConfigs
-
-	suspend fun count(): Int
-
-	suspend fun findByTunnelName(name: String): TunnelConfig?
-
-	suspend fun findByTunnelNetworksName(name: String): TunnelConfigs
-
-	suspend fun findByMobileDataTunnel(): TunnelConfigs
-
-	suspend fun findPrimary(): TunnelConfigs
-}
@@ -1,12 +1,12 @@
-package com.zaneschepke.wireguardautotunnel.module
+package com.zaneschepke.wireguardautotunnel.di

 import android.content.Context
 import com.zaneschepke.logcatter.LogReader
 import com.zaneschepke.logcatter.LogcatReader
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
-import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
-import com.zaneschepke.wireguardautotunnel.service.shortcut.DynamicShortcutManager
-import com.zaneschepke.wireguardautotunnel.service.shortcut.ShortcutManager
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
+import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
+import com.zaneschepke.wireguardautotunnel.core.shortcut.DynamicShortcutManager
+import com.zaneschepke.wireguardautotunnel.core.shortcut.ShortcutManager
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -34,7 +34,7 @@ class AppModule {

 	@Singleton
 	@Provides
-	fun provideNotificationService(@ApplicationContext context: Context): NotificationService {
+	fun provideNotificationService(@ApplicationContext context: Context): NotificationManager {
 		return WireGuardNotification(context)
 	}

@@ -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
@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.module
+package com.zaneschepke.wireguardautotunnel.di

 import javax.inject.Qualifier

@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.module
+package com.zaneschepke.wireguardautotunnel.di

 import dagger.Module
 import dagger.Provides
@@ -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)
 	}
 }
@@ -0,0 +1,16 @@
+package com.zaneschepke.wireguardautotunnel.di
+
+import com.zaneschepke.wireguardautotunnel.core.network.InternetConnectivityMonitor
+import com.zaneschepke.wireguardautotunnel.core.network.NetworkMonitor
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+
+@Module
+@InstallIn(SingletonComponent::class)
+abstract class ServiceModule {
+
+	@Binds
+	abstract fun provideInternetConnectivityService(wifiService: InternetConnectivityMonitor): NetworkMonitor
+}
@@ -0,0 +1,110 @@
+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.wireguardautotunnel.core.network.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)
+	}
+
+	@Singleton
+	@Provides
+	fun provideServiceManager(
+		@ApplicationContext context: Context,
+		@IoDispatcher ioDispatcher: CoroutineDispatcher,
+		appDataRepository: AppDataRepository,
+	): ServiceManager {
+		return ServiceManager(context, ioDispatcher, appDataRepository)
+	}
+}
@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.module
+package com.zaneschepke.wireguardautotunnel.di

 import android.content.Context
 import com.zaneschepke.wireguardautotunnel.util.FileUtils
@@ -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
+	}
+}
@@ -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,
+)
@@ -0,0 +1,126 @@
+package com.zaneschepke.wireguardautotunnel.domain.entity
+
+import com.wireguard.config.Config
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
+import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.extensions.asTunnelState
+import com.zaneschepke.wireguardautotunnel.util.extensions.isReachable
+import com.zaneschepke.wireguardautotunnel.util.extensions.toWgQuickString
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.update
+import kotlinx.coroutines.withContext
+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 = false,
+) : Tunnel, com.wireguard.android.backend.Tunnel {
+
+	val state = MutableStateFlow(TunnelState())
+
+	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: Tunnel.State) {
+		state.update {
+			it.copy(state = newState.asTunnelState())
+		}
+	}
+
+	override fun onStateChange(newState: com.wireguard.android.backend.Tunnel.State) {
+		state.update {
+			it.copy(state = newState.asTunnelState())
+		}
+	}
+
+	fun isQuickConfigChanged(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 pingTunnel(context: CoroutineContext): List<Boolean> {
+		return withContext(context) {
+			val config = toWgConfig()
+			if (pingIp != null) {
+				Timber.i("Pinging custom ip")
+				listOf(InetAddress.getByName(pingIp).isReachable(Constants.PING_TIMEOUT.toInt()))
+			} else {
+				Timber.i("Pinging all peers")
+				config.peers.map { peer ->
+					peer.isReachable(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): 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
+	}
+}
@@ -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()
+}
@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.service.tunnel
+package com.zaneschepke.wireguardautotunnel.domain.enums

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

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

 import android.content.Context
 import com.zaneschepke.wireguardautotunnel.R
@@ -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
+	}
+}
@@ -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()
+}
@@ -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()
+}
@@ -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
+}
@@ -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
+}
@@ -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

@@ -33,5 +33,5 @@ interface AppStateRepository {

 	suspend fun getLocale(): String?

-	val generalStateFlow: Flow<GeneralState>
+	val flow: Flow<GeneralState>
 }
@@ -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
+}
@@ -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
@@ -1,16 +1,16 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model
+package com.zaneschepke.wireguardautotunnel.domain.state

-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.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 vpnState: VpnState = VpnState(),
+	val activeTunnels: List<TunnelConf> = emptyList(),
 	val networkState: NetworkState = NetworkState(),
-	val settings: Settings = Settings(),
-	val tunnels: TunnelConfigs = emptyList(),
+	val settings: AppSettings = AppSettings(),
+	val tunnels: List<TunnelConf> = emptyList(),
 ) {

 	private fun isMobileDataActive(): Boolean {
@@ -20,23 +20,23 @@ data class AutoTunnelState(
 	private fun isMobileTunnelDataChangeNeeded(): Boolean {
 		val preferredTunnel = preferredMobileDataTunnel()
 		return preferredTunnel != null &&
-			vpnState.status.isUp() && preferredTunnel.id != vpnState.tunnelConfig?.id
+			activeTunnels.isNotEmpty() && !activeTunnels.any { it.id == preferredTunnel.id }
 	}

 	private fun isEthernetTunnelChangeNeeded(): Boolean {
 		val preferredTunnel = preferredEthernetTunnel()
-		return preferredTunnel != null && vpnState.status.isUp() && preferredTunnel.id != vpnState.tunnelConfig?.id
+		return preferredTunnel != null && activeTunnels.isNotEmpty() && !activeTunnels.any { it.id == preferredTunnel.id }
 	}

-	private fun preferredMobileDataTunnel(): TunnelConfig? {
+	private fun preferredMobileDataTunnel(): TunnelConf? {
 		return tunnels.firstOrNull { it.isMobileDataTunnel } ?: tunnels.firstOrNull { it.isPrimaryTunnel }
 	}

-	private fun preferredEthernetTunnel(): TunnelConfig? {
+	private fun preferredEthernetTunnel(): TunnelConf? {
 		return tunnels.firstOrNull { it.isEthernetTunnel } ?: tunnels.firstOrNull { it.isPrimaryTunnel }
 	}

-	private fun preferredWifiTunnel(): TunnelConfig? {
+	private fun preferredWifiTunnel(): TunnelConf? {
 		return getTunnelWithMatchingTunnelNetwork() ?: tunnels.firstOrNull { it.isPrimaryTunnel }
 	}

@@ -45,11 +45,21 @@ data class AutoTunnelState(
 	}

 	private fun startOnEthernet(): Boolean {
-		return networkState.isEthernetConnected && settings.isTunnelOnEthernetEnabled && vpnState.status.isDown()
+		return networkState.isEthernetConnected && settings.isTunnelOnEthernetEnabled && activeTunnels.isEmpty()
 	}

 	private fun stopOnEthernet(): Boolean {
-		return networkState.isEthernetConnected && !settings.isTunnelOnEthernetEnabled && vpnState.status.isUp()
+		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())
 	}

 	fun isNoConnectivity(): Boolean {
@@ -57,11 +67,11 @@ data class AutoTunnelState(
 	}

 	private fun stopOnMobileData(): Boolean {
-		return isMobileDataActive() && !settings.isTunnelOnMobileDataEnabled && vpnState.status.isUp()
+		return isMobileDataActive() && !settings.isTunnelOnMobileDataEnabled && activeTunnels.isNotEmpty()
 	}

 	private fun startOnMobileData(): Boolean {
-		return isMobileDataActive() && settings.isTunnelOnMobileDataEnabled && vpnState.status.isDown()
+		return isMobileDataActive() && settings.isTunnelOnMobileDataEnabled && activeTunnels.isEmpty()
 	}

 	private fun changeOnMobileData(): Boolean {
@@ -73,29 +83,24 @@ data class AutoTunnelState(
 	}

 	private fun stopOnWifi(): Boolean {
-		return isWifiActive() && !settings.isTunnelOnWifiEnabled && vpnState.status.isUp()
+		return isWifiActive() && !settings.isTunnelOnWifiEnabled && activeTunnels.isNotEmpty()
 	}

 	private fun stopOnTrustedWifi(): Boolean {
-		return isWifiActive() && settings.isTunnelOnWifiEnabled && vpnState.status.isUp() && isCurrentSSIDTrusted()
+		return isWifiActive() && settings.isTunnelOnWifiEnabled && activeTunnels.isNotEmpty() && isCurrentSSIDTrusted()
 	}

 	private fun startOnUntrustedWifi(): Boolean {
-		return isWifiActive() && settings.isTunnelOnWifiEnabled && vpnState.status.isDown() && !isCurrentSSIDTrusted()
+		return isWifiActive() && settings.isTunnelOnWifiEnabled && activeTunnels.isEmpty() && !isCurrentSSIDTrusted()
 	}

 	private fun changeOnUntrustedWifi(): Boolean {
-		return isWifiActive() && settings.isTunnelOnWifiEnabled && vpnState.status.isUp() && !isCurrentSSIDTrusted() && !isWifiTunnelPreferred()
+		return isWifiActive() && settings.isTunnelOnWifiEnabled && activeTunnels.isNotEmpty() && !isCurrentSSIDTrusted() && !isWifiTunnelPreferred()
 	}

 	private fun isWifiTunnelPreferred(): Boolean {
 		val preferred = preferredWifiTunnel()
-		val vpnTunnel = vpnState.tunnelConfig
-		return if (preferred != null && vpnTunnel != null) {
-			preferred.id == vpnTunnel.id
-		} else {
-			true
-		}
+		return activeTunnels.any { it.id == preferred?.id }
 	}

 	fun asAutoTunnelEvent(): AutoTunnelEvent {
@@ -116,6 +121,17 @@ data class AutoTunnelState(
 		}
 	}

+	fun asKillSwitchEvent(): KillSwitchEvent {
+		return when {
+			stopKillSwitchOnTrusted() -> KillSwitchEvent.Stop
+			startKillSwitch() -> {
+				val allowedIps = if (settings.isLanOnKillSwitchEnabled) TunnelConf.LAN_BYPASS_ALLOWED_IPS else emptyList()
+				KillSwitchEvent.Start(allowedIps)
+			}
+			else -> KillSwitchEvent.DoNothing
+		}
+	}
+
 	private fun isCurrentSSIDTrusted(): Boolean {
 		return networkState.wifiName?.let {
 			hasTrustedWifiName(it)
@@ -130,16 +146,11 @@ data class AutoTunnelState(
 		}
 	}

-	private fun getTunnelWithMatchingTunnelNetwork(): TunnelConfig? {
+	private fun getTunnelWithMatchingTunnelNetwork(): TunnelConf? {
 		return networkState.wifiName?.let { wifiName ->
 			tunnels.firstOrNull {
 				hasTrustedWifiName(wifiName, it.tunnelNetworks)
 			}
 		}
 	}
-
-	fun isPingEnabled(): Boolean {
-		return settings.isPingEnabled ||
-			(vpnState.status.isUp() && vpnState.tunnelConfig != null && tunnels.first { it.id == vpnState.tunnelConfig.id }.isPingEnabled)
-	}
 }
@@ -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
+}
@@ -1,8 +1,12 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model
+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
+	}
+}
@@ -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,
+)
@@ -1,4 +1,4 @@
-package com.zaneschepke.wireguardautotunnel.service.tunnel.statistics
+package com.zaneschepke.wireguardautotunnel.domain.state

 import org.amnezia.awg.crypto.Key

@@ -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
@@ -1,15 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.module
-
-import javax.inject.Qualifier
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class Wifi
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class MobileData
-
-@Qualifier
-@Retention(AnnotationRetention.BINARY)
-annotation class Ethernet
@@ -1,31 +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 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
-	@Wifi
-	@ServiceScoped
-	abstract fun provideWifiService(wifiService: WifiService): NetworkService
-
-	@Binds
-	@MobileData
-	@ServiceScoped
-	abstract fun provideMobileDataService(mobileDataService: MobileDataService): NetworkService
-
-	@Binds
-	@Ethernet
-	@ServiceScoped
-	abstract fun provideEthernetService(ethernetService: EthernetService): NetworkService
-}
@@ -1,103 +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.notification.NotificationService
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import com.zaneschepke.wireguardautotunnel.service.tunnel.WireGuardTunnel
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.components.SingletonComponent
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import javax.inject.Provider
-import javax.inject.Singleton
-
-@Module
-@InstallIn(SingletonComponent::class)
-class TunnelModule {
-
-	@Provides
-	@Singleton
-	@TunnelShell
-	fun provideTunnelRootShell(@ApplicationContext context: Context): RootShell {
-		return RootShell(context)
-	}
-
-	@Provides
-	@Singleton
-	@AppShell
-	fun provideAppRootShell(@ApplicationContext context: Context): RootShell {
-		return RootShell(context)
-	}
-
-	@Provides
-	@Singleton
-	fun provideRootShellAm(@ApplicationContext context: Context): org.amnezia.awg.util.RootShell {
-		return org.amnezia.awg.util.RootShell(context)
-	}
-
-	@Provides
-	@Singleton
-	@Userspace
-	fun provideUserspaceBackend(@ApplicationContext context: Context, @TunnelShell rootShell: RootShell): Backend {
-		return GoBackend(context, RootTunnelActionHandler(rootShell))
-	}
-
-	@Provides
-	@Singleton
-	@Kernel
-	fun provideKernelBackend(@ApplicationContext context: Context, @TunnelShell rootShell: RootShell): Backend {
-		return WgQuickBackend(context, rootShell, ToolsInstaller(context, rootShell), RootTunnelActionHandler(rootShell))
-	}
-
-	@Provides
-	@Singleton
-	fun provideAmneziaBackend(@ApplicationContext context: Context, rootShell: org.amnezia.awg.util.RootShell): org.amnezia.awg.backend.Backend {
-		return org.amnezia.awg.backend.GoBackend(context, org.amnezia.awg.backend.RootTunnelActionHandler(rootShell))
-	}
-
-	@Provides
-	@Singleton
-	fun provideVpnService(
-		amneziaBackend: Provider<org.amnezia.awg.backend.Backend>,
-		@Kernel kernelBackend: Provider<Backend>,
-		appDataRepository: AppDataRepository,
-		tunnelConfigRepository: TunnelConfigRepository,
-		@ApplicationScope applicationScope: CoroutineScope,
-		@IoDispatcher ioDispatcher: CoroutineDispatcher,
-		serviceManager: ServiceManager,
-		notificationService: NotificationService,
-	): TunnelService {
-		return WireGuardTunnel(
-			amneziaBackend,
-			tunnelConfigRepository,
-			kernelBackend,
-			appDataRepository,
-			applicationScope,
-			ioDispatcher,
-			serviceManager,
-			notificationService,
-		)
-	}
-
-	@Singleton
-	@Provides
-	fun provideServiceManager(
-		@ApplicationContext context: Context,
-		@IoDispatcher ioDispatcher: CoroutineDispatcher,
-		appDataRepository: AppDataRepository,
-	): ServiceManager {
-		return ServiceManager(context, ioDispatcher, appDataRepository)
-	}
-}
@@ -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)
-			}
-		}
-	}
-}
@@ -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)
-					}
-				}
-			}
-		}
-	}
-}
@@ -1,36 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationAction
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@AndroidEntryPoint
-class NotificationActionReceiver : BroadcastReceiver() {
-
-	@Inject
-	lateinit var serviceManager: ServiceManager
-
-	@Inject
-	lateinit var tunnelService: TunnelService
-
-	@Inject
-	@ApplicationScope
-	lateinit var applicationScope: CoroutineScope
-
-	override fun onReceive(context: Context, intent: Intent) {
-		applicationScope.launch {
-			when (intent.action) {
-				NotificationAction.AUTO_TUNNEL_OFF.name -> serviceManager.stopAutoTunnel()
-				NotificationAction.TUNNEL_OFF.name -> tunnelService.stopTunnel()
-			}
-		}
-	}
-}
@@ -1,300 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground.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.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.Ethernet
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.module.MainImmediateDispatcher
-import com.zaneschepke.wireguardautotunnel.module.MobileData
-import com.zaneschepke.wireguardautotunnel.module.Wifi
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model.AutoTunnelEvent
-import com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model.AutoTunnelState
-import com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model.NetworkState
-import com.zaneschepke.wireguardautotunnel.service.network.NetworkService
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationAction
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
-import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
-import com.zaneschepke.wireguardautotunnel.service.tunnel.TunnelService
-import com.zaneschepke.wireguardautotunnel.util.Constants
-import com.zaneschepke.wireguardautotunnel.util.extensions.TunnelConfigs
-import com.zaneschepke.wireguardautotunnel.util.extensions.cancelWithMessage
-import com.zaneschepke.wireguardautotunnel.util.extensions.isReachable
-import com.zaneschepke.wireguardautotunnel.util.extensions.onNotRunning
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.CompletableDeferred
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.FlowPreview
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.debounce
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.filterNot
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-import java.net.InetAddress
-import java.util.concurrent.atomic.AtomicBoolean
-import javax.inject.Inject
-import javax.inject.Provider
-
-@AndroidEntryPoint
-class AutoTunnelService : LifecycleService() {
-
-	@Inject
-	@AppShell
-	lateinit var rootShell: Provider<RootShell>
-
-	@Inject
-	@Wifi
-	lateinit var wifiService: NetworkService
-
-	@Inject
-	@MobileData
-	lateinit var mobileDataService: NetworkService
-
-	@Inject
-	@Ethernet
-	lateinit var ethernetService: NetworkService
-
-	@Inject
-	lateinit var appDataRepository: Provider<AppDataRepository>
-
-	@Inject
-	lateinit var notificationService: NotificationService
-
-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
-
-	@Inject
-	@IoDispatcher
-	lateinit var ioDispatcher: CoroutineDispatcher
-
-	@Inject
-	lateinit var serviceManager: ServiceManager
-
-	@Inject
-	@MainImmediateDispatcher
-	lateinit var mainImmediateDispatcher: CoroutineDispatcher
-
-	private val defaultState = AutoTunnelState()
-
-	private val autoTunnelStateFlow = MutableStateFlow(defaultState)
-
-	private var wakeLock: PowerManager.WakeLock? = null
-
-	private val pingTunnelRestartActive = AtomicBoolean(false)
-
-	private var pingJob: Job? = null
-
-	override fun onCreate() {
-		super.onCreate()
-		serviceManager.autoTunnelService.complete(this)
-		lifecycleScope.launch(mainImmediateDispatcher) {
-			kotlin.runCatching {
-				launchWatcherNotification()
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
-	}
-
-	override fun onBind(intent: Intent): IBinder? {
-		super.onBind(intent)
-		return null
-	}
-
-	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-		Timber.d("onStartCommand executed with startId: $startId")
-		serviceManager.autoTunnelService.complete(this)
-		return super.onStartCommand(intent, flags, startId)
-	}
-
-	fun start() {
-		kotlin.runCatching {
-			lifecycleScope.launch(mainImmediateDispatcher) {
-				launchWatcherNotification()
-				initWakeLock()
-			}
-			startAutoTunnelJob()
-			startAutoTunnelStateJob()
-			startPingStateJob()
-		}.onFailure {
-			Timber.e(it)
-		}
-	}
-
-	fun stop() {
-		wakeLock?.let { if (it.isHeld) it.release() }
-		stopSelf()
-	}
-
-	override fun onDestroy() {
-		cancelAndResetPingJob()
-		serviceManager.autoTunnelService = CompletableDeferred()
-		super.onDestroy()
-	}
-
-	private fun launchWatcherNotification(description: String = getString(R.string.monitoring_state_changes)) {
-		val notification =
-			notificationService.createNotification(
-				WireGuardNotification.NotificationChannels.AUTO_TUNNEL,
-				title = getString(R.string.auto_tunnel_title),
-				description = description,
-				actions = listOf(
-					notificationService.createNotificationAction(NotificationAction.AUTO_TUNNEL_OFF),
-				),
-			)
-		ServiceCompat.startForeground(
-			this,
-			NotificationService.AUTO_TUNNEL_NOTIFICATION_ID,
-			notification,
-			Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
-		)
-	}
-
-	private fun initWakeLock() {
-		wakeLock = (getSystemService(POWER_SERVICE) as PowerManager).run {
-			val tag = this.javaClass.name
-			newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "$tag::lock").apply {
-				try {
-					Timber.i("Initiating wakelock with 10 min timeout")
-					acquire(Constants.BATTERY_SAVER_WATCHER_WAKE_LOCK_TIMEOUT)
-				} finally {
-					release()
-				}
-			}
-		}
-	}
-
-	private fun startPingJob() = lifecycleScope.launch {
-		watchForPingFailure()
-	}
-
-	private fun startPingStateJob() = lifecycleScope.launch {
-		autoTunnelStateFlow.collect {
-			if (it == defaultState) return@collect
-			if (it.isPingEnabled()) {
-				pingJob.onNotRunning { pingJob = startPingJob() }
-			} else {
-				if (!pingTunnelRestartActive.get()) cancelAndResetPingJob()
-			}
-		}
-	}
-
-	private suspend fun watchForPingFailure() {
-		withContext(ioDispatcher) {
-			Timber.i("Starting ping watcher")
-			runCatching {
-				do {
-					val vpnState = autoTunnelStateFlow.value.vpnState
-					if (vpnState.status.isUp() && !autoTunnelStateFlow.value.isNoConnectivity()) {
-						if (vpnState.tunnelConfig != null) {
-							val config = TunnelConfig.configFromWgQuick(vpnState.tunnelConfig.wgQuick)
-							val results = if (vpnState.tunnelConfig.pingIp != null) {
-								Timber.d("Pinging custom ip : ${vpnState.tunnelConfig.pingIp}")
-								listOf(InetAddress.getByName(vpnState.tunnelConfig.pingIp).isReachable(Constants.PING_TIMEOUT.toInt()))
-							} else {
-								Timber.d("Pinging all peers")
-								config.peers.map { peer ->
-									peer.isReachable()
-								}
-							}
-							Timber.i("Ping results reachable: $results")
-							if (results.contains(false)) {
-								Timber.i("Restarting VPN for ping failure")
-								val cooldown = vpnState.tunnelConfig.pingCooldown
-								pingTunnelRestartActive.set(true)
-								tunnelService.get().bounceTunnel()
-								pingTunnelRestartActive.set(false)
-								delay(cooldown ?: Constants.PING_COOLDOWN)
-								continue
-							}
-						}
-					}
-					delay(vpnState.tunnelConfig?.pingInterval ?: Constants.PING_INTERVAL)
-				} while (true)
-			}.onFailure {
-				Timber.e(it)
-			}
-		}
-	}
-
-	private fun startAutoTunnelStateJob() = lifecycleScope.launch(ioDispatcher) {
-		combine(
-			combineSettings(),
-			combineNetworkEventsJob(),
-		) { double, networkState ->
-			AutoTunnelState(tunnelService.get().vpnState.value, networkState, double.first, double.second)
-		}.collect { state ->
-			Timber.d("Network state: ${state.networkState}")
-			autoTunnelStateFlow.update {
-				it.copy(vpnState = state.vpnState, networkState = state.networkState, settings = state.settings, tunnels = state.tunnels)
-			}
-		}
-	}
-
-	private fun cancelAndResetPingJob() {
-		pingJob?.cancelWithMessage("Ping job canceled")
-		pingJob = null
-	}
-
-	@OptIn(FlowPreview::class)
-	private fun combineNetworkEventsJob(): Flow<NetworkState> {
-		return combine(
-			wifiService.status,
-			mobileDataService.status,
-		) { wifi, mobileData ->
-			NetworkState(
-				wifi.available,
-				mobileData.available,
-				false,
-				wifi.name,
-			)
-		}.distinctUntilChanged().filterNot { it.isWifiConnected && it.wifiName == null }.debounce(500L)
-	}
-
-	private fun combineSettings(): Flow<Pair<Settings, TunnelConfigs>> {
-		return combine(
-			appDataRepository.get().settings.getSettingsFlow(),
-			appDataRepository.get().tunnels.getTunnelConfigsFlow().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()
-	}
-
-	@OptIn(FlowPreview::class)
-	private fun startAutoTunnelJob() = lifecycleScope.launch(ioDispatcher) {
-		Timber.i("Starting auto-tunnel network event watcher")
-		autoTunnelStateFlow.debounce(1000L).collect { watcherState ->
-			if (watcherState == defaultState) return@collect
-			Timber.d("New auto tunnel state emitted")
-			when (val event = watcherState.asAutoTunnelEvent()) {
-				is AutoTunnelEvent.Start -> tunnelService.get().startTunnel(
-					event.tunnelConfig
-						?: appDataRepository.get().getPrimaryOrFirstTunnel(),
-				)
-				is AutoTunnelEvent.Stop -> tunnelService.get().stopTunnel()
-				AutoTunnelEvent.DoNothing -> Timber.i("Auto-tunneling: no condition met")
-			}
-		}
-	}
-}
@@ -1,9 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.foreground.autotunnel.model
-
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-
-sealed class AutoTunnelEvent {
-	data class Start(val tunnelConfig: TunnelConfig? = null) : AutoTunnelEvent()
-	data object Stop : AutoTunnelEvent()
-	data object DoNothing : AutoTunnelEvent()
-}
@@ -1,64 +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 dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onStart
-import timber.log.Timber
-import javax.inject.Inject
-
-class EthernetService
-@Inject
-constructor(
-	@ApplicationContext context: Context,
-) : NetworkService {
-
-	private val connectivityManager =
-		context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-
-	override val status = callbackFlow {
-		val networkStatusCallback = object : ConnectivityManager.NetworkCallback() {
-			override fun onAvailable(network: Network) {
-				trySend(NetworkStatus.Available(network))
-			}
-			override fun onLost(network: Network) {
-				trySend(NetworkStatus.Unavailable())
-			}
-			override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
-				trySend(
-					NetworkStatus.CapabilitiesChanged(
-						network,
-						networkCapabilities,
-					),
-				)
-			}
-		}
-		val request =
-			NetworkRequest.Builder()
-				.addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET)
-				.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-				.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
-				.build()
-		connectivityManager.registerNetworkCallback(request, networkStatusCallback)
-
-		awaitClose { connectivityManager.unregisterNetworkCallback(networkStatusCallback) }
-	}.onStart {
-		// needed for services that are not yet available as it will impact later combine flows if we don't emit
-		emit(NetworkStatus.Unavailable())
-	}.catch {
-		Timber.e(it)
-		emit(NetworkStatus.Unavailable())
-	}.map {
-		when (it) {
-			is NetworkStatus.Available, is NetworkStatus.CapabilitiesChanged -> Status(true, null)
-			is NetworkStatus.Unavailable -> Status(false, null)
-		}
-	}
-}
@@ -1,63 +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 dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.onStart
-import timber.log.Timber
-import javax.inject.Inject
-
-class MobileDataService
-@Inject
-constructor(
-	@ApplicationContext context: Context,
-) : NetworkService {
-	private val connectivityManager =
-		context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-
-	override val status = callbackFlow {
-		val networkStatusCallback = object : ConnectivityManager.NetworkCallback() {
-			override fun onAvailable(network: Network) {
-				trySend(NetworkStatus.Available(network))
-			}
-			override fun onLost(network: Network) {
-				trySend(NetworkStatus.Unavailable())
-			}
-			override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
-				trySend(
-					NetworkStatus.CapabilitiesChanged(
-						network,
-						networkCapabilities,
-					),
-				)
-			}
-		}
-		val request =
-			NetworkRequest.Builder()
-				.addTransportType(NetworkCapabilities.TRANSPORT_CELLULAR)
-				.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-				.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
-				.build()
-		connectivityManager.registerNetworkCallback(request, networkStatusCallback)
-
-		awaitClose { connectivityManager.unregisterNetworkCallback(networkStatusCallback) }
-	}.onStart {
-		// needed for services that are not yet available as it will impact later combine flows if we don't emit
-		emit(NetworkStatus.Unavailable())
-	}.catch {
-		Timber.e(it)
-		emit(NetworkStatus.Unavailable())
-	}.map {
-		when (it) {
-			is NetworkStatus.Available, is NetworkStatus.CapabilitiesChanged -> Status(true, null)
-			is NetworkStatus.Unavailable -> Status(false, null)
-		}
-	}
-}
@@ -1,27 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.network
-
-import android.net.Network
-import android.net.NetworkCapabilities
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
-
-interface NetworkService {
-	val status: Flow<Status>
-}
-
-inline fun <Result> Flow<NetworkStatus>.map(
-	crossinline onUnavailable: suspend () -> Result,
-	crossinline onAvailable: suspend (network: Network) -> Result,
-	crossinline onCapabilitiesChanged:
-	suspend (network: Network, networkCapabilities: NetworkCapabilities) -> Result,
-): Flow<Result> = map { status ->
-	when (status) {
-		is NetworkStatus.Unavailable -> onUnavailable()
-		is NetworkStatus.Available -> onAvailable(status.network)
-		is NetworkStatus.CapabilitiesChanged ->
-			onCapabilitiesChanged(
-				status.network,
-				status.networkCapabilities,
-			)
-	}
-}
@@ -1,14 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.network
-
-import android.net.Network
-import android.net.NetworkCapabilities
-
-sealed class NetworkStatus {
-	abstract val isConnected: Boolean
-	class Available(val network: Network, override val isConnected: Boolean = true) : NetworkStatus()
-
-	class Unavailable(override val isConnected: Boolean = false) : NetworkStatus()
-
-	class CapabilitiesChanged(val network: Network, val networkCapabilities: NetworkCapabilities, override val isConnected: Boolean = true) :
-		NetworkStatus()
-}
@@ -1,6 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.network
-
-data class Status(
-	val available: Boolean,
-	val name: String?,
-)
@@ -1,139 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.network
-
-import android.content.Context
-import android.net.ConnectivityManager
-import android.net.ConnectivityManager.NetworkCallback.FLAG_INCLUDE_LOCATION_INFO
-import android.net.Network
-import android.net.NetworkCapabilities
-import android.net.NetworkRequest
-import android.net.wifi.SupplicantState
-import android.net.wifi.WifiManager
-import android.os.Build
-import com.wireguard.android.util.RootShell
-import com.zaneschepke.wireguardautotunnel.data.repository.SettingsRepository
-import com.zaneschepke.wireguardautotunnel.module.AppShell
-import com.zaneschepke.wireguardautotunnel.util.extensions.getCurrentWifiName
-import dagger.hilt.android.qualifiers.ApplicationContext
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.onStart
-import kotlinx.coroutines.flow.transform
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Provider
-
-class WifiService
-@Inject
-constructor(
-	@ApplicationContext private val context: Context,
-	private val settingsRepository: SettingsRepository,
-	@AppShell private val rootShell: Provider<RootShell>,
-) : NetworkService {
-
-	val mutex = Mutex()
-
-	private var ssid: String? = null
-	private var available: Boolean = false
-
-	private val connectivityManager =
-		context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-
-	override val status = 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())
-						}
-
-						override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
-							trySend(
-								NetworkStatus.CapabilitiesChanged(
-									network,
-									networkCapabilities,
-								),
-							)
-						}
-					}
-				}
-
-				else -> {
-					object : ConnectivityManager.NetworkCallback() {
-						override fun onAvailable(network: Network) {
-							trySend(NetworkStatus.Available(network))
-						}
-
-						override fun onLost(network: Network) {
-							trySend(NetworkStatus.Unavailable())
-						}
-
-						override fun onCapabilitiesChanged(network: Network, networkCapabilities: NetworkCapabilities) {
-							trySend(
-								NetworkStatus.CapabilitiesChanged(
-									network,
-									networkCapabilities,
-								),
-							)
-						}
-					}
-				}
-			}
-		val request =
-			NetworkRequest.Builder()
-				.addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
-				.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
-				.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
-				.build()
-		connectivityManager.registerNetworkCallback(request, networkStatusCallback)
-
-		awaitClose { connectivityManager.unregisterNetworkCallback(networkStatusCallback) }
-	}.onStart {
-		// needed for services that are not yet available as it will impact later combine flows if we don't emit
-		emit(NetworkStatus.Unavailable())
-	}.catch {
-		Timber.e(it)
-		emit(NetworkStatus.Unavailable())
-	}.transform {
-		when (it) {
-			is NetworkStatus.Available -> mutex.withLock {
-				available = true
-			}
-			is NetworkStatus.CapabilitiesChanged -> mutex.withLock {
-				if (available) {
-					available = false
-					Timber.d("Getting SSID from capabilities")
-					ssid = getNetworkName(it.networkCapabilities)
-				}
-				emit(Status(true, ssid))
-			}
-			is NetworkStatus.Unavailable -> emit(Status(false, null))
-		}
-	}
-
-	private suspend fun getNetworkName(networkCapabilities: NetworkCapabilities): String? {
-		if (settingsRepository.getSettings().isWifiNameByShellEnabled) return rootShell.get().getCurrentWifiName()
-		var ssid = networkCapabilities.getWifiName()
-		if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S) {
-			val wifiManager =
-				context.applicationContext.getSystemService(Context.WIFI_SERVICE) as WifiManager
-
-			@Suppress("DEPRECATION")
-			val info = wifiManager.connectionInfo
-			if (info.supplicantState === SupplicantState.COMPLETED) {
-				ssid = info.ssid
-			}
-		}
-		return ssid?.trim('"')
-	}
-}
@@ -1,46 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.tunnel
-
-import android.content.Intent
-import android.os.IBinder
-import androidx.lifecycle.LifecycleService
-import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.launch
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Provider
-
-@AndroidEntryPoint
-class AlwaysOnVpnService : LifecycleService() {
-
-	@Inject
-	lateinit var tunnelService: Provider<TunnelService>
-
-	@Inject
-	lateinit var appDataRepository: AppDataRepository
-
-	override fun onBind(intent: Intent): IBinder? {
-		super.onBind(intent)
-		// We don't provide binding, so return null
-		return null
-	}
-
-	override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-		if (intent == null || intent.component == null || intent.component!!.packageName != packageName) {
-			Timber.i("Always-on VPN requested started")
-			lifecycleScope.launch {
-				val settings = appDataRepository.settings.getSettings()
-				if (settings.isAlwaysOnVpnEnabled) {
-					val tunnel = appDataRepository.getPrimaryOrFirstTunnel()
-					tunnel?.let {
-						tunnelService.get().startTunnel(it)
-					}
-				} else {
-					Timber.w("Always-on VPN is not enabled in app settings")
-				}
-			}
-		}
-		return super.onStartCommand(intent, flags, startId)
-	}
-}
@@ -1,28 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.tunnel
-
-import com.wireguard.android.backend.Tunnel
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import kotlinx.coroutines.flow.StateFlow
-
-interface TunnelService : Tunnel, org.amnezia.awg.backend.Tunnel {
-
-	suspend fun startTunnel(tunnelConfig: TunnelConfig?, background: Boolean = false)
-
-	suspend fun stopTunnel()
-
-	suspend fun bounceTunnel()
-
-	suspend fun getBackendState(): BackendState
-
-	suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>)
-
-	val vpnState: StateFlow<VpnState>
-
-	suspend fun runningTunnelNames(): Set<String>
-
-	suspend fun getState(): TunnelState
-
-	fun cancelActiveTunnelJobs()
-
-	fun startActiveTunnelJobs()
-}
@@ -1,52 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.tunnel
-
-import com.wireguard.android.backend.Tunnel
-
-enum class TunnelState {
-	UP,
-	DOWN,
-	TOGGLE,
-	;
-
-	fun toWgState(): Tunnel.State {
-		return when (this) {
-			UP -> Tunnel.State.UP
-			DOWN -> Tunnel.State.DOWN
-			TOGGLE -> Tunnel.State.TOGGLE
-		}
-	}
-
-	fun toAmState(): org.amnezia.awg.backend.Tunnel.State {
-		return when (this) {
-			UP -> org.amnezia.awg.backend.Tunnel.State.UP
-			DOWN -> org.amnezia.awg.backend.Tunnel.State.DOWN
-			TOGGLE -> org.amnezia.awg.backend.Tunnel.State.TOGGLE
-		}
-	}
-
-	fun isDown(): Boolean {
-		return this == DOWN
-	}
-
-	fun isUp(): Boolean {
-		return this == UP
-	}
-
-	companion object {
-		fun from(state: Tunnel.State): TunnelState {
-			return when (state) {
-				Tunnel.State.DOWN -> DOWN
-				Tunnel.State.TOGGLE -> TOGGLE
-				Tunnel.State.UP -> UP
-			}
-		}
-
-		fun from(state: org.amnezia.awg.backend.Tunnel.State): TunnelState {
-			return when (state) {
-				org.amnezia.awg.backend.Tunnel.State.DOWN -> DOWN
-				org.amnezia.awg.backend.Tunnel.State.TOGGLE -> TOGGLE
-				org.amnezia.awg.backend.Tunnel.State.UP -> UP
-			}
-		}
-	}
-}
@@ -1,10 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.tunnel
-
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStatistics
-
-data class VpnState(
-	val status: TunnelState = TunnelState.DOWN,
-	val tunnelConfig: TunnelConfig? = null,
-	val statistics: TunnelStatistics? = null,
-)
@@ -1,347 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.service.tunnel
-
-import com.wireguard.android.backend.Backend
-import com.wireguard.android.backend.Tunnel.State
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.data.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.data.repository.TunnelConfigRepository
-import com.zaneschepke.wireguardautotunnel.module.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.module.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.module.Kernel
-import com.zaneschepke.wireguardautotunnel.service.foreground.ServiceManager
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationAction
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService
-import com.zaneschepke.wireguardautotunnel.service.notification.NotificationService.Companion.VPN_NOTIFICATION_ID
-import com.zaneschepke.wireguardautotunnel.service.notification.WireGuardNotification
-import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.AmneziaStatistics
-import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.TunnelStatistics
-import com.zaneschepke.wireguardautotunnel.service.tunnel.statistics.WireGuardStatistics
-import com.zaneschepke.wireguardautotunnel.util.extensions.asAmBackendState
-import com.zaneschepke.wireguardautotunnel.util.extensions.asBackendState
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.sync.Mutex
-import kotlinx.coroutines.sync.withLock
-import kotlinx.coroutines.withContext
-import org.amnezia.awg.backend.Tunnel
-import timber.log.Timber
-import javax.inject.Inject
-import javax.inject.Provider
-
-class WireGuardTunnel
-@Inject
-constructor(
-	private val amneziaBackend: Provider<org.amnezia.awg.backend.Backend>,
-	private val tunnelConfigRepository: TunnelConfigRepository,
-	@Kernel private val kernelBackend: Provider<Backend>,
-	private val appDataRepository: AppDataRepository,
-	@ApplicationScope private val applicationScope: CoroutineScope,
-	@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-	private val serviceManager: ServiceManager,
-	private val notificationService: NotificationService,
-) : TunnelService {
-
-	private val _vpnState = MutableStateFlow(VpnState())
-	override val vpnState: StateFlow<VpnState> = _vpnState.asStateFlow()
-
-	private var statsJob: Job? = null
-	private var tunnelChangesJob: Job? = null
-
-	@get:Synchronized @set:Synchronized
-	private var isKernelBackend: Boolean? = null
-
-	private val tunnelControlMutex = Mutex()
-
-	init {
-		applicationScope.launch(ioDispatcher) {
-			appDataRepository.settings.getSettingsFlow().collect {
-				isKernelBackend = it.isKernelEnabled
-			}
-		}
-	}
-
-	private suspend fun backend(): Any {
-		val isKernelEnabled = isKernelBackend
-			?: appDataRepository.settings.getSettings().isKernelEnabled
-		if (isKernelEnabled) return kernelBackend.get()
-		return amneziaBackend.get()
-	}
-
-	override suspend fun runningTunnelNames(): Set<String> {
-		return when (val backend = backend()) {
-			is Backend -> backend.runningTunnelNames
-			is org.amnezia.awg.backend.Backend -> backend.runningTunnelNames
-			else -> emptySet()
-		}
-	}
-
-	private suspend fun setState(tunnelConfig: TunnelConfig, tunnelState: TunnelState): Result<TunnelState> {
-		return runCatching {
-			when (val backend = backend()) {
-				is Backend -> backend.setState(this, tunnelState.toWgState(), TunnelConfig.configFromWgQuick(tunnelConfig.wgQuick)).let { TunnelState.from(it) }
-				is org.amnezia.awg.backend.Backend -> {
-					val config = if (tunnelConfig.amQuick.isBlank()) {
-						TunnelConfig.configFromAmQuick(
-							tunnelConfig.wgQuick,
-						)
-					} else {
-						TunnelConfig.configFromAmQuick(tunnelConfig.amQuick)
-					}
-					backend.setState(this, tunnelState.toAmState(), config).let {
-						TunnelState.from(it)
-					}
-				}
-				else -> throw NotImplementedError()
-			}
-		}.onFailure {
-			// TODO add better error message to user, especially for kernel as exceptions contain no details
-			Timber.e(it)
-		}
-	}
-
-	private fun isTunnelAlreadyRunning(tunnelConfig: TunnelConfig): Boolean {
-		val isRunning = tunnelConfig == _vpnState.value.tunnelConfig && _vpnState.value.status.isUp()
-		if (isRunning) Timber.w("Tunnel already running")
-		return isRunning
-	}
-
-	override suspend fun startTunnel(tunnelConfig: TunnelConfig?, background: Boolean) {
-		withContext(ioDispatcher) {
-			if (tunnelConfig == null || isTunnelAlreadyRunning(tunnelConfig)) return@withContext
-			updateTunnelConfig(tunnelConfig) // need to update this here
-			withServiceActive {
-				onBeforeStart(background)
-				tunnelControlMutex.withLock {
-					setState(tunnelConfig, TunnelState.UP).onSuccess {
-						updateTunnelState(it, tunnelConfig)
-						onTunnelStart(tunnelConfig, background)
-					}
-				}.onFailure {
-					Timber.e(it)
-				}
-			}
-		}
-	}
-
-	override suspend fun stopTunnel() {
-		withContext(ioDispatcher) {
-			if (_vpnState.value.status.isDown()) return@withContext
-			with(_vpnState.value) {
-				if (tunnelConfig == null) return@withContext
-				tunnelControlMutex.withLock {
-					setState(tunnelConfig, TunnelState.DOWN).onSuccess {
-						onTunnelStop(tunnelConfig)
-						updateTunnelState(it, null)
-					}.onFailure {
-						Timber.e(it)
-					}
-				}
-			}
-		}
-	}
-
-	private suspend fun toggleTunnel(tunnelConfig: TunnelConfig) {
-		withContext(ioDispatcher) {
-			tunnelControlMutex.withLock {
-				setState(tunnelConfig, TunnelState.TOGGLE)
-			}
-		}
-	}
-
-	// utility to keep vpnService alive during rapid changes to prevent bad states
-	private suspend fun withServiceActive(callback: suspend () -> Unit) {
-		when (val backend = backend()) {
-			is org.amnezia.awg.backend.Backend -> {
-				val backendState = backend.backendState
-				if (backendState == org.amnezia.awg.backend.Backend.BackendState.INACTIVE) {
-					backend.setBackendState(org.amnezia.awg.backend.Backend.BackendState.SERVICE_ACTIVE, emptyList())
-				}
-				callback()
-			}
-			is Backend -> callback()
-		}
-	}
-
-	override suspend fun bounceTunnel() {
-		_vpnState.value.tunnelConfig?.let {
-			withServiceActive {
-				toggleTunnel(it)
-				toggleTunnel(it)
-			}
-		}
-	}
-
-	override suspend fun getBackendState(): BackendState {
-		return when (val backend = backend()) {
-			is org.amnezia.awg.backend.Backend -> {
-				backend.backendState.asBackendState()
-			}
-			is Backend -> BackendState.SERVICE_ACTIVE
-			else -> BackendState.INACTIVE
-		}
-	}
-
-	override suspend fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
-		kotlin.runCatching {
-			when (val backend = backend()) {
-				is org.amnezia.awg.backend.Backend -> {
-					backend.setBackendState(backendState.asAmBackendState(), allowedIps)
-				}
-				is Backend -> {
-					// TODO not yet implemented
-					Timber.d("Kernel backend state not yet implemented")
-				}
-				else -> Unit
-			}
-		}
-	}
-
-	private suspend fun onBeforeStart(background: Boolean) {
-		with(_vpnState.value) {
-			if (status.isUp()) stopTunnel() else clearJobsAndStats()
-			if (isKernelBackend == true || background) serviceManager.startBackgroundService(tunnelConfig)
-		}
-	}
-
-	private suspend fun onTunnelStart(tunnelConfig: TunnelConfig, background: Boolean) {
-		startActiveTunnelJobs()
-		if (_vpnState.value.status.isUp()) {
-			appDataRepository.tunnels.save(tunnelConfig.copy(isActive = true))
-		}
-		if (isKernelBackend == false && !background) launchUserspaceTunnelNotification()
-	}
-
-	private fun launchUserspaceTunnelNotification() {
-		with(notificationService) {
-			val notification = createNotification(
-				WireGuardNotification.NotificationChannels.VPN,
-				title = "${context.getString(R.string.tunnel_running)} - ${_vpnState.value.tunnelConfig?.name}",
-				actions = listOf(
-					notificationService.createNotificationAction(NotificationAction.TUNNEL_OFF),
-				),
-			)
-			show(VPN_NOTIFICATION_ID, notification)
-		}
-	}
-
-	private suspend fun onTunnelStop(tunnelConfig: TunnelConfig) {
-		runCatching {
-			appDataRepository.tunnels.save(tunnelConfig.copy(isActive = false))
-			serviceManager.stopBackgroundService()
-			notificationService.remove(VPN_NOTIFICATION_ID)
-			clearJobsAndStats()
-		}
-	}
-
-	private fun clearJobsAndStats() {
-		cancelActiveTunnelJobs()
-		resetBackendStatistics()
-	}
-
-	private fun updateTunnelState(state: TunnelState, tunnelConfig: TunnelConfig?) {
-		_vpnState.update {
-			it.copy(status = state, tunnelConfig = tunnelConfig)
-		}
-	}
-
-	private fun updateTunnelConfig(tunnelConfig: TunnelConfig?) {
-		_vpnState.update {
-			it.copy(tunnelConfig = tunnelConfig)
-		}
-	}
-
-	private fun updateBackendStatistics(statistics: TunnelStatistics) {
-		_vpnState.update {
-			it.copy(statistics = statistics)
-		}
-	}
-
-	private fun resetBackendStatistics() {
-		_vpnState.update {
-			it.copy(statistics = null)
-		}
-	}
-
-	override suspend fun getState(): TunnelState {
-		return when (val backend = backend()) {
-			is Backend -> backend.getState(this).let { TunnelState.from(it) }
-			is org.amnezia.awg.backend.Backend -> backend.getState(this).let { TunnelState.from(it) }
-			else -> TunnelState.DOWN
-		}
-	}
-
-	override fun cancelActiveTunnelJobs() {
-		statsJob?.cancel()
-		tunnelChangesJob?.cancel()
-	}
-
-	override fun startActiveTunnelJobs() {
-		statsJob = startTunnelStatisticsJob()
-		tunnelChangesJob = startTunnelConfigChangesJob()
-	}
-
-	override fun getName(): String {
-		return _vpnState.value.tunnelConfig?.name ?: ""
-	}
-
-	private fun startTunnelStatisticsJob() = applicationScope.launch(ioDispatcher) {
-		val backend = backend()
-		delay(STATS_START_DELAY)
-		while (true) {
-			when (backend) {
-				is Backend -> updateBackendStatistics(
-					WireGuardStatistics(backend.getStatistics(this@WireGuardTunnel)),
-				)
-				is org.amnezia.awg.backend.Backend -> updateBackendStatistics(
-					AmneziaStatistics(
-						backend.getStatistics(this@WireGuardTunnel),
-					),
-				)
-			}
-			delay(VPN_STATISTIC_CHECK_INTERVAL)
-		}
-	}
-
-	private fun startTunnelConfigChangesJob() = applicationScope.launch(ioDispatcher) {
-		tunnelConfigRepository.getTunnelConfigsFlow().collect {
-			with(_vpnState.value) {
-				if (status.isDown() || tunnelConfig == null) return@collect
-				val vpnConfigFromStorage = it.first { it.id == tunnelConfig.id }
-				val isRestartNeeded = vpnConfigFromStorage.wgQuick != tunnelConfig.wgQuick ||
-					vpnConfigFromStorage.amQuick != tunnelConfig.amQuick
-				updateTunnelConfig(vpnConfigFromStorage)
-				if (isRestartNeeded) {
-					Timber.d("Bouncing tunnel on config change")
-					bounceTunnel()
-				}
-			}
-		}
-	}
-
-	override fun onStateChange(newState: Tunnel.State) {
-		_vpnState.update {
-			it.copy(status = TunnelState.from(newState))
-		}
-		serviceManager.updateTunnelTile()
-	}
-
-	override fun onStateChange(state: State) {
-		_vpnState.update {
-			it.copy(status = TunnelState.from(state))
-		}
-		serviceManager.updateTunnelTile()
-	}
-
-	companion object {
-		const val STATS_START_DELAY = 1_000L
-		const val VPN_STATISTIC_CHECK_INTERVAL = 1_000L
-	}
-}
@@ -1,14 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui
-
-import com.zaneschepke.wireguardautotunnel.data.domain.GeneralState
-import com.zaneschepke.wireguardautotunnel.data.domain.Settings
-import com.zaneschepke.wireguardautotunnel.data.domain.TunnelConfig
-import com.zaneschepke.wireguardautotunnel.service.tunnel.VpnState
-
-data class AppUiState(
-	val settings: Settings = Settings(),
-	val tunnels: List<TunnelConfig> = emptyList(),
-	val vpnState: VpnState = VpnState(),
-	val generalState: GeneralState = GeneralState(),
-	val autoTunnelActive: Boolean = false,
-)
@@ -12,6 +12,9 @@ sealed class Route {
 	@Serializable
 	data object AutoTunnel : Route()

+	@Serializable
+	data object AutoTunnelAdvanced : Route()
+
 	@Serializable
 	data object LocationDisclosure : Route()

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Zane Schepke	594ed85a71	start sticky	2025-02-22 07:52:16 -05:00
Zane Schepke	13bb300f20	feat: add worker to restart killed services	2025-02-21 21:16:10 -05:00
Zane Schepke	1375a468fd	feat: add export as amnezia or wg	2025-02-21 17:26:51 -05:00
Zane Schepke	f52efd92ff	fix: tunnel tile state	2025-02-14 19:05:02 -05:00
Zane Schepke	ae665d3e61	feat: multi tunnel support (#566 ) * add support endpoint resolve to ipv6 preference	2025-02-14 17:11:26 -05:00
Zane Schepke	1857977d9b	ci: add verification step	2025-01-19 13:39:56 -05:00
Zane Schepke	4784b1f65c	Merge branch 'main' of https://github.com/zaneschepke/wgtunnel	2025-01-19 12:38:32 -05:00
Zane Schepke	f3debcfe45	feat: disable kill switch on trusted fix: debounce ui bug closes #532	2025-01-19 12:37:43 -05:00
Weblate (bot)	a5229c62b1	feat: Translations update from Hosted Weblate (#542 ) Co-authored-by: solokot <solokot@gmail.com> Co-authored-by: Matthaiks <kitynska@gmail.com> Co-authored-by: CyanWolf <hydemr@pm.me>	2025-01-19 11:59:42 -05:00
Zane Schepke	3e6a2981cb	chore: bump deps	2025-01-18 13:21:13 -05:00
Zane Schepke	00254874f0	refactor: connectivity monitoring (#553 )	2025-01-18 11:56:04 -05:00
Zane Schepke	1b9560b601	fix: light mode text bugs	2025-01-18 07:16:12 -05:00
Zane Schepke	ff97c65d4f	fix: preshared key should be hidden closes #547	2025-01-18 05:47:23 -05:00
Zane Schepke	02dea1e6b0	fix: include all ipv6 with exclusion of private ipv4 addresses closes #550	2025-01-18 05:31:01 -05:00
Zane Schepke	548362cdde	refactor: minor refactor of tunnel options	2025-01-18 04:42:20 -05:00
Zane Schepke	932d27edd7	feat: localizations (#540 ) Co-authored-by: teemue <eemil.koivula@gmail.com> Co-authored-by: solokot <solokot@gmail.com> Co-authored-by: MouaisTe44 <r.craft.212121@gmail.com> Co-authored-by: Saturno <rodrigogigante4016@gmail.com> Co-authored-by: Languages add-on <noreply-addon-languages@weblate.org> Co-authored-by: Thomas Chuang <9euagazrg@mozmail.com>	2025-01-11 16:13:18 -05:00
Zane Schepke	d89870e6de	fix: tile titles not localized closes #537	2025-01-11 15:37:39 -05:00
Zane Schepke	0dcee673e1	fix: back gesture	2025-01-11 14:52:29 -05:00
Zane Schepke	7b7c8f6e8c	ci: fix fdroid dispatch	2025-01-02 22:58:04 -05:00
Zane Schepke	7cbe3311c9	chore: bump version	2025-01-02 22:45:43 -05:00
Zane Schepke	a5898d4ad1	fix: make sure ping shuts down	2025-01-02 17:10:32 -05:00
Zane Schepke	48c01aa0e3	Merge branch 'main' of https://github.com/zaneschepke/wgtunnel	2025-01-02 16:47:30 -05:00
Zane Schepke	b1dc6c5d59	fix: make ping aware of network availability add basic tunnel error messages	2025-01-02 16:47:23 -05:00
Weblate (bot)	2a7397edba	Translations update from Hosted Weblate (#531 ) Co-authored-by: Matthaiks <kitynska@gmail.com> Co-authored-by: solokot <solokot@gmail.com> Co-authored-by: Kachelkaiser <kachelkaiser@outlook.com> Co-authored-by: CyanWolf <hydemr@pm.me> Co-authored-by: Deleted User <noreply+48943@weblate.org> Co-authored-by: Languages add-on <noreply-addon-languages@weblate.org>	2025-01-02 16:35:43 -05:00
Zane Schepke	53c09267df	fix: ethernet monitoring and auto tunnel override	2025-01-01 19:14:56 -05:00
Zane Schepke	f772dc0f8a	feat!: move ping from auto tunnel to tunnel Ping feature will not be tunnel specific and work without auto tunneling being active	2025-01-01 18:16:26 -05:00
Zane Schepke	ba064b267f	fix: try to query ssid if we don't have a valid one yet	2025-01-01 02:38:59 -05:00
Zane Schepke	2c04b9d69c	fix: active tunnel bug	2025-01-01 01:32:24 -05:00
Zane Schepke	48adaae0a0	docs: fix readme	2025-01-01 00:43:28 -05:00
Zane Schepke	8e49a4d343	docs: fix readme title	2025-01-01 00:41:51 -05:00
Zane Schepke	67f53915cc	feat(lang): weblate localization changes (#530 ) Co-authored-by: Matthaiks <kitynska@gmail.com> Co-authored-by: Languages add-on <noreply-addon-languages@weblate.org> Co-authored-by: solokot <solokot@gmail.com> Co-authored-by: Kachelkaiser <kachelkaiser@outlook.com> Co-authored-by: L.y <lycidias@gmail.com>	2025-01-01 00:40:59 -05:00
Weblate (bot)	156c5478ae	Translations update from Hosted Weblate (#522 ) Co-authored-by: Zane Schepke <zanecschepke@gmail.com> Co-authored-by: Matthaiks <kitynska@gmail.com> Co-authored-by: Languages add-on <noreply-addon-languages@weblate.org>	2025-01-01 00:28:11 -05:00
Zane Schepke	85319ba874	refactor: navigation	2025-01-01 00:08:33 -05:00
Zane Schepke	ab858ab59e	feat: config screen peer action to exclude private ips closes #402	2024-12-31 22:31:31 -05:00
Zane Schepke	4196a543b2	fix: location disclosure screen navigation bug	2024-12-31 19:13:15 -05:00
Zane Schepke	02a8db0f9a	feat: add setting for debounce delay tuning closes #493	2024-12-31 19:02:44 -05:00
Zane Schepke	eb7c6ca7ba	ci: fix apk upload github release	2024-12-31 15:25:07 -05:00
Zane Schepke	8ffe145ade	fix: android 9 crash bug	2024-12-31 14:19:57 -05:00
Zane Schepke	4bdc43deb3	ci: move versionCode bump to build	2024-12-31 00:47:09 -05:00
Zane Schepke	83c0ff497b	ci: fix github publish	2024-12-31 00:27:29 -05:00
Zane Schepke	c8ac40d370	fix: improve tile sync #491	2024-12-31 00:17:34 -05:00
Zane Schepke	4dc91b5fae	fix: create tunnel from scratch bug closes #524	2024-12-28 23:46:21 -05:00
Zane Schepke	7a3627bf6a	fix: remove unused shortcuts dep	2024-12-27 15:03:38 -05:00
Zane Schepke	e86bba6a0e	docs: move chats	2024-12-27 13:52:20 -05:00
Zane Schepke	ac846bfdc9	docs: update screenshots and readme	2024-12-27 13:49:09 -05:00
Zane Schepke	11e385d350	feat: toggle to set amnezia/wg compatibility values closes #469 closes #518	2024-12-27 02:52:44 -05:00
Zane Schepke	b2e266fc9f	fix: toggle state bug	2024-12-26 22:56:09 -05:00
Zane Schepke	7cbbf00e52	fix: search case sensitive closes #515	2024-12-26 22:42:43 -05:00
Zane Schepke	6a0b2b678f	fix: banner background color removed	2024-12-26 22:39:55 -05:00
Zane Schepke	1bfea142ad	ci: fix fdroid publish	2024-12-26 22:34:00 -05:00
Zane Schepke	6fdf80e84d	chore: remove crowdin	2024-12-26 22:17:11 -05:00
Zane Schepke	b7ec9e2696	chore: fix language mapping	2024-12-26 20:36:30 -05:00
Zane Schepke	6502f553ac	Update Crowdin configuration file	2024-12-26 20:27:52 -05:00
Zane Schepke	946ac71fb1	Update Crowdin configuration file	2024-12-26 19:51:16 -05:00
Zane Schepke	dca8b50083	chore: crowdin yaml fix	2024-12-26 18:44:59 -05:00
Zane Schepke	1ab611aa7f	chore: cleanup unused strings	2024-12-26 14:33:08 -05:00
Zane Schepke	40a2732ec9	Update Crowdin configuration file	2024-12-26 13:41:42 -05:00
Zane Schepke	ffcb4f6ed8	fix: weblate conflicts (#519 ) Co-authored-by: lateweb <weblate@techkoala.net> Co-authored-by: Anonymous <noreply@weblate.org> Co-authored-by: Matthaiks <kitynska@gmail.com> Co-authored-by: Tom <weblate.delicate088@passinbox.com> Co-authored-by: Hosted Weblate <hosted@weblate.org> Co-authored-by: MouaisTe44 <r.craft.212121@gmail.com> Co-authored-by: Languages add-on <noreply-addon-languages@weblate.org> Co-authored-by: Julian Madsen <julian@sopyt.com> Co-authored-by: tomo90 <ivanek.tomas@gmail.com> Co-authored-by: solokot <solokot@gmail.com> Co-authored-by: Marco <16669146+RodoMa92@users.noreply.github.com>	2024-12-26 13:32:29 -05:00
Zane Schepke	7b6bdec133	fix!: notification channel id should not be localized	2024-12-26 12:49:00 -05:00
Zane Schepke	6ece224592	fix: translation bug	2024-12-26 12:23:36 -05:00