chore(deps): bump actions/setup-java from 4 to 5

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4 to 5.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -15,7 +15,7 @@ A clear and concise description of what the bug is.
 - Device: [e.g. Pixel 4a]
 - Android Version: [e.g. Android 13]
 - App Version [e.g. 3.3.3]
-- App mode: [e.g. Kernel, VPN, Proxy, Lockdown]
+- Backend: [e.g. Kernel, Userspace]
 
 **To Reproduce**
 Steps to reproduce the behavior:

.github/workflows/build.yml

@@ -72,7 +72,7 @@ jobs:
     outputs:
       UPLOAD_DIR_ANDROID: ${{ env.UPLOAD_DIR_ANDROID }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up JDK 17

.github/workflows/nightly.yml

@@ -16,7 +16,7 @@ jobs:
       has_new_commits: ${{ steps.check.outputs.new_commits }}
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Check for new commits
         id: check
         env:
@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
 
       - name: Install system dependencies
         run: |

.github/workflows/pr.yml

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

.github/workflows/publish.yml

@@ -72,7 +72,7 @@ jobs:
     name: publish-github
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.event_name == 'push' && github.ref || 'main' }}
       - name: Install system dependencies
@@ -189,7 +189,7 @@ jobs:
       KEY_STORE_LOCATION: ${{ github.workspace }}/app/keystore/
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
         uses: actions/setup-java@v5
         with:

README.md

@@ -4,7 +4,7 @@ WG Tunnel
 
 <div align="center">
 
-An alternative FOSS Android client for [WireGuard](https://www.wireguard.com/)
+An alternative Android client app for [WireGuard](https://www.wireguard.com/)
 and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/)
 <br />
 <br />
@@ -37,11 +37,11 @@ and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/)
 <summary>Table of Contents</summary>
 
 - [About](#about)
+- [Acknowledgements](#acknowledgements)
 - [Screenshots](#screenshots)
 - [Features](#features)
 - [Building](#building)
 - [Translation](#translation)
-- [Acknowledgements](#acknowledgements)
 - [Contributing](#contributing)
 
 </details>
@@ -49,13 +49,22 @@ and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/)
 <div style="text-align: left;">
 
 ## About
-
+Inspired by the official [wireguard-android](https://github.com/WireGuard/wireguard-android) app, WG Tunnel was created to address features and support missing from the official app. This app combines support for both [WireGuard](https://www.wireguard.com/)
-WG Tunnel is an alternative Android client for WireGuard and AmneziaWG, inspired by the official WireGuard Android app. It fills gaps in the official client by adding advanced features like auto-tunneling (on-demand VPN activation), while seamlessly supporting both protocols across app modes—including Kernel (for direct WireGuard kernel integration; AmneziaWG not supported), VPN (standard system-level tunneling), Lockdown (a custom kill switch for leak prevention), and Proxy (built-in HTTP/SOCKS5 forwarding)—for enhanced privacy, censorship resistance, and flexibility.
+and [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/), with its primary feature of auto-tunneling (on-demand tunneling).
 
 </div>
 
 <div style="text-align: left;">
 
+## Acknowledgements
+
+Thank you to the following:
+
+- All of the users that have helped contribute to the project with ideas, translations, feedback, bug reports, testing, and donations.
+- [WireGuard](https://www.wireguard.com/) - Jason A. Donenfeld (https://github.com/WireGuard/wireguard-android)
+
+- [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) - Amnezia Team (https://github.com/amnezia-vpn/amneziawg-android)
+
 ## Screenshots
 
 </div>
@@ -70,26 +79,26 @@ WG Tunnel is an alternative Android client for WireGuard and AmneziaWG, inspired
 
 ## Features
 
-- **Tunnel Import Methods**: Easily add tunnels using .conf files, ZIP archives, manual entry, or QR code scanning.
+* Add tunnels via .conf file, zip, manual entry, clipboard, or QR code
-- **Auto-Tunneling**: Automatically activate tunnels based on Wi-Fi SSID, Ethernet connections, or mobile data networks.
+* Auto-tunnel based on Wi-Fi SSID, ethernet, or mobile data
-- **Split Tunneling**: Flexible support for routing specific apps or traffic through the VPN.
+* Split tunneling by application with search
-- **WireGuard Modes**: Full compatibility with WireGuard in both kernel and userspace implementations.
+* Support for kernel and userspace modes
-- **AmneziaWG Integration**: Userspace mode for AmneziaWG, providing robust censorship evasion.
+* Amnezia support for userspace mode for DPI/censorship protection
-- **Always-On VPN**: Ensures continuous protection with Android's Always-On VPN feature.
+* Pre/Post Up/Down scripts support for all modes on a rooted device
-- **Quick Controls**: Quick Settings tile and home screen shortcuts for easy VPN toggling.
+* Always-On VPN support
-- **Automation Support**: Intent-based automation for controlling tunnels.
+* Export tunnels to zip
-- **Auto-Restore**: Seamlessly restores auto-tunneling and active tunnels after device restarts or app updates.
+* Quick tile support for tunnel toggling, auto-tunneling
-- **Proxying Options**: Built-in HTTP and SOCKS5 proxy support within tunnels.
+* Shortcuts support for tunnel toggling, auto-tunneling
-- **Lockdown Mode**: Custom kill switch for maximum leak prevention and security.
+* Intent automation support for all tunnels
-- **Dynamic DNS Handling**: Detects and updates DNS changes without tunnel restarts.
+* In app VPN kill switch with LAN bypass
-- **Monitoring Tools**: Advanced tunnel monitoring features for tunnel performance monitoring.
+* Automatic auto-tunneling service and/or tunnel restart after reboot or app update
-- **Android TV Support**: Android TV support for secure streaming and browsing.
+* Battery preservation measures
-- **Advanced DNS**: DNS over HTTPS support for tunnel endpoint resolutions.
+* Restart tunnel on ping failure
 
 ## Building
 
 ```sh
-git clone https://github.com/wgtunnel/wgtunnel
+git clone https://github.com/zaneschepke/wgtunnel
 cd wgtunnel
 ```
 
@@ -105,15 +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/)
 
-## Acknowledgements
-
-Thank you to the following:
-
-- All of the users that have helped contribute to the project with ideas, translations, feedback, bug reports, testing, and donations.
-- [WireGuard](https://www.wireguard.com/) - Jason A. Donenfeld (https://github.com/WireGuard/wireguard-android)
-- [AmneziaWG](https://docs.amnezia.org/documentation/amnezia-wg/) - Amnezia Team (https://github.com/amnezia-vpn/amneziawg-android)
-- [JetBrains](https://jetbrains.com) - For supporting open-source developers with free software licenses.
-
 ## Contributing
 
 Any contributions in the form of feedback, issues, code, or translations are welcome and much

app/build.gradle.kts

@@ -24,9 +24,6 @@ android {
 
     ksp { arg("room.schemaLocation", "$projectDir/schemas") }
 
-    // fix okhttp proguard issue
-    packaging { resources { pickFirsts.add("okhttp3/internal/publicsuffix/publicsuffixes.gz") } }
-
     defaultConfig {
         applicationId = Constants.APP_ID
         minSdk = Constants.MIN_SDK
@@ -200,9 +197,9 @@ dependencies {
 
     implementation(libs.zxing.android.embedded)
 
-    implementation(libs.material.icons.core)
     implementation(libs.material.icons.extended)
 
+    implementation(libs.androidx.biometric.ktx)
     implementation(libs.pin.lock.compose)
 
     implementation(libs.androidx.core)
@@ -231,11 +228,6 @@ dependencies {
     implementation(libs.roomdatabasebackup) {
         exclude(group = "org.reactivestreams", module = "reactive-streams")
     }
-
-    // state management
-    implementation(libs.orbit.compose)
-    implementation(libs.orbit.viewmodel)
-    implementation(libs.orbit.core)
 }
 
 tasks.register<Copy>("copyLicenseeJsonToAssets") {

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

@@ -1,359 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 20,
-    "identityHash": "51f828868c0ea2f0f5c987410ff5c5a1",
-    "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_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_wildcards_enabled` INTEGER NOT NULL DEFAULT false, `is_stop_on_no_internet_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, `is_tunnel_on_unsecure_enabled` INTEGER NOT NULL DEFAULT false, `wifi_detection_method` INTEGER NOT NULL DEFAULT 0, `is_ping_monitoring_enabled` INTEGER NOT NULL DEFAULT true, `tunnel_ping_interval_sec` INTEGER NOT NULL DEFAULT 30, `tunnel_ping_attempts` INTEGER NOT NULL DEFAULT 3, `tunnel_ping_timeout_sec` INTEGER, `app_mode` INTEGER NOT NULL DEFAULT 0, `dns_protocol` INTEGER NOT NULL DEFAULT 0, `dns_endpoint` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAutoTunnelEnabled",
-            "columnName": "is_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "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": "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": "isWildcardsEnabled",
-            "columnName": "is_wildcards_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isStopOnNoInternetEnabled",
-            "columnName": "is_stop_on_no_internet_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"
-          },
-          {
-            "fieldPath": "isTunnelOnUnsecureEnabled",
-            "columnName": "is_tunnel_on_unsecure_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "wifiDetectionMethod",
-            "columnName": "wifi_detection_method",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "isPingMonitoringEnabled",
-            "columnName": "is_ping_monitoring_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "true"
-          },
-          {
-            "fieldPath": "tunnelPingIntervalSeconds",
-            "columnName": "tunnel_ping_interval_sec",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "30"
-          },
-          {
-            "fieldPath": "tunnelPingAttempts",
-            "columnName": "tunnel_ping_attempts",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "3"
-          },
-          {
-            "fieldPath": "tunnelPingTimeoutSeconds",
-            "columnName": "tunnel_ping_timeout_sec",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "appMode",
-            "columnName": "app_mode",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "dnsProtocol",
-            "columnName": "dns_protocol",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "dnsEndpoint",
-            "columnName": "dns_endpoint",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "TunnelConfig",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `wg_quick` TEXT NOT NULL, `tunnel_networks` TEXT NOT NULL DEFAULT '', `is_mobile_data_tunnel` INTEGER NOT NULL DEFAULT false, `is_primary_tunnel` INTEGER NOT NULL DEFAULT false, `am_quick` TEXT NOT NULL DEFAULT '', `is_Active` INTEGER NOT NULL DEFAULT false, `restart_on_ping_failure` INTEGER NOT NULL DEFAULT false, `ping_target` TEXT DEFAULT null, `is_ethernet_tunnel` INTEGER NOT NULL DEFAULT false, `is_ipv4_preferred` INTEGER NOT NULL DEFAULT true, `position` INTEGER NOT NULL DEFAULT 0, `auto_tunnel_apps` TEXT NOT NULL DEFAULT '[]')",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "wgQuick",
-            "columnName": "wg_quick",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "tunnelNetworks",
-            "columnName": "tunnel_networks",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isMobileDataTunnel",
-            "columnName": "is_mobile_data_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPrimaryTunnel",
-            "columnName": "is_primary_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "amQuick",
-            "columnName": "am_quick",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isActive",
-            "columnName": "is_Active",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "restartOnPingFailure",
-            "columnName": "restart_on_ping_failure",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "pingTarget",
-            "columnName": "ping_target",
-            "affinity": "TEXT",
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "isEthernetTunnel",
-            "columnName": "is_ethernet_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isIpv4Preferred",
-            "columnName": "is_ipv4_preferred",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "true"
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "position",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "autoTunnelApps",
-            "columnName": "auto_tunnel_apps",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "'[]'"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_TunnelConfig_name",
-            "unique": true,
-            "columnNames": [
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_TunnelConfig_name` ON `${TABLE_NAME}` (`name`)"
-          }
-        ]
-      },
-      {
-        "tableName": "proxy_settings",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `socks5_proxy_enabled` INTEGER NOT NULL DEFAULT false, `socks5_proxy_bind_address` TEXT, `http_proxy_enable` INTEGER NOT NULL DEFAULT false, `http_proxy_bind_address` TEXT, `proxy_username` TEXT, `proxy_password` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "socks5ProxyEnabled",
-            "columnName": "socks5_proxy_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "socks5ProxyBindAddress",
-            "columnName": "socks5_proxy_bind_address",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "httpProxyEnabled",
-            "columnName": "http_proxy_enable",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "httpProxyBindAddress",
-            "columnName": "http_proxy_bind_address",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "proxyUsername",
-            "columnName": "proxy_username",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "proxyPassword",
-            "columnName": "proxy_password",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        }
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '51f828868c0ea2f0f5c987410ff5c5a1')"
-    ]
-  }
-}

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

@@ -1,359 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 21,
-    "identityHash": "51f828868c0ea2f0f5c987410ff5c5a1",
-    "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_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_wildcards_enabled` INTEGER NOT NULL DEFAULT false, `is_stop_on_no_internet_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, `is_tunnel_on_unsecure_enabled` INTEGER NOT NULL DEFAULT false, `wifi_detection_method` INTEGER NOT NULL DEFAULT 0, `is_ping_monitoring_enabled` INTEGER NOT NULL DEFAULT true, `tunnel_ping_interval_sec` INTEGER NOT NULL DEFAULT 30, `tunnel_ping_attempts` INTEGER NOT NULL DEFAULT 3, `tunnel_ping_timeout_sec` INTEGER, `app_mode` INTEGER NOT NULL DEFAULT 0, `dns_protocol` INTEGER NOT NULL DEFAULT 0, `dns_endpoint` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAutoTunnelEnabled",
-            "columnName": "is_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "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": "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": "isWildcardsEnabled",
-            "columnName": "is_wildcards_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isStopOnNoInternetEnabled",
-            "columnName": "is_stop_on_no_internet_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"
-          },
-          {
-            "fieldPath": "isTunnelOnUnsecureEnabled",
-            "columnName": "is_tunnel_on_unsecure_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "wifiDetectionMethod",
-            "columnName": "wifi_detection_method",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "isPingMonitoringEnabled",
-            "columnName": "is_ping_monitoring_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "true"
-          },
-          {
-            "fieldPath": "tunnelPingIntervalSeconds",
-            "columnName": "tunnel_ping_interval_sec",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "30"
-          },
-          {
-            "fieldPath": "tunnelPingAttempts",
-            "columnName": "tunnel_ping_attempts",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "3"
-          },
-          {
-            "fieldPath": "tunnelPingTimeoutSeconds",
-            "columnName": "tunnel_ping_timeout_sec",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "appMode",
-            "columnName": "app_mode",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "dnsProtocol",
-            "columnName": "dns_protocol",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "dnsEndpoint",
-            "columnName": "dns_endpoint",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "TunnelConfig",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `wg_quick` TEXT NOT NULL, `tunnel_networks` TEXT NOT NULL DEFAULT '', `is_mobile_data_tunnel` INTEGER NOT NULL DEFAULT false, `is_primary_tunnel` INTEGER NOT NULL DEFAULT false, `am_quick` TEXT NOT NULL DEFAULT '', `is_Active` INTEGER NOT NULL DEFAULT false, `restart_on_ping_failure` INTEGER NOT NULL DEFAULT false, `ping_target` TEXT DEFAULT null, `is_ethernet_tunnel` INTEGER NOT NULL DEFAULT false, `is_ipv4_preferred` INTEGER NOT NULL DEFAULT true, `position` INTEGER NOT NULL DEFAULT 0, `auto_tunnel_apps` TEXT NOT NULL DEFAULT '[]')",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "wgQuick",
-            "columnName": "wg_quick",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "tunnelNetworks",
-            "columnName": "tunnel_networks",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isMobileDataTunnel",
-            "columnName": "is_mobile_data_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPrimaryTunnel",
-            "columnName": "is_primary_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "amQuick",
-            "columnName": "am_quick",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isActive",
-            "columnName": "is_Active",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "restartOnPingFailure",
-            "columnName": "restart_on_ping_failure",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "pingTarget",
-            "columnName": "ping_target",
-            "affinity": "TEXT",
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "isEthernetTunnel",
-            "columnName": "is_ethernet_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isIpv4Preferred",
-            "columnName": "is_ipv4_preferred",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "true"
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "position",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "autoTunnelApps",
-            "columnName": "auto_tunnel_apps",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "'[]'"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_TunnelConfig_name",
-            "unique": true,
-            "columnNames": [
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_TunnelConfig_name` ON `${TABLE_NAME}` (`name`)"
-          }
-        ]
-      },
-      {
-        "tableName": "proxy_settings",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `socks5_proxy_enabled` INTEGER NOT NULL DEFAULT false, `socks5_proxy_bind_address` TEXT, `http_proxy_enable` INTEGER NOT NULL DEFAULT false, `http_proxy_bind_address` TEXT, `proxy_username` TEXT, `proxy_password` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "socks5ProxyEnabled",
-            "columnName": "socks5_proxy_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "socks5ProxyBindAddress",
-            "columnName": "socks5_proxy_bind_address",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "httpProxyEnabled",
-            "columnName": "http_proxy_enable",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "httpProxyBindAddress",
-            "columnName": "http_proxy_bind_address",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "proxyUsername",
-            "columnName": "proxy_username",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "proxyPassword",
-            "columnName": "proxy_password",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        }
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '51f828868c0ea2f0f5c987410ff5c5a1')"
-    ]
-  }
-}

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

@@ -1,364 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 22,
-    "identityHash": "db93d0490401ccbef25ca39f27bafa29",
-    "entities": [
-      {
-        "tableName": "Settings",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `is_tunnel_enabled` INTEGER NOT NULL DEFAULT 0, `is_tunnel_on_mobile_data_enabled` INTEGER NOT NULL DEFAULT 0, `trusted_network_ssids` TEXT NOT NULL DEFAULT '', `is_always_on_vpn_enabled` INTEGER NOT NULL DEFAULT 0, `is_tunnel_on_ethernet_enabled` INTEGER NOT NULL DEFAULT 0, `is_shortcuts_enabled` INTEGER NOT NULL DEFAULT 0, `is_tunnel_on_wifi_enabled` INTEGER NOT NULL DEFAULT 0, `is_restore_on_boot_enabled` INTEGER NOT NULL DEFAULT 0, `is_multi_tunnel_enabled` INTEGER NOT NULL DEFAULT 0, `is_ping_enabled` INTEGER NOT NULL DEFAULT 0, `is_wildcards_enabled` INTEGER NOT NULL DEFAULT 0, `is_stop_on_no_internet_enabled` INTEGER NOT NULL DEFAULT 0, `is_lan_on_kill_switch_enabled` INTEGER NOT NULL DEFAULT 0, `debounce_delay_seconds` INTEGER NOT NULL DEFAULT 3, `is_disable_kill_switch_on_trusted_enabled` INTEGER NOT NULL DEFAULT 0, `is_tunnel_on_unsecure_enabled` INTEGER NOT NULL DEFAULT 0, `wifi_detection_method` INTEGER NOT NULL DEFAULT 0, `is_ping_monitoring_enabled` INTEGER NOT NULL DEFAULT 1, `tunnel_ping_interval_sec` INTEGER NOT NULL DEFAULT 30, `tunnel_ping_attempts` INTEGER NOT NULL DEFAULT 3, `tunnel_ping_timeout_sec` INTEGER, `app_mode` INTEGER NOT NULL DEFAULT 0, `dns_protocol` INTEGER NOT NULL DEFAULT 0, `dns_endpoint` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "isAutoTunnelEnabled",
-            "columnName": "is_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "isTunnelOnMobileDataEnabled",
-            "columnName": "is_tunnel_on_mobile_data_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "trustedNetworkSSIDs",
-            "columnName": "trusted_network_ssids",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isAlwaysOnVpnEnabled",
-            "columnName": "is_always_on_vpn_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "isTunnelOnEthernetEnabled",
-            "columnName": "is_tunnel_on_ethernet_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "isShortcutsEnabled",
-            "columnName": "is_shortcuts_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "isTunnelOnWifiEnabled",
-            "columnName": "is_tunnel_on_wifi_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "isRestoreOnBootEnabled",
-            "columnName": "is_restore_on_boot_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "isMultiTunnelEnabled",
-            "columnName": "is_multi_tunnel_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "isPingEnabled",
-            "columnName": "is_ping_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "isWildcardsEnabled",
-            "columnName": "is_wildcards_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "isStopOnNoInternetEnabled",
-            "columnName": "is_stop_on_no_internet_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "isLanOnKillSwitchEnabled",
-            "columnName": "is_lan_on_kill_switch_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "debounceDelaySeconds",
-            "columnName": "debounce_delay_seconds",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "3"
-          },
-          {
-            "fieldPath": "isDisableKillSwitchOnTrustedEnabled",
-            "columnName": "is_disable_kill_switch_on_trusted_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "isTunnelOnUnsecureEnabled",
-            "columnName": "is_tunnel_on_unsecure_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "wifiDetectionMethod",
-            "columnName": "wifi_detection_method",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "isPingMonitoringEnabled",
-            "columnName": "is_ping_monitoring_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "1"
-          },
-          {
-            "fieldPath": "tunnelPingIntervalSeconds",
-            "columnName": "tunnel_ping_interval_sec",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "30"
-          },
-          {
-            "fieldPath": "tunnelPingAttempts",
-            "columnName": "tunnel_ping_attempts",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "3"
-          },
-          {
-            "fieldPath": "tunnelPingTimeoutSeconds",
-            "columnName": "tunnel_ping_timeout_sec",
-            "affinity": "INTEGER"
-          },
-          {
-            "fieldPath": "appMode",
-            "columnName": "app_mode",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "dnsProtocol",
-            "columnName": "dns_protocol",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "dnsEndpoint",
-            "columnName": "dns_endpoint",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        }
-      },
-      {
-        "tableName": "TunnelConfig",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `wg_quick` TEXT NOT NULL, `tunnel_networks` TEXT NOT NULL DEFAULT '', `is_mobile_data_tunnel` INTEGER NOT NULL DEFAULT false, `is_primary_tunnel` INTEGER NOT NULL DEFAULT false, `am_quick` TEXT NOT NULL DEFAULT '', `is_Active` INTEGER NOT NULL DEFAULT false, `restart_on_ping_failure` INTEGER NOT NULL DEFAULT false, `ping_target` TEXT DEFAULT null, `is_ethernet_tunnel` INTEGER NOT NULL DEFAULT false, `is_ipv4_preferred` INTEGER NOT NULL DEFAULT true, `position` INTEGER NOT NULL DEFAULT 0, `auto_tunnel_apps` TEXT NOT NULL DEFAULT '[]')",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "wgQuick",
-            "columnName": "wg_quick",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "tunnelNetworks",
-            "columnName": "tunnel_networks",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isMobileDataTunnel",
-            "columnName": "is_mobile_data_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isPrimaryTunnel",
-            "columnName": "is_primary_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "amQuick",
-            "columnName": "am_quick",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "''"
-          },
-          {
-            "fieldPath": "isActive",
-            "columnName": "is_Active",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "restartOnPingFailure",
-            "columnName": "restart_on_ping_failure",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "pingTarget",
-            "columnName": "ping_target",
-            "affinity": "TEXT",
-            "defaultValue": "null"
-          },
-          {
-            "fieldPath": "isEthernetTunnel",
-            "columnName": "is_ethernet_tunnel",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
-          },
-          {
-            "fieldPath": "isIpv4Preferred",
-            "columnName": "is_ipv4_preferred",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "true"
-          },
-          {
-            "fieldPath": "position",
-            "columnName": "position",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "autoTunnelApps",
-            "columnName": "auto_tunnel_apps",
-            "affinity": "TEXT",
-            "notNull": true,
-            "defaultValue": "'[]'"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        },
-        "indices": [
-          {
-            "name": "index_TunnelConfig_name",
-            "unique": true,
-            "columnNames": [
-              "name"
-            ],
-            "orders": [],
-            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_TunnelConfig_name` ON `${TABLE_NAME}` (`name`)"
-          }
-        ]
-      },
-      {
-        "tableName": "proxy_settings",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `socks5_proxy_enabled` INTEGER NOT NULL DEFAULT 0, `socks5_proxy_bind_address` TEXT, `http_proxy_enable` INTEGER NOT NULL DEFAULT 0, `http_proxy_bind_address` TEXT, `proxy_username` TEXT, `proxy_password` TEXT)",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "socks5ProxyEnabled",
-            "columnName": "socks5_proxy_enabled",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "socks5ProxyBindAddress",
-            "columnName": "socks5_proxy_bind_address",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "httpProxyEnabled",
-            "columnName": "http_proxy_enable",
-            "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "0"
-          },
-          {
-            "fieldPath": "httpProxyBindAddress",
-            "columnName": "http_proxy_bind_address",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "proxyUsername",
-            "columnName": "proxy_username",
-            "affinity": "TEXT"
-          },
-          {
-            "fieldPath": "proxyPassword",
-            "columnName": "proxy_password",
-            "affinity": "TEXT"
-          }
-        ],
-        "primaryKey": {
-          "autoGenerate": true,
-          "columnNames": [
-            "id"
-          ]
-        }
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'db93d0490401ccbef25ca39f27bafa29')"
-    ]
-  }
-}

app/src/androidTest/java/com/zaneschepke/wireguardautotunnel/MigrationTest.kt

@@ -4,6 +4,7 @@ import androidx.room.testing.MigrationTestHelper
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
+import com.zaneschepke.wireguardautotunnel.data.Queries
 import java.io.IOException
 import org.junit.Rule
 import org.junit.Test
@@ -23,6 +24,8 @@ class MigrationTest {
         helper.createDatabase(dbName, 6).apply {
             // Database has schema version 1. Insert some data using SQL queries.
             // You can't use DAO classes because they expect the latest schema.
+            execSQL(Queries.createDefaultSettings())
+            execSQL(Queries.createTunnelConfig())
             // Prepare for the next version.
             close()
         }

app/src/main/AndroidManifest.xml

@@ -5,11 +5,10 @@
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
-    <!--foreground service special use for non VPN service tunnels, android 14-->
+    <!--foreground service exempt android 14-->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
-    <!--foreground service special use for VPN service tunnels, android 14-->
-    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SYSTEM_EXEMPTED" />
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"
+		tools:ignore="ProtectedPermissions" />
 
     <!--foreground service permissions-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -152,45 +151,21 @@
             android:name=".core.service.autotunnel.AutoTunnelService"
             android:enabled="true"
             android:exported="false"
-            android:foregroundServiceType="specialUse"
+            android:foregroundServiceType="systemExempted"
             android:persistent="true"
             android:stopWithTask="false"
-            tools:node="merge">
+            tools:node="merge" />
-            <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
-                      android:value="This service monitors network changes to automatically
-                      establish and maintain WireGuard VPN tunnels on demand, ensuring seamless connectivity.
-                      It requires persistent foreground execution to detect real-time events,
-                      which cannot be achieved with standard background APIs due to timing and reliability needs for
-                      network connectivity monitoring."/>
-        </service>
-
-        <service
-                android:name=".core.service.TunnelForegroundService"
-                android:enabled="true"
-                android:exported="false"
-                android:foregroundServiceType="specialUse"
-                android:persistent="true"
-                android:stopWithTask="false"
-                tools:node="merge">
-            <property android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
-                      android:value="This service sustains non-VpnService virtual tunnels (using gVisor/netstack for
-                      isolated networking), keeping connections alive for continuous secure data routing.
-                      Persistent foreground operation is essential to handle
-                      low-level tunnel maintenance and avoid interruptions, beyond the capabilities of other
-                      service types or background work."/>
-        </service>
 
 		<service
-			android:name=".core.service.VpnForegroundService"
+			android:name=".core.service.TunnelForegroundService"
 			android:exported="false"
 			android:persistent="true"
-            android:foregroundServiceType="systemExempted"
+			android:foregroundServiceType="systemExempted"
 			android:permission="android.permission.BIND_VPN_SERVICE">
 			<intent-filter>
 				<action android:name="android.net.VpnService" />
 			</intent-filter>
 		</service>
-
         <receiver
             android:name=".core.broadcast.RestartReceiver"
             android:enabled="true"

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

@@ -1,10 +1,8 @@
 package com.zaneschepke.wireguardautotunnel
 
-import ProxySettingsScreen
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.graphics.Color
-import android.net.VpnService
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
@@ -16,6 +14,9 @@ import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
 import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.layout.*
@@ -23,131 +24,122 @@ import androidx.compose.material3.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.pointer.pointerInput
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.zIndex
 import androidx.core.net.toUri
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
+import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
-import androidx.navigation.navigation
 import androidx.navigation.toRoute
 import com.zaneschepke.networkmonitor.NetworkMonitor
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
-import com.zaneschepke.wireguardautotunnel.data.model.AppMode
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
+import com.zaneschepke.wireguardautotunnel.di.MainDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
-import com.zaneschepke.wireguardautotunnel.domain.sideeffect.GlobalSideEffect
+import com.zaneschepke.wireguardautotunnel.ui.Route
-import com.zaneschepke.wireguardautotunnel.ui.LocalIsAndroidTV
-import com.zaneschepke.wireguardautotunnel.ui.LocalNavController
-import com.zaneschepke.wireguardautotunnel.ui.LocalSharedVm
-import com.zaneschepke.wireguardautotunnel.ui.common.banner.AppAlertBanner
 import com.zaneschepke.wireguardautotunnel.ui.common.dialog.VpnDeniedDialog
 import com.zaneschepke.wireguardautotunnel.ui.common.snackbar.CustomSnackBar
-import com.zaneschepke.wireguardautotunnel.ui.navigation.Route
+import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalIsAndroidTV
+import com.zaneschepke.wireguardautotunnel.ui.navigation.LocalNavController
 import com.zaneschepke.wireguardautotunnel.ui.navigation.components.BottomNavbar
 import com.zaneschepke.wireguardautotunnel.ui.navigation.components.DynamicTopAppBar
-import com.zaneschepke.wireguardautotunnel.ui.navigation.components.currentBackStackEntryAsNavbarState
+import com.zaneschepke.wireguardautotunnel.ui.navigation.components.currentNavBackStackEntryAsNavBarState
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.AutoTunnelScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.advanced.AutoTunnelAdvancedScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.detection.WifiDetectionMethodScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.autotunnel.disclosure.LocationDisclosureScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.MainScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.autotunnel.TunnelAutoTunnelScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.config.ConfigScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.sort.SortScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.splittunnel.SplitTunnelScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.main.tunneloptions.TunnelOptionsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.pin.PinLockScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.SettingsScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.advanced.SettingsAdvancedScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.AppearanceScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.display.DisplayScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.appearance.language.LanguageScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.dns.DnsSettingsScreen
+import com.zaneschepke.wireguardautotunnel.ui.screens.settings.killswitch.KillSwitchScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.logs.LogsScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.settings.monitoring.TunnelMonitoringScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.settings.system.SystemFeaturesScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.SupportScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.support.donate.DonateScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.support.donate.crypto.AddressesScreen
 import com.zaneschepke.wireguardautotunnel.ui.screens.support.license.LicenseScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.TunnelsScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.autotunnel.TunnelAutoTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.config.ConfigScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.sort.SortScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.splittunnel.SplitTunnelScreen
-import com.zaneschepke.wireguardautotunnel.ui.screens.tunnels.tunneloptions.TunnelOptionsScreen
-import com.zaneschepke.wireguardautotunnel.ui.theme.AlertRed
-import com.zaneschepke.wireguardautotunnel.ui.theme.OffWhite
 import com.zaneschepke.wireguardautotunnel.ui.theme.WireguardAutoTunnelTheme
-import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
+import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
-import com.zaneschepke.wireguardautotunnel.util.extensions.*
+import com.zaneschepke.wireguardautotunnel.util.extensions.restartApp
-import com.zaneschepke.wireguardautotunnel.viewmodel.*
+import com.zaneschepke.wireguardautotunnel.util.extensions.showToast
+import com.zaneschepke.wireguardautotunnel.viewmodel.AppViewModel
+import com.zaneschepke.wireguardautotunnel.viewmodel.event.AppEvent
 import dagger.hilt.android.AndroidEntryPoint
 import de.raphaelebner.roomdatabasebackup.core.RoomBackup
-import java.util.*
 import javax.inject.Inject
+import kotlin.system.exitProcess
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.launch
-import timber.log.Timber
+import org.amnezia.awg.backend.GoBackend.VpnService
-import xyz.teamgravity.pin_lock_compose.PinManager
 
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
 
     @Inject lateinit var appStateRepository: AppStateRepository
+
     @Inject lateinit var tunnelManager: TunnelManager
+
     @Inject lateinit var networkMonitor: NetworkMonitor
+
+    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
+
+    @Inject @MainDispatcher lateinit var mainDispatcher: CoroutineDispatcher
+
     @Inject lateinit var appDatabase: AppDatabase
 
+    private var lastLocationPermissionState: Boolean? = null
+
     private lateinit var roomBackup: RoomBackup
 
+    val REQUEST_CODE = 123
+
     @SuppressLint("BatteryLife")
     override fun onCreate(savedInstanceState: Bundle?) {
         enableEdgeToEdge(
-            statusBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT),
+            statusBarStyle = SystemBarStyle.Companion.auto(Color.TRANSPARENT, Color.TRANSPARENT),
-            navigationBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT),
+            navigationBarStyle = SystemBarStyle.Companion.auto(Color.TRANSPARENT, Color.TRANSPARENT),
         )
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
             window.isNavigationBarContrastEnforced = false
         }
         super.onCreate(savedInstanceState)
-
         roomBackup = RoomBackup(this)
 
-        val viewModel by viewModels<SharedAppViewModel>()
+        val viewModel by viewModels<AppViewModel>()
 
         installSplashScreen().apply {
-            setKeepOnScreenCondition { !viewModel.container.stateFlow.value.isAppLoaded }
+            setKeepOnScreenCondition { !viewModel.appViewState.value.isAppReady }
         }
 
         setContent {
-            val context = LocalContext.current
             val isTv = isRunningOnTv()
-            val appState by viewModel.container.stateFlow.collectAsStateWithLifecycle()
+            val appUiState by viewModel.uiState.collectAsStateWithLifecycle()
+            val appViewState by viewModel.appViewState.collectAsStateWithLifecycle()
+
             val navController = rememberNavController()
-            val scope = rememberCoroutineScope()
+            val backStackEntry by navController.currentBackStackEntryAsState()
-
+            val navBarState by
-            var pinManagerInitialized by remember { mutableStateOf(false) }
+                currentNavBackStackEntryAsNavBarState(
-
+                    navController,
-            LaunchedEffect(appState.isAppLoaded) {
+                    backStackEntry,
-                if (appState.isAppLoaded) {
+                    viewModel,
-                    if (appState.pinLockEnabled && !pinManagerInitialized) {
+                    appUiState,
-                        PinManager.initialize(this@MainActivity)
+                    appViewState,
-                        pinManagerInitialized = true
+                )
-                    }
-                    appState.locale.let { LocaleUtil.changeLocale(it) }
-                }
-            }
-
-            val navState by
-                navController.currentBackStackEntryAsNavbarState(viewModel, navController)
             val snackbar = remember { SnackbarHostState() }
             var showVpnPermissionDialog by remember { mutableStateOf(false) }
             var vpnPermissionDenied by remember { mutableStateOf(false) }
-            var requestingAppMode by remember {
-                mutableStateOf<Pair<AppMode?, TunnelConf?>>(Pair(null, null))
-            }
-
-            LaunchedEffect(navState) { Timber.d("New navbar state $navState") }
 
             val vpnActivity =
                 rememberLauncherForActivityResult(
@@ -159,86 +151,86 @@ class MainActivity : AppCompatActivity() {
                         } else {
                             vpnPermissionDenied = false
                             showVpnPermissionDialog = false
-                            val (appMode, config) = requestingAppMode
-                            when (appMode) {
-                                AppMode.VPN -> if (config != null) viewModel.startTunnel(config)
-                                AppMode.LOCK_DOWN -> viewModel.setAppMode(AppMode.LOCK_DOWN)
-                                else -> Unit
-                            }
                         }
-                        requestingAppMode = Pair(null, null)
                     },
                 )
 
+            LaunchedEffect(appUiState.tunnels) {
+                if (!appViewState.isAppReady) {
+                    viewModel.handleEvent(AppEvent.AppReadyCheck(appUiState.tunnels))
+                }
+            }
+
             val batteryActivity =
                 rememberLauncherForActivityResult(
                     ActivityResultContracts.StartActivityForResult()
                 ) { _: ActivityResult ->
-                    viewModel.disableBatteryOptimizationsShown()
+                    viewModel.handleEvent(AppEvent.SetBatteryOptimizeDisableShown)
                 }
 
-            fun requestDisableBatteryOptimizations() {
+            with(appViewState) {
-                batteryActivity.launch(
+                LaunchedEffect(isConfigChanged) {
-                    Intent().apply {
+                    if (isConfigChanged) {
-                        action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
+                        Intent(this@MainActivity, MainActivity::class.java).also {
-                        data = "package:${this@MainActivity.packageName}".toUri()
+                            startActivity(it)
+                            exitProcess(0)
+                        }
                     }
-                )
+                }
-            }
+                LaunchedEffect(errorMessage) {
-
+                    errorMessage?.let {
-            LaunchedEffect(Unit) {
+                        snackbar.showSnackbar(it.asString(this@MainActivity))
-                viewModel.globalSideEffect.collect { sideEffect ->
+                        viewModel.handleEvent(AppEvent.MessageShown)
-                    when (sideEffect) {
+                    }
-                        GlobalSideEffect.ConfigChanged -> restartApp()
+                }
-                        GlobalSideEffect.PopBackStack -> navController.popBackStack()
+                LaunchedEffect(popBackStack) {
-                        GlobalSideEffect.RequestBatteryOptimizationDisabled ->
+                    if (popBackStack) {
-                            requestDisableBatteryOptimizations()
+                        navController.popBackStack()
-                        is GlobalSideEffect.RequestVpnPermission -> {
+                        viewModel.handleEvent(AppEvent.PopBackStack(false))
-                            requestingAppMode = Pair(sideEffect.requestingMode, sideEffect.config)
+                    }
+                }
+                LaunchedEffect(requestVpnPermission) {
+                    if (requestVpnPermission) {
+                        if (!vpnPermissionDenied) {
                             vpnActivity.launch(VpnService.prepare(this@MainActivity))
+                        } else {
+                            showVpnPermissionDialog = true
                         }
-                        is GlobalSideEffect.ShareFile -> context.launchShareFile(sideEffect.file)
+                        viewModel.handleEvent(AppEvent.VpnPermissionRequested)
-                        is GlobalSideEffect.Snackbar ->
+                    }
-                            scope.launch {
+                }
-                                snackbar.showSnackbar(sideEffect.message.asString(context))
+                LaunchedEffect(requestBatteryPermission) {
+                    if (requestBatteryPermission) {
+                        batteryActivity.launch(
+                            Intent().apply {
+                                action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
+                                data = "package:${this@MainActivity.packageName}".toUri()
                             }
-                        is GlobalSideEffect.Toast ->
+                        )
-                            scope.launch { context.showToast(sideEffect.message.asString(context)) }
-                        is GlobalSideEffect.LaunchUrl -> context.openWebUrl(sideEffect.url)
-                        is GlobalSideEffect.InstallApk -> context.installApk(sideEffect.apk)
                     }
                 }
             }
 
-            if (!appState.isAppLoaded) return@setContent
+            CompositionLocalProvider(LocalIsAndroidTV provides isTv) {
-
+                CompositionLocalProvider(LocalNavController provides navController) {
-            CompositionLocalProvider(
+                    WireguardAutoTunnelTheme(theme = appUiState.appState.theme) {
-                LocalIsAndroidTV provides isTv,
+                        VpnDeniedDialog(
-                LocalSharedVm provides viewModel,
+                            showVpnPermissionDialog,
-                LocalNavController provides navController,
+                            onDismiss = {
-            ) {
+                                showVpnPermissionDialog = false
-                WireguardAutoTunnelTheme(theme = appState.theme) {
+                                vpnPermissionDenied = false
-                    VpnDeniedDialog(
+                            },
-                        showVpnPermissionDialog,
+                        )
-                        onDismiss = {
-                            showVpnPermissionDialog = false
-                            vpnPermissionDenied = false
-                        },
-                    )
-
-                    Box(modifier = Modifier.fillMaxSize()) {
-                        if (appState.settings.appMode == AppMode.LOCK_DOWN) {
-                            AppAlertBanner(
-                                stringResource(R.string.locked_down).uppercase(Locale.getDefault()),
-                                OffWhite,
-                                AlertRed,
-                                modifier = Modifier.fillMaxWidth().zIndex(2f),
-                            )
-                        }
 
                         Scaffold(
+                            modifier =
+                                Modifier.pointerInput(Unit) {
+                                    detectTapGestures {
+                                        viewModel.handleEvent(AppEvent.ClearSelectedTunnels)
+                                    }
+                                },
                             snackbarHost = {
-                                SnackbarHost(snackbar) { snackbarData ->
+                                SnackbarHost(snackbar) { snackbarData: SnackbarData ->
                                     CustomSnackBar(
                                         snackbarData.visuals.message,
                                         isRtl = false,
@@ -247,14 +239,16 @@ class MainActivity : AppCompatActivity() {
                                     )
                                 }
                             },
-                            topBar = { DynamicTopAppBar(navState) },
+                            topBar = { DynamicTopAppBar(navBarState) },
                             bottomBar = {
-                                BottomNavbar(appState.isAutoTunnelActive, navState, navController)
+                                AnimatedVisibility(
+                                    visible = navBarState.showBottom,
+                                    enter = slideInVertically(initialOffsetY = { it }),
+                                    exit = slideOutVertically(targetOffsetY = { it }),
+                                ) {
+                                    BottomNavbar(appUiState = appUiState)
+                                }
                             },
-                            modifier =
-                                Modifier.pointerInput(Unit) {
-                                    detectTapGestures { viewModel.clearSelectedTunnels() }
-                                },
                         ) { padding ->
                             Box(
                                 modifier =
@@ -265,131 +259,83 @@ class MainActivity : AppCompatActivity() {
                                         .imePadding()
                             ) {
                                 NavHost(
-                                    navController = navController,
+                                    navController,
                                     startDestination =
-                                        if (appState.pinLockEnabled && !appState.isAuthorized)
+                                        (if (appUiState.appState.isPinLockEnabled) Route.Lock
-                                            Route.Lock
+                                        else Route.Main),
-                                        else Route.TunnelsGraph,
                                 ) {
-                                    composable<Route.Lock> { PinLockScreen() }
+                                    composable<Route.Main> {
-                                    navigation<Route.TunnelsGraph>(
+                                        MainScreen(appUiState, appViewState, viewModel)
-                                        startDestination = Route.Tunnels
-                                    ) {
-                                        composable<Route.Tunnels> {
-                                            val viewModel =
-                                                it.sharedViewModel<TunnelsViewModel>(navController)
-                                            TunnelsScreen(viewModel)
-                                        }
-                                        composable<Route.Sort> {
-                                            val viewModel =
-                                                it.sharedViewModel<TunnelsViewModel>(navController)
-                                            SortScreen(viewModel)
-                                        }
-                                        composable<Route.TunnelOptions> { backStackEntry ->
-                                            val args = backStackEntry.toRoute<Route.TunnelOptions>()
-                                            val viewModel =
-                                                backStackEntry.sharedViewModel<TunnelsViewModel>(
-                                                    navController
-                                                )
-                                            TunnelOptionsScreen(args.id, viewModel)
-                                        }
-                                        composable<Route.SplitTunnel> { backStackEntry ->
-                                            val args = backStackEntry.toRoute<Route.SplitTunnel>()
-                                            SplitTunnelScreen(args.id)
-                                        }
-                                        composable<Route.TunnelAutoTunnel> { backStackEntry ->
-                                            val args =
-                                                backStackEntry.toRoute<Route.TunnelAutoTunnel>()
-                                            val viewModel =
-                                                backStackEntry.sharedViewModel<TunnelsViewModel>(
-                                                    navController
-                                                )
-                                            TunnelAutoTunnelScreen(args.id, viewModel)
-                                        }
-                                        composable<Route.Config> { backStackEntry ->
-                                            val args = backStackEntry.toRoute<Route.Config>()
-                                            val viewModel =
-                                                backStackEntry.sharedViewModel<TunnelsViewModel>(
-                                                    navController
-                                                )
-                                            ConfigScreen(args.id, viewModel)
-                                        }
                                     }
-
+                                    composable<Route.Settings> {
-                                    navigation<Route.AutoTunnelGraph>(
+                                        SettingsScreen(appUiState, appViewState, viewModel)
-                                        startDestination = Route.AutoTunnel
-                                    ) {
-                                        composable<Route.LocationDisclosure> {
-                                            val viewModel =
-                                                it.sharedViewModel<AutoTunnelViewModel>(
-                                                    navController
-                                                )
-                                            LocationDisclosureScreen(viewModel)
-                                        }
-                                        composable<Route.AutoTunnel> {
-                                            val viewModel =
-                                                it.sharedViewModel<AutoTunnelViewModel>(
-                                                    navController
-                                                )
-                                            AutoTunnelScreen(viewModel)
-                                        }
-                                        composable<Route.AdvancedAutoTunnel> {
-                                            val viewModel =
-                                                it.sharedViewModel<AutoTunnelViewModel>(
-                                                    navController
-                                                )
-                                            AutoTunnelAdvancedScreen(viewModel)
-                                        }
-                                        composable<Route.WifiDetectionMethod> {
-                                            val viewModel =
-                                                it.sharedViewModel<AutoTunnelViewModel>(
-                                                    navController
-                                                )
-                                            WifiDetectionMethodScreen(viewModel)
-                                        }
                                     }
-
+                                    composable<Route.SettingsAdvanced> {
-                                    navigation<Route.SettingsGraph>(
+                                        SettingsAdvancedScreen(appUiState, viewModel)
-                                        startDestination = Route.Settings
-                                    ) {
-                                        composable<Route.Settings> {
-                                            val viewModel =
-                                                it.sharedViewModel<SettingsViewModel>(navController)
-                                            SettingsScreen(viewModel)
-                                        }
-                                        composable<Route.TunnelMonitoring> {
-                                            val viewModel =
-                                                it.sharedViewModel<SettingsViewModel>(navController)
-                                            TunnelMonitoringScreen(viewModel)
-                                        }
-                                        composable<Route.SystemFeatures> {
-                                            val viewModel =
-                                                it.sharedViewModel<SettingsViewModel>(navController)
-                                            SystemFeaturesScreen(viewModel)
-                                        }
-                                        composable<Route.Dns> {
-                                            val viewModel =
-                                                it.sharedViewModel<SettingsViewModel>(navController)
-                                            DnsSettingsScreen(viewModel)
-                                        }
-                                        composable<Route.ProxySettings> { ProxySettingsScreen() }
-                                        composable<Route.Appearance> { AppearanceScreen() }
-                                        composable<Route.Language> { LanguageScreen() }
-                                        composable<Route.Display> { DisplayScreen() }
-                                        composable<Route.Logs> { LogsScreen() }
                                     }
-
+                                    composable<Route.LocationDisclosure> {
-                                    navigation<Route.SupportGraph>(
+                                        LocationDisclosureScreen(viewModel)
-                                        startDestination = Route.Support
+                                    }
-                                    ) {
+                                    composable<Route.AutoTunnel> {
-                                        composable<Route.Support> {
+                                        AutoTunnelScreen(appUiState, viewModel)
-                                            val viewModel =
+                                    }
-                                                it.sharedViewModel<SupportViewModel>(navController)
+                                    composable<Route.Appearance> { AppearanceScreen() }
-                                            SupportScreen(viewModel)
+                                    composable<Route.Language> {
-                                        }
+                                        LanguageScreen(appUiState, viewModel)
-                                        composable<Route.License> { LicenseScreen() }
+                                    }
-                                        composable<Route.Donate> { DonateScreen(navController) }
+                                    composable<Route.Display> {
-                                        composable<Route.Addresses> { AddressesScreen() }
+                                        DisplayScreen(appUiState, viewModel)
+                                    }
+                                    composable<Route.Support> {
+                                        SupportScreen(appViewModel = viewModel)
+                                    }
+                                    composable<Route.License> { LicenseScreen() }
+                                    composable<Route.AutoTunnelAdvanced> {
+                                        AutoTunnelAdvancedScreen(appUiState, viewModel)
+                                    }
+                                    composable<Route.WifiDetectionMethod> {
+                                        WifiDetectionMethodScreen(appUiState, viewModel)
+                                    }
+                                    composable<Route.Logs> { LogsScreen(appViewState, viewModel) }
+                                    composable<Route.Config> { backStack ->
+                                        val args = backStack.toRoute<Route.Config>()
+                                        val config =
+                                            appUiState.tunnels.firstOrNull { it.id == args.id }
+                                        ConfigScreen(config, appUiState, viewModel)
+                                    }
+                                    composable<Route.TunnelOptions> { backStack ->
+                                        val args = backStack.toRoute<Route.TunnelOptions>()
+                                        appUiState.tunnels
+                                            .firstOrNull { it.id == args.id }
+                                            ?.let { config ->
+                                                TunnelOptionsScreen(
+                                                    config,
+                                                    viewModel,
+                                                    appViewState,
+                                                    appUiState.appSettings,
+                                                )
+                                            }
+                                    }
+                                    composable<Route.Lock> { PinLockScreen(viewModel) }
+                                    composable<Route.KillSwitch> {
+                                        KillSwitchScreen(appUiState, viewModel)
+                                    }
+                                    composable<Route.SplitTunnel> { SplitTunnelScreen(viewModel) }
+                                    composable<Route.TunnelAutoTunnel> { backStack ->
+                                        val args = backStack.toRoute<Route.TunnelOptions>()
+                                        appUiState.tunnels
+                                            .firstOrNull { it.id == args.id }
+                                            ?.let {
+                                                TunnelAutoTunnelScreen(
+                                                    it,
+                                                    appUiState.appSettings,
+                                                    viewModel,
+                                                )
+                                            }
+                                    }
+                                    composable<Route.Sort> { SortScreen(appUiState, viewModel) }
+                                    composable<Route.TunnelMonitoring> {
+                                        TunnelMonitoringScreen(appUiState, viewModel)
                                     }
                                 }
                             }
@@ -412,15 +358,15 @@ class MainActivity : AppCompatActivity() {
     }
 
     fun performBackup() =
-        lifecycleScope.launch {
+        lifecycleScope.launch(ioDispatcher) {
             roomBackup
                 .database(appDatabase)
                 .backupLocation(RoomBackup.BACKUP_FILE_LOCATION_CUSTOM_DIALOG)
                 .enableLogDebug(true)
                 .maxFileCount(5)
                 .apply {
-                    onCompleteListener { success, _, _ ->
+                    onCompleteListener { success, message, exitCode ->
-                        lifecycleScope.launch {
+                        lifecycleScope.launch(mainDispatcher) {
                             if (success) {
                                 showToast(
                                     getString(
@@ -429,9 +375,7 @@ class MainActivity : AppCompatActivity() {
                                     )
                                 )
                                 restartApp()
-                            } else {
+                            } else showToast(R.string.backup_failed)
-                                showToast(R.string.backup_failed)
-                            }
                         }
                     }
                 }
@@ -445,8 +389,8 @@ class MainActivity : AppCompatActivity() {
                 .enableLogDebug(true)
                 .backupLocation(RoomBackup.BACKUP_FILE_LOCATION_CUSTOM_DIALOG)
                 .apply {
-                    onCompleteListener { success, _, _ ->
+                    onCompleteListener { success, message, exitCode ->
-                        lifecycleScope.launch {
+                        lifecycleScope.launch(mainDispatcher) {
                             if (success) {
                                 showToast(
                                     getString(
@@ -455,9 +399,7 @@ class MainActivity : AppCompatActivity() {
                                     )
                                 )
                                 restartApp()
-                            } else {
+                            } else showToast(R.string.restore_failed)
-                                showToast(R.string.restore_failed)
-                            }
                         }
                     }
                 }

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

@@ -5,27 +5,24 @@ import android.os.StrictMode
 import android.os.StrictMode.ThreadPolicy
 import androidx.hilt.work.HiltWorkerFactory
 import androidx.work.Configuration
+import com.wireguard.android.backend.GoBackend
 import com.zaneschepke.logcatter.LogReader
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationMonitor
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.core.worker.ServiceWorker
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
+import com.zaneschepke.wireguardautotunnel.di.MainDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendStatus
-import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
 import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
 import dagger.hilt.android.HiltAndroidApp
 import javax.inject.Inject
-import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.*
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.launch
-import org.amnezia.awg.backend.GoBackend
 import timber.log.Timber
 
 @HiltAndroidApp
@@ -40,11 +37,11 @@ class WireGuardAutoTunnel : Application(), Configuration.Provider {
 
     @Inject lateinit var logReader: LogReader
 
+    @Inject lateinit var appDataRepository: AppDataRepository
+
     @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
 
-    @Inject lateinit var settingsRepository: GeneralSettingRepository
+    @Inject @MainDispatcher lateinit var mainDispatcher: CoroutineDispatcher
-    @Inject lateinit var tunnelsRepository: TunnelRepository
-    @Inject lateinit var appStateRepository: AppStateRepository
 
     @Inject lateinit var notificationMonitor: NotificationMonitor
 
@@ -67,16 +64,11 @@ class WireGuardAutoTunnel : Application(), Configuration.Provider {
             Timber.plant(ReleaseTree())
         }
 
-        applicationScope.launch(ioDispatcher) {
-            launch { if (appStateRepository.isLocalLogsEnabled()) logReader.start() }
-            launch { notificationMonitor.handleApplicationNotifications() }
-        }
-
         GoBackend.setAlwaysOnCallback {
             applicationScope.launch {
-                val settings = settingsRepository.get()
+                val settings = appDataRepository.settings.get()
                 if (settings.isAlwaysOnVpnEnabled) {
-                    val tunnel = tunnelsRepository.getDefaultTunnel()
+                    val tunnel = appDataRepository.getPrimaryOrFirstTunnel()
                     tunnel?.let { tunnelManager.startTunnel(it) }
                 } else {
                     Timber.w("Always-on VPN is not enabled in app settings")
@@ -85,11 +77,21 @@ class WireGuardAutoTunnel : Application(), Configuration.Provider {
         }
 
         ServiceWorker.start(this)
+
+        applicationScope.launch {
+            launch { notificationMonitor.handleApplicationNotifications() }
+            appDataRepository.appState.getLocale()?.let {
+                withContext(mainDispatcher) { LocaleUtil.changeLocale(it) }
+            }
+            appDataRepository.appState.isLocalLogsEnabled().let { enabled ->
+                if (enabled) logReader.start()
+            }
+        }
     }
 
     override fun onTerminate() {
         applicationScope.cancel()
-        tunnelManager.setBackendMode(BackendMode.Inactive)
+        tunnelManager.setBackendStatus(BackendStatus.Inactive)
         super.onTerminate()
     }
 

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

@@ -3,6 +3,7 @@ package com.zaneschepke.wireguardautotunnel.core.broadcast
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
@@ -18,6 +19,8 @@ class KernelReceiver : BroadcastReceiver() {
 
     @Inject lateinit var tunnelRepository: TunnelRepository
 
+    @Inject lateinit var serviceManager: ServiceManager
+
     @Inject lateinit var tunnelManager: TunnelManager
 
     override fun onReceive(context: Context, intent: Intent) {
@@ -28,6 +31,7 @@ class KernelReceiver : BroadcastReceiver() {
                     val tunnel = tunnelRepository.findByTunnelName(name)
                     tunnel?.let { tunnelRepository.save(it.copy(isActive = true)) }
                 }
+                serviceManager.updateTunnelTile()
             }
         }
     }

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

@@ -4,10 +4,10 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
-import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
 import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
@@ -17,24 +17,23 @@ import kotlinx.coroutines.launch
 @AndroidEntryPoint
 class NotificationActionReceiver : BroadcastReceiver() {
 
+    @Inject lateinit var serviceManager: ServiceManager
+
     @Inject lateinit var tunnelManager: TunnelManager
 
     @Inject lateinit var tunnelRepository: TunnelRepository
 
-    @Inject lateinit var settingsRepository: GeneralSettingRepository
-
     @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
 
     override fun onReceive(context: Context, intent: Intent) {
         applicationScope.launch {
             when (intent.action) {
-                NotificationAction.AUTO_TUNNEL_OFF.name ->
+                NotificationAction.AUTO_TUNNEL_OFF.name -> serviceManager.stopAutoTunnel()
-                    settingsRepository.updateAutoTunnelEnabled(false)
                 NotificationAction.TUNNEL_OFF.name -> {
                     val tunnelId = intent.getIntExtra(NotificationManager.EXTRA_ID, 0)
-                    if (tunnelId == STOP_ALL_TUNNELS_ID)
+                    if (tunnelId == STOP_ALL_TUNNELS_ID) return@launch tunnelManager.stopTunnel()
-                        return@launch tunnelManager.stopActiveTunnels()
+                    val tunnel = tunnelRepository.getById(tunnelId)
-                    tunnelRepository.getById(tunnelId)?.let { tunnelManager.stopTunnel(it.id) }
+                    tunnelManager.stopTunnel(tunnel)
                 }
             }
         }

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

@@ -3,11 +3,10 @@ package com.zaneschepke.wireguardautotunnel.core.broadcast
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
@@ -20,9 +19,9 @@ class RemoteControlReceiver : BroadcastReceiver() {
 
     @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
 
-    @Inject lateinit var appStateRepository: AppStateRepository
+    @Inject lateinit var appDataRepository: AppDataRepository
-    @Inject lateinit var settingsRepository: GeneralSettingRepository
+
-    @Inject lateinit var tunnelsRepository: TunnelRepository
+    @Inject lateinit var serviceManager: ServiceManager
 
     @Inject lateinit var tunnelManager: TunnelManager
 
@@ -53,10 +52,10 @@ class RemoteControlReceiver : BroadcastReceiver() {
         val action = intent.action ?: return
         val appAction = Action.fromAction(action) ?: return Timber.w("Unknown action $action")
         applicationScope.launch {
-            if (!appStateRepository.isRemoteControlEnabled())
+            if (!appDataRepository.appState.isRemoteControlEnabled())
                 return@launch Timber.w("Remote control disabled")
             val key =
-                appStateRepository.getRemoteKey()
+                appDataRepository.appState.getRemoteKey()
                     ?: return@launch Timber.w("Remote control key missing")
             if (key != intent.getStringExtra(EXTRA_KEY)?.trim())
                 return@launch Timber.w("Invalid remote control key")
@@ -65,27 +64,29 @@ class RemoteControlReceiver : BroadcastReceiver() {
                     val tunnelName =
                         intent.getStringExtra(EXTRA_TUN_NAME) ?: return@launch startDefaultTunnel()
                     val tunnel =
-                        tunnelsRepository.findByTunnelName(tunnelName)
+                        appDataRepository.tunnels.findByTunnelName(tunnelName)
                             ?: return@launch startDefaultTunnel()
                     tunnelManager.startTunnel(tunnel)
                 }
                 Action.STOP_TUNNEL -> {
                     val tunnelName =
                         intent.getStringExtra(EXTRA_TUN_NAME)
-                            ?: return@launch tunnelManager.stopActiveTunnels()
+                            ?: return@launch tunnelManager.stopTunnel()
                     val tunnel =
-                        tunnelsRepository.findByTunnelName(tunnelName)
+                        appDataRepository.tunnels.findByTunnelName(tunnelName)
-                            ?: return@launch tunnelManager.stopActiveTunnels()
+                            ?: return@launch tunnelManager.stopTunnel()
-                    tunnelManager.stopTunnel(tunnel.id)
+                    tunnelManager.stopTunnel(tunnel)
                 }
-                Action.START_AUTO_TUNNEL -> settingsRepository.updateAutoTunnelEnabled(true)
+                Action.START_AUTO_TUNNEL -> serviceManager.startAutoTunnel()
-                Action.STOP_AUTO_TUNNEL -> settingsRepository.updateAutoTunnelEnabled(false)
+                Action.STOP_AUTO_TUNNEL -> serviceManager.stopAutoTunnel()
             }
         }
     }
 
     private suspend fun startDefaultTunnel() {
-        tunnelsRepository.getDefaultTunnel()?.let { tunnel -> tunnelManager.startTunnel(tunnel) }
+        appDataRepository.getPrimaryOrFirstTunnel()?.let { tunnel ->
+            tunnelManager.startTunnel(tunnel)
+        }
     }
 
     companion object {

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

@@ -4,9 +4,11 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import com.zaneschepke.logcatter.LogReader
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
@@ -16,9 +18,12 @@ import timber.log.Timber
 
 @AndroidEntryPoint
 class RestartReceiver : BroadcastReceiver() {
+    @Inject lateinit var appDataRepository: AppDataRepository
 
     @Inject @ApplicationScope lateinit var applicationScope: CoroutineScope
 
+    @Inject lateinit var serviceManager: ServiceManager
+
     @Inject lateinit var tunnelManager: TunnelManager
 
     @Inject lateinit var logReader: LogReader
@@ -27,7 +32,24 @@ class RestartReceiver : BroadcastReceiver() {
 
     override fun onReceive(context: Context, intent: Intent) {
         Timber.d("RestartReceiver triggered with action: ${intent.action}")
-        if (intent.action == Intent.ACTION_MY_PACKAGE_REPLACED)
+        serviceManager.updateTunnelTile()
-            applicationScope.launch(ioDispatcher) { logReader.deleteAndClearLogs() }
+        serviceManager.updateAutoTunnelTile()
+        applicationScope.launch(ioDispatcher) {
+            val settings = appDataRepository.settings.get()
+            if (settings.isRestoreOnBootEnabled) {
+                if (
+                    settings.isAutoTunnelEnabled && serviceManager.autoTunnelService.value == null
+                ) {
+                    Timber.d("Starting auto-tunnel on boot/update")
+                    serviceManager.startAutoTunnel()
+                } else {
+                    Timber.d("Restoring previous tunnel state")
+                    tunnelManager.restorePreviousState()
+                }
+            } else {
+                Timber.d("Restore on boot disabled, skipping")
+            }
+            if (intent.action == Intent.ACTION_MY_PACKAGE_REPLACED) logReader.deleteAndClearLogs()
+        }
     }
 }

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

@@ -16,9 +16,9 @@ interface NotificationManager {
         title: String = "",
         actions: Collection<NotificationCompat.Action> = emptyList(),
         description: String = "",
-        showTimestamp: Boolean = true,
+        showTimestamp: Boolean = false,
         importance: Int = NotificationManager.IMPORTANCE_HIGH,
-        onGoing: Boolean = false,
+        onGoing: Boolean = true,
         onlyAlertOnce: Boolean = true,
     ): Notification
 
@@ -27,9 +27,9 @@ interface NotificationManager {
         title: StringValue,
         actions: Collection<NotificationCompat.Action> = emptyList(),
         description: StringValue,
-        showTimestamp: Boolean = true,
+        showTimestamp: Boolean = false,
         importance: Int = NotificationManager.IMPORTANCE_HIGH,
-        onGoing: Boolean = false,
+        onGoing: Boolean = true,
         onlyAlertOnce: Boolean = true,
     ): Notification
 

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

@@ -3,7 +3,7 @@ package com.zaneschepke.wireguardautotunnel.core.notification
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.domain.events.BackendCoreException
+import com.zaneschepke.wireguardautotunnel.domain.events.BackendError
 import com.zaneschepke.wireguardautotunnel.util.StringValue
 import jakarta.inject.Inject
 import kotlinx.coroutines.coroutineScope
@@ -22,15 +22,15 @@ constructor(
     }
 
     private suspend fun handleTunnelErrors() =
-        tunnelManager.errorEvents.collectLatest { (tunName, error) ->
+        tunnelManager.errorEvents.collectLatest { (tunnelConf, error) ->
             if (!WireGuardAutoTunnel.uiActive.value) {
                 val notification =
                     notificationManager.createNotification(
                         WireGuardNotification.NotificationChannels.VPN,
-                        title = StringValue.DynamicString(tunName),
+                        title = StringValue.DynamicString(tunnelConf.name),
                         description =
                             when (error) {
-                                is BackendCoreException.BounceFailed -> error.toStringValue()
+                                is BackendError.BounceFailed -> error.toStringValue()
                                 else ->
                                     StringValue.StringResource(
                                         R.string.tunnel_error_template,
@@ -46,12 +46,12 @@ constructor(
         }
 
     private suspend fun handleTunnelMessages() =
-        tunnelManager.messageEvents.collectLatest { (tunName, message) ->
+        tunnelManager.messageEvents.collectLatest { (tunnelConf, message) ->
             if (!WireGuardAutoTunnel.uiActive.value) {
                 val notification =
                     notificationManager.createNotification(
                         WireGuardNotification.NotificationChannels.VPN,
-                        title = StringValue.DynamicString(tunName),
+                        title = StringValue.DynamicString(tunnelConf.name),
                         description = message.toStringValue(),
                     )
                 notificationManager.show(

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

@@ -1,141 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.service
-
-import android.app.Notification
-import android.content.Intent
-import android.os.IBinder
-import androidx.core.app.ServiceCompat
-import androidx.lifecycle.LifecycleService
-import androidx.lifecycle.lifecycleScope
-import com.zaneschepke.wireguardautotunnel.R
-import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
-import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelMonitor
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
-import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import com.zaneschepke.wireguardautotunnel.util.extensions.distinctByKeys
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.launch
-import timber.log.Timber
-
-@AndroidEntryPoint
-abstract class BaseTunnelForegroundService : LifecycleService(), TunnelService {
-
-    @Inject lateinit var notificationManager: NotificationManager
-
-    @Inject lateinit var serviceManager: ServiceManager
-
-    @Inject lateinit var tunnelManager: TunnelManager
-
-    @Inject lateinit var tunnelMonitor: TunnelMonitor
-
-    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
-
-    @Inject lateinit var tunnelsRepository: TunnelRepository
-
-    protected abstract val fgsType: Int
-
-    override fun onBind(intent: Intent): IBinder {
-        super.onBind(intent)
-        return LocalBinder(this)
-    }
-
-    override fun onCreate() {
-        super.onCreate()
-        ServiceCompat.startForeground(
-            this,
-            NotificationManager.VPN_NOTIFICATION_ID,
-            onCreateNotification(),
-            fgsType,
-        )
-    }
-
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        super.onStartCommand(intent, flags, startId)
-        ServiceCompat.startForeground(
-            this,
-            NotificationManager.VPN_NOTIFICATION_ID,
-            onCreateNotification(),
-            fgsType,
-        )
-        start()
-        return START_STICKY
-    }
-
-    override fun start() {
-        lifecycleScope.launch(ioDispatcher) {
-            tunnelManager.activeTunnels.distinctByKeys().collect { activeTunnels ->
-                val activeTunConfigs = activeTunnels.keys
-                val tunnels = tunnelsRepository.getAll()
-                val activeConfigs = tunnels.filter { activeTunConfigs.contains(it.id) }
-                updateServiceNotification(activeConfigs)
-            }
-        }
-    }
-
-    // TODO Would be cool to have this include kill switch
-    private fun updateServiceNotification(activeConfigs: List<TunnelConf>) {
-        val notification =
-            when (activeConfigs.size) {
-                0 -> onCreateNotification()
-                1 -> createTunnelNotification(activeConfigs.first())
-                else -> createTunnelsNotification()
-            }
-        ServiceCompat.startForeground(
-            this,
-            NotificationManager.VPN_NOTIFICATION_ID,
-            notification,
-            fgsType,
-        )
-    }
-
-    override fun stop() {
-        Timber.d("Stop called")
-        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
-        stopSelf()
-    }
-
-    override fun onDestroy() {
-        serviceManager.handleTunnelServiceDestroy()
-        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
-        Timber.d("onDestroy")
-        super.onDestroy()
-    }
-
-    private fun createTunnelNotification(tunnelConf: TunnelConf): Notification {
-        return notificationManager.createNotification(
-            WireGuardNotification.NotificationChannels.VPN,
-            title = "${getString(R.string.tunnel_running)} - ${tunnelConf.tunName}",
-            actions =
-                listOf(
-                    notificationManager.createNotificationAction(
-                        NotificationAction.TUNNEL_OFF,
-                        tunnelConf.id,
-                    )
-                ),
-            onGoing = true,
-        )
-    }
-
-    private fun createTunnelsNotification(): Notification {
-        return notificationManager.createNotification(
-            WireGuardNotification.NotificationChannels.VPN,
-            title = "${getString(R.string.tunnel_running)} - ${getString(R.string.multiple)}",
-            actions =
-                listOf(
-                    notificationManager.createNotificationAction(NotificationAction.TUNNEL_OFF, 0)
-                ),
-        )
-    }
-
-    private fun onCreateNotification(): Notification {
-        return notificationManager.createNotification(
-            WireGuardNotification.NotificationChannels.VPN,
-            title = getString(R.string.tunnel_starting),
-        )
-    }
-}

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

@@ -1,5 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.service
-
-import android.os.Binder
-
-class LocalBinder(val service: TunnelService) : Binder()

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

@@ -7,16 +7,15 @@ import android.content.ServiceConnection
 import android.net.VpnService
 import android.os.IBinder
 import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelService
-import com.zaneschepke.wireguardautotunnel.data.model.AppMode
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
 import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
 import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
 import jakarta.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -27,71 +26,29 @@ class ServiceManager
 @Inject
 constructor(
     private val context: Context,
-    @IoDispatcher ioDispatcher: CoroutineDispatcher,
+    private val ioDispatcher: CoroutineDispatcher,
-    @ApplicationScope applicationScope: CoroutineScope,
+    private val applicationScope: CoroutineScope,
     private val mainDispatcher: CoroutineDispatcher,
-    private val settingsRepository: GeneralSettingRepository,
+    private val appDataRepository: AppDataRepository,
 ) {
 
     private val autoTunnelMutex = Mutex()
-    private val tunnelMutex = Mutex()
 
-    private val _tunnelService = MutableStateFlow<TunnelService?>(null)
+    private val _tunnelService = MutableStateFlow<TunnelForegroundService?>(null)
     private val _autoTunnelService = MutableStateFlow<AutoTunnelService?>(null)
     val autoTunnelService = _autoTunnelService.asStateFlow()
-    val tunnelService = _tunnelService.asStateFlow()
-
-    init {
-        applicationScope.launch(ioDispatcher) {
-            _autoTunnelService
-                .onEach { _ -> withContext(mainDispatcher) { updateAutoTunnelTile() } }
-                .launchIn(this)
-        }
-        applicationScope.launch(ioDispatcher) {
-            combine(
-                    settingsRepository.flow.map { it.isAutoTunnelEnabled }.distinctUntilChanged(),
-                    _autoTunnelService,
-                ) { enabled, service ->
-                    enabled to (service != null)
-                }
-                .collect { (enabled, isRunning) ->
-                    when {
-                        enabled && !isRunning -> {
-                            autoTunnelMutex.withLock { startServiceInternal() }
-                        }
-                        !enabled && isRunning -> {
-                            autoTunnelMutex.withLock { stopServiceInternal() }
-                        }
-                    }
-                }
-        }
-    }
 
     private val tunnelServiceConnection =
         object : ServiceConnection {
             override fun onServiceConnected(name: ComponentName, service: IBinder) {
-                val binder = service as? LocalBinder
+                val binder = service as? TunnelForegroundService.LocalBinder
                 _tunnelService.value = binder?.service
-                val serviceClass =
+                Timber.d("TunnelForegroundService connected")
-                    when {
-                        name.className.contains("VpnForegroundService") -> "VpnForegroundService"
-                        name.className.contains("TunnelForegroundService") ->
-                            "TunnelForegroundService"
-                        else -> "Unknown"
-                    }
-                Timber.d("$serviceClass connected")
             }
 
             override fun onServiceDisconnected(name: ComponentName) {
                 _tunnelService.value = null
-                val serviceClass =
+                Timber.d("TunnelForegroundService disconnected")
-                    when {
-                        name.className.contains("VpnForegroundService") -> "VpnForegroundService"
-                        name.className.contains("TunnelForegroundService") ->
-                            "TunnelForegroundService"
-                        else -> "Unknown"
-                    }
-                Timber.d("$serviceClass disconnected")
             }
         }
 
@@ -113,48 +70,68 @@ constructor(
         return VpnService.prepare(context) == null
     }
 
-    private fun startServiceInternal() {
+    suspend fun startAutoTunnel() {
-        val intent = Intent(context, AutoTunnelService::class.java)
+        autoTunnelMutex.withLock {
-        context.startForegroundService(intent)
+            val settings = appDataRepository.settings.get()
-        context.bindService(intent, autoTunnelServiceConnection, Context.BIND_AUTO_CREATE)
+            appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = true))
-    }
+            if (_autoTunnelService.value != null) return
-
+            withContext(ioDispatcher) {
-    private fun stopServiceInternal() {
+                val intent = Intent(context, AutoTunnelService::class.java)
-        _autoTunnelService.value?.stop()
+                context.startForegroundService(intent)
-        try {
+                context.bindService(intent, autoTunnelServiceConnection, Context.BIND_AUTO_CREATE)
-            context.unbindService(autoTunnelServiceConnection)
+                withContext(mainDispatcher) { updateAutoTunnelTile() }
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to unbind AutoTunnelService")
-        }
-        _autoTunnelService.update { null }
-    }
-
-    suspend fun startTunnelService(appMode: AppMode) =
-        tunnelMutex.withLock {
-            if (_tunnelService.value != null) return@withLock
-            val serviceClass =
-                when (appMode) {
-                    AppMode.VPN,
-                    AppMode.LOCK_DOWN -> VpnForegroundService::class.java
-                    AppMode.KERNEL,
-                    AppMode.PROXY -> TunnelForegroundService::class.java
-                }
-            val intent = Intent(context, serviceClass)
-            context.startForegroundService(intent)
-            context.bindService(intent, tunnelServiceConnection, Context.BIND_AUTO_CREATE)
-        }
-
-    suspend fun stopTunnelService() =
-        tunnelMutex.withLock {
-            _tunnelService.value?.let { service ->
-                service.stop()
-                try {
-                    context.unbindService(tunnelServiceConnection)
-                } catch (e: Exception) {
-                    Timber.e(e, "Failed to stop Tunnel Service")
-                }
             }
         }
+    }
+
+    suspend fun stopAutoTunnel() {
+        autoTunnelMutex.withLock {
+            val settings = appDataRepository.settings.get()
+            appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = false))
+            if (_autoTunnelService.value == null) return
+            _autoTunnelService.value?.let { service ->
+                service.stop()
+                try {
+                    context.unbindService(autoTunnelServiceConnection)
+                } catch (e: Exception) {
+                    Timber.e(e, "Failed to unbind AutoTunnelService")
+                } finally {
+                    _tunnelService.value = null
+                }
+            }
+            withContext(mainDispatcher) { updateAutoTunnelTile() }
+        }
+    }
+
+    suspend fun startTunnelForegroundService() {
+        if (_tunnelService.value != null) return
+        withContext(ioDispatcher) {
+            applicationScope.launch(ioDispatcher) {
+                val intent = Intent(context, TunnelForegroundService::class.java)
+                context.startForegroundService(intent)
+                context.bindService(intent, tunnelServiceConnection, Context.BIND_AUTO_CREATE)
+            }
+        }
+    }
+
+    fun stopTunnelForegroundService() {
+        _tunnelService.value?.let { service ->
+            service.stop()
+            try {
+                context.unbindService(tunnelServiceConnection)
+            } catch (e: Exception) {
+                Timber.e(e, "Failed to stop TunnelForegroundService")
+            } finally {
+                _tunnelService.value = null
+            }
+        }
+    }
+
+    fun toggleAutoTunnel() {
+        applicationScope.launch(ioDispatcher) {
+            if (_autoTunnelService.value != null) stopAutoTunnel() else startAutoTunnel()
+        }
+    }
 
     fun updateAutoTunnelTile() {
         context.requestAutoTunnelTileServiceUpdate()

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

@@ -1,8 +1,154 @@
 package com.zaneschepke.wireguardautotunnel.core.service
 
+import android.app.Notification
+import android.content.Intent
+import android.os.Binder
+import android.os.IBinder
+import androidx.core.app.ServiceCompat
+import androidx.lifecycle.LifecycleService
+import androidx.lifecycle.lifecycleScope
+import com.zaneschepke.wireguardautotunnel.R
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
+import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelMonitor
+import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.util.Constants
+import com.zaneschepke.wireguardautotunnel.util.extensions.distinctByKeys
 import dagger.hilt.android.AndroidEntryPoint
+import io.ktor.util.collections.*
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import timber.log.Timber
 
 @AndroidEntryPoint
-class TunnelForegroundService(override val fgsType: Int = Constants.SPECIAL_USE_SERVICE_TYPE_ID) :
+class TunnelForegroundService : LifecycleService() {
-    BaseTunnelForegroundService()
+
+    @Inject lateinit var notificationManager: NotificationManager
+
+    @Inject lateinit var serviceManager: ServiceManager
+
+    @Inject lateinit var tunnelManager: TunnelManager
+
+    @Inject lateinit var tunnelMonitor: TunnelMonitor
+
+    @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
+
+    @Inject lateinit var appDataRepository: AppDataRepository
+
+    class LocalBinder(val service: TunnelForegroundService) : Binder()
+
+    private val tunnelJobs = ConcurrentMap<TunnelConf, Job>()
+
+    private val binder = LocalBinder(this)
+
+    override fun onCreate() {
+        super.onCreate()
+        ServiceCompat.startForeground(
+            this@TunnelForegroundService,
+            NotificationManager.VPN_NOTIFICATION_ID,
+            onCreateNotification(),
+            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+        )
+    }
+
+    override fun onBind(intent: Intent): IBinder {
+        super.onBind(intent)
+        return binder
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        super.onStartCommand(intent, flags, startId)
+        ServiceCompat.startForeground(
+            this@TunnelForegroundService,
+            NotificationManager.VPN_NOTIFICATION_ID,
+            onCreateNotification(),
+            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+        )
+        start()
+        return START_STICKY
+    }
+
+    fun start() =
+        lifecycleScope.launch(ioDispatcher) {
+            tunnelManager.activeTunnels.distinctByKeys().collect { activeTunnels ->
+                val activeTunConfigs = activeTunnels.keys
+                val obsoleteJobs = tunnelJobs.keys - activeTunConfigs
+                obsoleteJobs.forEach { tunnelConf -> tunnelJobs[tunnelConf]?.cancel() }
+                activeTunConfigs.forEach { tun ->
+                    if (tunnelJobs.containsKey(tun)) return@forEach
+                    tunnelJobs[tun] = launch { tunnelMonitor.startMonitoring(tun, true) }
+                }
+                updateServiceNotification(activeTunnels)
+            }
+        }
+
+    // TODO Would be cool to have this include kill switch
+    private fun updateServiceNotification(activeTunnels: Map<TunnelConf, TunnelState>) {
+        val notification =
+            when (activeTunnels.size) {
+                0 -> onCreateNotification()
+                1 -> createTunnelNotification(activeTunnels.keys.first())
+                else -> createTunnelsNotification()
+            }
+        ServiceCompat.startForeground(
+            this@TunnelForegroundService,
+            NotificationManager.VPN_NOTIFICATION_ID,
+            notification,
+            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
+        )
+    }
+
+    fun stop() {
+        Timber.d("Stop called")
+        tunnelJobs.forEach { it.value.cancel() }
+        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
+        stopSelf()
+    }
+
+    override fun onDestroy() {
+        tunnelJobs.forEach { it.value.cancel() }
+        serviceManager.handleTunnelServiceDestroy()
+        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
+        Timber.d("onDestroy")
+        super.onDestroy()
+    }
+
+    private fun createTunnelNotification(tunnelConf: TunnelConf): Notification {
+        return notificationManager.createNotification(
+            WireGuardNotification.NotificationChannels.VPN,
+            title = "${getString(R.string.tunnel_running)} - ${tunnelConf.tunName}",
+            actions =
+                listOf(
+                    notificationManager.createNotificationAction(
+                        NotificationAction.TUNNEL_OFF,
+                        tunnelConf.id,
+                    )
+                ),
+        )
+    }
+
+    private fun createTunnelsNotification(): Notification {
+        return notificationManager.createNotification(
+            WireGuardNotification.NotificationChannels.VPN,
+            title = "${getString(R.string.tunnel_running)} - ${getString(R.string.multiple)}",
+            actions =
+                listOf(
+                    notificationManager.createNotificationAction(NotificationAction.TUNNEL_OFF, 0)
+                ),
+        )
+    }
+
+    private fun onCreateNotification(): Notification {
+        return notificationManager.createNotification(
+            WireGuardNotification.NotificationChannels.VPN,
+            title = getString(R.string.tunnel_starting),
+        )
+    }
+}

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

@@ -1,7 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.core.service
-
-interface TunnelService {
-    fun start()
-
-    fun stop()
-}

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

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

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

@@ -14,21 +14,24 @@ import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.notification.WireGuardNotification
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
+import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelMonitor
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendStatus
 import com.zaneschepke.wireguardautotunnel.domain.enums.NotificationAction
+import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus.StopReason.Ping
 import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
-import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
-import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.AutoTunnelState
 import com.zaneschepke.wireguardautotunnel.domain.state.NetworkState
 import com.zaneschepke.wireguardautotunnel.util.Constants
 import com.zaneschepke.wireguardautotunnel.util.extensions.Tunnels
-import com.zaneschepke.wireguardautotunnel.util.extensions.to
 import com.zaneschepke.wireguardautotunnel.util.extensions.toMillis
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import javax.inject.Provider
+import kotlin.math.pow
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.sync.Mutex
@@ -40,6 +43,8 @@ class AutoTunnelService : LifecycleService() {
 
     @Inject lateinit var networkMonitor: NetworkMonitor
 
+    @Inject lateinit var appDataRepository: Provider<AppDataRepository>
+
     @Inject lateinit var notificationManager: NotificationManager
 
     @Inject @IoDispatcher lateinit var ioDispatcher: CoroutineDispatcher
@@ -48,8 +53,7 @@ class AutoTunnelService : LifecycleService() {
 
     @Inject lateinit var tunnelManager: TunnelManager
 
-    @Inject lateinit var settingsRepository: Provider<GeneralSettingRepository>
+    @Inject lateinit var tunnelMonitor: TunnelMonitor
-    @Inject lateinit var tunnelsRepository: TunnelRepository
 
     private val defaultState = AutoTunnelState()
 
@@ -57,6 +61,12 @@ class AutoTunnelService : LifecycleService() {
 
     private val autoTunnelStateFlow = MutableStateFlow(defaultState)
 
+    private val bounceCounts = MutableStateFlow<Map<Int, Int>>(emptyMap())
+
+    private var eventHandlerJob: Job? = null
+
+    private val lastBounceTimes = mutableMapOf<Int, Long>()
+
     class LocalBinder(val service: AutoTunnelService) : Binder()
 
     private val binder = LocalBinder(this)
@@ -90,10 +100,26 @@ class AutoTunnelService : LifecycleService() {
 
     override fun onDestroy() {
         serviceManager.handleAutoTunnelServiceDestroy()
+        restoreVpnKillSwitch()
         ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
         super.onDestroy()
     }
 
+    private fun restoreVpnKillSwitch() {
+        with(autoTunnelStateFlow.value) {
+            if (
+                settings.isVpnKillSwitchEnabled &&
+                    tunnelManager.getBackendStatus() !is BackendStatus.KillSwitch
+            ) {
+                eventHandlerJob?.cancel()
+                val allowedIps =
+                    if (settings.isLanOnKillSwitchEnabled) TunnelConf.LAN_BYPASS_ALLOWED_IPS
+                    else emptyList()
+                tunnelManager.setBackendStatus(BackendStatus.KillSwitch(allowedIps))
+            }
+        }
+    }
+
     private fun launchWatcherNotification(
         description: String = getString(R.string.monitoring_state_changes)
     ) {
@@ -108,13 +134,12 @@ class AutoTunnelService : LifecycleService() {
                             NotificationAction.AUTO_TUNNEL_OFF
                         )
                     ),
-                onGoing = true,
             )
         ServiceCompat.startForeground(
             this,
             NotificationManager.AUTO_TUNNEL_NOTIFICATION_ID,
             notification,
-            Constants.SPECIAL_USE_SERVICE_TYPE_ID,
+            Constants.SYSTEM_EXEMPT_SERVICE_TYPE_ID,
         )
     }
 
@@ -133,10 +158,20 @@ class AutoTunnelService : LifecycleService() {
             val tunnelsFlow =
                 tunnelManager.activeTunnels.map { StateChange.ActiveTunnelsChange(it) }
 
+            val monitoringFlow =
+                tunnelManager.activeTunnels
+                    .map { map -> map.mapValues { (_, state) -> state.pingStates } }
+                    .distinctUntilChanged()
+                    .map { StateChange.MonitoringChange(it) }
+
             var reevaluationJob: Job? = null
 
             // get everything in sync before we use merge
-            combine(networkFlow, settingsFlow, tunnelsFlow) { network, settings, tunnels ->
+            combine(networkFlow, settingsFlow, tunnelsFlow, monitoringFlow) {
+                    network,
+                    settings,
+                    tunnels,
+                    monitoring ->
                     autoTunnelStateFlow.update {
                         it.copy(
                             activeTunnels = tunnels.activeTunnels,
@@ -150,7 +185,7 @@ class AutoTunnelService : LifecycleService() {
 
             // use merge to limit the noise of a combine and also increase the scalability of auto
             // tunnel handling new states
-            merge(networkFlow, settingsFlow, tunnelsFlow).collect { change ->
+            merge(networkFlow, settingsFlow, tunnelsFlow, monitoringFlow).collect { change ->
                 if (change !is StateChange.ActiveTunnelsChange) {
                     Timber.d("New state changed to ${change.javaClass.simpleName}")
                 }
@@ -181,6 +216,22 @@ class AutoTunnelService : LifecycleService() {
                         autoTunnelStateFlow.update { it.copy(activeTunnels = change.activeTunnels) }
                         return@collect
                     }
+                    is StateChange.MonitoringChange -> {
+                        change.pingStates.forEach { (config, pingState) ->
+                            Timber.d("Ping state $pingState")
+                            if (pingState?.all { it.value.isReachable } == true) {
+                                Timber.d("Clearing bounce count on success")
+                                bounceCounts.update { current ->
+                                    current.toMutableMap().apply { remove(config.id) }
+                                }
+                            }
+                        }
+                        return@collect handleAutoTunnelEvent(
+                            autoTunnelStateFlow.value.determineAutoTunnelEvent(
+                                StateChange.MonitoringChange(change.pingStates)
+                            )
+                        )
+                    }
                 }
 
                 handleAutoTunnelEvent(autoTunnelStateFlow.value.determineAutoTunnelEvent(change))
@@ -206,7 +257,7 @@ class AutoTunnelService : LifecycleService() {
     }
 
     // all relevant settings to auto tunnel
-    private fun areAutoTunnelSettingsTheSame(old: GeneralSettings, new: GeneralSettings): Boolean {
+    private fun areAutoTunnelSettingsTheSame(old: AppSettings, new: AppSettings): Boolean {
         return (old.isTunnelOnWifiEnabled == new.isTunnelOnWifiEnabled &&
             old.isTunnelOnMobileDataEnabled == new.isTunnelOnMobileDataEnabled &&
             old.isTunnelOnEthernetEnabled == new.isTunnelOnEthernetEnabled &&
@@ -217,14 +268,17 @@ class AutoTunnelService : LifecycleService() {
             old.isVpnKillSwitchEnabled == new.isVpnKillSwitchEnabled &&
             old.isLanOnKillSwitchEnabled == new.isLanOnKillSwitchEnabled &&
             old.isDisableKillSwitchOnTrustedEnabled == new.isDisableKillSwitchOnTrustedEnabled &&
-            old.isStopOnNoInternetEnabled == new.isStopOnNoInternetEnabled &&
+            old.isStopOnNoInternetEnabled == new.isStopOnNoInternetEnabled)
-            old.appMode == new.appMode)
     }
 
-    private fun combineSettings(): Flow<Pair<GeneralSettings, Tunnels>> {
+    private fun combineSettings(): Flow<Pair<AppSettings, Tunnels>> {
         return combine(
-                settingsRepository.get().flow.distinctUntilChanged(::areAutoTunnelSettingsTheSame),
+                appDataRepository
-                tunnelsRepository.flow.map { tunnels ->
+                    .get()
+                    .settings
+                    .flow
+                    .distinctUntilChanged(::areAutoTunnelSettingsTheSame),
+                appDataRepository.get().tunnels.flow.map { tunnels ->
                     // isActive is ignored for equality checks so user can manually toggle off
                     // tunnel with auto-tunnel
                     tunnels.map { it.copy(isActive = false) }
@@ -265,7 +319,7 @@ class AutoTunnelService : LifecycleService() {
                 .distinctUntilChanged(::areAutoTunnelPermissionsRequiredTheSame)
                 .map {
                     NetworkPermissionState(
-                        it.settings.wifiDetectionMethod.to(),
+                        it.settings.wifiDetectionMethod,
                         it.networkState.locationServicesEnabled == true,
                         it.networkState.locationPermissionGranted == true,
                         (it.tunnels.any { tunnel -> tunnel.tunnelNetworks.isNotEmpty() } ||
@@ -339,19 +393,59 @@ class AutoTunnelService : LifecycleService() {
                     }
             ) {
                 is AutoTunnelEvent.Start ->
-                    (event.tunnelConf ?: tunnelsRepository.getDefaultTunnel())?.let {
+                    (event.tunnelConf ?: appDataRepository.get().getPrimaryOrFirstTunnel())?.let {
                         tunnelManager.startTunnel(it)
                     }
-                is AutoTunnelEvent.Stop -> tunnelManager.stopActiveTunnels()
+                is AutoTunnelEvent.Stop -> tunnelManager.stopTunnel()
                 AutoTunnelEvent.DoNothing -> Timber.i("Auto-tunneling: nothing to do")
+                is AutoTunnelEvent.Bounce ->
+                    handleBounceWithBackoff(event.configsPeerKeyResolvedMap)
+                is AutoTunnelEvent.StartKillSwitch -> {
+                    Timber.d("Starting kill switch")
+                    tunnelManager.setBackendStatus(BackendStatus.KillSwitch(event.allowedIps))
+                }
+                AutoTunnelEvent.StopKillSwitch -> {
+                    Timber.d("Stopping kill switch")
+                    tunnelManager.setBackendStatus(BackendStatus.Active)
+                }
+            }
+        }
+    }
+
+    private suspend fun handleBounceWithBackoff(
+        configsPeerKeyResolvedMap: List<Pair<TunnelConf, Map<String, String?>>>
+    ) { // Simplified param: no failureCount
+        val settings = appDataRepository.get().settings.get()
+        val pingIntervalMillis = settings.tunnelPingIntervalSeconds.toMillis()
+        configsPeerKeyResolvedMap.forEach { (config, peerMap) ->
+            val bounceCount = bounceCounts.value.getOrDefault(config.id, 0)
+            val exponent = bounceCount.toDouble()
+            val backoffDelay =
+                (pingIntervalMillis * 2.0.pow(exponent)).toLong().coerceAtMost(MAX_BACKOFF_MS)
+            val currentTime = System.currentTimeMillis()
+            val lastTime = lastBounceTimes.getOrDefault(config.id, 0L)
+            if (currentTime - lastTime >= backoffDelay) {
+                Timber.d(
+                    "Bouncing tunnel ${config.name} after detecting failure, with bounce count $bounceCount and calculated backoff delay $backoffDelay ms"
+                )
+                tunnelManager.bounceTunnel(config, Ping(peerMap))
+                lastBounceTimes[config.id] = currentTime
+                bounceCounts.update { current ->
+                    current.toMutableMap().apply { this[config.id] = (this[config.id] ?: 0) + 1 }
+                }
+            } else {
+                Timber.d(
+                    "Backoff in progress for tunnel ${config.name}, skipping bounce (required delay: $backoffDelay ms)"
+                )
             }
         }
     }
 
     @OptIn(FlowPreview::class, ExperimentalCoroutinesApi::class)
     private val debouncedConnectivityStateFlow: Flow<ConnectivityState> by lazy {
-        settingsRepository
+        appDataRepository
             .get()
+            .settings
             .flow
             .map { it.debounceDelaySeconds.toMillis() }
             .distinctUntilChanged()
@@ -363,5 +457,6 @@ class AutoTunnelService : LifecycleService() {
     companion object {
         // try to keep this window short as it will interrupt manual overrides
         const val REEVALUATE_CHECK_DELAY = 2_000L
+        const val MAX_BACKOFF_MS = 300_000L // 5 minutes
     }
 }

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

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

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

@@ -9,8 +9,7 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
 import androidx.lifecycle.lifecycleScope
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlinx.coroutines.launch
@@ -18,9 +17,7 @@ import timber.log.Timber
 
 @AndroidEntryPoint
 class AutoTunnelControlTile : TileService(), LifecycleOwner {
-
+    @Inject lateinit var appDataRepository: AppDataRepository
-    @Inject lateinit var settingsRepository: GeneralSettingRepository
-    @Inject lateinit var tunnelsRepository: TunnelRepository
 
     @Inject lateinit var serviceManager: ServiceManager
 
@@ -47,7 +44,7 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
             }
         }
         lifecycleScope.launch {
-            tunnelsRepository.flow.collect {
+            appDataRepository.tunnels.flow.collect {
                 if (it.isEmpty()) {
                     setUnavailable()
                 }
@@ -60,10 +57,10 @@ class AutoTunnelControlTile : TileService(), LifecycleOwner {
         unlockAndRun {
             lifecycleScope.launch {
                 if (serviceManager.autoTunnelService.value != null) {
-                    settingsRepository.updateAutoTunnelEnabled(false)
+                    serviceManager.stopAutoTunnel()
                     setInactive()
                 } else {
-                    settingsRepository.updateAutoTunnelEnabled(true)
+                    serviceManager.startAutoTunnel()
                     setActive()
                 }
             }

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

@@ -13,7 +13,9 @@ import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.WireGuardAutoTunnel
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
+import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
+import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlinx.coroutines.launch
@@ -21,8 +23,7 @@ import timber.log.Timber
 
 @AndroidEntryPoint
 class TunnelControlTile : TileService(), LifecycleOwner {
-
+    @Inject lateinit var appDataRepository: AppDataRepository
-    @Inject lateinit var tunnelsRepository: TunnelRepository
 
     @Inject lateinit var serviceManager: ServiceManager
 
@@ -53,7 +54,7 @@ class TunnelControlTile : TileService(), LifecycleOwner {
 
     private suspend fun updateTileState() {
         try {
-            val tunnels = tunnelsRepository.getAll()
+            val tunnels = appDataRepository.tunnels.getAll()
             if (tunnels.isEmpty()) {
                 setUnavailable()
                 return
@@ -64,14 +65,12 @@ class TunnelControlTile : TileService(), LifecycleOwner {
 
             when {
                 activeTunnels.isNotEmpty() -> {
-                    val activeIds = activeTunnels.map { it.key }
+                    val activeIds = activeTunnels.map { it.key.id }
                     // TODO improvements would be needed to make this work well with toggling
                     // multiple tunnels
                     // this would be better managed elsewhere
                     WireGuardAutoTunnel.setLastActiveTunnels(activeIds)
-                    val activeTunNames =
+                    updateTileForActiveTunnels(activeTunnels)
-                        tunnels.filter { activeTunnels.keys.contains(it.id) }.map { it.tunName }
-                    updateTileForActiveTunnels(activeTunNames)
                 }
                 else -> updateTileForLastActiveTunnels()
             }
@@ -80,10 +79,10 @@ class TunnelControlTile : TileService(), LifecycleOwner {
         }
     }
 
-    private fun updateTileForActiveTunnels(activeTunnelNames: List<String>) {
+    private fun updateTileForActiveTunnels(activeTunnels: Map<TunnelConf, TunnelState>) {
         val tileName =
-            when (activeTunnelNames.size) {
+            when (activeTunnels.size) {
-                1 -> activeTunnelNames[0]
+                1 -> activeTunnels.keys.first().tunName
                 else -> getString(R.string.multiple)
             }
         updateTile(tileName, true)
@@ -93,14 +92,14 @@ class TunnelControlTile : TileService(), LifecycleOwner {
         val lastActiveIds = WireGuardAutoTunnel.getLastActiveTunnels()
         when {
             lastActiveIds.isEmpty() -> {
-                tunnelsRepository.getStartTunnel()?.let { config ->
+                appDataRepository.getStartTunnelConfig()?.let { config ->
                     updateTile(config.tunName, false)
                 } ?: setUnavailable()
             }
             lastActiveIds.size > 1 -> updateTile(getString(R.string.multiple), false)
             else -> {
                 val tunnelId = lastActiveIds.first()
-                tunnelsRepository.getById(tunnelId)?.let { tunnel ->
+                appDataRepository.tunnels.getById(tunnelId)?.let { tunnel ->
                     updateTile(tunnel.tunName, false)
                 } ?: setUnavailable()
             }
@@ -112,13 +111,13 @@ class TunnelControlTile : TileService(), LifecycleOwner {
         unlockAndRun {
             lifecycleScope.launch {
                 if (tunnelManager.activeTunnels.value.isNotEmpty())
-                    return@launch tunnelManager.stopActiveTunnels()
+                    return@launch tunnelManager.stopTunnel()
                 val lastActive = WireGuardAutoTunnel.getLastActiveTunnels()
                 if (lastActive.isEmpty()) {
-                    tunnelsRepository.getStartTunnel()?.let { tunnelManager.startTunnel(it) }
+                    appDataRepository.getStartTunnelConfig()?.let { tunnelManager.startTunnel(it) }
                 } else {
                     lastActive.forEach { id ->
-                        tunnelsRepository.getById(id)?.let { tunnelManager.startTunnel(it) }
+                        appDataRepository.tunnels.getById(id)?.let { tunnelManager.startTunnel(it) }
                     }
                 }
             }

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

@@ -2,12 +2,12 @@ package com.zaneschepke.wireguardautotunnel.core.shortcut
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.AutoTunnelService
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.TunnelProvider
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
@@ -16,9 +16,9 @@ import timber.log.Timber
 
 @AndroidEntryPoint
 class ShortcutsActivity : ComponentActivity() {
+    @Inject lateinit var appDataRepository: AppDataRepository
 
-    @Inject lateinit var settingsRepository: GeneralSettingRepository
+    @Inject lateinit var serviceManager: ServiceManager
-    @Inject lateinit var tunnelsRepository: TunnelRepository
 
     @Inject lateinit var tunnelManager: TunnelManager
 
@@ -27,7 +27,7 @@ class ShortcutsActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         applicationScope.launch {
-            val settings = settingsRepository.get()
+            val settings = appDataRepository.settings.get()
             if (settings.isShortcutsEnabled) {
                 when (intent.getStringExtra(CLASS_NAME_EXTRA_KEY)) {
                     LEGACY_TUNNEL_SERVICE_NAME,
@@ -35,13 +35,16 @@ class ShortcutsActivity : ComponentActivity() {
                         val tunnelName = intent.getStringExtra(TUNNEL_NAME_EXTRA_KEY)
                         Timber.d("Tunnel name extra: $tunnelName")
                         val tunnelConfig =
-                            tunnelName?.let { tunnelsRepository.findByTunnelName(it) }
+                            tunnelName?.let {
-                                ?: tunnelsRepository.getDefaultTunnel()
+                                appDataRepository.tunnels.getAll().firstOrNull {
+                                    it.tunName == tunnelName
+                                }
+                            } ?: appDataRepository.getStartTunnelConfig()
                         Timber.d("Shortcut action on name: ${tunnelConfig?.tunName}")
                         tunnelConfig?.let {
                             when (intent.action) {
                                 Action.START.name -> tunnelManager.startTunnel(it)
-                                Action.STOP.name -> tunnelManager.stopActiveTunnels()
+                                Action.STOP.name -> tunnelManager.stopTunnel()
                                 else -> Unit
                             }
                         }
@@ -49,8 +52,8 @@ class ShortcutsActivity : ComponentActivity() {
                     AutoTunnelService::class.java.simpleName,
                     LEGACY_AUTO_TUNNEL_SERVICE_NAME -> {
                         when (intent.action) {
-                            Action.START.name -> settingsRepository.updateAutoTunnelEnabled(true)
+                            Action.START.name -> serviceManager.startAutoTunnel()
-                            Action.STOP.name -> settingsRepository.updateAutoTunnelEnabled(false)
+                            Action.STOP.name -> serviceManager.stopAutoTunnel()
                         }
                     }
                 }

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

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

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

@@ -2,98 +2,69 @@ package com.zaneschepke.wireguardautotunnel.core.tunnel
 
 import com.wireguard.android.backend.Backend
 import com.wireguard.android.backend.BackendException
-import com.wireguard.android.backend.Tunnel as WgTunnel
+import com.wireguard.android.backend.Tunnel
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.di.Kernel
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendStatus
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
-import com.zaneschepke.wireguardautotunnel.domain.events.BackendCoreException
+import com.zaneschepke.wireguardautotunnel.domain.events.BackendError
 import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import com.zaneschepke.wireguardautotunnel.domain.state.WireGuardStatistics
-import com.zaneschepke.wireguardautotunnel.util.extensions.asTunnelState
+import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
-import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendCoreException
-import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.consumeAsFlow
-import kotlinx.coroutines.launch
 import timber.log.Timber
 
 class KernelTunnel
 @Inject
 constructor(
-    @ApplicationScope applicationScope: CoroutineScope,
+    @ApplicationScope private val applicationScope: CoroutineScope,
-    @Kernel private val backend: Backend,
+    serviceManager: ServiceManager,
-) : BaseTunnel(applicationScope) {
+    appDataRepository: AppDataRepository,
+    private val backend: Backend,
+) : BaseTunnel(applicationScope, appDataRepository, serviceManager) {
 
-    private val runtimeTunnels = ConcurrentHashMap<Int, WgTunnel>()
+    override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
-
-    // TODO Add DNS settings
-    override fun tunnelStateFlow(tunnelConf: TunnelConf): Flow<TunnelStatus> = callbackFlow {
-        if (!tunnelConf.isNameKernelCompatible) close(BackendCoreException.TunnelNameTooLong)
-
-        val stateChannel = Channel<WgTunnel.State>()
-
-        val runtimeTunnel = RuntimeWgTunnel(tunnelConf, stateChannel)
-        runtimeTunnels[tunnelConf.id] = runtimeTunnel
-
-        val consumerJob = launch {
-            stateChannel.consumeAsFlow().collect { state -> trySend(state.asTunnelState()) }
-        }
-
-        try {
-            updateTunnelStatus(tunnelConf.id, TunnelStatus.Starting)
-            backend.setState(runtimeTunnel, WgTunnel.State.UP, tunnelConf.toWgConfig())
-        } catch (e: BackendException) {
-            close(e.toBackendCoreException())
-        } catch (e: IllegalArgumentException) {
-            Timber.e(e, "Invalid backend arguments")
-            close(BackendCoreException.Config)
-        } catch (e: Exception) {
-            Timber.e(e, "Error while setting tunnel state")
-            close(BackendCoreException.Unknown)
-        }
-
-        awaitClose {
-            try {
-                backend.setState(runtimeTunnel, WgTunnel.State.DOWN, null)
-            } catch (e: BackendException) {
-                errors.tryEmit(tunnelConf.tunName to e.toBackendCoreException())
-            } finally {
-                consumerJob.cancel()
-                stateChannel.close()
-                runtimeTunnels.remove(tunnelConf.id)
-                trySend(TunnelStatus.Down)
-                close()
-            }
-        }
-    }
-
-    override fun getStatistics(tunnelId: Int): TunnelStatistics? {
         return try {
-            val runtimeTunnel = runtimeTunnels[tunnelId] ?: return null
+            WireGuardStatistics(backend.getStatistics(tunnelConf))
-            WireGuardStatistics(backend.getStatistics(runtimeTunnel))
         } catch (e: Exception) {
-            Timber.e(e, "Failed to get stats for $tunnelId")
+            Timber.e(e)
             null
         }
     }
 
-    override fun setBackendMode(backendMode: BackendMode) {
+    override suspend fun startBackend(tunnel: TunnelConf) {
+        // name too long for kernel mode
+        if (!tunnel.isNameKernelCompatible) throw BackendError.TunnelNameTooLong
+        try {
+            updateTunnelStatus(tunnel, TunnelStatus.Starting)
+            backend.setState(tunnel, Tunnel.State.UP, tunnel.toWgConfig())
+        } catch (e: BackendException) {
+            Timber.e(e, "Failed to start up backend for tunnel ${tunnel.name}")
+            throw e.toBackendError()
+        } catch (e: IllegalArgumentException) {
+            Timber.e(e, "Failed to start up backend for tunnel ${tunnel.name}")
+            throw BackendError.Config
+        }
+    }
+
+    override fun stopBackend(tunnel: TunnelConf) {
+        Timber.i("Stopping tunnel ${tunnel.id} kernel")
+        try {
+            backend.setState(tunnel, Tunnel.State.DOWN, tunnel.toWgConfig())
+        } catch (e: BackendException) {
+            throw e.toBackendError()
+        }
+    }
+
+    override fun setBackendStatus(backendStatus: BackendStatus) {
         Timber.w("Not yet implemented for kernel")
     }
 
-    override fun getBackendMode(): BackendMode {
+    override fun getBackendStatus(): BackendStatus {
-        return BackendMode.Inactive
+        return BackendStatus.Inactive
-    }
-
-    override fun handleDnsReresolve(tunnelConf: TunnelConf): Boolean {
-        throw NotImplementedError()
     }
 
     override suspend fun runningTunnelNames(): Set<String> {

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

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

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

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

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

@@ -1,190 +1,53 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
-import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendStatus
-import com.zaneschepke.wireguardautotunnel.data.model.AppMode
-import com.zaneschepke.wireguardautotunnel.di.*
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
-import com.zaneschepke.wireguardautotunnel.domain.events.BackendCoreException
+import com.zaneschepke.wireguardautotunnel.domain.events.BackendError
 import com.zaneschepke.wireguardautotunnel.domain.events.BackendMessage
-import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings
 import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import com.zaneschepke.wireguardautotunnel.domain.state.LogHealthState
 import com.zaneschepke.wireguardautotunnel.domain.state.PingState
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject
-import kotlin.concurrent.atomics.AtomicBoolean
+import kotlinx.coroutines.CoroutineDispatcher
-import kotlin.concurrent.atomics.AtomicReference
+import kotlinx.coroutines.CoroutineScope
-import kotlin.concurrent.atomics.ExperimentalAtomicApi
+import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.*
-import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.plus
 import org.amnezia.awg.crypto.Key
-import timber.log.Timber
 
-@OptIn(ExperimentalCoroutinesApi::class, ExperimentalAtomicApi::class)
+@OptIn(ExperimentalCoroutinesApi::class)
 class TunnelManager
 @Inject
 constructor(
-    @Kernel private val kernelTunnel: TunnelProvider,
+    private val kernelTunnel: TunnelProvider,
-    @Userspace private val userspaceTunnel: TunnelProvider,
+    private val userspaceTunnel: TunnelProvider,
-    @ProxyUserspace private val proxyUserspaceTunnel: TunnelProvider,
+    private val appDataRepository: AppDataRepository,
-    private val serviceManager: ServiceManager,
+    applicationScope: CoroutineScope,
-    private val settingsRepository: GeneralSettingRepository,
+    ioDispatcher: CoroutineDispatcher,
-    private val tunnelsRepository: TunnelRepository,
-    private val tunnelMonitor: TunnelMonitor,
-    @ApplicationScope private val applicationScope: CoroutineScope,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : TunnelProvider {
 
-    private val monitoringJobs = ConcurrentHashMap<Int, Job>()
+    @OptIn(ExperimentalCoroutinesApi::class)
-
+    private val tunnelProviderFlow =
-    private data class SideEffectState(
+        appDataRepository.settings.flow
-        val activeTuns: Map<Int, TunnelState>,
-        val tuns: List<TunnelConf>,
-        val settings: GeneralSettings,
-        val previouslyActive: Map<Int, TunnelState>,
-    )
-
-    private data class SideEffectWithCondition(
-        val effect: suspend (SideEffectState) -> Unit,
-        val condition: (SideEffectState) -> Boolean,
-    )
-
-    private val sideEffectChannelFlow =
-        MutableStateFlow<Channel<SideEffectState>>(Channel(Channel.CONFLATED))
-
-    private val tunnelProviderFlow: StateFlow<TunnelProvider> = run {
-        val currentBackend = AtomicReference(userspaceTunnel)
-        val currentSettings = AtomicReference(GeneralSettings())
-        val initialEmit = AtomicBoolean(true)
-
-        settingsRepository.flow
             .filterNotNull()
-            // ignore default state
+            .flatMapLatest { settings ->
-            .filterNot { it == GeneralSettings() }
+                val backend = if (settings.isKernelEnabled) kernelTunnel else userspaceTunnel
-            .distinctUntilChanged { old, new ->
+                MutableStateFlow(backend)
-                old.appMode == new.appMode &&
-                    old.isLanOnKillSwitchEnabled == new.isLanOnKillSwitchEnabled
             }
-            .map { settings ->
-                Timber.d("App mode changes with ${settings.appMode}")
-                val backend =
-                    when (settings.appMode) {
-                        AppMode.VPN -> userspaceTunnel
-                        AppMode.PROXY -> proxyUserspaceTunnel
-                        AppMode.LOCK_DOWN -> proxyUserspaceTunnel
-                        AppMode.KERNEL -> kernelTunnel
-                    }
-                settings to backend
-            }
-            .onEach { (settings, newBackend) ->
-                val isInitialEmit = initialEmit.exchange(false)
-                val previousBackend = currentBackend.exchange(newBackend)
-                val previousSettings = currentSettings.exchange(settings)
-
-                if ((previousSettings.appMode != settings.appMode) && !isInitialEmit) {
-                    handleModeChangeCleanup(previousBackend, previousSettings.appMode)
-                }
-                if (settings.appMode == AppMode.LOCK_DOWN) {
-                    handleLockDownModeInit(settings.isLanOnKillSwitchEnabled)
-                }
-            }
-            .map { (_, backend) -> backend }
             .stateIn(
                 scope = applicationScope.plus(ioDispatcher),
                 started = SharingStarted.Eagerly,
                 initialValue = userspaceTunnel,
             )
-    }
 
-    override val activeTunnels: StateFlow<Map<Int, TunnelState>> = run {
+    override val activeTunnels: StateFlow<Map<TunnelConf, TunnelState>> =
-        val activeTunsReference: AtomicReference<Map<Int, TunnelState>> =
+        tunnelProviderFlow.value.activeTunnels
-            AtomicReference(emptyMap())
-        tunnelProviderFlow
-            .flatMapLatest { backend ->
-                // Create a new channel for each backend to reset side-effect processing
-                val newChannel = Channel<SideEffectState>(Channel.CONFLATED)
-                sideEffectChannelFlow.value = newChannel
-
-                val sideEffects =
-                    listOf(
-                        SideEffectWithCondition(
-                            effect = { s ->
-                                handleTunnelServiceChange(s.settings.appMode, s.activeTuns)
-                            },
-                            condition = { s -> s.activeTuns.size != s.previouslyActive.size },
-                        ),
-                        SideEffectWithCondition(
-                            effect = { s ->
-                                handleTunnelsActiveChange(s.previouslyActive, s.activeTuns, s.tuns)
-                            },
-                            condition = { s -> s.activeTuns.size != s.previouslyActive.size },
-                        ),
-                        // TODO Not for kernel mode for now
-                        SideEffectWithCondition(
-                            effect = { s -> handleTunnelMonitoringChanges(s.activeTuns, s.tuns) },
-                            condition = { s ->
-                                s.tuns.any {
-                                    it.restartOnPingFailure && s.activeTuns.keys.contains(it.id)
-                                } && s.settings.appMode != AppMode.KERNEL
-                            },
-                        ),
-                        SideEffectWithCondition(
-                            effect = { s ->
-                                handleFullTunnelMonitoring(s.activeTuns, s.tuns, s.settings)
-                            },
-                            condition = { s -> s.activeTuns.keys != s.previouslyActive.keys },
-                        ),
-                    )
-
-                applicationScope.launch(ioDispatcher) {
-                    for (state in newChannel) {
-                        supervisorScope {
-                            sideEffects
-                                .filter { it.condition(state) }
-                                .forEach { sideEffect ->
-                                    launch {
-                                        try {
-                                            sideEffect.effect(state)
-                                        } catch (e: Exception) {
-                                            Timber.e(e, "Side effect failed")
-                                        }
-                                    }
-                                }
-                        }
-                    }
-                }
-
-                combine(
-                    backend.activeTunnels,
-                    tunnelsRepository.flow,
-                    settingsRepository.flow.filterNotNull(),
-                ) { activeTuns, tuns, settings ->
-                    Triple(activeTuns, tuns, settings)
-                }
-            }
-            .onStart { handleStateRestore() }
-            .onEach { (activeTuns, tuns, settings) ->
-                val previouslyActive = activeTunsReference.exchange(activeTuns)
-                sideEffectChannelFlow.value.trySend(
-                    SideEffectState(activeTuns, tuns, settings, previouslyActive)
-                )
-            }
-            .map { (activeTuns, _, _) -> activeTuns }
-            .stateIn(
-                scope = applicationScope,
-                started = SharingStarted.Eagerly,
-                initialValue = emptyMap(),
-            )
-    }
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    override val errorEvents: SharedFlow<Pair<String, BackendCoreException>> =
+    override val errorEvents: SharedFlow<Pair<TunnelConf, BackendError>> =
         tunnelProviderFlow
             .flatMapLatest { it.errorEvents }
             .shareIn(
@@ -194,210 +57,80 @@ constructor(
             )
 
     @OptIn(ExperimentalCoroutinesApi::class)
-    override val messageEvents: SharedFlow<Pair<String, BackendMessage>> =
+    override val messageEvents: SharedFlow<Pair<TunnelConf, BackendMessage>> =
         tunnelProviderFlow
             .flatMapLatest { it.messageEvents }
+            .filterNotNull()
             .shareIn(
                 scope = applicationScope.plus(ioDispatcher),
                 started = SharingStarted.Eagerly,
                 replay = 0,
             )
 
-    override fun getStatistics(tunnelId: Int): TunnelStatistics? {
+    override val bouncingTunnelIds: ConcurrentHashMap<Int, TunnelStatus.StopReason> =
-        return tunnelProviderFlow.value.getStatistics(tunnelId)
+        tunnelProviderFlow.value.bouncingTunnelIds
+
+    override fun hasVpnPermission(): Boolean {
+        return userspaceTunnel.hasVpnPermission()
+    }
+
+    override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
+        return tunnelProviderFlow.value.getStatistics(tunnelConf)
     }
 
     override suspend fun startTunnel(tunnelConf: TunnelConf) {
-        // for VPN Mode, we need to stop active tunnels as we can only have one active at a time
-        if (activeTunnels.value.isNotEmpty() && tunnelProviderFlow.value == userspaceTunnel)
-            stopActiveTunnels()
         tunnelProviderFlow.value.startTunnel(tunnelConf)
     }
 
-    override suspend fun stopTunnel(tunnelId: Int) {
+    override suspend fun stopTunnel(tunnelConf: TunnelConf?, reason: TunnelStatus.StopReason) {
-        tunnelProviderFlow.value.stopTunnel(tunnelId)
+        tunnelProviderFlow.value.stopTunnel(tunnelConf, reason)
     }
 
-    override suspend fun stopActiveTunnels() {
+    override suspend fun bounceTunnel(tunnelConf: TunnelConf, reason: TunnelStatus.StopReason) {
-        tunnelProviderFlow.value.stopActiveTunnels()
+        tunnelProviderFlow.value.bounceTunnel(tunnelConf, reason)
     }
 
-    override fun setBackendMode(backendMode: BackendMode) {
+    override fun setBackendStatus(backendStatus: BackendStatus) {
-        tunnelProviderFlow.value.setBackendMode(backendMode)
+        tunnelProviderFlow.value.setBackendStatus(backendStatus)
     }
 
-    override fun getBackendMode(): BackendMode {
+    override fun getBackendStatus(): BackendStatus {
-        return tunnelProviderFlow.value.getBackendMode()
+        return tunnelProviderFlow.value.getBackendStatus()
     }
 
     override suspend fun runningTunnelNames(): Set<String> {
         return tunnelProviderFlow.value.runningTunnelNames()
     }
 
-    override fun handleDnsReresolve(tunnelConf: TunnelConf): Boolean {
-        return tunnelProviderFlow.value.handleDnsReresolve(tunnelConf)
-    }
-
     override suspend fun updateTunnelStatus(
-        tunnelId: Int,
+        tunnelConf: TunnelConf,
         status: TunnelStatus?,
         stats: TunnelStatistics?,
         pingStates: Map<Key, PingState>?,
-        logHealthState: LogHealthState?,
+        handshakeSuccessLogs: Boolean?,
     ) {
         tunnelProviderFlow.value.updateTunnelStatus(
-            tunnelId,
+            tunnelConf,
             status,
             stats,
             pingStates,
-            logHealthState,
+            handshakeSuccessLogs,
         )
     }
 
-    private suspend fun handleTunnelServiceChange(
+    suspend fun restorePreviousState() {
-        appMode: AppMode,
+        val settings = appDataRepository.settings.get()
-        activeTuns: Map<Int, TunnelState>,
-    ) {
-        if (activeTuns.isEmpty()) serviceManager.stopTunnelService()
-        if (activeTuns.isNotEmpty() && serviceManager.tunnelService.value == null)
-            serviceManager.startTunnelService(appMode)
-        serviceManager.updateTunnelTile()
-    }
-
-    private fun handleLockDownModeInit(withLanBypass: Boolean) {
-        val allowedIps = if (withLanBypass) TunnelConf.IPV4_PUBLIC_NETWORKS else emptySet()
-        try {
-            // TODO handle situation where they don't have vpn permission, request it
-            if (serviceManager.hasVpnPermission()) {
-                proxyUserspaceTunnel.setBackendMode(BackendMode.KillSwitch(allowedIps))
-            }
-        } catch (e: BackendCoreException) {
-            // TODO expose this error to user
-            Timber.e(e)
-        }
-    }
-
-    private suspend fun handleModeChangeCleanup(
-        previousBackend: TunnelProvider,
-        previousAppMode: AppMode,
-    ) {
-        previousBackend.stopActiveTunnels()
-        // stop lockdown if we switch from that mode
-        if (previousAppMode == AppMode.LOCK_DOWN)
-            proxyUserspaceTunnel.setBackendMode(BackendMode.Inactive)
-    }
-
-    private suspend fun handleStateRestore() {
-        val settings = settingsRepository.flow.first()
         if (settings.isRestoreOnBootEnabled) {
-            if (settings.isAutoTunnelEnabled) {
+            val previouslyActiveTuns = appDataRepository.tunnels.getActive()
-                tunnelsRepository.resetActiveTunnels()
+            val tunsToStart =
-                return settingsRepository.updateAutoTunnelEnabled(true)
+                previouslyActiveTuns.filterNot { tun ->
-            }
+                    activeTunnels.value.any { tun.id == it.key.id }
-            val tunnels = tunnelsRepository.flow.first()
-            when (settings.appMode) {
-                // TODO eventually, lockdown/proxy can support multi
-                AppMode.VPN,
-                AppMode.LOCK_DOWN,
-                AppMode.PROXY ->
-                    tunnels
-                        .firstOrNull { it.isActive }
-                        ?.let {
-                            // clear any duplicates
-                            tunnelsRepository.resetActiveTunnels()
-                            startTunnel(it)
-                        }
-                // kernel supports multi
-                AppMode.KERNEL ->
-                    tunnels.filter { it.isActive }.forEach { conf -> startTunnel(conf) }
-            }
-        }
-    }
-
-    private suspend fun handleTunnelMonitoringChanges(
-        activeTuns: Map<Int, TunnelState>,
-        configs: List<TunnelConf>,
-    ) {
-        configs
-            .filter { it.restartOnPingFailure && activeTuns.keys.contains(it.id) }
-            .forEach { conf ->
-                val tunState = activeTuns[conf.id] ?: return@forEach
-                if (tunState.health() == TunnelState.Health.UNHEALTHY) {
-                    runCatching {
-                            val updated = handleDnsReresolve(conf)
-                            // TODO user messages
-                            if (updated) {
-                                Timber.i("Successfully update the peer endpoint to new address.")
-                            } else {
-                                Timber.i("Current endpoint address is already up to date.")
-                            }
-                        }
-                        .onFailure {
-                            Timber.e(it, "Failed to handle dns re-resolution for ${conf.tunName}")
-                        }
-                    // TODO backoff
-                    delay(30_000L)
                 }
+            if (settings.isKernelEnabled) {
+                return tunsToStart.forEach { startTunnel(it) }
+            } else {
+                tunsToStart.firstOrNull()?.let { startTunnel(it) }
             }
-    }
-
-    private suspend fun handleTunnelsActiveChange(
-        previousActiveTuns: Map<Int, TunnelState>,
-        activeTuns: Map<Int, TunnelState>,
-        tuns: List<TunnelConf>,
-    ) {
-        val relevantTunnels = previousActiveTuns.keys + activeTuns.keys
-
-        relevantTunnels.forEach { tunnelId ->
-            val wasActive = previousActiveTuns.containsKey(tunnelId)
-            val isActiveNow = activeTuns.containsKey(tunnelId)
-
-            when {
-                !wasActive && isActiveNow -> {
-                    tuns
-                        .find { it.id == tunnelId }
-                        ?.let { dbTunnelConf ->
-                            tunnelsRepository.save(dbTunnelConf.copy(isActive = true))
-                        }
-                }
-                wasActive && !isActiveNow -> {
-                    tuns
-                        .find { it.id == tunnelId }
-                        ?.let { dbTunnelConf ->
-                            tunnelsRepository.save(dbTunnelConf.copy(isActive = false))
-                        }
-                }
-            }
-        }
-    }
-
-    private suspend fun handleFullTunnelMonitoring(
-        activeTuns: Map<Int, TunnelState>,
-        configs: List<TunnelConf>,
-        settings: GeneralSettings,
-    ) {
-        val activeIds = activeTuns.keys
-        val obsoleteIds = monitoringJobs.keys - activeIds
-        obsoleteIds.forEach { id ->
-            monitoringJobs[id]?.cancel()
-            monitoringJobs.remove(id)
-        }
-        activeIds.forEach { id ->
-            if (monitoringJobs.contains(id)) return@forEach
-            configs.find { it.id == id } ?: return@forEach
-            val tunStateFlow = activeTunnels.map { it[id] }.stateIn(applicationScope + ioDispatcher)
-            monitoringJobs[id] =
-                applicationScope.launch(ioDispatcher) {
-                    tunnelMonitor.startMonitoring(
-                        id,
-                        withLogs = settings.appMode != AppMode.KERNEL,
-                        tunStateFlow = tunStateFlow,
-                        getStatistics = { tunnelId -> getStatistics(tunnelId) },
-                        updateTunnelStatus = { tid, status, stats, pings, logHealth ->
-                            updateTunnelStatus(tid, null, stats, pings, logHealth)
-                        },
-                    )
-                }
         }
     }
 }

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

@@ -2,16 +2,11 @@ package com.zaneschepke.wireguardautotunnel.core.tunnel
 
 import com.zaneschepke.logcatter.LogReader
 import com.zaneschepke.networkmonitor.NetworkMonitor
-import com.zaneschepke.wireguardautotunnel.data.model.AppMode
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.FailureReason
-import com.zaneschepke.wireguardautotunnel.domain.state.LogHealthState
 import com.zaneschepke.wireguardautotunnel.domain.state.PingState
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelState
-import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
 import com.zaneschepke.wireguardautotunnel.util.extensions.toMillis
 import com.zaneschepke.wireguardautotunnel.util.network.NetworkUtils
 import dagger.hilt.android.scopes.ServiceScoped
@@ -26,71 +21,65 @@ import timber.log.Timber
 class TunnelMonitor
 @Inject
 constructor(
-    private val settingsRepository: GeneralSettingRepository,
+    private val appDataRepository: AppDataRepository,
-    private val tunnelsRepository: TunnelRepository,
+    private val tunnelManager: TunnelManager,
     private val networkMonitor: NetworkMonitor,
     private val networkUtils: NetworkUtils,
     private val logReader: LogReader,
 ) {
 
     @OptIn(FlowPreview::class)
-    suspend fun startMonitoring(
+    suspend fun startMonitoring(tunnelConf: TunnelConf, withLogs: Boolean): Job = coroutineScope {
-        tunnelId: Int,
-        withLogs: Boolean,
-        tunStateFlow: StateFlow<TunnelState?>,
-        getStatistics: suspend (Int) -> TunnelStatistics?,
-        updateTunnelStatus:
-            suspend (
-                Int, TunnelStatus?, TunnelStatistics?, Map<Key, PingState>?, LogHealthState?,
-            ) -> Unit,
-    ): Job = coroutineScope {
         launch {
-            val config = tunnelsRepository.getById(tunnelId) ?: return@launch
+            launch { startTunnelConfChangesJob(tunnelConf) }
-            launch { startPingMonitor(config, tunStateFlow, updateTunnelStatus) }
+            launch { startPingMonitor(tunnelConf) }
-            launch { startWgStatsPoll(tunnelId, getStatistics, updateTunnelStatus) }
+            launch { startWgStatsPoll(tunnelConf) }
-            if (withLogs) launch { startLogsMonitor(config, updateTunnelStatus) }
+            if (withLogs) launch { startLogsMonitor(tunnelConf) }
         }
     }
 
-    private suspend fun startLogsMonitor(
+    private suspend fun startTunnelConfChangesJob(tunnelConf: TunnelConf) {
-        tunnelConf: TunnelConf,
+        appDataRepository.tunnels.flow
-        updateTunnelStatus:
+            .map { storedTunnels -> storedTunnels.firstOrNull { it.id == tunnelConf.id } }
-            suspend (
+            .filterNotNull()
-                Int, TunnelStatus?, TunnelStatistics?, Map<Key, PingState>?, LogHealthState?,
+            .distinctUntilChanged { old, new -> old == new }
-            ) -> Unit,
+            .collect { storedTunnel ->
-    ) {
+                if (tunnelConf != storedTunnel) {
-        logReader.liveLogs
+                    Timber.d("Config changed for ${storedTunnel.tunName}, bouncing")
-            .filter { log -> log.tag.contains(tunnelConf.tunName) }
+                    withContext(NonCancellable) {
-            .mapNotNull { log ->
+                        tunnelManager.bounceTunnel(
-                val now = System.currentTimeMillis()
+                            storedTunnel,
-
+                            TunnelStatus.StopReason.ConfigChanged,
-                when {
+                        )
-                    successLogRegex.containsMatchIn(log.message) ->
+                    }
-                        LogHealthState(isHealthy = true, timestamp = now)
-
-                    failureLogRegex.containsMatchIn(log.message) ->
-                        LogHealthState(isHealthy = false, timestamp = now)
-
-                    else -> null
                 }
             }
-            .distinctUntilChangedBy { it.isHealthy } // Only emit when health changes
-            .collect { logHealthState ->
-                Timber.d("Tunnel log health updated for ${tunnelConf.tunName}: $logHealthState")
-                updateTunnelStatus(tunnelConf.id, null, null, null, logHealthState)
-            }
     }
 
-    private suspend fun startPingMonitor(
+    private suspend fun startLogsMonitor(tunnelConf: TunnelConf) {
-        tunnelConf: TunnelConf,
+        logReader.liveLogs.collect { log ->
-        tunStateFlow: StateFlow<TunnelState?>,
+            val healthLogs =
-        updateTunnelStatus:
+                when {
-            suspend (
+                    log.message.contains(HANDSHAKE_RESPONSE_TEXT, true) ||
-                Int, TunnelStatus?, TunnelStatistics?, Map<Key, PingState>?, LogHealthState?,
+                        log.message.contains(KEEPALIVE_RESPONSE_TEXT, true) -> true
-            ) -> Unit,
+                    log.message.contains(HANDSHAKE_INIT_FAILED_TEXT, true) ||
-    ) = coroutineScope {
+                        log.message.contains(HANDSHAKE_NOT_COMPLETED_TEXT) ||
+                        log.message.contains(DATA_PACKET_FAILED_TEXT) -> false
+
+                    else -> null
+                }
+            healthLogs?.let { healthy ->
+                tunnelManager.updateTunnelStatus(tunnelConf, null, null, null, healthy)
+            }
+        }
+    }
+
+    private suspend fun startPingMonitor(tunnelConf: TunnelConf) = coroutineScope {
         val pingStatsFlow = MutableStateFlow<Map<Key, PingState>>(emptyMap())
 
+        val tunStateFlow =
+            tunnelManager.activeTunnels.mapNotNull { it.getValueById(tunnelConf.id) }.stateIn(this)
+
         val connectivityStateFlow = networkMonitor.connectivityStateFlow.stateIn(this)
 
         val isNetworkConnected = connectivityStateFlow.map { it.hasConnectivity() }.stateIn(this)
@@ -114,19 +103,15 @@ constructor(
             .distinctUntilChanged()
             .stateIn(this)
 
-        settingsRepository.flow
+        appDataRepository.settings.flow
             .distinctUntilChanged { old, new ->
                 old.isPingEnabled == new.isPingEnabled &&
                     old.tunnelPingIntervalSeconds == new.tunnelPingIntervalSeconds &&
                     old.tunnelPingAttempts == new.tunnelPingAttempts &&
-                    old.tunnelPingTimeoutSeconds == new.tunnelPingTimeoutSeconds &&
+                    old.tunnelPingTimeoutSeconds == new.tunnelPingTimeoutSeconds
-                    old.appMode == new.appMode
             }
             .collectLatest { settings ->
                 if (!settings.isPingEnabled) return@collectLatest
-                // TODO for now until we get monitoring for these modes
-                if (settings.appMode == AppMode.LOCK_DOWN || settings.appMode == AppMode.PROXY)
-                    return@collectLatest
 
                 Timber.d("Starting pinger for ${tunnelConf.tunName} with settings")
 
@@ -225,12 +210,12 @@ constructor(
 
                     if (updates.isNotEmpty()) {
                         pingStatsFlow.update { updates }
-                        updateTunnelStatus(tunnelConf.id, null, null, updates, null)
+                        tunnelManager.updateTunnelStatus(tunnelConf, null, null, updates)
                     }
                 }
 
                 // Wait for the tunnel to be fully active
-                tunStateFlow.filter { state -> state?.status == TunnelStatus.Up }.first()
+                tunStateFlow.filter { state -> state.status == TunnelStatus.Up }.first()
 
                 // small delay to make sure tunnel is fully up before we actively monitor
                 delay(3_000L)
@@ -248,44 +233,37 @@ constructor(
                                 )
                             }
                         }
-                        updateTunnelStatus(tunnelConf.id, null, null, pingStatsFlow.value, null)
+                        tunnelManager.updateTunnelStatus(
+                            tunnelConf,
+                            null,
+                            null,
+                            pingStatsFlow.value,
+                        )
                     }
                     delay(settings.tunnelPingIntervalSeconds.toMillis())
                 }
             }
     }
 
-    private suspend fun startWgStatsPoll(
+    private suspend fun startWgStatsPoll(tunnelConf: TunnelConf) = coroutineScope {
-        tunnelId: Int,
-        getStatistics: suspend (Int) -> TunnelStatistics?,
-        updateTunnelStatus:
-            suspend (
-                Int, TunnelStatus?, TunnelStatistics?, Map<Key, PingState>?, LogHealthState?,
-            ) -> Unit,
-    ) = coroutineScope {
         while (isActive) {
-            val stats = getStatistics(tunnelId)
+            val stats = tunnelManager.getStatistics(tunnelConf)
-            updateTunnelStatus(tunnelId, null, stats, null, null)
+            tunnelManager.updateTunnelStatus(tunnelConf, null, stats, null)
             delay(STATS_DELAY)
         }
     }
 
     companion object {
-
-        private val successLogRegex =
-            Regex("Received handshake response|Receiving keepalive packet", RegexOption.IGNORE_CASE)
-
-        private val failureLogRegex =
-            Regex(
-                "Failed to send handshake initiation: write udp|" +
-                    "Handshake did not complete after 5 seconds, retrying|" +
-                    "Failed to send data packets",
-                RegexOption.IGNORE_CASE,
-            )
-
         const val CLOUDFLARE_IPV6_IP = "2606:4700:4700::1111"
         const val CLOUDFLARE_IPV4_IP = "1.1.1.1"
 
         const val STATS_DELAY = 1_000L
+
+        const val KEEPALIVE_RESPONSE_TEXT = "Receiving keepalive packet"
+        const val HANDSHAKE_RESPONSE_TEXT = "Received handshake response"
+        const val HANDSHAKE_INIT_FAILED_TEXT = "Failed to send handshake initiation: write udp"
+        const val DATA_PACKET_FAILED_TEXT = "Failed to send data packets"
+        const val HANDSHAKE_NOT_COMPLETED_TEXT =
+            "Handshake did not complete after 5 seconds, retrying"
     }
 }

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

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

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

@@ -1,169 +1,89 @@
 package com.zaneschepke.wireguardautotunnel.core.tunnel
 
-import com.zaneschepke.wireguardautotunnel.data.model.DnsProtocol
+import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendStatus
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
-import com.zaneschepke.wireguardautotunnel.domain.events.BackendCoreException
+import com.zaneschepke.wireguardautotunnel.domain.events.BackendError
-import com.zaneschepke.wireguardautotunnel.domain.model.AppProxySettings
 import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
-import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.ProxySettingsRepository
 import com.zaneschepke.wireguardautotunnel.domain.state.AmneziaStatistics
 import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
-import com.zaneschepke.wireguardautotunnel.util.extensions.asAmBackendMode
+import com.zaneschepke.wireguardautotunnel.util.extensions.asAmBackendStatus
-import com.zaneschepke.wireguardautotunnel.util.extensions.asBackendMode
+import com.zaneschepke.wireguardautotunnel.util.extensions.asBackendStatus
-import com.zaneschepke.wireguardautotunnel.util.extensions.asTunnelState
+import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
-import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendCoreException
-import java.io.IOException
-import java.util.*
-import java.util.concurrent.ConcurrentHashMap
 import javax.inject.Inject
+import kotlin.jvm.optionals.getOrNull
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.callbackFlow
-import kotlinx.coroutines.flow.consumeAsFlow
-import kotlinx.coroutines.launch
 import org.amnezia.awg.backend.Backend
 import org.amnezia.awg.backend.BackendException
-import org.amnezia.awg.backend.ProxyGoBackend
+import org.amnezia.awg.backend.Tunnel
-import org.amnezia.awg.backend.Tunnel as AwgTunnel
-import org.amnezia.awg.config.Config
-import org.amnezia.awg.config.DnsSettings
-import org.amnezia.awg.config.proxy.HttpProxy
-import org.amnezia.awg.config.proxy.Proxy
-import org.amnezia.awg.config.proxy.Socks5Proxy
 import timber.log.Timber
 
 class UserspaceTunnel
 @Inject
 constructor(
-    @ApplicationScope applicationScope: CoroutineScope,
+    applicationScope: CoroutineScope,
-    private val proxySettingsRepository: ProxySettingsRepository,
+    val serviceManager: ServiceManager,
-    private val settingsRepository: GeneralSettingRepository,
+    val appDataRepository: AppDataRepository,
     private val backend: Backend,
-) : BaseTunnel(applicationScope) {
+) : BaseTunnel(applicationScope, appDataRepository, serviceManager) {
-
-    private val runtimeTunnels = ConcurrentHashMap<Int, AwgTunnel>()
-
-    override fun tunnelStateFlow(tunnelConf: TunnelConf): Flow<TunnelStatus> = callbackFlow {
-        val stateChannel = Channel<AwgTunnel.State>()
-
-        val runtimeTunnel = RuntimeAwgTunnel(tunnelConf, stateChannel)
-        runtimeTunnels[tunnelConf.id] = runtimeTunnel
-
-        val consumerJob = launch {
-            stateChannel.consumeAsFlow().collect { awgState -> trySend(awgState.asTunnelState()) }
-        }
 
+    override suspend fun startBackend(tunnel: TunnelConf) {
         try {
-            updateTunnelStatus(tunnelConf.id, TunnelStatus.Starting)
+            updateTunnelStatus(tunnel, TunnelStatus.Starting)
-
+            val amConfig = tunnel.toAmConfig()
-            val proxies: List<Proxy> =
+            var previousKillSwitch: Backend.BackendStatus? = null
-                when (backend) {
+            // prevent dns failures from bringing tuns up when vpn kill switch active
-                    is ProxyGoBackend -> {
+            if (
-                        val proxySettings = proxySettingsRepository.get()
+                amConfig.peers.any { it.endpoint.getOrNull()?.toString()?.isUrl() == true } &&
-                        Timber.d("Adding proxy configs")
+                    backend.backendStatus is Backend.BackendStatus.KillSwitchActive
-                        buildList {
+            ) {
-                            if (proxySettings.socks5ProxyEnabled) {
+                previousKillSwitch = backend.backendStatus
-                                add(
+                setBackendStatus(BackendStatus.Active)
-                                    Socks5Proxy(
-                                        proxySettings.socks5ProxyBindAddress
-                                            ?: AppProxySettings.DEFAULT_SOCKS_BIND_ADDRESS,
-                                        proxySettings.proxyUsername,
-                                        proxySettings.proxyPassword,
-                                    )
-                                )
-                            }
-                            if (proxySettings.httpProxyEnabled) {
-                                add(
-                                    HttpProxy(
-                                        proxySettings.httpProxyBindAddress
-                                            ?: AppProxySettings.DEFAULT_HTTP_BIND_ADDRESS,
-                                        proxySettings.proxyUsername,
-                                        proxySettings.proxyPassword,
-                                    )
-                                )
-                            }
-                        }
-                    }
-                    else -> emptyList()
-                }
-            val setting = settingsRepository.get()
-            val config = tunnelConf.toAmConfig()
-            val updatedConfig =
-                Config.Builder()
-                    .apply {
-                        setInterface(config.`interface`)
-                        addPeers(config.peers)
-                        addProxies(proxies)
-                        setDnsSettings(
-                            DnsSettings(
-                                setting.dnsProtocol == DnsProtocol.DOH,
-                                Optional.ofNullable(setting.dnsEndpoint),
-                            )
-                        )
-                    }
-                    .build()
-            backend.setState(runtimeTunnel, AwgTunnel.State.UP, updatedConfig)
-        } catch (e: BackendException) {
-            close(e.toBackendCoreException())
-        } catch (e: IllegalArgumentException) {
-            close(BackendCoreException.Config)
-        } catch (e: Exception) {
-            Timber.e(e, "Error while setting tunnel state")
-            close(BackendCoreException.Unknown)
-        }
-
-        awaitClose {
-            try {
-                backend.setState(runtimeTunnel, AwgTunnel.State.DOWN, null)
-            } catch (e: BackendException) {
-                errors.tryEmit(tunnelConf.tunName to e.toBackendCoreException())
-            } finally {
-                consumerJob.cancel()
-                stateChannel.close()
-                runtimeTunnels.remove(tunnelConf.id)
-                trySend(TunnelStatus.Down)
-                close()
             }
-        }
+            backend.setState(tunnel, Tunnel.State.UP, amConfig)
-    }
+            previousKillSwitch?.let { backend.backendStatus = it }
-
-    override fun setBackendMode(backendMode: BackendMode) {
-        Timber.d("Setting backend mode: $backendMode")
-        try {
-            backend.backendMode = backendMode.asAmBackendMode()
         } catch (e: BackendException) {
-            throw e.toBackendCoreException()
+            Timber.e(e, "Failed to start up backend for tunnel ${tunnel.name}")
-            // TODO this should be mapped to BackendException in the lib
+            throw e.toBackendError()
-        } catch (e: IOException) {
+        } catch (e: IllegalArgumentException) {
-            throw BackendCoreException.NotAuthorized
+            Timber.e(e, "Failed to start up backend for tunnel ${tunnel.name}")
+            throw BackendError.Config
         }
     }
 
-    override fun getBackendMode(): BackendMode {
+    override fun stopBackend(tunnel: TunnelConf) {
-        return backend.backendMode.asBackendMode()
+        Timber.i("Stopping tunnel ${tunnel.name} userspace")
+        try {
+            backend.setState(tunnel, Tunnel.State.DOWN, tunnel.toAmConfig())
+        } catch (e: BackendException) {
+            Timber.e(e, "Failed to stop tunnel ${tunnel.id}")
+            throw e.toBackendError()
+        }
     }
 
-    override fun handleDnsReresolve(tunnelConf: TunnelConf): Boolean {
+    override fun setBackendStatus(backendStatus: BackendStatus) {
-        val tunnel =
+        Timber.d("Setting backend state: $backendStatus")
-            runtimeTunnels.get(tunnelConf.id) ?: throw BackendCoreException.ServiceNotRunning
+        try {
-        return backend.resolveDDNS(tunnelConf.toAmConfig(), tunnel.isIpv4ResolutionPreferred)
+            backend.backendStatus = backendStatus.asAmBackendStatus()
+        } catch (e: BackendException) {
+            throw e.toBackendError()
+        }
+    }
+
+    override fun getBackendStatus(): BackendStatus {
+        return backend.backendStatus.asBackendStatus()
     }
 
     override suspend fun runningTunnelNames(): Set<String> {
         return backend.runningTunnelNames
     }
 
-    override fun getStatistics(tunnelId: Int): TunnelStatistics? {
+    override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
         return try {
-            val runtimeTunnel = runtimeTunnels[tunnelId] ?: return null
+            AmneziaStatistics(backend.getStatistics(tunnelConf))
-            AmneziaStatistics(backend.getStatistics(runtimeTunnel))
         } catch (e: Exception) {
-            Timber.e(e, "Failed to get stats for $tunnelId")
+            Timber.e(e, "Failed to get stats for ${tunnelConf.tunName}")
             null
         }
     }

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

@@ -4,8 +4,9 @@ import android.content.Context
 import androidx.hilt.work.HiltWorker
 import androidx.work.*
 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.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import java.util.concurrent.TimeUnit
@@ -20,8 +21,9 @@ constructor(
     @Assisted private val context: Context,
     @Assisted private val params: WorkerParameters,
     private val serviceManager: ServiceManager,
-    private val settingsRepository: GeneralSettingRepository,
+    private val appDataRepository: AppDataRepository,
     @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
+    private val tunnelManager: TunnelManager,
 ) : CoroutineWorker(context, params) {
 
     companion object {
@@ -50,12 +52,11 @@ constructor(
     override suspend fun doWork(): Result =
         withContext(ioDispatcher) {
             Timber.i("Service worker started")
-            with(settingsRepository.get()) {
+            with(appDataRepository.settings.get()) {
-                Timber.i("Checking to see if auto-tunnel has been killed by system")
+                if (isAutoTunnelEnabled && serviceManager.autoTunnelService.value == null)
-                if (isAutoTunnelEnabled && serviceManager.autoTunnelService.value == null) {
+                    return@with serviceManager.startAutoTunnel()
-                    Timber.i("Service has been killed by system, restoring.")
+                if (tunnelManager.activeTunnels.value.isEmpty())
-                    settingsRepository.updateAutoTunnelEnabled(true)
+                    tunnelManager.restorePreviousState()
-                }
             }
             Result.success()
         }

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

@@ -2,17 +2,14 @@ package com.zaneschepke.wireguardautotunnel.data
 
 import androidx.room.*
 import androidx.room.migration.AutoMigrationSpec
-import androidx.sqlite.db.SupportSQLiteDatabase
-import com.zaneschepke.wireguardautotunnel.data.dao.ProxySettingsDao
 import com.zaneschepke.wireguardautotunnel.data.dao.SettingsDao
 import com.zaneschepke.wireguardautotunnel.data.dao.TunnelConfigDao
-import com.zaneschepke.wireguardautotunnel.data.entity.ProxySettings
 import com.zaneschepke.wireguardautotunnel.data.entity.Settings
 import com.zaneschepke.wireguardautotunnel.data.entity.TunnelConfig
 
 @Database(
-    entities = [Settings::class, TunnelConfig::class, ProxySettings::class],
+    entities = [Settings::class, TunnelConfig::class],
-    version = 22,
+    version = 19,
     autoMigrations =
         [
             AutoMigration(from = 1, to = 2),
@@ -33,9 +30,6 @@ import com.zaneschepke.wireguardautotunnel.data.entity.TunnelConfig
             AutoMigration(from = 16, to = 17, spec = WifiDetectionMigration::class),
             AutoMigration(from = 17, to = 18),
             AutoMigration(from = 18, to = 19, spec = PingMigration::class),
-            AutoMigration(from = 19, to = 20, spec = ProxyMigration::class),
-            AutoMigration(from = 20, to = 21, spec = FixProxySettingsMigration::class),
-            AutoMigration(from = 21, to = 22),
         ],
     exportSchema = true,
 )
@@ -44,8 +38,6 @@ abstract class AppDatabase : RoomDatabase() {
     abstract fun settingDao(): SettingsDao
 
     abstract fun tunnelConfigDoa(): TunnelConfigDao
-
-    abstract fun proxySettingsDoa(): ProxySettingsDao
 }
 
 @DeleteColumn(tableName = "Settings", columnName = "default_tunnel")
@@ -76,27 +68,3 @@ class WifiDetectionMigration : AutoMigrationSpec
     ),
 )
 class PingMigration : AutoMigrationSpec
-
-@DeleteColumn.Entries(
-    DeleteColumn(tableName = "Settings", columnName = "is_amnezia_enabled"),
-    DeleteColumn(tableName = "Settings", columnName = "is_vpn_kill_switch_enabled"),
-    DeleteColumn(tableName = "Settings", columnName = "is_kernel_kill_switch_enabled"),
-    DeleteColumn(tableName = "Settings", columnName = "is_kernel_enabled"),
-)
-class ProxyMigration : AutoMigrationSpec {
-    override fun onPostMigrate(db: SupportSQLiteDatabase) {
-        db.execSQL("INSERT INTO proxy_settings DEFAULT VALUES")
-    }
-}
-
-class FixProxySettingsMigration : AutoMigrationSpec {
-    override fun onPostMigrate(db: SupportSQLiteDatabase) {
-        val cursor = db.query("SELECT COUNT(*) FROM proxy_settings")
-        val count = if (cursor.moveToFirst()) cursor.getInt(0) else 0
-        cursor.close()
-
-        if (count == 0) {
-            db.execSQL("INSERT INTO proxy_settings DEFAULT VALUES")
-        }
-    }
-}

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

@@ -13,6 +13,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import timber.log.Timber
 
@@ -42,7 +43,7 @@ class DataStoreManager(
             try {
                 context.dataStore.data.first()
             } catch (e: IOException) {
-                Timber.e(e)
+                Timber.Forest.e(e)
             }
         }
     }
@@ -52,9 +53,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)
             }
         }
     }
@@ -64,9 +65,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)
             }
         }
     }
@@ -78,11 +79,15 @@ class DataStoreManager(
             try {
                 context.dataStore.data.map { it[key] }.first()
             } catch (e: IOException) {
-                Timber.e(e)
+                Timber.Forest.e(e)
                 null
             }
         }
     }
 
+    fun <T> getFromStoreBlocking(key: Preferences.Key<T>) = runBlocking {
+        context.dataStore.data.map { it[key] }.first()
+    }
+
     val preferencesFlow: Flow<Preferences?> = context.dataStore.data.flowOn(ioDispatcher)
 }

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

@@ -2,15 +2,20 @@ package com.zaneschepke.wireguardautotunnel.data
 
 import androidx.room.RoomDatabase
 import androidx.sqlite.db.SupportSQLiteDatabase
-import javax.inject.Inject
+import timber.log.Timber
-import javax.inject.Provider
 
-class DatabaseCallback @Inject constructor(private val databaseProvider: Provider<AppDatabase>) :
+class DatabaseCallback : RoomDatabase.Callback() {
-    RoomDatabase.Callback() {
+    override fun onCreate(db: SupportSQLiteDatabase) =
-
+        db.run {
-    override fun onCreate(db: SupportSQLiteDatabase) {
+            beginTransaction()
-        super.onCreate(db)
+            try {
-        db.execSQL("INSERT INTO proxy_settings DEFAULT VALUES")
+                execSQL(Queries.createDefaultSettings())
-        db.execSQL("INSERT INTO Settings DEFAULT VALUES")
+                Timber.i("Bootstrapping settings data")
-    }
+                setTransactionSuccessful()
+            } catch (e: Exception) {
+                Timber.e(e)
+            } finally {
+                endTransaction()
+            }
+        }
 }

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

@@ -1,9 +1,7 @@
 package com.zaneschepke.wireguardautotunnel.data
 
 import androidx.room.TypeConverter
-import com.zaneschepke.wireguardautotunnel.data.model.AppMode
+import com.zaneschepke.wireguardautotunnel.data.entity.Settings
-import com.zaneschepke.wireguardautotunnel.data.model.DnsProtocol
-import com.zaneschepke.wireguardautotunnel.data.model.WifiDetectionMethod
 import kotlinx.serialization.json.Json
 
 class DatabaseConverters {
@@ -24,26 +22,9 @@ class DatabaseConverters {
         }
     }
 
-    @TypeConverter
+    @TypeConverter fun fromStatus(status: Settings.WifiDetectionMethod): Int = status.value
-    fun setToString(value: Set<String>): String {
-        return listToString(value.toList())
-    }
 
     @TypeConverter
-    fun stringToSet(value: String): Set<String> {
+    fun toStatus(value: Int): Settings.WifiDetectionMethod =
-        return stringToList(value).toSet()
+        Settings.WifiDetectionMethod.fromValue(value)
-    }
-
-    @TypeConverter fun fromStatus(status: WifiDetectionMethod): Int = status.value
-
-    @TypeConverter
-    fun toStatus(value: Int): WifiDetectionMethod = WifiDetectionMethod.fromValue(value)
-
-    @TypeConverter fun toMode(value: Int): AppMode = AppMode.fromValue(value)
-
-    @TypeConverter fun fromMode(mode: AppMode): Int = mode.value
-
-    @TypeConverter fun toDnsProtocol(value: Int): DnsProtocol = DnsProtocol.fromValue(value)
-
-    @TypeConverter fun fromDnsProtocol(mode: DnsProtocol): Int = mode.value
 }

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

@@ -0,0 +1,37 @@
+package com.zaneschepke.wireguardautotunnel.data
+
+object Queries {
+    fun createDefaultSettings(): String {
+        return """
+		INSERT INTO Settings (is_tunnel_enabled,
+		        is_tunnel_on_mobile_data_enabled,
+		        trusted_network_ssids,
+		        is_always_on_vpn_enabled,
+		        is_tunnel_on_ethernet_enabled,
+		        is_shortcuts_enabled,
+		        is_tunnel_on_wifi_enabled,
+		        is_kernel_enabled,
+		        is_restore_on_boot_enabled,
+		        is_multi_tunnel_enabled)
+		        VALUES
+		        ('false',
+		        'false',
+		        '',
+		        'false',
+		        'false',
+		        'false',
+		        'false',
+		        'false',
+		        'false',
+		        'false')
+		"""
+            .trimIndent()
+    }
+
+    fun createTunnelConfig(): String {
+        return """
+		INSERT INTO TunnelConfig (name, wg_quick) VALUES ('test', 'test')
+		"""
+            .trimIndent()
+    }
+}

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

@@ -1,25 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.dao
-
-import androidx.room.*
-import com.zaneschepke.wireguardautotunnel.data.entity.ProxySettings
-import kotlinx.coroutines.flow.Flow
-
-@Dao
-interface ProxySettingsDao {
-    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun save(t: ProxySettings)
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun saveAll(t: List<ProxySettings>)
-
-    @Query("SELECT * FROM proxy_settings WHERE id=:id")
-    suspend fun getById(id: Long): ProxySettings?
-
-    @Query("SELECT * FROM proxy_settings") suspend fun getAll(): List<ProxySettings>
-
-    @Query("SELECT * FROM proxy_settings LIMIT 1") fun getSettingsFlow(): Flow<ProxySettings>
-
-    @Query("SELECT * FROM proxy_settings") fun getAllFlow(): Flow<List<ProxySettings>>
-
-    @Delete suspend fun delete(t: ProxySettings)
-
-    @Query("SELECT COUNT('id') FROM proxy_settings") suspend fun count(): Long
-}

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

@@ -16,12 +16,9 @@ interface SettingsDao {
 
     @Query("SELECT * FROM settings LIMIT 1") fun getSettingsFlow(): Flow<Settings>
 
-    @Query("SELECT * FROM settings") fun getAllFlow(): Flow<List<Settings>>
+    @Query("SELECT * FROM settings") fun getAllFlow(): Flow<MutableList<Settings>>
 
     @Delete suspend fun delete(t: Settings)
 
     @Query("SELECT COUNT('id') FROM settings") suspend fun count(): Long
-
-    @Query("UPDATE settings SET is_tunnel_enabled = :enabled")
-    suspend fun updateAutoTunnelEnabled(enabled: Boolean)
 }

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

@@ -13,9 +13,6 @@ interface TunnelConfigDao {
 
     @Query("SELECT * FROM TunnelConfig WHERE id=:id") suspend fun getById(id: Long): TunnelConfig?
 
-    @Query("UPDATE TunnelConfig SET is_Active = 0 WHERE is_Active = 1")
-    suspend fun resetActiveTunnels()
-
     @Query("SELECT * FROM TunnelConfig WHERE name=:name")
     suspend fun getByName(name: String): TunnelConfig?
 
@@ -25,8 +22,6 @@ interface TunnelConfigDao {
 
     @Delete suspend fun delete(t: TunnelConfig)
 
-    @Delete suspend fun delete(t: TunnelConfigs)
-
     @Query("SELECT COUNT('id') FROM TunnelConfig") suspend fun count(): Long
 
     @Query("SELECT * FROM TunnelConfig WHERE tunnel_networks LIKE '%' || :name || '%'")
@@ -47,28 +42,6 @@ interface TunnelConfigDao {
     @Query("SELECT * FROM TUNNELCONFIG WHERE is_mobile_data_tunnel=1")
     suspend fun findByMobileDataTunnel(): TunnelConfigs
 
-    @Query(
-        """
-    SELECT * FROM TunnelConfig 
-    ORDER BY 
-        CASE WHEN is_primary_tunnel = 1 THEN 0 ELSE 1 END, 
-        position ASC 
-    LIMIT 1"""
-    )
-    suspend fun getDefaultTunnel(): TunnelConfig?
-
-    @Query(
-        """
-    SELECT * FROM TunnelConfig 
-    ORDER BY 
-        CASE WHEN is_Active = 1 THEN 0 
-             WHEN is_primary_tunnel = 1 THEN 1 
-             ELSE 2 END, 
-        position ASC 
-    LIMIT 1"""
-    )
-    suspend fun getStartTunnel(): TunnelConfig?
-
     @Query("SELECT * FROM tunnelconfig ORDER BY position")
     fun getAllFlow(): Flow<List<TunnelConfig>>
 }

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

@@ -1,18 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.entity
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity(tableName = "proxy_settings")
-data class ProxySettings(
-    @PrimaryKey(autoGenerate = true) val id: Long = 0,
-    @ColumnInfo(name = "socks5_proxy_enabled", defaultValue = "0")
-    val socks5ProxyEnabled: Boolean = false,
-    @ColumnInfo(name = "socks5_proxy_bind_address") val socks5ProxyBindAddress: String? = null,
-    @ColumnInfo(name = "http_proxy_enable", defaultValue = "0")
-    val httpProxyEnabled: Boolean = false,
-    @ColumnInfo(name = "http_proxy_bind_address") val httpProxyBindAddress: String? = null,
-    @ColumnInfo(name = "proxy_username") val proxyUsername: String? = null,
-    @ColumnInfo(name = "proxy_password") val proxyPassword: String? = null,
-)

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

@@ -3,54 +3,65 @@ package com.zaneschepke.wireguardautotunnel.data.entity
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import com.zaneschepke.wireguardautotunnel.data.model.AppMode
-import com.zaneschepke.wireguardautotunnel.data.model.DnsProtocol
-import com.zaneschepke.wireguardautotunnel.data.model.WifiDetectionMethod
 
 @Entity
 data class Settings(
     @PrimaryKey(autoGenerate = true) val id: Int = 0,
-    @ColumnInfo(name = "is_tunnel_enabled", defaultValue = "0")
+    @ColumnInfo(name = "is_tunnel_enabled") val isAutoTunnelEnabled: Boolean = false,
-    val isAutoTunnelEnabled: Boolean = false,
+    @ColumnInfo(name = "is_tunnel_on_mobile_data_enabled")
-    @ColumnInfo(name = "is_tunnel_on_mobile_data_enabled", defaultValue = "0")
     val isTunnelOnMobileDataEnabled: Boolean = false,
-    @ColumnInfo(name = "trusted_network_ssids", defaultValue = "")
+    @ColumnInfo(name = "trusted_network_ssids") val trustedNetworkSSIDs: List<String> = emptyList(),
-    val trustedNetworkSSIDs: Set<String> = emptySet(),
+    @ColumnInfo(name = "is_always_on_vpn_enabled") val isAlwaysOnVpnEnabled: Boolean = false,
-    @ColumnInfo(name = "is_always_on_vpn_enabled", defaultValue = "0")
+    @ColumnInfo(name = "is_tunnel_on_ethernet_enabled")
-    val isAlwaysOnVpnEnabled: Boolean = false,
-    @ColumnInfo(name = "is_tunnel_on_ethernet_enabled", defaultValue = "0")
     val isTunnelOnEthernetEnabled: Boolean = false,
-    @ColumnInfo(name = "is_shortcuts_enabled", defaultValue = "0")
+    @ColumnInfo(name = "is_shortcuts_enabled", defaultValue = "false")
     val isShortcutsEnabled: Boolean = false,
-    @ColumnInfo(name = "is_tunnel_on_wifi_enabled", defaultValue = "0")
+    @ColumnInfo(name = "is_tunnel_on_wifi_enabled", defaultValue = "false")
     val isTunnelOnWifiEnabled: Boolean = false,
-    @ColumnInfo(name = "is_restore_on_boot_enabled", defaultValue = "0")
+    @ColumnInfo(name = "is_kernel_enabled", defaultValue = "false")
+    val isKernelEnabled: Boolean = false,
+    @ColumnInfo(name = "is_restore_on_boot_enabled", defaultValue = "false")
     val isRestoreOnBootEnabled: Boolean = false,
-    @ColumnInfo(name = "is_multi_tunnel_enabled", defaultValue = "0")
+    @ColumnInfo(name = "is_multi_tunnel_enabled", defaultValue = "false")
     val isMultiTunnelEnabled: Boolean = false,
-    @ColumnInfo(name = "is_ping_enabled", defaultValue = "0") val isPingEnabled: Boolean = false,
+    @ColumnInfo(name = "is_ping_enabled", defaultValue = "false")
-    @ColumnInfo(name = "is_wildcards_enabled", defaultValue = "0")
+    val isPingEnabled: Boolean = false,
+    @ColumnInfo(name = "is_amnezia_enabled", defaultValue = "false")
+    val isAmneziaEnabled: Boolean = false,
+    @ColumnInfo(name = "is_wildcards_enabled", defaultValue = "false")
     val isWildcardsEnabled: Boolean = false,
-    @ColumnInfo(name = "is_stop_on_no_internet_enabled", defaultValue = "0")
+    @ColumnInfo(name = "is_stop_on_no_internet_enabled", defaultValue = "false")
     val isStopOnNoInternetEnabled: Boolean = false,
-    @ColumnInfo(name = "is_lan_on_kill_switch_enabled", defaultValue = "0")
+    @ColumnInfo(name = "is_vpn_kill_switch_enabled", defaultValue = "false")
+    val isVpnKillSwitchEnabled: Boolean = false,
+    @ColumnInfo(name = "is_kernel_kill_switch_enabled", defaultValue = "false")
+    val isKernelKillSwitchEnabled: Boolean = false,
+    @ColumnInfo(name = "is_lan_on_kill_switch_enabled", defaultValue = "false")
     val isLanOnKillSwitchEnabled: Boolean = false,
     @ColumnInfo(name = "debounce_delay_seconds", defaultValue = "3")
     val debounceDelaySeconds: Int = 3,
-    @ColumnInfo(name = "is_disable_kill_switch_on_trusted_enabled", defaultValue = "0")
+    @ColumnInfo(name = "is_disable_kill_switch_on_trusted_enabled", defaultValue = "false")
     val isDisableKillSwitchOnTrustedEnabled: Boolean = false,
-    @ColumnInfo(name = "is_tunnel_on_unsecure_enabled", defaultValue = "0")
+    @ColumnInfo(name = "is_tunnel_on_unsecure_enabled", defaultValue = "false")
     val isTunnelOnUnsecureEnabled: Boolean = false,
     @ColumnInfo(name = "wifi_detection_method", defaultValue = "0")
     val wifiDetectionMethod: WifiDetectionMethod = WifiDetectionMethod.fromValue(0),
-    @ColumnInfo(name = "is_ping_monitoring_enabled", defaultValue = "1")
+    @ColumnInfo(name = "is_ping_monitoring_enabled", defaultValue = "true")
     val isPingMonitoringEnabled: Boolean = true,
     @ColumnInfo(name = "tunnel_ping_interval_sec", defaultValue = "30")
     val tunnelPingIntervalSeconds: Int = 30,
     @ColumnInfo(name = "tunnel_ping_attempts", defaultValue = "3") val tunnelPingAttempts: Int = 3,
     @ColumnInfo(name = "tunnel_ping_timeout_sec") val tunnelPingTimeoutSeconds: Int? = null,
-    @ColumnInfo(name = "app_mode", defaultValue = "0") val appMode: AppMode = AppMode.fromValue(0),
+) {
-    @ColumnInfo(name = "dns_protocol", defaultValue = "0")
+    enum class WifiDetectionMethod(val value: Int) {
-    val dnsProtocol: DnsProtocol = DnsProtocol.fromValue(0),
+        DEFAULT(0),
-    @ColumnInfo(name = "dns_endpoint") val dnsEndpoint: String? = null,
+        LEGACY(1),
-)
+        ROOT(2),
+        SHIZUKU(3);
+
+        companion object {
+            fun fromValue(value: Int): WifiDetectionMethod =
+                entries.find { it.value == value } ?: DEFAULT
+        }
+    }
+}

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

@@ -11,7 +11,7 @@ data class TunnelConfig(
     @ColumnInfo(name = "name") val name: String,
     @ColumnInfo(name = "wg_quick") val wgQuick: String,
     @ColumnInfo(name = "tunnel_networks", defaultValue = "")
-    val tunnelNetworks: Set<String> = setOf(),
+    val tunnelNetworks: List<String> = listOf(),
     @ColumnInfo(name = "is_mobile_data_tunnel", defaultValue = "false")
     val isMobileDataTunnel: Boolean = false,
     @ColumnInfo(name = "is_primary_tunnel", defaultValue = "false")
@@ -27,7 +27,7 @@ data class TunnelConfig(
     val isIpv4Preferred: Boolean = true,
     @ColumnInfo(name = "position", defaultValue = "0") val position: Int = 0,
     @ColumnInfo(name = "auto_tunnel_apps", defaultValue = "[]")
-    val autoTunnelApps: Set<String> = setOf(),
+    val autoTunnelApps: List<String> = listOf(),
 ) {
 
     companion object {

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

@@ -1,32 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.mapper
-
-import com.zaneschepke.wireguardautotunnel.data.entity.ProxySettings
-import com.zaneschepke.wireguardautotunnel.domain.model.AppProxySettings
-
-object ProxySettingsMapper {
-    fun to(proxySettings: ProxySettings): AppProxySettings =
-        with(proxySettings) {
-            AppProxySettings(
-                id,
-                socks5ProxyEnabled,
-                socks5ProxyBindAddress,
-                httpProxyEnabled,
-                httpProxyBindAddress,
-                proxyUsername,
-                proxyPassword,
-            )
-        }
-
-    fun to(proxySettings: AppProxySettings): ProxySettings =
-        with(proxySettings) {
-            ProxySettings(
-                id,
-                socks5ProxyEnabled,
-                socks5ProxyBindAddress,
-                httpProxyEnabled,
-                httpProxyBindAddress,
-                proxyUsername,
-                proxyPassword,
-            )
-        }
-}

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

@@ -1,77 +1,71 @@
 package com.zaneschepke.wireguardautotunnel.data.mapper
 
+import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
 import com.zaneschepke.wireguardautotunnel.data.entity.Settings
-import com.zaneschepke.wireguardautotunnel.data.model.DnsProtocol
+import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
-import com.zaneschepke.wireguardautotunnel.data.model.DnsSettings
-import com.zaneschepke.wireguardautotunnel.data.model.WifiDetectionMethod
-import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings
 
-fun Settings.toAppSettings(): GeneralSettings {
+object SettingsMapper {
-    return GeneralSettings(
+    fun toAppSettings(settings: Settings): AppSettings {
-        id = id,
+        return AppSettings(
-        isAutoTunnelEnabled = isAutoTunnelEnabled,
+            id = settings.id,
-        isTunnelOnMobileDataEnabled = isTunnelOnMobileDataEnabled,
+            isAutoTunnelEnabled = settings.isAutoTunnelEnabled,
-        trustedNetworkSSIDs = trustedNetworkSSIDs,
+            isTunnelOnMobileDataEnabled = settings.isTunnelOnMobileDataEnabled,
-        isAlwaysOnVpnEnabled = isAlwaysOnVpnEnabled,
+            trustedNetworkSSIDs = settings.trustedNetworkSSIDs,
-        isTunnelOnEthernetEnabled = isTunnelOnEthernetEnabled,
+            isAlwaysOnVpnEnabled = settings.isAlwaysOnVpnEnabled,
-        isShortcutsEnabled = isShortcutsEnabled,
+            isTunnelOnEthernetEnabled = settings.isTunnelOnEthernetEnabled,
-        isTunnelOnWifiEnabled = isTunnelOnWifiEnabled,
+            isShortcutsEnabled = settings.isShortcutsEnabled,
-        isRestoreOnBootEnabled = isRestoreOnBootEnabled,
+            isTunnelOnWifiEnabled = settings.isTunnelOnWifiEnabled,
-        isMultiTunnelEnabled = isMultiTunnelEnabled,
+            isKernelEnabled = settings.isKernelEnabled,
-        isPingEnabled = isPingEnabled,
+            isRestoreOnBootEnabled = settings.isRestoreOnBootEnabled,
-        isWildcardsEnabled = isWildcardsEnabled,
+            isMultiTunnelEnabled = settings.isMultiTunnelEnabled,
-        isStopOnNoInternetEnabled = isStopOnNoInternetEnabled,
+            isPingEnabled = settings.isPingEnabled,
-        isLanOnKillSwitchEnabled = isLanOnKillSwitchEnabled,
+            isAmneziaEnabled = settings.isAmneziaEnabled,
-        debounceDelaySeconds = debounceDelaySeconds,
+            isWildcardsEnabled = settings.isWildcardsEnabled,
-        isDisableKillSwitchOnTrustedEnabled = isDisableKillSwitchOnTrustedEnabled,
+            isStopOnNoInternetEnabled = settings.isStopOnNoInternetEnabled,
-        isTunnelOnUnsecureEnabled = isTunnelOnUnsecureEnabled,
+            isVpnKillSwitchEnabled = settings.isVpnKillSwitchEnabled,
-        wifiDetectionMethod = WifiDetectionMethod.fromValue(wifiDetectionMethod.value),
+            isKernelKillSwitchEnabled = settings.isKernelKillSwitchEnabled,
-        tunnelPingIntervalSeconds = tunnelPingIntervalSeconds,
+            isLanOnKillSwitchEnabled = settings.isLanOnKillSwitchEnabled,
-        tunnelPingAttempts = tunnelPingAttempts,
+            debounceDelaySeconds = settings.debounceDelaySeconds,
-        tunnelPingTimeoutSeconds = tunnelPingTimeoutSeconds,
+            isDisableKillSwitchOnTrustedEnabled = settings.isDisableKillSwitchOnTrustedEnabled,
-        appMode = appMode,
+            isTunnelOnUnsecureEnabled = settings.isTunnelOnUnsecureEnabled,
-        dnsProtocol = dnsProtocol,
+            wifiDetectionMethod =
-        dnsEndpoint = dnsEndpoint,
+                AndroidNetworkMonitor.WifiDetectionMethod.fromValue(
-    )
+                    settings.wifiDetectionMethod.value
-}
+                ),
+            tunnelPingIntervalSeconds = settings.tunnelPingIntervalSeconds,
+            tunnelPingAttempts = settings.tunnelPingAttempts,
+            tunnelPingTimeoutSeconds = settings.tunnelPingTimeoutSeconds,
+        )
+    }
 
-fun GeneralSettings.toSettings(): Settings {
+    fun toSettings(appSettings: AppSettings): Settings {
-    return Settings(
+        return Settings(
-        id = id,
+            id = appSettings.id,
-        isAutoTunnelEnabled = isAutoTunnelEnabled,
+            isAutoTunnelEnabled = appSettings.isAutoTunnelEnabled,
-        isTunnelOnMobileDataEnabled = isTunnelOnMobileDataEnabled,
+            isTunnelOnMobileDataEnabled = appSettings.isTunnelOnMobileDataEnabled,
-        trustedNetworkSSIDs = trustedNetworkSSIDs,
+            trustedNetworkSSIDs = appSettings.trustedNetworkSSIDs,
-        isAlwaysOnVpnEnabled = isAlwaysOnVpnEnabled,
+            isAlwaysOnVpnEnabled = appSettings.isAlwaysOnVpnEnabled,
-        isTunnelOnEthernetEnabled = isTunnelOnEthernetEnabled,
+            isTunnelOnEthernetEnabled = appSettings.isTunnelOnEthernetEnabled,
-        isShortcutsEnabled = isShortcutsEnabled,
+            isShortcutsEnabled = appSettings.isShortcutsEnabled,
-        isTunnelOnWifiEnabled = isTunnelOnWifiEnabled,
+            isTunnelOnWifiEnabled = appSettings.isTunnelOnWifiEnabled,
-        isRestoreOnBootEnabled = isRestoreOnBootEnabled,
+            isKernelEnabled = appSettings.isKernelEnabled,
-        isMultiTunnelEnabled = isMultiTunnelEnabled,
+            isRestoreOnBootEnabled = appSettings.isRestoreOnBootEnabled,
-        isPingEnabled = isPingEnabled,
+            isMultiTunnelEnabled = appSettings.isMultiTunnelEnabled,
-        isWildcardsEnabled = isWildcardsEnabled,
+            isPingEnabled = appSettings.isPingEnabled,
-        isStopOnNoInternetEnabled = isStopOnNoInternetEnabled,
+            isAmneziaEnabled = appSettings.isAmneziaEnabled,
-        isLanOnKillSwitchEnabled = isLanOnKillSwitchEnabled,
+            isWildcardsEnabled = appSettings.isWildcardsEnabled,
-        debounceDelaySeconds = debounceDelaySeconds,
+            isStopOnNoInternetEnabled = appSettings.isStopOnNoInternetEnabled,
-        isDisableKillSwitchOnTrustedEnabled = isDisableKillSwitchOnTrustedEnabled,
+            isVpnKillSwitchEnabled = appSettings.isVpnKillSwitchEnabled,
-        isTunnelOnUnsecureEnabled = isTunnelOnUnsecureEnabled,
+            isKernelKillSwitchEnabled = appSettings.isKernelKillSwitchEnabled,
-        wifiDetectionMethod = WifiDetectionMethod.fromValue(wifiDetectionMethod.value),
+            isLanOnKillSwitchEnabled = appSettings.isLanOnKillSwitchEnabled,
-        tunnelPingIntervalSeconds = tunnelPingIntervalSeconds,
+            debounceDelaySeconds = appSettings.debounceDelaySeconds,
-        tunnelPingAttempts = tunnelPingAttempts,
+            isDisableKillSwitchOnTrustedEnabled = appSettings.isDisableKillSwitchOnTrustedEnabled,
-        tunnelPingTimeoutSeconds = tunnelPingTimeoutSeconds,
+            isTunnelOnUnsecureEnabled = appSettings.isTunnelOnUnsecureEnabled,
-        appMode = appMode,
+            wifiDetectionMethod =
-        dnsProtocol = dnsProtocol,
+                Settings.WifiDetectionMethod.fromValue(appSettings.wifiDetectionMethod.value),
-        dnsEndpoint = dnsEndpoint,
+            tunnelPingIntervalSeconds = appSettings.tunnelPingIntervalSeconds,
-    )
+            tunnelPingAttempts = appSettings.tunnelPingAttempts,
-}
+            tunnelPingTimeoutSeconds = appSettings.tunnelPingTimeoutSeconds,
-
+        )
-fun GeneralSettings.toDomain(): DnsSettings {
+    }
-    return DnsSettings(
-        protocol =
-            DnsProtocol.entries.toTypedArray().getOrElse(dnsProtocol.value) { DnsProtocol.SYSTEM },
-        endpoint = dnsEndpoint,
-    )
-}
-
-fun DnsSettings.toAppSettings(existing: GeneralSettings): GeneralSettings {
-    return existing.copy(dnsProtocol = protocol, dnsEndpoint = endpoint)
 }

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

@@ -1,12 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.model
-
-enum class AppMode(val value: Int) {
-    VPN(0),
-    PROXY(1),
-    LOCK_DOWN(2),
-    KERNEL(3);
-
-    companion object {
-        fun fromValue(value: Int): AppMode = entries.find { it.value == value } ?: VPN
-    }
-}

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

@@ -1,45 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.model
-
-import android.content.Context
-import com.zaneschepke.wireguardautotunnel.R
-
-enum class DnsProtocol(val value: Int) {
-    SYSTEM(0),
-    DOH(1);
-
-    fun asString(context: Context): String {
-        return when (this) {
-            SYSTEM -> context.getString(R.string.system)
-            DOH -> context.getString(R.string.doh)
-        }
-    }
-
-    companion object {
-        fun fromValue(value: Int): DnsProtocol =
-            DnsProtocol.entries.find { it.value == value } ?: SYSTEM
-    }
-}
-
-data class DnsSettings(
-    val protocol: DnsProtocol = DnsProtocol.SYSTEM,
-    val endpoint: String? = null,
-)
-
-enum class DnsProvider(private val systemAddress: String, private val dohAddress: String) {
-    CLOUDFLARE("1.1.1.1", "https://1.1.1.1/dns-query"),
-    ADGUARD("94.140.14.14", "https://94.140.14.14/dns-query");
-
-    fun asAddress(protocol: DnsProtocol): String {
-        return when (protocol) {
-            DnsProtocol.SYSTEM -> systemAddress
-            DnsProtocol.DOH -> dohAddress
-        }
-    }
-
-    companion object {
-        fun fromAddress(address: String): DnsProvider {
-            return entries.find { it.systemAddress == address || it.dohAddress == address }
-                ?: CLOUDFLARE
-        }
-    }
-}

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

@@ -1,17 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.data.model
-
-enum class WifiDetectionMethod(val value: Int) {
-    DEFAULT(0),
-    LEGACY(1),
-    ROOT(2),
-    SHIZUKU(3);
-
-    fun needsLocationPermissions(): Boolean {
-        return this == LEGACY || this == DEFAULT
-    }
-
-    companion object {
-        fun fromValue(value: Int): WifiDetectionMethod =
-            entries.find { it.value == value } ?: DEFAULT
-    }
-}

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

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

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

@@ -3,25 +3,15 @@ package com.zaneschepke.wireguardautotunnel.data.repository
 import com.zaneschepke.wireguardautotunnel.data.DataStoreManager
 import com.zaneschepke.wireguardautotunnel.data.entity.GeneralState
 import com.zaneschepke.wireguardautotunnel.data.mapper.GeneralStateMapper
-import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
-import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
 import com.zaneschepke.wireguardautotunnel.domain.model.AppState
 import com.zaneschepke.wireguardautotunnel.domain.repository.AppStateRepository
 import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.plus
 import timber.log.Timber
 
-class DataStoreAppStateRepository(
+class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager) :
-    private val dataStoreManager: DataStoreManager,
+    AppStateRepository {
-    @ApplicationScope private val applicationScope: CoroutineScope,
-    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-) : AppStateRepository {
     override suspend fun isLocationDisclosureShown(): Boolean {
         return dataStoreManager.getFromStore(DataStoreManager.locationDisclosureShown)
             ?: GeneralState.LOCATION_DISCLOSURE_SHOWN_DEFAULT
@@ -177,9 +167,4 @@ class DataStoreAppStateRepository(
                 } ?: GeneralState()
             }
             .map(GeneralStateMapper::toAppState)
-            .stateIn(
-                scope = applicationScope + ioDispatcher,
-                started = SharingStarted.Eagerly,
-                initialValue = AppState(),
-            )
 }

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

@@ -41,7 +41,7 @@ class GitHubUpdateRepository(
                 val standaloneApkAsset =
                     release.assets.find { asset ->
                         asset.name.startsWith("wgtunnel-${Constants.STANDALONE_FLAVOR}-v") &&
-                            asset.name.endsWith(".apk")
+                                asset.name.endsWith(".apk")
                     }
                 val newVersion =
                     standaloneApkAsset
@@ -53,10 +53,9 @@ class GitHubUpdateRepository(
                 if (isNightly && newVersion != currentVersion)
                     return@map GitHubReleaseMapper.toAppUpdate(release, newVersion)
                 if (NumberUtils.compareVersions(newVersion, currentVersion) > 0) {
-                    GitHubReleaseMapper.toAppUpdate(
+                    GitHubReleaseMapper.toAppUpdate(release.copy(
-                        release.copy(assets = listOf(standaloneApkAsset)),
+                        assets = listOf(standaloneApkAsset)
-                        newVersion,
+                    ), newVersion)
-                    )
                 } else {
                     null
                 }
@@ -104,4 +103,4 @@ class GitHubUpdateRepository(
                 Result.failure(e)
             }
         }
-}
+}

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

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

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

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

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

@@ -2,11 +2,10 @@ package com.zaneschepke.wireguardautotunnel.data.repository
 
 import com.zaneschepke.wireguardautotunnel.data.dao.SettingsDao
 import com.zaneschepke.wireguardautotunnel.data.entity.Settings
-import com.zaneschepke.wireguardautotunnel.data.mapper.toAppSettings
+import com.zaneschepke.wireguardautotunnel.data.mapper.SettingsMapper
-import com.zaneschepke.wireguardautotunnel.data.mapper.toSettings
 import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
-import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings
+import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
-import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
@@ -15,22 +14,18 @@ import kotlinx.coroutines.withContext
 class RoomSettingsRepository(
     private val settingsDoa: SettingsDao,
     @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
-) : GeneralSettingRepository {
+) : AppSettingRepository {
 
-    override suspend fun save(generalSettings: GeneralSettings) {
+    override suspend fun save(appSettings: AppSettings) {
-        withContext(ioDispatcher) { settingsDoa.save(generalSettings.toSettings()) }
+        withContext(ioDispatcher) { settingsDoa.save(SettingsMapper.toSettings(appSettings)) }
     }
 
     override val flow =
-        settingsDoa.getSettingsFlow().flowOn(ioDispatcher).map { it.toAppSettings() }
+        settingsDoa.getSettingsFlow().flowOn(ioDispatcher).map(SettingsMapper::toAppSettings)
 
-    override suspend fun get(): GeneralSettings {
+    override suspend fun get(): AppSettings {
         return withContext(ioDispatcher) {
-            (settingsDoa.getAll().firstOrNull() ?: Settings()).toAppSettings()
+            SettingsMapper.toAppSettings(settingsDoa.getAll().firstOrNull() ?: Settings())
         }
     }
-
-    override suspend fun updateAutoTunnelEnabled(enabled: Boolean) {
-        withContext(ioDispatcher) { settingsDoa.updateAutoTunnelEnabled(enabled) }
-    }
 }

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

@@ -46,10 +46,6 @@ class RoomTunnelRepository(
         }
     }
 
-    override suspend fun resetActiveTunnels() {
-        withContext(ioDispatcher) { tunnelConfigDao.resetActiveTunnels() }
-    }
-
     override suspend fun updateMobileDataTunnel(tunnelConf: TunnelConf?) {
         withContext(ioDispatcher) {
             tunnelConfigDao.resetMobileDataTunnel()
@@ -82,18 +78,6 @@ class RoomTunnelRepository(
         }
     }
 
-    override suspend fun getDefaultTunnel(): TunnelConf? {
-        return withContext(ioDispatcher) {
-            tunnelConfigDao.getDefaultTunnel()?.let(TunnelConfigMapper::toTunnelConf)
-        }
-    }
-
-    override suspend fun getStartTunnel(): TunnelConf? {
-        return withContext(ioDispatcher) {
-            tunnelConfigDao.getStartTunnel()?.let(TunnelConfigMapper::toTunnelConf)
-        }
-    }
-
     override suspend fun count(): Int {
         return withContext(ioDispatcher) { tunnelConfigDao.count().toInt() }
     }
@@ -121,10 +105,4 @@ class RoomTunnelRepository(
             tunnelConfigDao.findByPrimary().map(TunnelConfigMapper::toTunnelConf)
         }
     }
-
-    override suspend fun delete(tunnels: List<TunnelConf>) {
-        withContext(ioDispatcher) {
-            tunnelConfigDao.delete(tunnels.map { TunnelConfigMapper.toTunnelConfig(it) })
-        }
-    }
 }

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

@@ -23,7 +23,6 @@ import kotlinx.coroutines.SupervisorJob
 @Module
 @InstallIn(SingletonComponent::class)
 class AppModule {
-
     @Singleton
     @ApplicationScope
     @Provides

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

@@ -9,5 +9,3 @@ import javax.inject.Qualifier
 @Qualifier @Retention(AnnotationRetention.BINARY) annotation class Kernel
 
 @Qualifier @Retention(AnnotationRetention.BINARY) annotation class Userspace
-
-@Qualifier @Retention(AnnotationRetention.BINARY) annotation class ProxyUserspace

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

@@ -2,14 +2,14 @@ package com.zaneschepke.wireguardautotunnel.di
 
 import javax.inject.Qualifier
 
-@Retention(AnnotationRetention.BINARY) @Qualifier annotation class DefaultDispatcher
+@Retention(AnnotationRetention.RUNTIME) @Qualifier annotation class DefaultDispatcher
 
-@Retention(AnnotationRetention.BINARY) @Qualifier annotation class IoDispatcher
+@Retention(AnnotationRetention.RUNTIME) @Qualifier annotation class IoDispatcher
 
-@Retention(AnnotationRetention.BINARY) @Qualifier annotation class MainDispatcher
+@Retention(AnnotationRetention.RUNTIME) @Qualifier annotation class MainDispatcher
 
 @Retention(AnnotationRetention.BINARY) @Qualifier annotation class MainImmediateDispatcher
 
-@Retention(AnnotationRetention.BINARY) @Qualifier annotation class ApplicationScope
+@Retention(AnnotationRetention.RUNTIME) @Qualifier annotation class ApplicationScope
 
-@Retention(AnnotationRetention.BINARY) @Qualifier annotation class ServiceScope
+@Retention(AnnotationRetention.RUNTIME) @Qualifier annotation class ServiceScope

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

@@ -6,7 +6,6 @@ import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.data.AppDatabase
 import com.zaneschepke.wireguardautotunnel.data.DataStoreManager
 import com.zaneschepke.wireguardautotunnel.data.DatabaseCallback
-import com.zaneschepke.wireguardautotunnel.data.dao.ProxySettingsDao
 import com.zaneschepke.wireguardautotunnel.data.dao.SettingsDao
 import com.zaneschepke.wireguardautotunnel.data.dao.TunnelConfigDao
 import com.zaneschepke.wireguardautotunnel.data.network.GitHubApi
@@ -22,41 +21,20 @@ import dagger.hilt.components.SingletonComponent
 import io.ktor.client.*
 import javax.inject.Singleton
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.CoroutineScope
 
 @Module
 @InstallIn(SingletonComponent::class)
 class RepositoryModule {
-
     @Provides
     @Singleton
-    fun provideGlobalEffectRepository(): GlobalEffectRepository {
+    fun provideDatabase(@ApplicationContext context: Context): AppDatabase {
-        return GlobalEffectRepository()
-    }
-
-    @Provides
-    @Singleton
-    fun provideInstalledPackageRepository(
-        @ApplicationContext context: Context,
-        @ApplicationScope applicationScope: CoroutineScope,
-        @IoDispatcher ioDispatcher: CoroutineDispatcher,
-    ): InstalledPackageRepository {
-        return InstalledAndroidPackageRepository(context, applicationScope, ioDispatcher)
-    }
-
-    @Provides
-    @Singleton
-    fun provideDatabase(
-        @ApplicationContext context: Context,
-        callback: DatabaseCallback,
-    ): AppDatabase {
         return Room.databaseBuilder(
                 context,
                 AppDatabase::class.java,
                 context.getString(R.string.db_name),
             )
             .fallbackToDestructiveMigration(true)
-            .addCallback(callback)
+            .addCallback(DatabaseCallback())
             .build()
     }
 
@@ -66,12 +44,6 @@ class RepositoryModule {
         return appDatabase.settingDao()
     }
 
-    @Singleton
-    @Provides
-    fun provideProxyDoa(appDatabase: AppDatabase): ProxySettingsDao {
-        return appDatabase.proxySettingsDoa()
-    }
-
     @Singleton
     @Provides
     fun provideTunnelConfigDoa(appDatabase: AppDatabase): TunnelConfigDao {
@@ -92,19 +64,10 @@ class RepositoryModule {
     fun provideSettingsRepository(
         settingsDao: SettingsDao,
         @IoDispatcher ioDispatcher: CoroutineDispatcher,
-    ): GeneralSettingRepository {
+    ): AppSettingRepository {
         return RoomSettingsRepository(settingsDao, ioDispatcher)
     }
 
-    @Singleton
-    @Provides
-    fun provideProxySettingsRepository(
-        proxySettingsDao: ProxySettingsDao,
-        @IoDispatcher ioDispatcher: CoroutineDispatcher,
-    ): ProxySettingsRepository {
-        return RoomProxySettingsRepository(proxySettingsDao, ioDispatcher)
-    }
-
     @Singleton
     @Provides
     fun providePreferencesDataStore(
@@ -116,12 +79,18 @@ class RepositoryModule {
 
     @Provides
     @Singleton
-    fun provideGeneralStateRepository(
+    fun provideGeneralStateRepository(dataStoreManager: DataStoreManager): AppStateRepository {
-        dataStoreManager: DataStoreManager,
+        return DataStoreAppStateRepository(dataStoreManager)
-        @ApplicationScope applicationScope: CoroutineScope,
+    }
-        @IoDispatcher ioDispatcher: CoroutineDispatcher,
+
-    ): AppStateRepository {
+    @Provides
-        return DataStoreAppStateRepository(dataStoreManager, applicationScope, ioDispatcher)
+    @Singleton
+    fun provideAppDataRepository(
+        settingsRepository: AppSettingRepository,
+        tunnelRepository: TunnelRepository,
+        appStateRepository: AppStateRepository,
+    ): AppDataRepository {
+        return AppDataRoomRepository(settingsRepository, tunnelRepository, appStateRepository)
     }
 
     @Provides

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

@@ -7,12 +7,11 @@ import com.wireguard.android.util.ToolsInstaller
 import com.zaneschepke.logcatter.LogReader
 import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
 import com.zaneschepke.networkmonitor.NetworkMonitor
+import com.zaneschepke.wireguardautotunnel.core.notification.NotificationManager
 import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
 import com.zaneschepke.wireguardautotunnel.core.tunnel.*
-import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.ProxySettingsRepository
+import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
-import com.zaneschepke.wireguardautotunnel.domain.repository.TunnelRepository
-import com.zaneschepke.wireguardautotunnel.util.extensions.to
 import com.zaneschepke.wireguardautotunnel.util.network.NetworkUtils
 import dagger.Module
 import dagger.Provides
@@ -27,7 +26,6 @@ import kotlinx.coroutines.flow.distinctUntilChangedBy
 import kotlinx.coroutines.flow.map
 import org.amnezia.awg.backend.Backend
 import org.amnezia.awg.backend.GoBackend
-import org.amnezia.awg.backend.ProxyGoBackend
 import org.amnezia.awg.backend.RootTunnelActionHandler
 
 @Module
@@ -50,21 +48,10 @@ class TunnelModule {
 
     @Provides
     @Singleton
-    @Userspace
     fun provideAmneziaBackend(@ApplicationContext context: Context): Backend {
         return GoBackend(context, RootTunnelActionHandler(org.amnezia.awg.util.RootShell(context)))
     }
 
-    @Provides
-    @Singleton
-    @ProxyUserspace
-    fun provideAmneziaProxyBackend(@ApplicationContext context: Context): Backend {
-        return ProxyGoBackend(
-            context,
-            RootTunnelActionHandler(org.amnezia.awg.util.RootShell(context)),
-        )
-    }
-
     @Provides
     @Singleton
     fun provideKernelBackend(
@@ -85,9 +72,11 @@ class TunnelModule {
     @Kernel
     fun provideKernelProvider(
         @ApplicationScope applicationScope: CoroutineScope,
+        serviceManager: ServiceManager,
+        appDataRepository: AppDataRepository,
         backend: com.wireguard.android.backend.Backend,
     ): TunnelProvider {
-        return KernelTunnel(applicationScope, backend)
+        return KernelTunnel(applicationScope, serviceManager, appDataRepository, backend)
     }
 
     @Provides
@@ -95,33 +84,11 @@ class TunnelModule {
     @Userspace
     fun provideUserspaceProvider(
         @ApplicationScope applicationScope: CoroutineScope,
-        proxySettingsRepository: ProxySettingsRepository,
+        serviceManager: ServiceManager,
-        settingsRepository: GeneralSettingRepository,
+        appDataRepository: AppDataRepository,
-        @Userspace backend: Backend,
+        backend: Backend,
     ): TunnelProvider {
-        return UserspaceTunnel(
+        return UserspaceTunnel(applicationScope, serviceManager, appDataRepository, backend)
-            applicationScope,
-            proxySettingsRepository,
-            settingsRepository,
-            backend,
-        )
-    }
-
-    @Provides
-    @Singleton
-    @ProxyUserspace
-    fun provideProxyUserspaceProvider(
-        @ApplicationScope applicationScope: CoroutineScope,
-        settingsRepository: GeneralSettingRepository,
-        proxySettingsRepository: ProxySettingsRepository,
-        @ProxyUserspace backend: Backend,
-    ): TunnelProvider {
-        return UserspaceTunnel(
-            applicationScope,
-            proxySettingsRepository,
-            settingsRepository,
-            backend,
-        )
     }
 
     @Provides
@@ -129,22 +96,15 @@ class TunnelModule {
     fun provideTunnelManager(
         @Kernel kernelTunnel: TunnelProvider,
         @Userspace userspaceTunnel: TunnelProvider,
-        @ProxyUserspace proxyTunnel: TunnelProvider,
+        appDataRepository: AppDataRepository,
-        serviceManager: ServiceManager,
-        tunnelRepository: TunnelRepository,
-        settingsRepository: GeneralSettingRepository,
-        tunnelMonitor: TunnelMonitor,
         @IoDispatcher ioDispatcher: CoroutineDispatcher,
         @ApplicationScope applicationScope: CoroutineScope,
+        notificationManager: NotificationManager,
     ): TunnelManager {
         return TunnelManager(
             kernelTunnel,
             userspaceTunnel,
-            proxyTunnel,
+            appDataRepository,
-            serviceManager,
-            settingsRepository,
-            tunnelRepository,
-            tunnelMonitor,
             applicationScope,
             ioDispatcher,
         )
@@ -154,7 +114,7 @@ class TunnelModule {
     @Singleton
     fun provideNetworkMonitor(
         @ApplicationContext context: Context,
-        settingsRepository: GeneralSettingRepository,
+        settingsRepository: AppSettingRepository,
         @ApplicationScope applicationScope: CoroutineScope,
         @AppShell appShell: RootShell,
     ): NetworkMonitor {
@@ -165,7 +125,7 @@ class TunnelModule {
                     get() =
                         settingsRepository.flow
                             .distinctUntilChangedBy { it.wifiDetectionMethod }
-                            .map { it.wifiDetectionMethod.to() }
+                            .map { it.wifiDetectionMethod }
 
                 override val rootShell: RootShell
                     get() = appShell
@@ -181,29 +141,30 @@ class TunnelModule {
         @IoDispatcher ioDispatcher: CoroutineDispatcher,
         @MainDispatcher mainCoroutineDispatcher: CoroutineDispatcher,
         @ApplicationScope applicationScope: CoroutineScope,
-        settingsRepository: GeneralSettingRepository,
+        appDataRepository: AppDataRepository,
     ): ServiceManager {
         return ServiceManager(
             context,
             ioDispatcher,
             applicationScope,
             mainCoroutineDispatcher,
-            settingsRepository,
+            appDataRepository,
         )
     }
 
     @Singleton
     @Provides
     fun provideTunnelMonitor(
+        @ApplicationContext context: Context,
+        tunnelManager: TunnelManager,
         networkMonitor: NetworkMonitor,
         networkUtils: NetworkUtils,
         logReader: LogReader,
-        tunnelsRepository: TunnelRepository,
+        appDataRepository: AppDataRepository,
-        settingsRepository: GeneralSettingRepository,
     ): TunnelMonitor {
         return TunnelMonitor(
-            settingsRepository,
+            appDataRepository,
-            tunnelsRepository,
+            tunnelManager,
             networkMonitor,
             networkUtils,
             logReader,

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

@@ -1,7 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.enums
-
-sealed class BackendMode {
-    data object Inactive : BackendMode()
-
-    data class KillSwitch(val allowedIps: Set<String>) : BackendMode()
-}

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

@@ -0,0 +1,9 @@
+package com.zaneschepke.wireguardautotunnel.domain.enums
+
+sealed class BackendStatus {
+    data object Inactive : BackendStatus()
+
+    data object Active : BackendStatus()
+
+    data class KillSwitch(val allowedIps: List<String>) : BackendStatus()
+}

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

@@ -6,10 +6,18 @@ sealed class TunnelStatus {
 
     data object Down : TunnelStatus()
 
-    data object Stopping : TunnelStatus()
+    data class Stopping(val reason: StopReason) : TunnelStatus()
 
     data object Starting : TunnelStatus()
 
+    sealed class StopReason {
+        data object User : StopReason()
+
+        data class Ping(val previouslyResolvedEndpoints: Map<String, String?>) : StopReason()
+
+        data object ConfigChanged : StopReason()
+    }
+
     fun isDown(): Boolean {
         return this == Down
     }

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

@@ -5,7 +5,14 @@ import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 sealed class AutoTunnelEvent {
     data class Start(val tunnelConf: TunnelConf? = null) : AutoTunnelEvent()
 
+    data class Bounce(val configsPeerKeyResolvedMap: List<Pair<TunnelConf, Map<String, String?>>>) :
+        AutoTunnelEvent()
+
     data object Stop : AutoTunnelEvent()
 
     data object DoNothing : AutoTunnelEvent()
+
+    data class StartKillSwitch(val allowedIps: List<String>) : AutoTunnelEvent()
+
+    data object StopKillSwitch : AutoTunnelEvent()
 }

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

@@ -3,26 +3,24 @@ package com.zaneschepke.wireguardautotunnel.domain.events
 import com.zaneschepke.wireguardautotunnel.R
 import com.zaneschepke.wireguardautotunnel.util.StringValue
 
-sealed class BackendCoreException : Exception() {
+sealed class BackendError : Exception() {
-    data object DNS : BackendCoreException()
+    data object DNS : BackendError()
 
-    data object Unauthorized : BackendCoreException()
+    data object Unauthorized : BackendError()
 
-    data object Config : BackendCoreException()
+    data object Config : BackendError()
 
-    data object KernelModuleName : BackendCoreException()
+    data object KernelModuleName : BackendError()
 
-    data object NotAuthorized : BackendCoreException()
+    data object NotAuthorized : BackendError()
 
-    data object ServiceNotRunning : BackendCoreException()
+    data object ServiceNotRunning : BackendError()
 
-    data object Unknown : BackendCoreException()
+    data object Unknown : BackendError()
 
-    data object TunnelNameTooLong : BackendCoreException()
+    data object TunnelNameTooLong : BackendError()
 
-    data object UapiUpdateFailed : BackendCoreException()
+    data class BounceFailed(val error: BackendError) : BackendError()
-
-    data class BounceFailed(val error: BackendCoreException) : BackendCoreException()
 
     fun toStringRes() =
         when (this) {
@@ -35,7 +33,6 @@ sealed class BackendCoreException : Exception() {
             Unknown -> R.string.unknown_error
             TunnelNameTooLong -> R.string.error_tunnel_name
             is BounceFailed -> R.string.bounce_failed_template
-            UapiUpdateFailed -> R.string.active_tunnel_update_failed
         }
 
     fun toStringValue(): StringValue {

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/model/AppProxySettings.kt

@@ -1,16 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.model
-
-data class AppProxySettings(
-    val id: Long = 0,
-    val socks5ProxyEnabled: Boolean = false,
-    val socks5ProxyBindAddress: String? = null,
-    val httpProxyEnabled: Boolean = false,
-    val httpProxyBindAddress: String? = null,
-    val proxyUsername: String? = null,
-    val proxyPassword: String? = null,
-) {
-    companion object {
-        const val DEFAULT_SOCKS_BIND_ADDRESS = "127.0.0.1:25344"
-        const val DEFAULT_HTTP_BIND_ADDRESS = "127.0.0.1:25345"
-    }
-}

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

@@ -1,21 +1,21 @@
 package com.zaneschepke.wireguardautotunnel.domain.model
 
-import com.zaneschepke.wireguardautotunnel.data.model.AppMode
+import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
-import com.zaneschepke.wireguardautotunnel.data.model.DnsProtocol
-import com.zaneschepke.wireguardautotunnel.data.model.WifiDetectionMethod
 
-data class GeneralSettings(
+data class AppSettings(
     val id: Int = 0,
     val isAutoTunnelEnabled: Boolean = false,
     val isTunnelOnMobileDataEnabled: Boolean = false,
-    val trustedNetworkSSIDs: Set<String> = emptySet(),
+    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 isStopOnNoInternetEnabled: Boolean = false,
     val isVpnKillSwitchEnabled: Boolean = false,
@@ -24,13 +24,11 @@ data class GeneralSettings(
     val debounceDelaySeconds: Int = 3,
     val isDisableKillSwitchOnTrustedEnabled: Boolean = false,
     val isTunnelOnUnsecureEnabled: Boolean = false,
-    val wifiDetectionMethod: WifiDetectionMethod = WifiDetectionMethod.DEFAULT,
+    val wifiDetectionMethod: AndroidNetworkMonitor.WifiDetectionMethod =
-    val tunnelPingIntervalSeconds: Int = PING_INTERVAL_DEFAULT,
+        AndroidNetworkMonitor.WifiDetectionMethod.DEFAULT,
-    val tunnelPingAttempts: Int = PING_ATTEMPTS_DEFAULT,
+    val tunnelPingIntervalSeconds: Int = 30,
+    val tunnelPingAttempts: Int = 3,
     val tunnelPingTimeoutSeconds: Int? = null,
-    val appMode: AppMode = AppMode.VPN,
-    val dnsProtocol: DnsProtocol = DnsProtocol.SYSTEM,
-    val dnsEndpoint: String? = null,
 ) {
     fun toAutoTunnelStateString(): String {
         return """
@@ -43,9 +41,4 @@ data class GeneralSettings(
         """
             .trimIndent()
     }
-
-    companion object {
-        const val PING_INTERVAL_DEFAULT = 30
-        const val PING_ATTEMPTS_DEFAULT = 3
-    }
 }

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

@@ -3,14 +3,14 @@ package com.zaneschepke.wireguardautotunnel.domain.model
 import com.zaneschepke.wireguardautotunnel.ui.theme.Theme
 
 data class AppState(
-    val isLocationDisclosureShown: Boolean = false,
+    val isLocationDisclosureShown: Boolean,
-    val isBatteryOptimizationDisableShown: Boolean = false,
+    val isBatteryOptimizationDisableShown: Boolean,
-    val isPinLockEnabled: Boolean = false,
+    val isPinLockEnabled: Boolean,
-    val expandedTunnelIds: List<Int> = emptyList(),
+    val expandedTunnelIds: List<Int>,
-    val isLocalLogsEnabled: Boolean = false,
+    val isLocalLogsEnabled: Boolean,
-    val isRemoteControlEnabled: Boolean = false,
+    val isRemoteControlEnabled: Boolean,
-    val showDetailedPingStats: Boolean = false,
+    val showDetailedPingStats: Boolean,
-    val remoteKey: String? = null,
+    val remoteKey: String?,
-    val locale: String? = null,
+    val locale: String?,
-    val theme: Theme = Theme.AUTOMATIC,
+    val theme: Theme,
 )

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/model/InstalledPackage.kt

@@ -1,3 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.model
-
-data class InstalledPackage(val name: String, val packageName: String, val uId: Int)

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

@@ -1,8 +1,8 @@
 package com.zaneschepke.wireguardautotunnel.domain.model
 
+import com.wireguard.android.backend.Tunnel
 import com.wireguard.config.Config
-import com.zaneschepke.wireguardautotunnel.util.extensions.defaultName
+import com.zaneschepke.wireguardautotunnel.util.extensions.*
-import com.zaneschepke.wireguardautotunnel.util.extensions.isValidIpv4orIpv6Address
 import java.io.InputStream
 import java.nio.charset.StandardCharsets
 
@@ -10,7 +10,7 @@ data class TunnelConf(
     val id: Int = 0,
     val tunName: String,
     val wgQuick: String,
-    val tunnelNetworks: Set<String> = emptySet(),
+    val tunnelNetworks: List<String> = emptyList(),
     val isMobileDataTunnel: Boolean = false,
     val isPrimaryTunnel: Boolean = false,
     val amQuick: String,
@@ -20,9 +20,14 @@ data class TunnelConf(
     val isEthernetTunnel: Boolean = false,
     val isIpv4Preferred: Boolean = true,
     val position: Int = 0,
-) {
+    @Transient private var stateChangeCallback: ((Any) -> Unit)? = null,
+) : Tunnel, org.amnezia.awg.backend.Tunnel {
 
-    val isNameKernelCompatible: Boolean = (tunName.length <= 15)
+    val isNameKernelCompatible: Boolean = (name.length <= 15)
+
+    fun setStateChangeCallback(callback: (Any) -> Unit) {
+        stateChangeCallback = callback
+    }
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
@@ -52,6 +57,38 @@ data class TunnelConf(
         return toAmConfig().peers.all { it.endpoint.get().host.isValidIpv4orIpv6Address() }
     }
 
+    fun copyWithCallback(
+        id: Int = this.id,
+        tunName: String = this.tunName,
+        wgQuick: String = this.wgQuick,
+        tunnelNetworks: List<String> = this.tunnelNetworks,
+        isMobileDataTunnel: Boolean = this.isMobileDataTunnel,
+        isPrimaryTunnel: Boolean = this.isPrimaryTunnel,
+        amQuick: String = this.amQuick,
+        isActive: Boolean = this.isActive,
+        restartOnPingFailure: Boolean = this.restartOnPingFailure,
+        pingIp: String? = this.pingTarget,
+        isEthernetTunnel: Boolean = this.isEthernetTunnel,
+        isIpv4Preferred: Boolean = this.isIpv4Preferred,
+    ): TunnelConf {
+        return TunnelConf(
+                id,
+                tunName,
+                wgQuick,
+                tunnelNetworks,
+                isMobileDataTunnel,
+                isPrimaryTunnel,
+                amQuick,
+                isActive,
+                pingIp,
+                restartOnPingFailure,
+                isEthernetTunnel,
+                isIpv4Preferred,
+                position,
+            )
+            .apply { stateChangeCallback = this@TunnelConf.stateChangeCallback }
+    }
+
     fun toAmConfig(): org.amnezia.awg.config.Config {
         return configFromAmQuick(amQuick.ifBlank { wgQuick })
     }
@@ -60,6 +97,34 @@ data class TunnelConf(
         return configFromWgQuick(wgQuick)
     }
 
+    override fun getName(): String = tunName
+
+    override fun isIpv4ResolutionPreferred(): Boolean = isIpv4Preferred
+
+    override fun onStateChange(newState: org.amnezia.awg.backend.Tunnel.State) {
+        stateChangeCallback?.invoke(newState)
+    }
+
+    override fun onStateChange(newState: Tunnel.State) {
+        stateChangeCallback?.invoke(newState)
+    }
+
+    fun generateUniqueName(tunnelNames: List<String>): String {
+        var tunnelName = this.tunName
+        var num = 1
+        while (tunnelNames.any { it == tunnelName }) {
+            tunnelName =
+                if (!tunnelName.hasNumberInParentheses()) {
+                    "$name($num)"
+                } else {
+                    val pair = tunnelName.extractNameAndNumber()
+                    "${pair?.first}($num)"
+                }
+            num++
+        }
+        return tunnelName
+    }
+
     companion object {
         fun configFromWgQuick(wgQuick: String): Config {
             val inputStream: InputStream = wgQuick.byteInputStream()
@@ -73,22 +138,12 @@ data class TunnelConf(
             }
         }
 
-        fun tunnelConfFromQuick(amQuick: String, name: String? = null): TunnelConf {
+        fun tunnelConfigFromAmConfig(
-            val config = configFromAmQuick(amQuick)
-            val wgQuick = config.toWgQuickString(true)
-            return TunnelConf(
-                tunName = name ?: config.defaultName(),
-                wgQuick = wgQuick,
-                amQuick = amQuick,
-            )
-        }
-
-        private fun tunnelConfFromAmConfig(
             config: org.amnezia.awg.config.Config,
             name: String? = null,
         ): TunnelConf {
-            val amQuick = config.toAwgQuickString(true, false)
+            val amQuick = config.toAwgQuickString(true)
-            val wgQuick = config.toWgQuickString(true)
+            val wgQuick = config.toWgQuickString()
             return TunnelConf(
                 tunName = name ?: config.defaultName(),
                 wgQuick = wgQuick,
@@ -99,8 +154,8 @@ data class TunnelConf(
         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)
-        val IPV4_PUBLIC_NETWORKS =
+        private val IPV4_PUBLIC_NETWORKS =
-            setOf(
+            listOf(
                 "0.0.0.0/5",
                 "8.0.0.0/7",
                 "11.0.0.0/8",
@@ -132,6 +187,6 @@ data class TunnelConf(
                 "200.0.0.0/5",
                 "208.0.0.0/4",
             )
-        val LAN_BYPASS_ALLOWED_IPS = setOf(IPV6_ALL_NETWORKS) + IPV4_PUBLIC_NETWORKS
+        val LAN_BYPASS_ALLOWED_IPS = listOf(IPV6_ALL_NETWORKS) + IPV4_PUBLIC_NETWORKS
     }
 }

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

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

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

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

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

@@ -1,18 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.repository
-
-import com.zaneschepke.wireguardautotunnel.domain.sideeffect.GlobalSideEffect
-import javax.inject.Singleton
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.asSharedFlow
-
-@Singleton
-class GlobalEffectRepository {
-
-    private val _globalEffectFlow =
-        MutableSharedFlow<GlobalSideEffect>(replay = 0, extraBufferCapacity = 1)
-    val flow = _globalEffectFlow.asSharedFlow()
-
-    suspend fun post(effect: GlobalSideEffect) {
-        _globalEffectFlow.emit(effect)
-    }
-}

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

@@ -1,14 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.repository
-
-import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings
-import kotlinx.coroutines.flow.Flow
-
-interface GeneralSettingRepository {
-    suspend fun save(generalSettings: GeneralSettings)
-
-    val flow: Flow<GeneralSettings>
-
-    suspend fun get(): GeneralSettings
-
-    suspend fun updateAutoTunnelEnabled(enabled: Boolean)
-}

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

@@ -1,12 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.repository
-
-import com.zaneschepke.wireguardautotunnel.domain.model.InstalledPackage
-
-interface InstalledPackageRepository {
-
-    // gets packages from cache or queries and updates cache if empty
-    suspend fun getInstalledPackages(): List<InstalledPackage>
-
-    // updates the cache and returns the results
-    suspend fun refreshInstalledPackages(): List<InstalledPackage>
-}

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

@@ -1,12 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.repository
-
-import com.zaneschepke.wireguardautotunnel.domain.model.AppProxySettings
-import kotlinx.coroutines.flow.Flow
-
-interface ProxySettingsRepository {
-    suspend fun save(proxySettings: AppProxySettings)
-
-    val flow: Flow<AppProxySettings>
-
-    suspend fun get(): AppProxySettings
-}

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

@@ -15,8 +15,6 @@ interface TunnelRepository {
 
     suspend fun updatePrimaryTunnel(tunnelConf: TunnelConf?)
 
-    suspend fun resetActiveTunnels()
-
     suspend fun updateMobileDataTunnel(tunnelConf: TunnelConf?)
 
     suspend fun updateEthernetTunnel(tunnelConf: TunnelConf?)
@@ -27,10 +25,6 @@ interface TunnelRepository {
 
     suspend fun getActive(): Tunnels
 
-    suspend fun getDefaultTunnel(): TunnelConf?
-
-    suspend fun getStartTunnel(): TunnelConf?
-
     suspend fun count(): Int
 
     suspend fun findByTunnelName(name: String): TunnelConf?
@@ -40,6 +34,4 @@ interface TunnelRepository {
     suspend fun findByMobileDataTunnel(): Tunnels
 
     suspend fun findPrimary(): Tunnels
-
-    suspend fun delete(tunnels: List<TunnelConf>)
 }

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/sideeffect/GlobalSideEffect.kt

@@ -1,27 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.sideeffect
-
-import com.zaneschepke.wireguardautotunnel.data.model.AppMode
-import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
-import com.zaneschepke.wireguardautotunnel.util.StringValue
-import java.io.File
-
-sealed class GlobalSideEffect {
-    data object RequestBatteryOptimizationDisabled : GlobalSideEffect()
-
-    data class Snackbar(val message: StringValue) : GlobalSideEffect()
-
-    data class Toast(val message: StringValue) : GlobalSideEffect()
-
-    data object PopBackStack : GlobalSideEffect()
-
-    data class ShareFile(val file: File) : GlobalSideEffect()
-
-    data class LaunchUrl(val url: String) : GlobalSideEffect()
-
-    data object ConfigChanged : GlobalSideEffect()
-
-    data class RequestVpnPermission(val requestingMode: AppMode, val config: TunnelConf?) :
-        GlobalSideEffect()
-
-    data class InstallApk(val apk: File) : GlobalSideEffect()
-}

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

@@ -2,21 +2,20 @@ package com.zaneschepke.wireguardautotunnel.domain.state
 
 import com.zaneschepke.wireguardautotunnel.core.service.autotunnel.StateChange
 import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent
-import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent.DoNothing
+import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent.*
-import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent.Start
+import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
-import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings
 import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
 import com.zaneschepke.wireguardautotunnel.util.extensions.isMatchingToWildcardList
 
 data class AutoTunnelState(
-    val activeTunnels: Map<Int, TunnelState> = emptyMap(),
+    val activeTunnels: Map<TunnelConf, TunnelState> = emptyMap(),
     val networkState: NetworkState = NetworkState(),
-    val settings: GeneralSettings = GeneralSettings(),
+    val settings: AppSettings = AppSettings(),
     val tunnels: List<TunnelConf> = emptyList(),
 ) {
 
     fun determineAutoTunnelEvent(stateChange: StateChange): AutoTunnelEvent {
-        when (stateChange) {
+        when (val change = stateChange) {
             is StateChange.NetworkChange,
             is StateChange.SettingsChange -> {
                 // Compute desired tunnel based on network conditions
@@ -41,7 +40,7 @@ data class AutoTunnelState(
 
                 // Handle tunnel start/stop/change
                 if (desiredTunnel != null) {
-                    if (currentTunnel != desiredTunnel.id) {
+                    if (currentTunnel != desiredTunnel) {
                         // Start or switch to the desired tunnel (overrides any kill switch)
                         return Start(desiredTunnel)
                     }
@@ -54,6 +53,22 @@ data class AutoTunnelState(
                         return AutoTunnelEvent.Stop
                     }
                 }
+                // Handle kill switch only if no user tunnel is or will be active
+                if (stopKillSwitchOnTrusted()) {
+                    return AutoTunnelEvent.StopKillSwitch
+                }
+                if (startKillSwitch()) {
+                    val allowedIps =
+                        if (settings.isLanOnKillSwitchEnabled) TunnelConf.LAN_BYPASS_ALLOWED_IPS
+                        else emptyList()
+                    return StartKillSwitch(allowedIps)
+                }
+            }
+            is StateChange.MonitoringChange -> {
+                val bounceTunnels = bounceOnPingFailed()
+                if (bounceTunnels.isNotEmpty()) {
+                    return Bounce(bounceTunnels)
+                }
             }
 
             is StateChange.ActiveTunnelsChange -> Unit
@@ -91,19 +106,48 @@ data class AutoTunnelState(
         return !networkState.isEthernetConnected && networkState.isWifiConnected
     }
 
+    private fun stopKillSwitchOnTrusted(): Boolean {
+        return networkState.isWifiConnected &&
+            settings.isVpnKillSwitchEnabled &&
+            settings.isDisableKillSwitchOnTrustedEnabled &&
+            isCurrentSSIDTrusted()
+    }
+
+    private fun startKillSwitch(): Boolean {
+        return settings.isVpnKillSwitchEnabled &&
+            (!settings.isDisableKillSwitchOnTrustedEnabled || !isCurrentSSIDTrusted())
+    }
+
     private fun isNoConnectivity(): Boolean {
         return !networkState.isEthernetConnected &&
             !networkState.isWifiConnected &&
             !networkState.isMobileDataConnected
     }
 
+    private fun bounceOnPingFailed(): List<Pair<TunnelConf, Map<String, String?>>> {
+        return activeTunnels.entries
+            .filter { (tunnel, state) ->
+                tunnel.restartOnPingFailure &&
+                    (state.pingStates?.any { (key, pingState) ->
+                        pingState.failureReason == FailureReason.PingFailed
+                    } ?: false)
+            }
+            .map { (tunnel, state) ->
+                val peerMap =
+                    (state.statistics?.getPeers()?.associate { peerKey ->
+                        peerKey.toBase64() to state.statistics.peerStats(peerKey)?.resolvedEndpoint
+                    } ?: emptyMap())
+                Pair(tunnel, peerMap)
+            }
+    }
+
     private fun isCurrentSSIDTrusted(): Boolean {
         return networkState.wifiName?.let { hasTrustedWifiName(it) } == true
     }
 
     private fun hasTrustedWifiName(
         wifiName: String,
-        wifiNames: Set<String> = settings.trustedNetworkSSIDs,
+        wifiNames: List<String> = settings.trustedNetworkSSIDs,
     ): Boolean {
         return if (settings.isWildcardsEnabled) {
             wifiNames.isMatchingToWildcardList(wifiName)

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

@@ -1,3 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.domain.state
-
-data class LogHealthState(val isHealthy: Boolean, val timestamp: Long = System.currentTimeMillis())

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

@@ -1,56 +1,13 @@
 package com.zaneschepke.wireguardautotunnel.domain.state
 
-import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
+import com.zaneschepke.wireguardautotunnel.domain.enums.BackendStatus
 import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
 import org.amnezia.awg.crypto.Key
 
 data class TunnelState(
     val status: TunnelStatus = TunnelStatus.Down,
-    val backendState: BackendMode = BackendMode.Inactive,
+    val backendState: BackendStatus = BackendStatus.Inactive,
     val statistics: TunnelStatistics? = null,
     val pingStates: Map<Key, PingState>? = null,
-    val logHealthState: LogHealthState? = null,
+    val handshakeSuccessLogs: Boolean? = null,
-) {
+)
-
-    fun health(): Health {
-        val now = System.currentTimeMillis()
-
-        if (pingStates == null && logHealthState == null && statistics == null)
-            return Health.UNKNOWN
-
-        // Logs check take precedent
-        logHealthState?.let { log ->
-            if (!log.isHealthy) return Health.UNHEALTHY
-            val recent = (now - log.timestamp) <= LOG_HEALTH_SUCCESS_TIMEOUT_MS
-            if (recent) {
-                // Logs healthy but override if pings are unhealthy
-                if (pingStates?.any { !it.value.isReachable } == true) return Health.UNHEALTHY
-                return Health.HEALTHY
-            }
-        }
-
-        // Ping health if no logs
-        pingStates?.let { pings ->
-            if (pings.any { !it.value.isReachable }) return Health.UNHEALTHY
-            return Health.HEALTHY
-        }
-
-        // Stats health if no logs or pings
-        statistics?.let { stats ->
-            return if (stats.isTunnelStale()) Health.STALE else Health.HEALTHY
-        }
-
-        return Health.UNKNOWN
-    }
-
-    enum class Health {
-        UNKNOWN,
-        UNHEALTHY,
-        HEALTHY,
-        STALE,
-    }
-
-    companion object {
-        const val LOG_HEALTH_SUCCESS_TIMEOUT_MS = 2 * 60 * 1000L // 2 minutes
-    }
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/Locals.kt

@@ -1,13 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui
-
-import androidx.compose.runtime.compositionLocalOf
-import androidx.compose.runtime.staticCompositionLocalOf
-import androidx.navigation.NavHostController
-import com.zaneschepke.wireguardautotunnel.viewmodel.SharedAppViewModel
-
-val LocalNavController =
-    compositionLocalOf<NavHostController> { error("NavController was not provided") }
-
-val LocalIsAndroidTV = staticCompositionLocalOf { false }
-
-val LocalSharedVm = staticCompositionLocalOf<SharedAppViewModel> { error("No SharedVm") }

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/Route.kt

@@ -0,0 +1,52 @@
+package com.zaneschepke.wireguardautotunnel.ui
+
+import kotlinx.serialization.Serializable
+
+sealed class Route {
+    @Serializable data object Support : Route()
+
+    @Serializable data object Settings : Route()
+
+    @Serializable data object SettingsAdvanced : Route()
+
+    @Serializable data object AutoTunnel : Route()
+
+    @Serializable data object AutoTunnelAdvanced : Route()
+
+    @Serializable data object WifiDetectionMethod : Route()
+
+    @Serializable data object LocationDisclosure : Route()
+
+    @Serializable data object Appearance : Route()
+
+    @Serializable data object Display : Route()
+
+    @Serializable data object KillSwitch : Route()
+
+    @Serializable data object Language : Route()
+
+    @Serializable data object Main : Route()
+
+    @Serializable data class TunnelOptions(val id: Int) : Route()
+
+    @Serializable data object Lock : Route()
+
+    @Serializable data object License : Route()
+
+    @Serializable data class Config(val id: Int) : Route()
+
+    @Serializable
+    data class SplitTunnel(val id: Int) : Route() {
+        companion object {
+            const val KEY_ID = "id"
+        }
+    }
+
+    @Serializable data class TunnelAutoTunnel(val id: Int) : Route()
+
+    @Serializable data object Logs : Route()
+
+    @Serializable data object Sort : Route()
+
+    @Serializable data object TunnelMonitoring : Route()
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/ExpandingRowListItem.kt

@@ -22,7 +22,7 @@ fun ExpandingRowListItem(
     text: String,
     trailing: @Composable () -> Unit,
     isSelected: Boolean,
-    expanded: (@Composable () -> Unit),
+    expanded: @Composable () -> Unit,
     modifier: Modifier = Modifier,
 ) {
     Box(

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/SecureScreenFromRecording.kt

@@ -1,25 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common
-
-import android.view.WindowManager
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.ui.platform.LocalContext
-import com.zaneschepke.wireguardautotunnel.MainActivity
-
-@Composable
-fun SecureScreenFromRecording() {
-    val context = LocalContext.current
-
-    val activity = context as? MainActivity
-
-    // Secure screen due to sensitive information
-    DisposableEffect(Unit) {
-        activity
-            ?.window
-            ?.setFlags(
-                WindowManager.LayoutParams.FLAG_SECURE,
-                WindowManager.LayoutParams.FLAG_SECURE,
-            )
-        onDispose { activity?.window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE) }
-    }
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/animation/ShimmerEffect.kt

@@ -0,0 +1,34 @@
+package com.zaneschepke.wireguardautotunnel.ui.common.animation
+
+import androidx.compose.animation.core.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+
+@Composable
+fun ShimmerEffect(modifier: Modifier = Modifier): Brush {
+    val shimmerColors =
+        listOf(
+            Color.LightGray.copy(alpha = 0.9f),
+            Color.LightGray.copy(alpha = 0.3f),
+            Color.LightGray.copy(alpha = 0.9f),
+        )
+
+    val transition = rememberInfiniteTransition()
+    val translateAnim by
+        transition.animateFloat(
+            initialValue = 0f,
+            targetValue = 1000f,
+            animationSpec =
+                infiniteRepeatable(animation = tween(durationMillis = 1200, easing = LinearEasing)),
+        )
+
+    return Brush.linearGradient(
+        colors = shimmerColors,
+        start = Offset(0f, 0f),
+        end = Offset(translateAnim, translateAnim),
+    )
+}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/banner/AppAlertBanner.kt

@@ -1,42 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.banner
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-
-@Composable
-fun AppAlertBanner(
-    message: String,
-    textColor: Color,
-    containerColor: Color,
-    modifier: Modifier = Modifier,
-) {
-    Box(
-        modifier =
-            modifier
-                .fillMaxWidth()
-                .height(IntrinsicSize.Min)
-                .background(
-                    color = containerColor,
-                    shape = RoundedCornerShape(bottomStart = 8.dp, bottomEnd = 8.dp),
-                )
-                .clip(RoundedCornerShape(bottomStart = 8.dp, bottomEnd = 8.dp))
-                .statusBarsPadding()
-    ) {
-        Text(
-            text = message,
-            color = textColor,
-            style = MaterialTheme.typography.labelSmall.copy(fontSize = 8.sp),
-            modifier = Modifier.align(Alignment.Center).padding(bottom = 5.dp),
-        )
-    }
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/button/ActionIconButton.kt

@@ -1,21 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.button
-
-import androidx.compose.foundation.layout.size
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.res.stringResource
-import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
-
-@Composable
-fun ActionIconButton(icon: ImageVector, labelRes: Int, onClick: () -> Unit) {
-    IconButton(onClick = onClick) {
-        Icon(
-            icon,
-            contentDescription = stringResource(labelRes),
-            modifier = Modifier.size(iconSize),
-        )
-    }
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/button/IconSurfaceButton.kt

@@ -12,10 +12,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItemLabel
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionLabelType
 
-@Composable
+@androidx.compose.runtime.Composable
 fun IconSurfaceButton(
     title: String,
     onClick: () -> Unit,
@@ -46,18 +44,18 @@ fun IconSurfaceButton(
                 horizontalAlignment = Alignment.Start,
             ) {
                 Row(
-                    verticalAlignment = Alignment.CenterVertically,
+                    verticalAlignment = Alignment.Companion.CenterVertically,
                     horizontalArrangement = Arrangement.spacedBy(16.dp),
                 ) {
                     Row(
                         horizontalArrangement = Arrangement.spacedBy(16.dp),
-                        verticalAlignment = Alignment.CenterVertically,
+                        verticalAlignment = Alignment.Companion.CenterVertically,
                         modifier =
                             Modifier.padding(vertical = if (description == null) 10.dp else 0.dp),
                     ) {
                         leading?.invoke()
                         Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
-                            SelectionItemLabel(title, SelectionLabelType.TITLE)
+                            Text(title, style = MaterialTheme.typography.titleMedium)
                             description?.let {
                                 Text(
                                     description,

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/button/LaunchButton.kt

@@ -1,19 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.button
-
-import androidx.compose.foundation.focusable
-import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.outlined.Launch
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
-
-@Composable
-fun LaunchButton(modifier: Modifier = Modifier.focusable(), onClick: () -> Unit) {
-    IconButton(modifier = modifier, onClick = onClick) {
-        val icon = Icons.AutoMirrored.Outlined.Launch
-        Icon(icon, icon.name, Modifier.size(iconSize))
-    }
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/button/LinkIconButton.kt

@@ -1,19 +0,0 @@
-package com.zaneschepke.wireguardautotunnel.ui.common.button
-
-import androidx.compose.foundation.focusable
-import androidx.compose.foundation.layout.size
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.outlined.OpenInNew
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import com.zaneschepke.wireguardautotunnel.ui.theme.iconSize
-
-@Composable
-fun LinkIconButton(modifier: Modifier = Modifier.focusable(), onClick: () -> Unit) {
-    IconButton(modifier = modifier, onClick = onClick) {
-        val icon = Icons.AutoMirrored.Outlined.OpenInNew
-        Icon(icon, icon.name, Modifier.size(iconSize))
-    }
-}

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/common/button/SelectionItemButton.kt

@@ -4,28 +4,24 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Card
+import androidx.compose.material3.*
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.ripple
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionItemLabel
-import com.zaneschepke.wireguardautotunnel.ui.common.button.surface.SelectionLabelType
 
 @Composable
 fun SelectionItemButton(
-    buttonText: String,
-    description: String? = null,
-    onClick: () -> Unit,
-    modifier: Modifier = Modifier,
     leading: (@Composable () -> Unit)? = null,
+    buttonText: String,
     trailing: (@Composable () -> Unit)? = null,
+    onClick: () -> Unit,
     ripple: Boolean = true,
+    modifier: Modifier = Modifier,
 ) {
     Card(
         modifier =
@@ -36,39 +32,23 @@ fun SelectionItemButton(
                     interactionSource = remember { MutableInteractionSource() },
                     onClick = { onClick() },
                 )
-                .height(IntrinsicSize.Min)
+                .height(56.dp),
-                .padding(horizontal = 12.dp)
-                .padding(end = 12.dp),
         colors = CardDefaults.cardColors(containerColor = Color.Transparent),
     ) {
         Row(
             verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.Start,
             modifier = Modifier.fillMaxSize().padding(horizontal = 12.dp),
         ) {
-            Row(
+            leading?.let { it() }
-                verticalAlignment = Alignment.CenterVertically,
+            Text(
-                horizontalArrangement = Arrangement.spacedBy(24.dp),
+                buttonText,
-            ) {
+                style = MaterialTheme.typography.labelMedium,
-                leading?.let { it() }
+                color = MaterialTheme.colorScheme.onSurface,
-                Column(
+                modifier = Modifier.fillMaxWidth(3 / 4f),
-                    horizontalAlignment = Alignment.Start,
+                maxLines = 2,
-                    modifier = Modifier.weight(1f).padding(end = 12.dp),
+                overflow = TextOverflow.Ellipsis,
-                    verticalArrangement = Arrangement.Center,
+            )
-                ) {
-                    SelectionItemLabel(
-                        buttonText,
-                        SelectionLabelType.TITLE,
-                        modifier = Modifier.weight(1f).padding(end = 24.dp),
-                    )
-                    description?.let {
-                        SelectionItemLabel(
-                            it,
-                            SelectionLabelType.DESCRIPTION,
-                            modifier = Modifier.weight(1f).padding(end = 24.dp),
-                        )
-                    }
-                }
-            }
             trailing?.let { it() }
         }
     }