mirror of
https://github.com/wgtunnel/android.git
synced 2026-07-03 14:07:49 +02:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Zane Schepke
|
4b2714c151 |
@@ -69,7 +69,7 @@ jobs:
|
||||
run: mkdir ${{ github.workspace }}/temp
|
||||
|
||||
- name: Download artifacts
|
||||
uses: actions/download-artifact@v5
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
pattern: android_artifacts_*
|
||||
path: ${{ github.workspace }}/temp
|
||||
|
||||
@@ -108,7 +108,7 @@ jobs:
|
||||
run: mkdir ${{ github.workspace }}/temp
|
||||
|
||||
- name: Download artifacts
|
||||
uses: actions/download-artifact@v5
|
||||
uses: actions/download-artifact@v4
|
||||
with:
|
||||
pattern: android_artifacts_*
|
||||
path: ${{ github.workspace }}/temp
|
||||
|
||||
@@ -9,7 +9,6 @@ plugins {
|
||||
alias(libs.plugins.compose.compiler)
|
||||
alias(libs.plugins.grgit)
|
||||
alias(libs.plugins.licensee)
|
||||
id("kotlin-parcelize")
|
||||
}
|
||||
|
||||
android {
|
||||
@@ -198,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)
|
||||
@@ -229,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") {
|
||||
|
||||
@@ -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')"
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -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')"
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -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')"
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -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()
|
||||
}
|
||||
|
||||
@@ -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-->
|
||||
<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" />
|
||||
<!--foreground service exempt android 14-->
|
||||
<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" />
|
||||
@@ -48,10 +47,6 @@
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent>
|
||||
<intent>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
|
||||
</intent>
|
||||
</queries>
|
||||
<application
|
||||
android:name=".WireGuardAutoTunnel"
|
||||
@@ -152,45 +147,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">
|
||||
<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>
|
||||
tools:node="merge" />
|
||||
|
||||
<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"
|
||||
|
||||
@@ -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,83 +24,86 @@ 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.domain.model.TunnelConf
|
||||
import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
|
||||
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.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.Route
|
||||
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.*
|
||||
import com.zaneschepke.wireguardautotunnel.viewmodel.*
|
||||
import com.zaneschepke.wireguardautotunnel.util.extensions.isRunningOnTv
|
||||
import com.zaneschepke.wireguardautotunnel.util.extensions.restartApp
|
||||
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 xyz.teamgravity.pin_lock_compose.PinManager
|
||||
import org.amnezia.awg.backend.GoBackend.VpnService
|
||||
|
||||
@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(
|
||||
@@ -110,44 +114,32 @@ class MainActivity : AppCompatActivity() {
|
||||
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()
|
||||
|
||||
var pinManagerInitialized by remember { mutableStateOf(false) }
|
||||
|
||||
LaunchedEffect(appState.isAppLoaded) {
|
||||
if (appState.isAppLoaded) {
|
||||
if (appState.pinLockEnabled && !pinManagerInitialized) {
|
||||
PinManager.initialize(this@MainActivity)
|
||||
pinManagerInitialized = true
|
||||
}
|
||||
appState.locale.let { LocaleUtil.changeLocale(it) }
|
||||
}
|
||||
}
|
||||
|
||||
val navState by
|
||||
navController.currentBackStackEntryAsNavbarState(viewModel, navController)
|
||||
val backStackEntry by navController.currentBackStackEntryAsState()
|
||||
val navBarState by
|
||||
currentNavBackStackEntryAsNavBarState(
|
||||
navController,
|
||||
backStackEntry,
|
||||
viewModel,
|
||||
appUiState,
|
||||
appViewState,
|
||||
)
|
||||
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() {
|
||||
batteryActivity.launch(
|
||||
Intent().apply {
|
||||
action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
|
||||
data = "package:${this@MainActivity.packageName}".toUri()
|
||||
with(appViewState) {
|
||||
LaunchedEffect(isConfigChanged) {
|
||||
if (isConfigChanged) {
|
||||
Intent(this@MainActivity, MainActivity::class.java).also {
|
||||
startActivity(it)
|
||||
exitProcess(0)
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
LaunchedEffect(Unit) {
|
||||
viewModel.globalSideEffect.collect { sideEffect ->
|
||||
when (sideEffect) {
|
||||
GlobalSideEffect.ConfigChanged -> restartApp()
|
||||
GlobalSideEffect.PopBackStack -> navController.popBackStack()
|
||||
GlobalSideEffect.RequestBatteryOptimizationDisabled ->
|
||||
requestDisableBatteryOptimizations()
|
||||
is GlobalSideEffect.RequestVpnPermission -> {
|
||||
requestingAppMode = Pair(sideEffect.requestingMode, sideEffect.config)
|
||||
}
|
||||
LaunchedEffect(errorMessage) {
|
||||
errorMessage?.let {
|
||||
snackbar.showSnackbar(it.asString(this@MainActivity))
|
||||
viewModel.handleEvent(AppEvent.MessageShown)
|
||||
}
|
||||
}
|
||||
LaunchedEffect(popBackStack) {
|
||||
if (popBackStack) {
|
||||
navController.popBackStack()
|
||||
viewModel.handleEvent(AppEvent.PopBackStack(false))
|
||||
}
|
||||
}
|
||||
LaunchedEffect(requestVpnPermission) {
|
||||
if (requestVpnPermission) {
|
||||
if (!vpnPermissionDenied) {
|
||||
vpnActivity.launch(VpnService.prepare(this@MainActivity))
|
||||
} else {
|
||||
showVpnPermissionDialog = true
|
||||
}
|
||||
is GlobalSideEffect.ShareFile -> context.launchShareFile(sideEffect.file)
|
||||
is GlobalSideEffect.Snackbar ->
|
||||
scope.launch {
|
||||
snackbar.showSnackbar(sideEffect.message.asString(context))
|
||||
viewModel.handleEvent(AppEvent.VpnPermissionRequested)
|
||||
}
|
||||
}
|
||||
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,
|
||||
LocalSharedVm provides viewModel,
|
||||
LocalNavController provides navController,
|
||||
) {
|
||||
WireguardAutoTunnelTheme(theme = appState.theme) {
|
||||
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),
|
||||
)
|
||||
}
|
||||
CompositionLocalProvider(LocalIsAndroidTV provides isTv) {
|
||||
CompositionLocalProvider(LocalNavController provides navController) {
|
||||
WireguardAutoTunnelTheme(theme = appUiState.appState.theme) {
|
||||
VpnDeniedDialog(
|
||||
showVpnPermissionDialog,
|
||||
onDismiss = {
|
||||
showVpnPermissionDialog = false
|
||||
vpnPermissionDenied = false
|
||||
},
|
||||
)
|
||||
|
||||
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,133 +259,83 @@ class MainActivity : AppCompatActivity() {
|
||||
.imePadding()
|
||||
) {
|
||||
NavHost(
|
||||
navController = navController,
|
||||
navController,
|
||||
startDestination =
|
||||
if (appState.pinLockEnabled && !appState.isAuthorized)
|
||||
Route.Lock
|
||||
else Route.TunnelsGraph,
|
||||
(if (appUiState.appState.isPinLockEnabled) Route.Lock
|
||||
else Route.Main),
|
||||
) {
|
||||
composable<Route.Lock> { PinLockScreen() }
|
||||
navigation<Route.TunnelsGraph>(
|
||||
startDestination = Route.Tunnels
|
||||
) {
|
||||
composable<Route.Tunnels> {
|
||||
val viewModel =
|
||||
it.sharedViewModel<TunnelsViewModel>(navController)
|
||||
TunnelsScreen(viewModel)
|
||||
}
|
||||
composable<Route.Sort> {
|
||||
val viewModel =
|
||||
it.sharedViewModel<TunnelsViewModel>(navController)
|
||||
SortScreen(viewModel)
|
||||
}
|
||||
composable<Route.TunnelOptions> { backStackEntry ->
|
||||
val args = backStackEntry.toRoute<Route.TunnelOptions>()
|
||||
val viewModel =
|
||||
backStackEntry.sharedViewModel<TunnelsViewModel>(
|
||||
navController
|
||||
)
|
||||
TunnelOptionsScreen(args.id, viewModel)
|
||||
}
|
||||
composable<Route.SplitTunnel> { backStackEntry ->
|
||||
val args = backStackEntry.toRoute<Route.SplitTunnel>()
|
||||
SplitTunnelScreen(args.id)
|
||||
}
|
||||
composable<Route.TunnelAutoTunnel> { backStackEntry ->
|
||||
val args =
|
||||
backStackEntry.toRoute<Route.TunnelAutoTunnel>()
|
||||
val viewModel =
|
||||
backStackEntry.sharedViewModel<TunnelsViewModel>(
|
||||
navController
|
||||
)
|
||||
TunnelAutoTunnelScreen(args.id, viewModel)
|
||||
}
|
||||
composable<Route.Config> { backStackEntry ->
|
||||
val args = backStackEntry.toRoute<Route.Config>()
|
||||
val viewModel =
|
||||
backStackEntry.sharedViewModel<TunnelsViewModel>(
|
||||
navController
|
||||
)
|
||||
ConfigScreen(args.id, viewModel)
|
||||
}
|
||||
composable<Route.Main> {
|
||||
MainScreen(appUiState, appViewState, viewModel)
|
||||
}
|
||||
|
||||
navigation<Route.AutoTunnelGraph>(
|
||||
startDestination =
|
||||
if (appState.isLocationDisclosureShown) Route.AutoTunnel
|
||||
else Route.LocationDisclosure
|
||||
) {
|
||||
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.Settings> {
|
||||
SettingsScreen(appUiState, appViewState, viewModel)
|
||||
}
|
||||
|
||||
navigation<Route.SettingsGraph>(
|
||||
startDestination = Route.Settings
|
||||
) {
|
||||
composable<Route.Settings> {
|
||||
val viewModel =
|
||||
it.sharedViewModel<SettingsViewModel>(navController)
|
||||
SettingsScreen(viewModel)
|
||||
}
|
||||
composable<Route.TunnelMonitoring> {
|
||||
val viewModel =
|
||||
it.sharedViewModel<SettingsViewModel>(navController)
|
||||
TunnelMonitoringScreen(viewModel)
|
||||
}
|
||||
composable<Route.SystemFeatures> {
|
||||
val viewModel =
|
||||
it.sharedViewModel<SettingsViewModel>(navController)
|
||||
SystemFeaturesScreen(viewModel)
|
||||
}
|
||||
composable<Route.Dns> {
|
||||
val viewModel =
|
||||
it.sharedViewModel<SettingsViewModel>(navController)
|
||||
DnsSettingsScreen(viewModel)
|
||||
}
|
||||
composable<Route.ProxySettings> { ProxySettingsScreen() }
|
||||
composable<Route.Appearance> { AppearanceScreen() }
|
||||
composable<Route.Language> { LanguageScreen() }
|
||||
composable<Route.Display> { DisplayScreen() }
|
||||
composable<Route.Logs> { LogsScreen() }
|
||||
composable<Route.SettingsAdvanced> {
|
||||
SettingsAdvancedScreen(appUiState, viewModel)
|
||||
}
|
||||
|
||||
navigation<Route.SupportGraph>(
|
||||
startDestination = Route.Support
|
||||
) {
|
||||
composable<Route.Support> {
|
||||
val viewModel =
|
||||
it.sharedViewModel<SupportViewModel>(navController)
|
||||
SupportScreen(viewModel)
|
||||
}
|
||||
composable<Route.License> { LicenseScreen() }
|
||||
composable<Route.Donate> { DonateScreen(navController) }
|
||||
composable<Route.Addresses> { AddressesScreen() }
|
||||
composable<Route.LocationDisclosure> {
|
||||
LocationDisclosureScreen(viewModel)
|
||||
}
|
||||
composable<Route.AutoTunnel> {
|
||||
AutoTunnelScreen(appUiState, viewModel)
|
||||
}
|
||||
composable<Route.Appearance> { AppearanceScreen() }
|
||||
composable<Route.Language> {
|
||||
LanguageScreen(appUiState, viewModel)
|
||||
}
|
||||
composable<Route.Display> {
|
||||
DisplayScreen(appUiState, viewModel)
|
||||
}
|
||||
composable<Route.Support> {
|
||||
SupportScreen(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, 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)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -414,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, _, _ ->
|
||||
lifecycleScope.launch {
|
||||
onCompleteListener { success, message, exitCode ->
|
||||
lifecycleScope.launch(mainDispatcher) {
|
||||
if (success) {
|
||||
showToast(
|
||||
getString(
|
||||
@@ -431,9 +375,7 @@ class MainActivity : AppCompatActivity() {
|
||||
)
|
||||
)
|
||||
restartApp()
|
||||
} else {
|
||||
showToast(R.string.backup_failed)
|
||||
}
|
||||
} else showToast(R.string.backup_failed)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -447,8 +389,8 @@ class MainActivity : AppCompatActivity() {
|
||||
.enableLogDebug(true)
|
||||
.backupLocation(RoomBackup.BACKUP_FILE_LOCATION_CUSTOM_DIALOG)
|
||||
.apply {
|
||||
onCompleteListener { success, _, _ ->
|
||||
lifecycleScope.launch {
|
||||
onCompleteListener { success, message, exitCode ->
|
||||
lifecycleScope.launch(mainDispatcher) {
|
||||
if (success) {
|
||||
showToast(
|
||||
getString(
|
||||
@@ -457,9 +399,7 @@ class MainActivity : AppCompatActivity() {
|
||||
)
|
||||
)
|
||||
restartApp()
|
||||
} else {
|
||||
showToast(R.string.restore_failed)
|
||||
}
|
||||
} else showToast(R.string.restore_failed)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ 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
|
||||
@@ -12,19 +13,16 @@ import com.zaneschepke.wireguardautotunnel.core.worker.ServiceWorker
|
||||
import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
|
||||
import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
|
||||
import com.zaneschepke.wireguardautotunnel.di.MainDispatcher
|
||||
import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
|
||||
import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
|
||||
import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
|
||||
import com.zaneschepke.wireguardautotunnel.util.LocaleUtil
|
||||
import com.zaneschepke.wireguardautotunnel.util.ReleaseTree
|
||||
import dagger.hilt.android.HiltAndroidApp
|
||||
import javax.inject.Inject
|
||||
import kotlinx.coroutines.CoroutineDispatcher
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.cancel
|
||||
import kotlinx.coroutines.*
|
||||
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
|
||||
@@ -66,11 +64,6 @@ class WireGuardAutoTunnel : Application(), Configuration.Provider {
|
||||
Timber.plant(ReleaseTree())
|
||||
}
|
||||
|
||||
applicationScope.launch(ioDispatcher) {
|
||||
launch { if (appDataRepository.appState.isLocalLogsEnabled()) logReader.start() }
|
||||
launch { notificationMonitor.handleApplicationNotifications() }
|
||||
}
|
||||
|
||||
GoBackend.setAlwaysOnCallback {
|
||||
applicationScope.launch {
|
||||
val settings = appDataRepository.settings.get()
|
||||
@@ -84,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.setBackendState(BackendState.INACTIVE, emptyList())
|
||||
super.onTerminate()
|
||||
}
|
||||
|
||||
|
||||
+3
-3
@@ -31,9 +31,9 @@ class NotificationActionReceiver : BroadcastReceiver() {
|
||||
NotificationAction.AUTO_TUNNEL_OFF.name -> serviceManager.stopAutoTunnel()
|
||||
NotificationAction.TUNNEL_OFF.name -> {
|
||||
val tunnelId = intent.getIntExtra(NotificationManager.EXTRA_ID, 0)
|
||||
if (tunnelId == STOP_ALL_TUNNELS_ID)
|
||||
return@launch tunnelManager.stopActiveTunnels()
|
||||
tunnelRepository.getById(tunnelId)?.let { tunnelManager.stopTunnel(it.id) }
|
||||
if (tunnelId == STOP_ALL_TUNNELS_ID) return@launch tunnelManager.stopTunnel()
|
||||
val tunnel = tunnelRepository.getById(tunnelId)
|
||||
tunnelManager.stopTunnel(tunnel)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+3
-3
@@ -71,11 +71,11 @@ class RemoteControlReceiver : BroadcastReceiver() {
|
||||
Action.STOP_TUNNEL -> {
|
||||
val tunnelName =
|
||||
intent.getStringExtra(EXTRA_TUN_NAME)
|
||||
?: return@launch tunnelManager.stopActiveTunnels()
|
||||
?: return@launch tunnelManager.stopTunnel()
|
||||
val tunnel =
|
||||
appDataRepository.tunnels.findByTunnelName(tunnelName)
|
||||
?: return@launch tunnelManager.stopActiveTunnels()
|
||||
tunnelManager.stopTunnel(tunnel.id)
|
||||
?: return@launch tunnelManager.stopTunnel()
|
||||
tunnelManager.stopTunnel(tunnel)
|
||||
}
|
||||
Action.START_AUTO_TUNNEL -> serviceManager.startAutoTunnel()
|
||||
Action.STOP_AUTO_TUNNEL -> serviceManager.stopAutoTunnel()
|
||||
|
||||
+17
-3
@@ -24,7 +24,6 @@ class RestartReceiver : BroadcastReceiver() {
|
||||
|
||||
@Inject lateinit var serviceManager: ServiceManager
|
||||
|
||||
// injecting this should let tunnelManger handle clean startup
|
||||
@Inject lateinit var tunnelManager: TunnelManager
|
||||
|
||||
@Inject lateinit var logReader: LogReader
|
||||
@@ -35,7 +34,22 @@ class RestartReceiver : BroadcastReceiver() {
|
||||
Timber.d("RestartReceiver triggered with action: ${intent.action}")
|
||||
serviceManager.updateTunnelTile()
|
||||
serviceManager.updateAutoTunnelTile()
|
||||
if (intent.action == Intent.ACTION_MY_PACKAGE_REPLACED)
|
||||
applicationScope.launch(ioDispatcher) { logReader.deleteAndClearLogs() }
|
||||
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()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+4
-4
@@ -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
|
||||
|
||||
|
||||
+6
-6
@@ -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(
|
||||
|
||||
-153
@@ -1,153 +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.AppDataRepository
|
||||
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
|
||||
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 appDataRepository: AppDataRepository
|
||||
|
||||
private val tunnelJobs = ConcurrentMap<Int, Job>()
|
||||
|
||||
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 obsoleteJobs = tunnelJobs.keys - activeTunConfigs
|
||||
obsoleteJobs.forEach { tunId -> tunnelJobs[tunId]?.cancel() }
|
||||
activeTunConfigs.forEach { tunId ->
|
||||
if (tunnelJobs.contains(tunId)) return@forEach
|
||||
tunnelJobs[tunId] = launch { tunnelMonitor.startMonitoring(tunId, true) }
|
||||
}
|
||||
val tunnels = appDataRepository.tunnels.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")
|
||||
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,
|
||||
)
|
||||
),
|
||||
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),
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -1,5 +0,0 @@
|
||||
package com.zaneschepke.wireguardautotunnel.core.service
|
||||
|
||||
import android.os.Binder
|
||||
|
||||
class LocalBinder(val service: TunnelService) : Binder()
|
||||
+52
-71
@@ -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.di.ApplicationScope
|
||||
import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
|
||||
import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
|
||||
import com.zaneschepke.wireguardautotunnel.util.extensions.requestAutoTunnelTileServiceUpdate
|
||||
import com.zaneschepke.wireguardautotunnel.util.extensions.requestTunnelTileServiceStateUpdate
|
||||
import jakarta.inject.Inject
|
||||
import kotlinx.coroutines.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,45 +26,29 @@ class ServiceManager
|
||||
@Inject
|
||||
constructor(
|
||||
private val context: Context,
|
||||
@IoDispatcher ioDispatcher: CoroutineDispatcher,
|
||||
@ApplicationScope applicationScope: CoroutineScope,
|
||||
private val ioDispatcher: CoroutineDispatcher,
|
||||
private val applicationScope: CoroutineScope,
|
||||
private val mainDispatcher: CoroutineDispatcher,
|
||||
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()
|
||||
|
||||
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 =
|
||||
when {
|
||||
name.className.contains("VpnForegroundService") -> "VpnForegroundService"
|
||||
name.className.contains("TunnelForegroundService") ->
|
||||
"TunnelForegroundService"
|
||||
else -> "Unknown"
|
||||
}
|
||||
Timber.d("$serviceClass connected")
|
||||
Timber.d("TunnelForegroundService connected")
|
||||
}
|
||||
|
||||
override fun onServiceDisconnected(name: ComponentName) {
|
||||
_tunnelService.value = null
|
||||
val serviceClass =
|
||||
when {
|
||||
name.className.contains("VpnForegroundService") -> "VpnForegroundService"
|
||||
name.className.contains("TunnelForegroundService") ->
|
||||
"TunnelForegroundService"
|
||||
else -> "Unknown"
|
||||
}
|
||||
Timber.d("$serviceClass disconnected")
|
||||
Timber.d("TunnelForegroundService disconnected")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -83,74 +66,72 @@ constructor(
|
||||
}
|
||||
}
|
||||
|
||||
init {
|
||||
// Observe changes to the AutoTunnelService and trigger side effects
|
||||
applicationScope.launch(ioDispatcher) {
|
||||
_autoTunnelService
|
||||
.onEach { service ->
|
||||
withContext(mainDispatcher) { updateAutoTunnelTile() }
|
||||
if (service == null) {
|
||||
// The service is disconnected, update the DB state
|
||||
val settings = appDataRepository.settings.get()
|
||||
appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = false))
|
||||
}
|
||||
}
|
||||
.launchIn(this)
|
||||
}
|
||||
}
|
||||
|
||||
fun hasVpnPermission(): Boolean {
|
||||
return VpnService.prepare(context) == null
|
||||
}
|
||||
|
||||
suspend fun startAutoTunnel() {
|
||||
autoTunnelMutex.withLock {
|
||||
val settings = appDataRepository.settings.get()
|
||||
appDataRepository.settings.save(settings.copy(isAutoTunnelEnabled = true))
|
||||
if (_autoTunnelService.value != null) return
|
||||
val intent = Intent(context, AutoTunnelService::class.java)
|
||||
context.startForegroundService(intent)
|
||||
context.bindService(intent, autoTunnelServiceConnection, Context.BIND_AUTO_CREATE)
|
||||
withContext(ioDispatcher) {
|
||||
val intent = Intent(context, AutoTunnelService::class.java)
|
||||
context.startForegroundService(intent)
|
||||
context.bindService(intent, autoTunnelServiceConnection, Context.BIND_AUTO_CREATE)
|
||||
withContext(mainDispatcher) { updateAutoTunnelTile() }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
suspend fun stopAutoTunnel() =
|
||||
suspend fun stopAutoTunnel() {
|
||||
autoTunnelMutex.withLock {
|
||||
if (_autoTunnelService.value == null) return@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 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 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()
|
||||
|
||||
+148
-2
@@ -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) :
|
||||
BaseTunnelForegroundService()
|
||||
class TunnelForegroundService : LifecycleService() {
|
||||
|
||||
@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),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
package com.zaneschepke.wireguardautotunnel.core.service
|
||||
|
||||
interface TunnelService {
|
||||
fun start()
|
||||
|
||||
fun stop()
|
||||
}
|
||||
-8
@@ -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()
|
||||
+99
-9
@@ -16,19 +16,22 @@ 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.BackendState
|
||||
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.model.TunnelConf
|
||||
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
|
||||
@@ -58,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)
|
||||
@@ -91,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.getBackendState() != BackendState.KILL_SWITCH_ACTIVE
|
||||
) {
|
||||
eventHandlerJob?.cancel()
|
||||
val allowedIps =
|
||||
if (settings.isLanOnKillSwitchEnabled) TunnelConf.LAN_BYPASS_ALLOWED_IPS
|
||||
else emptyList()
|
||||
tunnelManager.setBackendState(BackendState.KILL_SWITCH_ACTIVE, allowedIps)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun launchWatcherNotification(
|
||||
description: String = getString(R.string.monitoring_state_changes)
|
||||
) {
|
||||
@@ -109,7 +134,6 @@ class AutoTunnelService : LifecycleService() {
|
||||
NotificationAction.AUTO_TUNNEL_OFF
|
||||
)
|
||||
),
|
||||
onGoing = true,
|
||||
)
|
||||
ServiceCompat.startForeground(
|
||||
this,
|
||||
@@ -134,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,
|
||||
@@ -151,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}")
|
||||
}
|
||||
@@ -182,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))
|
||||
@@ -207,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 &&
|
||||
@@ -221,7 +271,7 @@ class AutoTunnelService : LifecycleService() {
|
||||
old.isStopOnNoInternetEnabled == new.isStopOnNoInternetEnabled)
|
||||
}
|
||||
|
||||
private fun combineSettings(): Flow<Pair<GeneralSettings, Tunnels>> {
|
||||
private fun combineSettings(): Flow<Pair<AppSettings, Tunnels>> {
|
||||
return combine(
|
||||
appDataRepository
|
||||
.get()
|
||||
@@ -269,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() } ||
|
||||
@@ -346,8 +396,47 @@ class AutoTunnelService : LifecycleService() {
|
||||
(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.setBackendState(BackendState.KILL_SWITCH_ACTIVE, event.allowedIps)
|
||||
}
|
||||
AutoTunnelEvent.StopKillSwitch -> {
|
||||
Timber.d("Stopping kill switch")
|
||||
tunnelManager.setBackendState(BackendState.SERVICE_ACTIVE, emptySet())
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
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)"
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -368,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
|
||||
}
|
||||
}
|
||||
|
||||
+9
-3
@@ -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()
|
||||
}
|
||||
|
||||
+8
-9
@@ -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.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
|
||||
@@ -63,15 +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 tunnels = appDataRepository.tunnels.getAll()
|
||||
val activeTunNames =
|
||||
tunnels.filter { activeTunnels.keys.contains(it.id) }.map { it.tunName }
|
||||
updateTileForActiveTunnels(activeTunNames)
|
||||
updateTileForActiveTunnels(activeTunnels)
|
||||
}
|
||||
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) {
|
||||
1 -> activeTunnelNames[0]
|
||||
when (activeTunnels.size) {
|
||||
1 -> activeTunnels.keys.first().tunName
|
||||
else -> getString(R.string.multiple)
|
||||
}
|
||||
updateTile(tileName, true)
|
||||
@@ -112,7 +111,7 @@ 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()) {
|
||||
appDataRepository.getStartTunnelConfig()?.let { tunnelManager.startTunnel(it) }
|
||||
|
||||
+1
-1
@@ -44,7 +44,7 @@ class ShortcutsActivity : ComponentActivity() {
|
||||
tunnelConfig?.let {
|
||||
when (intent.action) {
|
||||
Action.START.name -> tunnelManager.startTunnel(it)
|
||||
Action.STOP.name -> tunnelManager.stopActiveTunnels()
|
||||
Action.STOP.name -> tunnelManager.stopTunnel()
|
||||
else -> Unit
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,21 +1,22 @@
|
||||
package com.zaneschepke.wireguardautotunnel.core.tunnel
|
||||
|
||||
import com.wireguard.android.backend.Tunnel
|
||||
import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
|
||||
import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
|
||||
import com.zaneschepke.wireguardautotunnel.domain.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.TunnelConf
|
||||
import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
|
||||
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.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
|
||||
@@ -24,60 +25,58 @@ import org.amnezia.awg.crypto.Key
|
||||
import timber.log.Timber
|
||||
|
||||
abstract class BaseTunnel(
|
||||
@ApplicationScope protected val applicationScope: CoroutineScope,
|
||||
protected val appDataRepository: AppDataRepository,
|
||||
protected val serviceManager: ServiceManager,
|
||||
private val applicationScope: CoroutineScope,
|
||||
private val appDataRepository: AppDataRepository,
|
||||
private val serviceManager: ServiceManager,
|
||||
) : TunnelProvider {
|
||||
|
||||
protected val errors = MutableSharedFlow<Pair<String, BackendCoreException>>()
|
||||
override val errorEvents = errors.asSharedFlow()
|
||||
private val _errorEvents = MutableSharedFlow<Pair<TunnelConf, BackendError>>()
|
||||
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 override fun handleDnsReresolve(tunnelConf: TunnelConf): Boolean
|
||||
|
||||
abstract override fun getStatistics(tunnelId: Int): TunnelStatistics?
|
||||
abstract fun stopBackend(tunnel: TunnelConf)
|
||||
|
||||
override fun hasVpnPermission(): Boolean {
|
||||
return serviceManager.hasVpnPermission()
|
||||
}
|
||||
|
||||
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")
|
||||
cleanUpTunJob(tunnelId)
|
||||
currentTuns - tunnelId
|
||||
Timber.d("Removing tunnel ${tunnelConf.id} from activeTunnels as state is DOWN")
|
||||
cleanUpTunJob(tunnelConf)
|
||||
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 =
|
||||
@@ -85,15 +84,17 @@ abstract class BaseTunnel(
|
||||
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)
|
||||
@@ -101,43 +102,191 @@ abstract class BaseTunnel(
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun startTunnel(tunnelConf: TunnelConf) {
|
||||
tunMutex.withLock {
|
||||
if (activeTuns.value.containsKey(tunnelConf.id) || tunJobs.containsKey(tunnelConf.id)) {
|
||||
return Timber.w("Tunnel is already running: ${tunnelConf.tunName}")
|
||||
private fun configureTunnelCallbacks(tunnelConf: TunnelConf) {
|
||||
Timber.d("Configuring TunnelConf instance: ${tunnelConf.hashCode()}")
|
||||
tunnelConf.setStateChangeCallback { state ->
|
||||
applicationScope.launch {
|
||||
Timber.d(
|
||||
"State change callback triggered for tunnel ${tunnelConf.id}: ${tunnelConf.tunName} with state $state at ${System.currentTimeMillis()}"
|
||||
)
|
||||
when (state) {
|
||||
is Tunnel.State -> updateTunnelStatus(tunnelConf, state.asTunnelState())
|
||||
is org.amnezia.awg.backend.Tunnel.State ->
|
||||
updateTunnelStatus(tunnelConf, state.asTunnelState())
|
||||
}
|
||||
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 ->
|
||||
updateTunnelStatus(tunnelConf.id, status)
|
||||
serviceManager.updateTunnelTile()
|
||||
}
|
||||
} catch (e: BackendCoreException) {
|
||||
errors.emit(tunnelConf.tunName to e)
|
||||
updateTunnelStatus(tunnelConf.id, TunnelStatus.Down)
|
||||
} catch (_: CancellationException) {}
|
||||
Timber.d("Starting tunnel ${tunnelConf.id}...")
|
||||
startTunnelInner(tunnelConf)
|
||||
Timber.d("Started complete for tunnel ${tunnelConf.name}...")
|
||||
// catch cancellation that could occur before and during startTunnelInner
|
||||
// and trigger at that suspend point
|
||||
} catch (e: 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) {
|
||||
tunMutex.withLock {
|
||||
updateTunnelStatus(tunnelId, TunnelStatus.Stopping)
|
||||
tunJobs[tunnelId]?.cancel() // Triggers awaitClose to stop backend
|
||||
private suspend fun startTunnelInner(tunnelConf: TunnelConf) {
|
||||
configureTunnelCallbacks(tunnelConf)
|
||||
Timber.d("Starting backend for tunnel ${tunnelConf.id}...")
|
||||
|
||||
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) {
|
||||
Timber.d("Removing job for $tunnelId")
|
||||
tunJobs -= tunnelId
|
||||
private suspend fun saveTunnelActiveState(tunnelConf: TunnelConf, active: Boolean) {
|
||||
val tunnelCopy = tunnelConf.copyWithCallback(isActive = active)
|
||||
appDataRepository.tunnels.save(tunnelCopy)
|
||||
}
|
||||
|
||||
override suspend fun stopTunnel(tunnelConf: TunnelConf?, reason: TunnelStatus.StopReason) {
|
||||
if (tunnelConf == null) return stopActiveTunnels()
|
||||
tunMutex.withLock {
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,102 +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.BackendMode
|
||||
import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
|
||||
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.toBackendCoreException
|
||||
import java.util.concurrent.ConcurrentHashMap
|
||||
import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
|
||||
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,
|
||||
serviceManager: ServiceManager,
|
||||
appDataRepository: AppDataRepository,
|
||||
@Kernel private val backend: Backend,
|
||||
private val backend: Backend,
|
||||
) : BaseTunnel(applicationScope, appDataRepository, serviceManager) {
|
||||
|
||||
private val runtimeTunnels = ConcurrentHashMap<Int, WgTunnel>()
|
||||
|
||||
// TODO Add DNS settings
|
||||
override fun tunnelStateFlow(tunnelConf: TunnelConf): Flow<TunnelStatus> = callbackFlow {
|
||||
if (!tunnelConf.isNameKernelCompatible) close(BackendCoreException.TunnelNameTooLong)
|
||||
|
||||
val stateChannel = Channel<WgTunnel.State>()
|
||||
|
||||
val runtimeTunnel = RuntimeWgTunnel(tunnelConf, stateChannel)
|
||||
runtimeTunnels[tunnelConf.id] = runtimeTunnel
|
||||
|
||||
val consumerJob = launch {
|
||||
stateChannel.consumeAsFlow().collect { state -> trySend(state.asTunnelState()) }
|
||||
}
|
||||
|
||||
try {
|
||||
updateTunnelStatus(tunnelConf.id, TunnelStatus.Starting)
|
||||
backend.setState(runtimeTunnel, WgTunnel.State.UP, tunnelConf.toWgConfig())
|
||||
} catch (e: BackendException) {
|
||||
close(e.toBackendCoreException())
|
||||
} catch (e: IllegalArgumentException) {
|
||||
Timber.e(e, "Invalid backend arguments")
|
||||
close(BackendCoreException.Config)
|
||||
} catch (e: Exception) {
|
||||
Timber.e(e, "Error while setting tunnel state")
|
||||
close(BackendCoreException.Unknown)
|
||||
}
|
||||
|
||||
awaitClose {
|
||||
try {
|
||||
backend.setState(runtimeTunnel, WgTunnel.State.DOWN, null)
|
||||
} catch (e: BackendException) {
|
||||
errors.tryEmit(tunnelConf.tunName to e.toBackendCoreException())
|
||||
} finally {
|
||||
consumerJob.cancel()
|
||||
stateChannel.close()
|
||||
runtimeTunnels.remove(tunnelConf.id)
|
||||
trySend(TunnelStatus.Down)
|
||||
close()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun getStatistics(tunnelId: Int): TunnelStatistics? {
|
||||
override fun getStatistics(tunnelConf: TunnelConf): TunnelStatistics? {
|
||||
return try {
|
||||
val runtimeTunnel = runtimeTunnels[tunnelId] ?: return null
|
||||
WireGuardStatistics(backend.getStatistics(runtimeTunnel))
|
||||
WireGuardStatistics(backend.getStatistics(tunnelConf))
|
||||
} 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 setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
|
||||
Timber.w("Not yet implemented for kernel")
|
||||
}
|
||||
|
||||
override fun getBackendMode(): BackendMode {
|
||||
return BackendMode.Inactive
|
||||
}
|
||||
|
||||
override fun handleDnsReresolve(tunnelConf: TunnelConf): Boolean {
|
||||
throw NotImplementedError()
|
||||
override fun getBackendState(): BackendState {
|
||||
return BackendState.INACTIVE
|
||||
}
|
||||
|
||||
override suspend fun runningTunnelNames(): Set<String> {
|
||||
|
||||
@@ -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
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
+48
-279
@@ -1,178 +1,52 @@
|
||||
package com.zaneschepke.wireguardautotunnel.core.tunnel
|
||||
|
||||
import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
|
||||
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.BackendState
|
||||
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.AppDataRepository
|
||||
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 kotlin.concurrent.atomics.AtomicReference
|
||||
import kotlin.concurrent.atomics.ExperimentalAtomicApi
|
||||
import kotlinx.coroutines.*
|
||||
import kotlinx.coroutines.channels.Channel
|
||||
import kotlinx.coroutines.CoroutineDispatcher
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.ExperimentalCoroutinesApi
|
||||
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,
|
||||
@Userspace private val userspaceTunnel: TunnelProvider,
|
||||
@ProxyUserspace private val proxyUserspaceTunnel: TunnelProvider,
|
||||
private val serviceManager: ServiceManager,
|
||||
private val kernelTunnel: TunnelProvider,
|
||||
private val userspaceTunnel: TunnelProvider,
|
||||
private val appDataRepository: AppDataRepository,
|
||||
@ApplicationScope applicationScope: CoroutineScope,
|
||||
@IoDispatcher ioDispatcher: CoroutineDispatcher,
|
||||
applicationScope: CoroutineScope,
|
||||
ioDispatcher: CoroutineDispatcher,
|
||||
) : TunnelProvider {
|
||||
|
||||
private data class SideEffectState(
|
||||
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)
|
||||
|
||||
@OptIn(ExperimentalCoroutinesApi::class)
|
||||
private val tunnelProviderFlow =
|
||||
appDataRepository.settings.flow
|
||||
.filterNotNull()
|
||||
// ignore default state
|
||||
.filterNot { it == GeneralSettings() }
|
||||
.distinctUntilChanged { old, new ->
|
||||
old.appMode == new.appMode &&
|
||||
old.isLanOnKillSwitchEnabled == new.isLanOnKillSwitchEnabled
|
||||
.flatMapLatest { settings ->
|
||||
MutableStateFlow(if (settings.isKernelEnabled) kernelTunnel else userspaceTunnel)
|
||||
}
|
||||
.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 {
|
||||
val activeTunsReference: AtomicReference<Map<Int, TunnelState>> =
|
||||
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 ->
|
||||
handleActiveTunnelsChange(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
|
||||
},
|
||||
),
|
||||
)
|
||||
|
||||
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,
|
||||
appDataRepository.tunnels.flow,
|
||||
appDataRepository.settings.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(),
|
||||
)
|
||||
}
|
||||
override val activeTunnels: StateFlow<Map<TunnelConf, TunnelState>> =
|
||||
tunnelProviderFlow.value.activeTunnels
|
||||
|
||||
@OptIn(ExperimentalCoroutinesApi::class)
|
||||
override val errorEvents: SharedFlow<Pair<String, BackendCoreException>> =
|
||||
override val errorEvents: SharedFlow<Pair<TunnelConf, BackendError>> =
|
||||
tunnelProviderFlow
|
||||
.flatMapLatest { it.errorEvents }
|
||||
.shareIn(
|
||||
@@ -182,184 +56,79 @@ 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 val bouncingTunnelIds: ConcurrentHashMap<Int, TunnelStatus.StopReason> =
|
||||
tunnelProviderFlow.value.bouncingTunnelIds
|
||||
|
||||
override fun hasVpnPermission(): Boolean {
|
||||
return userspaceTunnel.hasVpnPermission()
|
||||
}
|
||||
|
||||
override fun getStatistics(tunnelId: Int): TunnelStatistics? {
|
||||
return tunnelProviderFlow.value.getStatistics(tunnelId)
|
||||
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) {
|
||||
tunnelProviderFlow.value.stopTunnel(tunnelId)
|
||||
override suspend fun stopTunnel(tunnelConf: TunnelConf?, reason: TunnelStatus.StopReason) {
|
||||
tunnelProviderFlow.value.stopTunnel(tunnelConf, reason)
|
||||
}
|
||||
|
||||
override suspend fun stopActiveTunnels() {
|
||||
tunnelProviderFlow.value.stopActiveTunnels()
|
||||
override suspend fun bounceTunnel(tunnelConf: TunnelConf, reason: TunnelStatus.StopReason) {
|
||||
tunnelProviderFlow.value.bounceTunnel(tunnelConf, reason)
|
||||
}
|
||||
|
||||
override fun setBackendMode(backendMode: BackendMode) {
|
||||
tunnelProviderFlow.value.setBackendMode(backendMode)
|
||||
override fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
|
||||
tunnelProviderFlow.value.setBackendState(backendState, allowedIps)
|
||||
}
|
||||
|
||||
override fun getBackendMode(): BackendMode {
|
||||
return tunnelProviderFlow.value.getBackendMode()
|
||||
override fun getBackendState(): BackendState {
|
||||
return tunnelProviderFlow.value.getBackendState()
|
||||
}
|
||||
|
||||
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(
|
||||
appMode: AppMode,
|
||||
activeTuns: Map<Int, TunnelState>,
|
||||
) {
|
||||
if (activeTuns.isEmpty()) serviceManager.stopTunnelService()
|
||||
if (activeTuns.isNotEmpty() && serviceManager.tunnelService.value == null)
|
||||
serviceManager.startTunnelService(appMode)
|
||||
}
|
||||
|
||||
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 (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 = appDataRepository.settings.flow.first()
|
||||
suspend fun restorePreviousState() {
|
||||
val settings = appDataRepository.settings.get()
|
||||
if (settings.isRestoreOnBootEnabled) {
|
||||
// if auto tun enabled, reset active and restore auto tun, letting it start appropriate
|
||||
// tuns
|
||||
if (settings.isAutoTunnelEnabled) {
|
||||
appDataRepository.tunnels.resetActiveTunnels()
|
||||
return serviceManager.startAutoTunnel()
|
||||
}
|
||||
val tunnels = appDataRepository.tunnels.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
|
||||
appDataRepository.tunnels.resetActiveTunnels()
|
||||
startTunnel(it)
|
||||
}
|
||||
// kernel supports multi
|
||||
AppMode.KERNEL ->
|
||||
tunnels.filter { it.isActive }.forEach { conf -> startTunnel(conf) }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun handleTunnelMonitoringChanges(
|
||||
activeTuns: Map<Int, TunnelState>,
|
||||
configs: List<TunnelConf>,
|
||||
) {
|
||||
configs
|
||||
.filter { it.restartOnPingFailure && activeTuns.keys.contains(it.id) }
|
||||
.forEach { conf ->
|
||||
val tunState = activeTuns[conf.id] ?: return@forEach
|
||||
if (tunState.health() == TunnelState.Health.UNHEALTHY) {
|
||||
runCatching {
|
||||
val updated = handleDnsReresolve(conf)
|
||||
// TODO user messages
|
||||
if (updated) {
|
||||
Timber.i("Successfully update the peer endpoint to new address.")
|
||||
} else {
|
||||
Timber.i("Current endpoint address is already up to date.")
|
||||
}
|
||||
}
|
||||
.onFailure {
|
||||
Timber.e(it, "Failed to handle dns re-resolution for ${conf.tunName}")
|
||||
}
|
||||
// TODO backoff
|
||||
delay(30_000L)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun handleActiveTunnelsChange(
|
||||
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 ->
|
||||
appDataRepository.tunnels.save(dbTunnelConf.copy(isActive = true))
|
||||
}
|
||||
}
|
||||
wasActive && !isActiveNow -> {
|
||||
tuns
|
||||
.find { it.id == tunnelId }
|
||||
?.let { dbTunnelConf ->
|
||||
appDataRepository.tunnels.save(dbTunnelConf.copy(isActive = false))
|
||||
}
|
||||
val previouslyActiveTuns = appDataRepository.tunnels.getActive()
|
||||
val tunsToStart =
|
||||
previouslyActiveTuns.filterNot { tun ->
|
||||
activeTunnels.value.any { tun.id == it.key.id }
|
||||
}
|
||||
if (settings.isKernelEnabled) {
|
||||
return tunsToStart.forEach { startTunnel(it) }
|
||||
} else {
|
||||
tunsToStart.firstOrNull()?.let { startTunnel(it) }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+50
-58
@@ -2,12 +2,10 @@ 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.AppDataRepository
|
||||
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.util.extensions.toMillis
|
||||
import com.zaneschepke.wireguardautotunnel.util.network.NetworkUtils
|
||||
@@ -31,43 +29,56 @@ constructor(
|
||||
) {
|
||||
|
||||
@OptIn(FlowPreview::class)
|
||||
suspend fun startMonitoring(tunnelId: Int, withLogs: Boolean): Job = coroutineScope {
|
||||
suspend fun startMonitoring(tunnelConf: TunnelConf, withLogs: Boolean): Job = coroutineScope {
|
||||
launch {
|
||||
val config = appDataRepository.tunnels.getById(tunnelId) ?: return@launch
|
||||
launch { startPingMonitor(config) }
|
||||
launch { startWgStatsPoll(config.id) }
|
||||
if (withLogs) launch { startLogsMonitor(config) }
|
||||
launch { startTunnelConfChangesJob(tunnelConf) }
|
||||
launch { startPingMonitor(tunnelConf) }
|
||||
launch { startWgStatsPoll(tunnelConf) }
|
||||
if (withLogs) launch { startLogsMonitor(tunnelConf) }
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun startTunnelConfChangesJob(tunnelConf: TunnelConf) {
|
||||
appDataRepository.tunnels.flow
|
||||
.map { storedTunnels -> storedTunnels.firstOrNull { it.id == tunnelConf.id } }
|
||||
.filterNotNull()
|
||||
.distinctUntilChanged { old, new -> old == new }
|
||||
.collect { storedTunnel ->
|
||||
if (tunnelConf != storedTunnel) {
|
||||
Timber.d("Config changed for ${storedTunnel.tunName}, bouncing")
|
||||
withContext(NonCancellable) {
|
||||
tunnelManager.bounceTunnel(
|
||||
storedTunnel,
|
||||
TunnelStatus.StopReason.ConfigChanged,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun startLogsMonitor(tunnelConf: TunnelConf) {
|
||||
logReader.liveLogs
|
||||
.filter { log -> log.tag.contains(tunnelConf.tunName) }
|
||||
.mapNotNull { log ->
|
||||
val now = System.currentTimeMillis()
|
||||
|
||||
logReader.liveLogs.collect { log ->
|
||||
val healthLogs =
|
||||
when {
|
||||
successLogRegex.containsMatchIn(log.message) ->
|
||||
LogHealthState(isHealthy = true, timestamp = now)
|
||||
|
||||
failureLogRegex.containsMatchIn(log.message) ->
|
||||
LogHealthState(isHealthy = false, timestamp = now)
|
||||
log.message.contains(HANDSHAKE_RESPONSE_TEXT, true) ||
|
||||
log.message.contains(KEEPALIVE_RESPONSE_TEXT, true) -> true
|
||||
log.message.contains(HANDSHAKE_INIT_FAILED_TEXT, true) ||
|
||||
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)
|
||||
}
|
||||
.distinctUntilChangedBy { it.isHealthy } // Only emit when health changes
|
||||
.collect { logHealthState ->
|
||||
Timber.d("Tunnel log health updated for ${tunnelConf.tunName}: $logHealthState")
|
||||
tunnelManager.updateTunnelStatus(tunnelConf.id, logHealthState = logHealthState)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun startPingMonitor(tunnelConf: TunnelConf) = coroutineScope {
|
||||
val pingStatsFlow = MutableStateFlow<Map<Key, PingState>>(emptyMap())
|
||||
|
||||
val tunStateFlow =
|
||||
tunnelManager.activeTunnels.mapNotNull { it[tunnelConf.id] }.stateIn(this)
|
||||
tunnelManager.activeTunnels.mapNotNull { it.getValueById(tunnelConf.id) }.stateIn(this)
|
||||
|
||||
val connectivityStateFlow = networkMonitor.connectivityStateFlow.stateIn(this)
|
||||
|
||||
@@ -98,13 +109,9 @@ constructor(
|
||||
old.tunnelPingIntervalSeconds == new.tunnelPingIntervalSeconds &&
|
||||
old.tunnelPingAttempts == new.tunnelPingAttempts &&
|
||||
old.tunnelPingTimeoutSeconds == new.tunnelPingTimeoutSeconds
|
||||
old.appMode == new.appMode
|
||||
}
|
||||
.collectLatest { settings ->
|
||||
if (!settings.isPingEnabled) return@collectLatest
|
||||
// TODO for now until we get monitoring for these modes
|
||||
if (settings.appMode == AppMode.LOCK_DOWN || settings.appMode == AppMode.PROXY)
|
||||
return@collectLatest
|
||||
|
||||
Timber.d("Starting pinger for ${tunnelConf.tunName} with settings")
|
||||
|
||||
@@ -131,22 +138,19 @@ constructor(
|
||||
}
|
||||
|
||||
val host =
|
||||
tunnelConf.pingTarget
|
||||
?: {
|
||||
val parts = allowedIpStr.split("/")
|
||||
val internalIp =
|
||||
if (parts.size == 2) parts[0] else allowedIpStr
|
||||
{
|
||||
val parts = allowedIpStr.split("/")
|
||||
val internalIp = if (parts.size == 2) parts[0] else allowedIpStr
|
||||
|
||||
val prefix =
|
||||
if (parts.size == 2) parts[1].toIntOrNull() ?: 32
|
||||
else 32
|
||||
if (prefix <= 1) {
|
||||
CLOUDFLARE_IPV4_IP
|
||||
} else {
|
||||
internalIp.removeSurrounding("[", "]")
|
||||
}
|
||||
val prefix =
|
||||
if (parts.size == 2) parts[1].toIntOrNull() ?: 32 else 32
|
||||
if (prefix <= 1) {
|
||||
tunnelConf.pingTarget ?: CLOUDFLARE_IPV4_IP
|
||||
} else {
|
||||
internalIp.removeSurrounding("[", "]")
|
||||
}
|
||||
.invoke()
|
||||
}
|
||||
.invoke()
|
||||
|
||||
val attemptTime = System.currentTimeMillis()
|
||||
runCatching {
|
||||
@@ -203,7 +207,7 @@ constructor(
|
||||
|
||||
if (updates.isNotEmpty()) {
|
||||
pingStatsFlow.update { updates }
|
||||
tunnelManager.updateTunnelStatus(tunnelConf.id, null, null, updates)
|
||||
tunnelManager.updateTunnelStatus(tunnelConf, null, null, updates)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -227,7 +231,7 @@ constructor(
|
||||
}
|
||||
}
|
||||
tunnelManager.updateTunnelStatus(
|
||||
tunnelConf.id,
|
||||
tunnelConf,
|
||||
null,
|
||||
null,
|
||||
pingStatsFlow.value,
|
||||
@@ -238,27 +242,15 @@ constructor(
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun startWgStatsPoll(tunnelId: Int) = coroutineScope {
|
||||
private suspend fun startWgStatsPoll(tunnelConf: TunnelConf) = coroutineScope {
|
||||
while (isActive) {
|
||||
val stats = tunnelManager.getStatistics(tunnelId)
|
||||
tunnelManager.updateTunnelStatus(tunnelId, null, stats, null)
|
||||
val stats = tunnelManager.getStatistics(tunnelConf)
|
||||
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"
|
||||
|
||||
|
||||
+31
-17
@@ -1,14 +1,14 @@
|
||||
package com.zaneschepke.wireguardautotunnel.core.tunnel
|
||||
|
||||
import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
|
||||
import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
|
||||
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,38 +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 setBackendState(backendState: BackendState, allowedIps: Collection<String>)
|
||||
|
||||
fun getBackendMode(): BackendMode
|
||||
fun getBackendState(): BackendState
|
||||
|
||||
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,
|
||||
)
|
||||
}
|
||||
|
||||
+63
-122
@@ -1,169 +1,110 @@
|
||||
package com.zaneschepke.wireguardautotunnel.core.tunnel
|
||||
|
||||
import com.zaneschepke.wireguardautotunnel.core.service.ServiceManager
|
||||
import com.zaneschepke.wireguardautotunnel.data.model.DnsProtocol
|
||||
import com.zaneschepke.wireguardautotunnel.di.ApplicationScope
|
||||
import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
|
||||
import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
|
||||
import com.zaneschepke.wireguardautotunnel.domain.enums.TunnelStatus
|
||||
import com.zaneschepke.wireguardautotunnel.domain.events.BackendCoreException
|
||||
import com.zaneschepke.wireguardautotunnel.domain.model.AppProxySettings
|
||||
import com.zaneschepke.wireguardautotunnel.domain.events.BackendError
|
||||
import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
|
||||
import com.zaneschepke.wireguardautotunnel.domain.repository.AppDataRepository
|
||||
import com.zaneschepke.wireguardautotunnel.domain.state.AmneziaStatistics
|
||||
import com.zaneschepke.wireguardautotunnel.domain.state.TunnelStatistics
|
||||
import com.zaneschepke.wireguardautotunnel.util.extensions.asAmBackendMode
|
||||
import com.zaneschepke.wireguardautotunnel.util.extensions.asBackendMode
|
||||
import com.zaneschepke.wireguardautotunnel.util.extensions.asTunnelState
|
||||
import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendCoreException
|
||||
import java.io.IOException
|
||||
import java.util.*
|
||||
import java.util.concurrent.ConcurrentHashMap
|
||||
import com.zaneschepke.wireguardautotunnel.util.extensions.asAmBackendState
|
||||
import com.zaneschepke.wireguardautotunnel.util.extensions.asBackendState
|
||||
import com.zaneschepke.wireguardautotunnel.util.extensions.toBackendError
|
||||
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 as AwgTunnel
|
||||
import org.amnezia.awg.backend.Tunnel
|
||||
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,
|
||||
serviceManager: ServiceManager,
|
||||
appDataRepository: AppDataRepository,
|
||||
applicationScope: CoroutineScope,
|
||||
val serviceManager: ServiceManager,
|
||||
val appDataRepository: AppDataRepository,
|
||||
private val backend: Backend,
|
||||
) : 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()) }
|
||||
}
|
||||
private var previousBackendState: Pair<BackendState, Boolean>? = null
|
||||
|
||||
override suspend fun startBackend(tunnel: TunnelConf) {
|
||||
try {
|
||||
updateTunnelStatus(tunnelConf.id, TunnelStatus.Starting)
|
||||
|
||||
val proxies: List<Proxy> =
|
||||
when (backend) {
|
||||
is ProxyGoBackend -> {
|
||||
val proxySettings = appDataRepository.proxySettings.get()
|
||||
Timber.d("Adding proxy configs")
|
||||
buildList {
|
||||
if (proxySettings.socks5ProxyEnabled) {
|
||||
add(
|
||||
Socks5Proxy(
|
||||
proxySettings.socks5ProxyBindAddress
|
||||
?: AppProxySettings.DEFAULT_SOCKS_BIND_ADDRESS,
|
||||
proxySettings.proxyUsername,
|
||||
proxySettings.proxyPassword,
|
||||
)
|
||||
)
|
||||
}
|
||||
if (proxySettings.httpProxyEnabled) {
|
||||
add(
|
||||
HttpProxy(
|
||||
proxySettings.httpProxyBindAddress
|
||||
?: AppProxySettings.DEFAULT_HTTP_BIND_ADDRESS,
|
||||
proxySettings.proxyUsername,
|
||||
proxySettings.proxyPassword,
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
else -> emptyList()
|
||||
}
|
||||
val setting = appDataRepository.settings.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)
|
||||
updateTunnelStatus(tunnel, TunnelStatus.Starting)
|
||||
val amConfig = tunnel.toAmConfig()
|
||||
handleVpnKillSwitchWithDomainEndpoints(amConfig)
|
||||
backend.setState(tunnel, Tunnel.State.UP, amConfig)
|
||||
} catch (e: BackendException) {
|
||||
close(e.toBackendCoreException())
|
||||
Timber.e(e, "Failed to start up backend for tunnel ${tunnel.name}")
|
||||
throw e.toBackendError()
|
||||
} catch (e: IllegalArgumentException) {
|
||||
close(BackendCoreException.Config)
|
||||
} catch (e: Exception) {
|
||||
Timber.e(e, "Error while setting tunnel state")
|
||||
close(BackendCoreException.Unknown)
|
||||
Timber.e(e, "Failed to start up backend for tunnel ${tunnel.name}")
|
||||
throw BackendError.Config
|
||||
}
|
||||
}
|
||||
|
||||
awaitClose {
|
||||
try {
|
||||
backend.setState(runtimeTunnel, AwgTunnel.State.DOWN, null)
|
||||
} catch (e: BackendException) {
|
||||
errors.tryEmit(tunnelConf.tunName to e.toBackendCoreException())
|
||||
} finally {
|
||||
consumerJob.cancel()
|
||||
stateChannel.close()
|
||||
runtimeTunnels.remove(tunnelConf.id)
|
||||
trySend(TunnelStatus.Down)
|
||||
close()
|
||||
override fun stopBackend(tunnel: TunnelConf) {
|
||||
Timber.i("Stopping tunnel ${tunnel.name} userspace")
|
||||
try {
|
||||
backend.setState(tunnel, Tunnel.State.DOWN, tunnel.toAmConfig())
|
||||
} catch (e: BackendException) {
|
||||
Timber.e(e, "Failed to stop tunnel ${tunnel.id}")
|
||||
throw e.toBackendError()
|
||||
} finally {
|
||||
handlePreviouslyEnabledVpnKillSwitch()
|
||||
}
|
||||
}
|
||||
|
||||
// stop vpn kill switch if we need to resolve DNS for peer endpoints
|
||||
private suspend fun handleVpnKillSwitchWithDomainEndpoints(config: Config) {
|
||||
if (
|
||||
config.peers.any { it.endpoint.getOrNull()?.toString()?.isUrl() == true } &&
|
||||
backend.backendState.asBackendState() == BackendState.KILL_SWITCH_ACTIVE
|
||||
) {
|
||||
val bypassLan = appDataRepository.settings.get().isLanOnKillSwitchEnabled
|
||||
previousBackendState = Pair(BackendState.KILL_SWITCH_ACTIVE, bypassLan)
|
||||
setBackendState(BackendState.SERVICE_ACTIVE, emptyList())
|
||||
}
|
||||
}
|
||||
|
||||
// restore vpn kill switch if needed
|
||||
private fun handlePreviouslyEnabledVpnKillSwitch() {
|
||||
// let auto tunnel handle this if it is active
|
||||
if (serviceManager.autoTunnelService.value == null) {
|
||||
previousBackendState?.let { (state, lanEnabled) ->
|
||||
Timber.d("Restoring kill switch configuration")
|
||||
val lan = if (lanEnabled) TunnelConf.LAN_BYPASS_ALLOWED_IPS else emptyList()
|
||||
backend.setBackendState(state.asAmBackendState(), lan)
|
||||
}
|
||||
}
|
||||
previousBackendState = null
|
||||
}
|
||||
|
||||
override fun setBackendMode(backendMode: BackendMode) {
|
||||
Timber.d("Setting backend mode: $backendMode")
|
||||
override fun setBackendState(backendState: BackendState, allowedIps: Collection<String>) {
|
||||
Timber.d("Setting backend state: $backendState with allowedIps: $allowedIps")
|
||||
try {
|
||||
backend.backendMode = backendMode.asAmBackendMode()
|
||||
backend.setBackendState(backendState.asAmBackendState(), allowedIps)
|
||||
} catch (e: BackendException) {
|
||||
throw e.toBackendCoreException()
|
||||
// TODO this should be mapped to BackendException in the lib
|
||||
} catch (e: IOException) {
|
||||
throw BackendCoreException.NotAuthorized
|
||||
throw e.toBackendError()
|
||||
}
|
||||
}
|
||||
|
||||
override fun getBackendMode(): BackendMode {
|
||||
return backend.backendMode.asBackendMode()
|
||||
}
|
||||
|
||||
override fun handleDnsReresolve(tunnelConf: TunnelConf): Boolean {
|
||||
val tunnel =
|
||||
runtimeTunnels.get(tunnelConf.id) ?: throw BackendCoreException.ServiceNotRunning
|
||||
return backend.resolveDDNS(tunnelConf.toAmConfig(), tunnel.isIpv4ResolutionPreferred)
|
||||
override fun getBackendState(): BackendState {
|
||||
return backend.backendState.asBackendState()
|
||||
}
|
||||
|
||||
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(runtimeTunnel))
|
||||
AmneziaStatistics(backend.getStatistics(tunnelConf))
|
||||
} catch (e: Exception) {
|
||||
Timber.e(e, "Failed to get stats for $tunnelId")
|
||||
Timber.e(e, "Failed to get stats for ${tunnelConf.tunName}")
|
||||
null
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,6 +4,7 @@ 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.AppDataRepository
|
||||
import dagger.assisted.Assisted
|
||||
@@ -22,6 +23,7 @@ constructor(
|
||||
private val serviceManager: ServiceManager,
|
||||
private val appDataRepository: AppDataRepository,
|
||||
@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
|
||||
private val tunnelManager: TunnelManager,
|
||||
) : CoroutineWorker(context, params) {
|
||||
|
||||
companion object {
|
||||
@@ -51,11 +53,10 @@ constructor(
|
||||
withContext(ioDispatcher) {
|
||||
Timber.i("Service worker started")
|
||||
with(appDataRepository.settings.get()) {
|
||||
Timber.i("Checking to see if auto-tunnel has been killed by system")
|
||||
if (isAutoTunnelEnabled && serviceManager.autoTunnelService.value == null) {
|
||||
Timber.i("Service has been killed by system, restoring.")
|
||||
serviceManager.startAutoTunnel()
|
||||
}
|
||||
if (isAutoTunnelEnabled && serviceManager.autoTunnelService.value == null)
|
||||
return@with serviceManager.startAutoTunnel()
|
||||
if (tunnelManager.activeTunnels.value.isEmpty())
|
||||
tunnelManager.restorePreviousState()
|
||||
}
|
||||
Result.success()
|
||||
}
|
||||
|
||||
@@ -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],
|
||||
version = 22,
|
||||
entities = [Settings::class, TunnelConfig::class],
|
||||
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")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -84,5 +85,9 @@ class DataStoreManager(
|
||||
}
|
||||
}
|
||||
|
||||
fun <T> getFromStoreBlocking(key: Preferences.Key<T>) = runBlocking {
|
||||
context.dataStore.data.map { it[key] }.first()
|
||||
}
|
||||
|
||||
val preferencesFlow: Flow<Preferences?> = context.dataStore.data.flowOn(ioDispatcher)
|
||||
}
|
||||
|
||||
@@ -2,15 +2,20 @@ package com.zaneschepke.wireguardautotunnel.data
|
||||
|
||||
import androidx.room.RoomDatabase
|
||||
import androidx.sqlite.db.SupportSQLiteDatabase
|
||||
import javax.inject.Inject
|
||||
import javax.inject.Provider
|
||||
import timber.log.Timber
|
||||
|
||||
class DatabaseCallback @Inject constructor(private val databaseProvider: Provider<AppDatabase>) :
|
||||
RoomDatabase.Callback() {
|
||||
|
||||
override fun onCreate(db: SupportSQLiteDatabase) {
|
||||
super.onCreate(db)
|
||||
db.execSQL("INSERT INTO proxy_settings DEFAULT VALUES")
|
||||
db.execSQL("INSERT INTO Settings DEFAULT VALUES")
|
||||
}
|
||||
class DatabaseCallback : RoomDatabase.Callback() {
|
||||
override fun onCreate(db: SupportSQLiteDatabase) =
|
||||
db.run {
|
||||
beginTransaction()
|
||||
try {
|
||||
execSQL(Queries.createDefaultSettings())
|
||||
Timber.i("Bootstrapping settings data")
|
||||
setTransactionSuccessful()
|
||||
} catch (e: Exception) {
|
||||
Timber.e(e)
|
||||
} finally {
|
||||
endTransaction()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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.model.DnsProtocol
|
||||
import com.zaneschepke.wireguardautotunnel.data.model.WifiDetectionMethod
|
||||
import com.zaneschepke.wireguardautotunnel.data.entity.Settings
|
||||
import kotlinx.serialization.json.Json
|
||||
|
||||
class DatabaseConverters {
|
||||
@@ -24,26 +22,9 @@ class DatabaseConverters {
|
||||
}
|
||||
}
|
||||
|
||||
@TypeConverter
|
||||
fun setToString(value: Set<String>): String {
|
||||
return listToString(value.toList())
|
||||
}
|
||||
@TypeConverter fun fromStatus(status: Settings.WifiDetectionMethod): Int = status.value
|
||||
|
||||
@TypeConverter
|
||||
fun stringToSet(value: String): Set<String> {
|
||||
return stringToList(value).toSet()
|
||||
}
|
||||
|
||||
@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
|
||||
fun toStatus(value: Int): Settings.WifiDetectionMethod =
|
||||
Settings.WifiDetectionMethod.fromValue(value)
|
||||
}
|
||||
|
||||
@@ -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()
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
@@ -16,7 +16,7 @@ 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)
|
||||
|
||||
|
||||
@@ -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 || '%'")
|
||||
|
||||
@@ -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,
|
||||
)
|
||||
@@ -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")
|
||||
val isAutoTunnelEnabled: Boolean = false,
|
||||
@ColumnInfo(name = "is_tunnel_on_mobile_data_enabled", defaultValue = "0")
|
||||
@ColumnInfo(name = "is_tunnel_enabled") val isAutoTunnelEnabled: Boolean = false,
|
||||
@ColumnInfo(name = "is_tunnel_on_mobile_data_enabled")
|
||||
val isTunnelOnMobileDataEnabled: Boolean = false,
|
||||
@ColumnInfo(name = "trusted_network_ssids", defaultValue = "")
|
||||
val trustedNetworkSSIDs: Set<String> = emptySet(),
|
||||
@ColumnInfo(name = "is_always_on_vpn_enabled", defaultValue = "0")
|
||||
val isAlwaysOnVpnEnabled: Boolean = false,
|
||||
@ColumnInfo(name = "is_tunnel_on_ethernet_enabled", defaultValue = "0")
|
||||
@ColumnInfo(name = "trusted_network_ssids") val trustedNetworkSSIDs: List<String> = emptyList(),
|
||||
@ColumnInfo(name = "is_always_on_vpn_enabled") val isAlwaysOnVpnEnabled: Boolean = false,
|
||||
@ColumnInfo(name = "is_tunnel_on_ethernet_enabled")
|
||||
val isTunnelOnEthernetEnabled: Boolean = false,
|
||||
@ColumnInfo(name = "is_shortcuts_enabled", defaultValue = "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_wildcards_enabled", defaultValue = "0")
|
||||
@ColumnInfo(name = "is_ping_enabled", defaultValue = "false")
|
||||
val isPingEnabled: Boolean = false,
|
||||
@ColumnInfo(name = "is_amnezia_enabled", defaultValue = "false")
|
||||
val isAmneziaEnabled: Boolean = false,
|
||||
@ColumnInfo(name = "is_wildcards_enabled", defaultValue = "false")
|
||||
val isWildcardsEnabled: Boolean = false,
|
||||
@ColumnInfo(name = "is_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")
|
||||
val dnsProtocol: DnsProtocol = DnsProtocol.fromValue(0),
|
||||
@ColumnInfo(name = "dns_endpoint") val dnsEndpoint: String? = null,
|
||||
)
|
||||
) {
|
||||
enum class WifiDetectionMethod(val value: Int) {
|
||||
DEFAULT(0),
|
||||
LEGACY(1),
|
||||
ROOT(2),
|
||||
SHIZUKU(3);
|
||||
|
||||
companion object {
|
||||
fun fromValue(value: Int): WifiDetectionMethod =
|
||||
entries.find { it.value == value } ?: DEFAULT
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
-32
@@ -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,
|
||||
)
|
||||
}
|
||||
}
|
||||
+65
-71
@@ -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.data.model.DnsSettings
|
||||
import com.zaneschepke.wireguardautotunnel.data.model.WifiDetectionMethod
|
||||
import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings
|
||||
import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
|
||||
|
||||
fun Settings.toAppSettings(): GeneralSettings {
|
||||
return GeneralSettings(
|
||||
id = id,
|
||||
isAutoTunnelEnabled = isAutoTunnelEnabled,
|
||||
isTunnelOnMobileDataEnabled = isTunnelOnMobileDataEnabled,
|
||||
trustedNetworkSSIDs = trustedNetworkSSIDs,
|
||||
isAlwaysOnVpnEnabled = isAlwaysOnVpnEnabled,
|
||||
isTunnelOnEthernetEnabled = isTunnelOnEthernetEnabled,
|
||||
isShortcutsEnabled = isShortcutsEnabled,
|
||||
isTunnelOnWifiEnabled = isTunnelOnWifiEnabled,
|
||||
isRestoreOnBootEnabled = isRestoreOnBootEnabled,
|
||||
isMultiTunnelEnabled = isMultiTunnelEnabled,
|
||||
isPingEnabled = isPingEnabled,
|
||||
isWildcardsEnabled = isWildcardsEnabled,
|
||||
isStopOnNoInternetEnabled = isStopOnNoInternetEnabled,
|
||||
isLanOnKillSwitchEnabled = isLanOnKillSwitchEnabled,
|
||||
debounceDelaySeconds = debounceDelaySeconds,
|
||||
isDisableKillSwitchOnTrustedEnabled = isDisableKillSwitchOnTrustedEnabled,
|
||||
isTunnelOnUnsecureEnabled = isTunnelOnUnsecureEnabled,
|
||||
wifiDetectionMethod = WifiDetectionMethod.fromValue(wifiDetectionMethod.value),
|
||||
tunnelPingIntervalSeconds = tunnelPingIntervalSeconds,
|
||||
tunnelPingAttempts = tunnelPingAttempts,
|
||||
tunnelPingTimeoutSeconds = tunnelPingTimeoutSeconds,
|
||||
appMode = appMode,
|
||||
dnsProtocol = dnsProtocol,
|
||||
dnsEndpoint = dnsEndpoint,
|
||||
)
|
||||
}
|
||||
object SettingsMapper {
|
||||
fun toAppSettings(settings: Settings): AppSettings {
|
||||
return AppSettings(
|
||||
id = settings.id,
|
||||
isAutoTunnelEnabled = settings.isAutoTunnelEnabled,
|
||||
isTunnelOnMobileDataEnabled = settings.isTunnelOnMobileDataEnabled,
|
||||
trustedNetworkSSIDs = settings.trustedNetworkSSIDs,
|
||||
isAlwaysOnVpnEnabled = settings.isAlwaysOnVpnEnabled,
|
||||
isTunnelOnEthernetEnabled = settings.isTunnelOnEthernetEnabled,
|
||||
isShortcutsEnabled = settings.isShortcutsEnabled,
|
||||
isTunnelOnWifiEnabled = settings.isTunnelOnWifiEnabled,
|
||||
isKernelEnabled = settings.isKernelEnabled,
|
||||
isRestoreOnBootEnabled = settings.isRestoreOnBootEnabled,
|
||||
isMultiTunnelEnabled = settings.isMultiTunnelEnabled,
|
||||
isPingEnabled = settings.isPingEnabled,
|
||||
isAmneziaEnabled = settings.isAmneziaEnabled,
|
||||
isWildcardsEnabled = settings.isWildcardsEnabled,
|
||||
isStopOnNoInternetEnabled = settings.isStopOnNoInternetEnabled,
|
||||
isVpnKillSwitchEnabled = settings.isVpnKillSwitchEnabled,
|
||||
isKernelKillSwitchEnabled = settings.isKernelKillSwitchEnabled,
|
||||
isLanOnKillSwitchEnabled = settings.isLanOnKillSwitchEnabled,
|
||||
debounceDelaySeconds = settings.debounceDelaySeconds,
|
||||
isDisableKillSwitchOnTrustedEnabled = settings.isDisableKillSwitchOnTrustedEnabled,
|
||||
isTunnelOnUnsecureEnabled = settings.isTunnelOnUnsecureEnabled,
|
||||
wifiDetectionMethod =
|
||||
AndroidNetworkMonitor.WifiDetectionMethod.fromValue(
|
||||
settings.wifiDetectionMethod.value
|
||||
),
|
||||
tunnelPingIntervalSeconds = settings.tunnelPingIntervalSeconds,
|
||||
tunnelPingAttempts = settings.tunnelPingAttempts,
|
||||
tunnelPingTimeoutSeconds = settings.tunnelPingTimeoutSeconds,
|
||||
)
|
||||
}
|
||||
|
||||
fun GeneralSettings.toSettings(): Settings {
|
||||
return Settings(
|
||||
id = id,
|
||||
isAutoTunnelEnabled = isAutoTunnelEnabled,
|
||||
isTunnelOnMobileDataEnabled = isTunnelOnMobileDataEnabled,
|
||||
trustedNetworkSSIDs = trustedNetworkSSIDs,
|
||||
isAlwaysOnVpnEnabled = isAlwaysOnVpnEnabled,
|
||||
isTunnelOnEthernetEnabled = isTunnelOnEthernetEnabled,
|
||||
isShortcutsEnabled = isShortcutsEnabled,
|
||||
isTunnelOnWifiEnabled = isTunnelOnWifiEnabled,
|
||||
isRestoreOnBootEnabled = isRestoreOnBootEnabled,
|
||||
isMultiTunnelEnabled = isMultiTunnelEnabled,
|
||||
isPingEnabled = isPingEnabled,
|
||||
isWildcardsEnabled = isWildcardsEnabled,
|
||||
isStopOnNoInternetEnabled = isStopOnNoInternetEnabled,
|
||||
isLanOnKillSwitchEnabled = isLanOnKillSwitchEnabled,
|
||||
debounceDelaySeconds = debounceDelaySeconds,
|
||||
isDisableKillSwitchOnTrustedEnabled = isDisableKillSwitchOnTrustedEnabled,
|
||||
isTunnelOnUnsecureEnabled = isTunnelOnUnsecureEnabled,
|
||||
wifiDetectionMethod = WifiDetectionMethod.fromValue(wifiDetectionMethod.value),
|
||||
tunnelPingIntervalSeconds = tunnelPingIntervalSeconds,
|
||||
tunnelPingAttempts = tunnelPingAttempts,
|
||||
tunnelPingTimeoutSeconds = tunnelPingTimeoutSeconds,
|
||||
appMode = appMode,
|
||||
dnsProtocol = dnsProtocol,
|
||||
dnsEndpoint = dnsEndpoint,
|
||||
)
|
||||
}
|
||||
|
||||
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)
|
||||
fun toSettings(appSettings: AppSettings): Settings {
|
||||
return Settings(
|
||||
id = appSettings.id,
|
||||
isAutoTunnelEnabled = appSettings.isAutoTunnelEnabled,
|
||||
isTunnelOnMobileDataEnabled = appSettings.isTunnelOnMobileDataEnabled,
|
||||
trustedNetworkSSIDs = appSettings.trustedNetworkSSIDs,
|
||||
isAlwaysOnVpnEnabled = appSettings.isAlwaysOnVpnEnabled,
|
||||
isTunnelOnEthernetEnabled = appSettings.isTunnelOnEthernetEnabled,
|
||||
isShortcutsEnabled = appSettings.isShortcutsEnabled,
|
||||
isTunnelOnWifiEnabled = appSettings.isTunnelOnWifiEnabled,
|
||||
isKernelEnabled = appSettings.isKernelEnabled,
|
||||
isRestoreOnBootEnabled = appSettings.isRestoreOnBootEnabled,
|
||||
isMultiTunnelEnabled = appSettings.isMultiTunnelEnabled,
|
||||
isPingEnabled = appSettings.isPingEnabled,
|
||||
isAmneziaEnabled = appSettings.isAmneziaEnabled,
|
||||
isWildcardsEnabled = appSettings.isWildcardsEnabled,
|
||||
isStopOnNoInternetEnabled = appSettings.isStopOnNoInternetEnabled,
|
||||
isVpnKillSwitchEnabled = appSettings.isVpnKillSwitchEnabled,
|
||||
isKernelKillSwitchEnabled = appSettings.isKernelKillSwitchEnabled,
|
||||
isLanOnKillSwitchEnabled = appSettings.isLanOnKillSwitchEnabled,
|
||||
debounceDelaySeconds = appSettings.debounceDelaySeconds,
|
||||
isDisableKillSwitchOnTrustedEnabled = appSettings.isDisableKillSwitchOnTrustedEnabled,
|
||||
isTunnelOnUnsecureEnabled = appSettings.isTunnelOnUnsecureEnabled,
|
||||
wifiDetectionMethod =
|
||||
Settings.WifiDetectionMethod.fromValue(appSettings.wifiDetectionMethod.value),
|
||||
tunnelPingIntervalSeconds = appSettings.tunnelPingIntervalSeconds,
|
||||
tunnelPingAttempts = appSettings.tunnelPingAttempts,
|
||||
tunnelPingTimeoutSeconds = appSettings.tunnelPingTimeoutSeconds,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
}
|
||||
-17
@@ -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
|
||||
}
|
||||
}
|
||||
+5
-3
@@ -1,16 +1,18 @@
|
||||
package com.zaneschepke.wireguardautotunnel.data.repository
|
||||
|
||||
import com.zaneschepke.wireguardautotunnel.domain.model.TunnelConf
|
||||
import com.zaneschepke.wireguardautotunnel.domain.repository.*
|
||||
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: GeneralSettingRepository,
|
||||
override val settings: AppSettingRepository,
|
||||
override val tunnels: TunnelRepository,
|
||||
override val appState: AppStateRepository,
|
||||
override val proxySettings: ProxySettingsRepository,
|
||||
) : AppDataRepository {
|
||||
|
||||
override suspend fun getPrimaryOrFirstTunnel(): TunnelConf? {
|
||||
|
||||
+2
-17
@@ -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(
|
||||
private val dataStoreManager: DataStoreManager,
|
||||
@ApplicationScope private val applicationScope: CoroutineScope,
|
||||
@IoDispatcher private val ioDispatcher: CoroutineDispatcher,
|
||||
) : AppStateRepository {
|
||||
class DataStoreAppStateRepository(private val dataStoreManager: DataStoreManager) :
|
||||
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(),
|
||||
)
|
||||
}
|
||||
|
||||
+4
-7
@@ -38,13 +38,13 @@ class GitHubUpdateRepository(
|
||||
gitHubApi.getLatestRelease(githubOwner, githubRepo).onFailure(Timber::e)
|
||||
}
|
||||
release.map { release ->
|
||||
val standaloneApkAsset =
|
||||
val apkAsset =
|
||||
release.assets.find { asset ->
|
||||
asset.name.startsWith("wgtunnel-${Constants.STANDALONE_FLAVOR}-v") &&
|
||||
asset.name.endsWith(".apk")
|
||||
}
|
||||
val newVersion =
|
||||
standaloneApkAsset
|
||||
apkAsset
|
||||
?.name
|
||||
?.removePrefix("wgtunnel-${Constants.STANDALONE_FLAVOR}-v")
|
||||
?.removeSuffix(".apk") ?: return@map null
|
||||
@@ -53,10 +53,7 @@ class GitHubUpdateRepository(
|
||||
if (isNightly && newVersion != currentVersion)
|
||||
return@map GitHubReleaseMapper.toAppUpdate(release, newVersion)
|
||||
if (NumberUtils.compareVersions(newVersion, currentVersion) > 0) {
|
||||
GitHubReleaseMapper.toAppUpdate(
|
||||
release.copy(assets = listOf(standaloneApkAsset)),
|
||||
newVersion,
|
||||
)
|
||||
GitHubReleaseMapper.toAppUpdate(release, newVersion)
|
||||
} else {
|
||||
null
|
||||
}
|
||||
@@ -66,7 +63,7 @@ class GitHubUpdateRepository(
|
||||
override suspend fun downloadApk(
|
||||
apkUrl: String,
|
||||
fileName: String,
|
||||
onProgress: suspend (Float) -> Unit,
|
||||
onProgress: (Float) -> Unit,
|
||||
): Result<File> =
|
||||
withContext(ioDispatcher) {
|
||||
try {
|
||||
|
||||
-92
@@ -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
|
||||
}
|
||||
}
|
||||
-30
@@ -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())
|
||||
}
|
||||
}
|
||||
}
|
||||
+9
-10
@@ -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.toSettings
|
||||
import com.zaneschepke.wireguardautotunnel.data.mapper.SettingsMapper
|
||||
import com.zaneschepke.wireguardautotunnel.di.IoDispatcher
|
||||
import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings
|
||||
import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
|
||||
import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
|
||||
import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
|
||||
import kotlinx.coroutines.CoroutineDispatcher
|
||||
import kotlinx.coroutines.flow.flowOn
|
||||
import kotlinx.coroutines.flow.map
|
||||
@@ -15,18 +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) {
|
||||
withContext(ioDispatcher) { settingsDoa.save(generalSettings.toSettings()) }
|
||||
override suspend fun save(appSettings: AppSettings) {
|
||||
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())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
-10
@@ -46,10 +46,6 @@ class RoomTunnelRepository(
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun resetActiveTunnels() {
|
||||
withContext(ioDispatcher) { tunnelConfigDao.resetActiveTunnels() }
|
||||
}
|
||||
|
||||
override suspend fun updateMobileDataTunnel(tunnelConf: TunnelConf?) {
|
||||
withContext(ioDispatcher) {
|
||||
tunnelConfigDao.resetMobileDataTunnel()
|
||||
@@ -109,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) })
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,7 +23,6 @@ import kotlinx.coroutines.SupervisorJob
|
||||
@Module
|
||||
@InstallIn(SingletonComponent::class)
|
||||
class AppModule {
|
||||
|
||||
@Singleton
|
||||
@ApplicationScope
|
||||
@Provides
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 {
|
||||
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 {
|
||||
fun provideDatabase(@ApplicationContext context: Context): 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,28 +79,18 @@ class RepositoryModule {
|
||||
|
||||
@Provides
|
||||
@Singleton
|
||||
fun provideGeneralStateRepository(
|
||||
dataStoreManager: DataStoreManager,
|
||||
@ApplicationScope applicationScope: CoroutineScope,
|
||||
@IoDispatcher ioDispatcher: CoroutineDispatcher,
|
||||
): AppStateRepository {
|
||||
return DataStoreAppStateRepository(dataStoreManager, applicationScope, ioDispatcher)
|
||||
fun provideGeneralStateRepository(dataStoreManager: DataStoreManager): AppStateRepository {
|
||||
return DataStoreAppStateRepository(dataStoreManager)
|
||||
}
|
||||
|
||||
@Provides
|
||||
@Singleton
|
||||
fun provideAppDataRepository(
|
||||
settingsRepository: GeneralSettingRepository,
|
||||
settingsRepository: AppSettingRepository,
|
||||
tunnelRepository: TunnelRepository,
|
||||
appStateRepository: AppStateRepository,
|
||||
proxySettingsRepository: ProxySettingsRepository,
|
||||
): AppDataRepository {
|
||||
return AppDataRoomRepository(
|
||||
settingsRepository,
|
||||
tunnelRepository,
|
||||
appStateRepository,
|
||||
proxySettingsRepository,
|
||||
)
|
||||
return AppDataRoomRepository(settingsRepository, tunnelRepository, appStateRepository)
|
||||
}
|
||||
|
||||
@Provides
|
||||
|
||||
@@ -7,11 +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.AppDataRepository
|
||||
import com.zaneschepke.wireguardautotunnel.domain.repository.GeneralSettingRepository
|
||||
import com.zaneschepke.wireguardautotunnel.util.extensions.to
|
||||
import com.zaneschepke.wireguardautotunnel.domain.repository.AppSettingRepository
|
||||
import com.zaneschepke.wireguardautotunnel.util.network.NetworkUtils
|
||||
import dagger.Module
|
||||
import dagger.Provides
|
||||
@@ -26,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
|
||||
@@ -49,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(
|
||||
@@ -98,19 +86,7 @@ class TunnelModule {
|
||||
@ApplicationScope applicationScope: CoroutineScope,
|
||||
serviceManager: ServiceManager,
|
||||
appDataRepository: AppDataRepository,
|
||||
@Userspace backend: Backend,
|
||||
): TunnelProvider {
|
||||
return UserspaceTunnel(applicationScope, serviceManager, appDataRepository, backend)
|
||||
}
|
||||
|
||||
@Provides
|
||||
@Singleton
|
||||
@ProxyUserspace
|
||||
fun provideProxyUserspaceProvider(
|
||||
@ApplicationScope applicationScope: CoroutineScope,
|
||||
serviceManager: ServiceManager,
|
||||
appDataRepository: AppDataRepository,
|
||||
@ProxyUserspace backend: Backend,
|
||||
backend: Backend,
|
||||
): TunnelProvider {
|
||||
return UserspaceTunnel(applicationScope, serviceManager, appDataRepository, backend)
|
||||
}
|
||||
@@ -120,17 +96,14 @@ class TunnelModule {
|
||||
fun provideTunnelManager(
|
||||
@Kernel kernelTunnel: TunnelProvider,
|
||||
@Userspace userspaceTunnel: TunnelProvider,
|
||||
@ProxyUserspace proxyTunnel: TunnelProvider,
|
||||
serviceManager: ServiceManager,
|
||||
appDataRepository: AppDataRepository,
|
||||
@IoDispatcher ioDispatcher: CoroutineDispatcher,
|
||||
@ApplicationScope applicationScope: CoroutineScope,
|
||||
notificationManager: NotificationManager,
|
||||
): TunnelManager {
|
||||
return TunnelManager(
|
||||
kernelTunnel,
|
||||
userspaceTunnel,
|
||||
proxyTunnel,
|
||||
serviceManager,
|
||||
appDataRepository,
|
||||
applicationScope,
|
||||
ioDispatcher,
|
||||
@@ -141,7 +114,7 @@ class TunnelModule {
|
||||
@Singleton
|
||||
fun provideNetworkMonitor(
|
||||
@ApplicationContext context: Context,
|
||||
settingsRepository: GeneralSettingRepository,
|
||||
settingsRepository: AppSettingRepository,
|
||||
@ApplicationScope applicationScope: CoroutineScope,
|
||||
@AppShell appShell: RootShell,
|
||||
): NetworkMonitor {
|
||||
@@ -152,7 +125,7 @@ class TunnelModule {
|
||||
get() =
|
||||
settingsRepository.flow
|
||||
.distinctUntilChangedBy { it.wifiDetectionMethod }
|
||||
.map { it.wifiDetectionMethod.to() }
|
||||
.map { it.wifiDetectionMethod }
|
||||
|
||||
override val rootShell: RootShell
|
||||
get() = appShell
|
||||
|
||||
@@ -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()
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package com.zaneschepke.wireguardautotunnel.domain.enums
|
||||
|
||||
enum class BackendState {
|
||||
KILL_SWITCH_ACTIVE,
|
||||
SERVICE_ACTIVE,
|
||||
INACTIVE,
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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()
|
||||
}
|
||||
|
||||
+10
-13
@@ -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() {
|
||||
data object DNS : BackendCoreException()
|
||||
sealed class BackendError : Exception() {
|
||||
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: BackendCoreException) : BackendCoreException()
|
||||
data class BounceFailed(val error: BackendError) : BackendError()
|
||||
|
||||
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 {
|
||||
-16
@@ -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"
|
||||
}
|
||||
}
|
||||
+9
-16
@@ -1,21 +1,21 @@
|
||||
package com.zaneschepke.wireguardautotunnel.domain.model
|
||||
|
||||
import com.zaneschepke.wireguardautotunnel.data.model.AppMode
|
||||
import com.zaneschepke.wireguardautotunnel.data.model.DnsProtocol
|
||||
import com.zaneschepke.wireguardautotunnel.data.model.WifiDetectionMethod
|
||||
import com.zaneschepke.networkmonitor.AndroidNetworkMonitor
|
||||
|
||||
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 tunnelPingIntervalSeconds: Int = PING_INTERVAL_DEFAULT,
|
||||
val tunnelPingAttempts: Int = PING_ATTEMPTS_DEFAULT,
|
||||
val wifiDetectionMethod: AndroidNetworkMonitor.WifiDetectionMethod =
|
||||
AndroidNetworkMonitor.WifiDetectionMethod.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
|
||||
}
|
||||
}
|
||||
@@ -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 isBatteryOptimizationDisableShown: Boolean = false,
|
||||
val isPinLockEnabled: Boolean = false,
|
||||
val expandedTunnelIds: List<Int> = emptyList(),
|
||||
val isLocalLogsEnabled: Boolean = false,
|
||||
val isRemoteControlEnabled: Boolean = false,
|
||||
val showDetailedPingStats: Boolean = false,
|
||||
val remoteKey: String? = null,
|
||||
val locale: String? = null,
|
||||
val theme: Theme = Theme.AUTOMATIC,
|
||||
val isLocationDisclosureShown: Boolean,
|
||||
val isBatteryOptimizationDisableShown: Boolean,
|
||||
val isPinLockEnabled: Boolean,
|
||||
val expandedTunnelIds: List<Int>,
|
||||
val isLocalLogsEnabled: Boolean,
|
||||
val isRemoteControlEnabled: Boolean,
|
||||
val showDetailedPingStats: Boolean,
|
||||
val remoteKey: String?,
|
||||
val locale: String?,
|
||||
val theme: Theme,
|
||||
)
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
package com.zaneschepke.wireguardautotunnel.domain.model
|
||||
|
||||
data class InstalledPackage(val name: String, val packageName: String, val uId: Int)
|
||||
@@ -1,9 +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.isValidIpv4orIpv6Address
|
||||
import com.zaneschepke.wireguardautotunnel.util.extensions.toWgQuickString
|
||||
import com.zaneschepke.wireguardautotunnel.util.extensions.*
|
||||
import java.io.InputStream
|
||||
import java.nio.charset.StandardCharsets
|
||||
|
||||
@@ -11,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,
|
||||
@@ -21,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
|
||||
@@ -53,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 })
|
||||
}
|
||||
@@ -61,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()
|
||||
@@ -74,21 +138,11 @@ data class TunnelConf(
|
||||
}
|
||||
}
|
||||
|
||||
fun tunnelConfFromQuick(amQuick: String, name: String? = null): TunnelConf {
|
||||
val config = configFromAmQuick(amQuick)
|
||||
val wgQuick = config.toWgQuickString()
|
||||
return TunnelConf(
|
||||
tunName = name ?: config.defaultName(),
|
||||
wgQuick = wgQuick,
|
||||
amQuick = amQuick,
|
||||
)
|
||||
}
|
||||
|
||||
private fun tunnelConfFromAmConfig(
|
||||
fun tunnelConfigFromAmConfig(
|
||||
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()
|
||||
return TunnelConf(
|
||||
tunName = name ?: config.defaultName(),
|
||||
@@ -100,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 =
|
||||
setOf(
|
||||
private val IPV4_PUBLIC_NETWORKS =
|
||||
listOf(
|
||||
"0.0.0.0/5",
|
||||
"8.0.0.0/7",
|
||||
"11.0.0.0/8",
|
||||
@@ -133,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
|
||||
}
|
||||
}
|
||||
|
||||
+1
-3
@@ -7,9 +7,7 @@ interface AppDataRepository {
|
||||
|
||||
suspend fun getStartTunnelConfig(): TunnelConf?
|
||||
|
||||
val settings: GeneralSettingRepository
|
||||
val settings: AppSettingRepository
|
||||
val tunnels: TunnelRepository
|
||||
val appState: AppStateRepository
|
||||
|
||||
val proxySettings: ProxySettingsRepository
|
||||
}
|
||||
|
||||
+12
@@ -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
|
||||
}
|
||||
-18
@@ -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)
|
||||
}
|
||||
}
|
||||
-12
@@ -1,12 +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
|
||||
}
|
||||
-12
@@ -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>
|
||||
}
|
||||
-12
@@ -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
|
||||
}
|
||||
-4
@@ -15,8 +15,6 @@ interface TunnelRepository {
|
||||
|
||||
suspend fun updatePrimaryTunnel(tunnelConf: TunnelConf?)
|
||||
|
||||
suspend fun resetActiveTunnels()
|
||||
|
||||
suspend fun updateMobileDataTunnel(tunnelConf: TunnelConf?)
|
||||
|
||||
suspend fun updateEthernetTunnel(tunnelConf: TunnelConf?)
|
||||
@@ -36,6 +34,4 @@ interface TunnelRepository {
|
||||
suspend fun findByMobileDataTunnel(): Tunnels
|
||||
|
||||
suspend fun findPrimary(): Tunnels
|
||||
|
||||
suspend fun delete(tunnels: List<TunnelConf>)
|
||||
}
|
||||
|
||||
+1
-1
@@ -9,6 +9,6 @@ interface UpdateRepository {
|
||||
suspend fun downloadApk(
|
||||
apkUrl: String,
|
||||
fileName: String,
|
||||
onProgress: suspend (Float) -> Unit,
|
||||
onProgress: (Float) -> Unit,
|
||||
): Result<File>
|
||||
}
|
||||
|
||||
-27
@@ -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()
|
||||
}
|
||||
+52
-8
@@ -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.Start
|
||||
import com.zaneschepke.wireguardautotunnel.domain.model.GeneralSettings
|
||||
import com.zaneschepke.wireguardautotunnel.domain.events.AutoTunnelEvent.*
|
||||
import com.zaneschepke.wireguardautotunnel.domain.model.AppSettings
|
||||
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)
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
package com.zaneschepke.wireguardautotunnel.domain.state
|
||||
|
||||
data class LogHealthState(val isHealthy: Boolean, val timestamp: Long = System.currentTimeMillis())
|
||||
@@ -1,59 +1,13 @@
|
||||
package com.zaneschepke.wireguardautotunnel.domain.state
|
||||
|
||||
import com.zaneschepke.wireguardautotunnel.domain.enums.BackendMode
|
||||
import com.zaneschepke.wireguardautotunnel.domain.enums.BackendState
|
||||
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: BackendState = BackendState.INACTIVE,
|
||||
val statistics: TunnelStatistics? = null,
|
||||
val pingStates: Map<Key, PingState>? = null,
|
||||
val logHealthState: LogHealthState? = null,
|
||||
) {
|
||||
|
||||
fun health(): Health {
|
||||
val now = System.currentTimeMillis()
|
||||
|
||||
if (pingStates == null && logHealthState == null && statistics == null)
|
||||
return Health.UNKNOWN
|
||||
|
||||
if (logHealthState?.isHealthy == false) return Health.UNHEALTHY
|
||||
|
||||
val healthLogs =
|
||||
logHealthState?.isHealthy == true &&
|
||||
(now - logHealthState.timestamp) <= LOG_HEALTH_SUCCESS_TIMEOUT_MS
|
||||
|
||||
if (pingStates?.any { !it.value.isReachable } == true) return Health.UNHEALTHY
|
||||
|
||||
if (statistics != null) {
|
||||
if (statistics.isTunnelStale()) {
|
||||
return Health.STALE
|
||||
}
|
||||
if ((logHealthState == null || !healthLogs) && pingStates == null) {
|
||||
return Health.HEALTHY
|
||||
}
|
||||
} else {
|
||||
if (!healthLogs) {
|
||||
return Health.UNKNOWN
|
||||
}
|
||||
}
|
||||
|
||||
if (healthLogs) {
|
||||
return 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
|
||||
}
|
||||
}
|
||||
val handshakeSuccessLogs: Boolean? = null,
|
||||
)
|
||||
|
||||
@@ -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") }
|
||||
@@ -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()
|
||||
}
|
||||
+1
-1
@@ -22,7 +22,7 @@ fun ExpandingRowListItem(
|
||||
text: String,
|
||||
trailing: @Composable () -> Unit,
|
||||
isSelected: Boolean,
|
||||
expanded: (@Composable () -> Unit),
|
||||
expanded: @Composable () -> Unit,
|
||||
modifier: Modifier = Modifier,
|
||||
) {
|
||||
Box(
|
||||
|
||||
-25
@@ -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) }
|
||||
}
|
||||
}
|
||||
+34
@@ -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),
|
||||
)
|
||||
}
|
||||
-42
@@ -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),
|
||||
)
|
||||
}
|
||||
}
|
||||
-21
@@ -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),
|
||||
)
|
||||
}
|
||||
}
|
||||
+2
-4
@@ -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,
|
||||
@@ -57,7 +55,7 @@ fun IconSurfaceButton(
|
||||
) {
|
||||
leading?.invoke()
|
||||
Column(verticalArrangement = Arrangement.spacedBy(4.dp)) {
|
||||
SelectionItemLabel(title, SelectionLabelType.TITLE)
|
||||
Text(title, style = MaterialTheme.typography.titleMedium)
|
||||
description?.let {
|
||||
Text(
|
||||
description,
|
||||
|
||||
-19
@@ -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))
|
||||
}
|
||||
}
|
||||
-19
@@ -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))
|
||||
}
|
||||
}
|
||||
+16
-36
@@ -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.CardDefaults
|
||||
import androidx.compose.material3.ripple
|
||||
import androidx.compose.material3.*
|
||||
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)
|
||||
.padding(horizontal = 12.dp)
|
||||
.padding(end = 12.dp),
|
||||
.height(56.dp),
|
||||
colors = CardDefaults.cardColors(containerColor = Color.Transparent),
|
||||
) {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.Start,
|
||||
modifier = Modifier.fillMaxSize().padding(horizontal = 12.dp),
|
||||
) {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.spacedBy(24.dp),
|
||||
) {
|
||||
leading?.let { it() }
|
||||
Column(
|
||||
horizontalAlignment = Alignment.Start,
|
||||
modifier = Modifier.weight(1f).padding(end = 12.dp),
|
||||
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),
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
leading?.let { it() }
|
||||
Text(
|
||||
buttonText,
|
||||
style = MaterialTheme.typography.labelMedium,
|
||||
color = MaterialTheme.colorScheme.onSurface,
|
||||
modifier = Modifier.fillMaxWidth(3 / 4f),
|
||||
maxLines = 2,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
)
|
||||
trailing?.let { it() }
|
||||
}
|
||||
}
|
||||
|
||||
+1
-6
@@ -3,7 +3,6 @@ package com.zaneschepke.wireguardautotunnel.ui.common.button.surface
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.unit.Dp
|
||||
import androidx.compose.ui.unit.dp
|
||||
|
||||
data class SelectionItem(
|
||||
@@ -12,9 +11,5 @@ data class SelectionItem(
|
||||
val title: (@Composable () -> Unit),
|
||||
val description: (@Composable () -> Unit)? = null,
|
||||
val onClick: (() -> Unit)? = null,
|
||||
val isEnabled: Boolean = true,
|
||||
val disabledReason: String? = null,
|
||||
val modifier: Modifier = Modifier.height(48.dp),
|
||||
val padding: Dp = if (description == null && disabledReason == null) 16.dp else 6.dp,
|
||||
val onLongPress: (() -> Unit)? = null,
|
||||
val modifier: Modifier = Modifier.height(64.dp),
|
||||
)
|
||||
|
||||
-1
@@ -22,7 +22,6 @@ fun SelectionItemLabel(text: String, labelType: SelectionLabelType, modifier: Mo
|
||||
}
|
||||
|
||||
enum class SelectionLabelType {
|
||||
|
||||
DESCRIPTION,
|
||||
TITLE,
|
||||
}
|
||||
|
||||
+35
-83
@@ -1,113 +1,65 @@
|
||||
package com.zaneschepke.wireguardautotunnel.ui.common.button.surface
|
||||
|
||||
import androidx.compose.foundation.combinedClickable
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material3.Card
|
||||
import androidx.compose.material3.CardDefaults
|
||||
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.alpha
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.semantics.semantics
|
||||
import androidx.compose.ui.semantics.stateDescription
|
||||
import androidx.compose.ui.unit.dp
|
||||
import com.zaneschepke.wireguardautotunnel.R
|
||||
|
||||
@Composable
|
||||
fun SurfaceSelectionGroupButton(items: List<SelectionItem>, modifier: Modifier = Modifier) {
|
||||
if (items.isEmpty()) return
|
||||
val context = LocalContext.current
|
||||
|
||||
Card(
|
||||
modifier = modifier.fillMaxWidth(),
|
||||
shape = RoundedCornerShape(8.dp),
|
||||
colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surface),
|
||||
) {
|
||||
Column(
|
||||
verticalArrangement = Arrangement.spacedBy(0.dp),
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
) {
|
||||
items.forEach { item ->
|
||||
Box(
|
||||
contentAlignment = Alignment.Center,
|
||||
modifier =
|
||||
Modifier.fillMaxWidth()
|
||||
.clip(RoundedCornerShape(8.dp))
|
||||
.alpha(if (item.isEnabled) 1f else 0.6f)
|
||||
.semantics {
|
||||
if (!item.isEnabled) {
|
||||
stateDescription =
|
||||
item.disabledReason ?: context.getString(R.string.disabled)
|
||||
}
|
||||
}
|
||||
.combinedClickable(
|
||||
onClick = { item.onClick?.invoke() },
|
||||
onLongClick = { item.onLongPress?.invoke() },
|
||||
enabled = true,
|
||||
),
|
||||
items.map { item ->
|
||||
Box(
|
||||
contentAlignment = Alignment.Center,
|
||||
modifier =
|
||||
modifier
|
||||
.fillMaxWidth()
|
||||
.clip(RoundedCornerShape(8.dp))
|
||||
.then(item.onClick?.let { modifier.clickable { it() } } ?: modifier),
|
||||
) {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp),
|
||||
) {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp),
|
||||
modifier = Modifier.weight(4f, false).fillMaxWidth(),
|
||||
) {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
item.leading?.invoke()
|
||||
Column(
|
||||
horizontalAlignment = Alignment.Start,
|
||||
verticalArrangement =
|
||||
Arrangement.spacedBy(2.dp, Alignment.CenterVertically),
|
||||
modifier =
|
||||
Modifier.weight(4f, false)
|
||||
.fillMaxWidth()
|
||||
.padding(vertical = item.padding),
|
||||
Modifier.fillMaxWidth()
|
||||
.padding(start = if (item.leading != null) 16.dp else 0.dp)
|
||||
.weight(1f)
|
||||
.padding(
|
||||
vertical = if (item.description == null) 16.dp else 6.dp
|
||||
),
|
||||
) {
|
||||
item.leading?.let {
|
||||
Box(modifier = Modifier.alpha(if (item.isEnabled) 1f else 0.6f)) {
|
||||
it()
|
||||
}
|
||||
}
|
||||
Column(
|
||||
horizontalAlignment = Alignment.Start,
|
||||
verticalArrangement =
|
||||
Arrangement.spacedBy(2.dp, Alignment.CenterVertically),
|
||||
modifier =
|
||||
Modifier.fillMaxWidth()
|
||||
.padding(start = if (item.leading != null) 16.dp else 0.dp)
|
||||
.weight(1f),
|
||||
) {
|
||||
Box(modifier = Modifier.alpha(if (item.isEnabled) 1f else 0.6f)) {
|
||||
item.title()
|
||||
}
|
||||
item.description?.invoke()
|
||||
if (!item.isEnabled && item.disabledReason != null) {
|
||||
Text(
|
||||
text = item.disabledReason,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color =
|
||||
MaterialTheme.colorScheme.onSurface.copy(alpha = 0.6f),
|
||||
)
|
||||
}
|
||||
}
|
||||
item.title()
|
||||
item.description?.let { it() }
|
||||
}
|
||||
item.trailing?.let {
|
||||
Box(
|
||||
contentAlignment = Alignment.CenterEnd,
|
||||
modifier =
|
||||
Modifier.padding(start = 16.dp)
|
||||
.alpha(if (item.isEnabled) 1f else 0.6f)
|
||||
.run {
|
||||
if (!item.isEnabled) {
|
||||
semantics {
|
||||
stateDescription =
|
||||
context.getString(R.string.disabled)
|
||||
}
|
||||
} else {
|
||||
this
|
||||
}
|
||||
},
|
||||
) {
|
||||
it()
|
||||
}
|
||||
}
|
||||
item.trailing?.let {
|
||||
Box(
|
||||
contentAlignment = Alignment.CenterEnd,
|
||||
modifier = Modifier.padding(start = 16.dp),
|
||||
) {
|
||||
it()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+13
-28
@@ -1,70 +1,55 @@
|
||||
package com.zaneschepke.wireguardautotunnel.ui.common.textbox
|
||||
package com.zaneschepke.wireguardautotunnel.ui.common.config
|
||||
|
||||
import androidx.compose.foundation.interaction.MutableInteractionSource
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.text.KeyboardActions
|
||||
import androidx.compose.foundation.text.KeyboardOptions
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.OutlinedTextField
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.text.input.ImeAction
|
||||
import androidx.compose.ui.text.input.KeyboardCapitalization
|
||||
import androidx.compose.ui.text.input.VisualTransformation
|
||||
import androidx.compose.ui.unit.dp
|
||||
|
||||
@Composable
|
||||
fun ConfigurationTextBox(
|
||||
value: String,
|
||||
label: String,
|
||||
hint: String,
|
||||
onValueChange: (String) -> Unit,
|
||||
modifier: Modifier = Modifier,
|
||||
keyboardActions: KeyboardActions = KeyboardActions(),
|
||||
label: String,
|
||||
modifier: Modifier,
|
||||
isError: Boolean = false,
|
||||
keyboardOptions: KeyboardOptions =
|
||||
KeyboardOptions(capitalization = KeyboardCapitalization.None, imeAction = ImeAction.Done),
|
||||
leading: (@Composable () -> Unit)? = null,
|
||||
trailing: (@Composable () -> Unit)? = null,
|
||||
supportingText: (@Composable () -> Unit)? = null,
|
||||
interactionSource: MutableInteractionSource = MutableInteractionSource(),
|
||||
visualTransformation: VisualTransformation = VisualTransformation.None,
|
||||
enabled: Boolean = true,
|
||||
readOnly: Boolean = false,
|
||||
singleLine: Boolean = true,
|
||||
interactionSource: MutableInteractionSource? = null,
|
||||
) {
|
||||
CustomTextField(
|
||||
OutlinedTextField(
|
||||
isError = isError,
|
||||
textStyle =
|
||||
MaterialTheme.typography.bodySmall.copy(color = MaterialTheme.colorScheme.onSurface),
|
||||
modifier = modifier.fillMaxWidth().height(48.dp),
|
||||
textStyle = MaterialTheme.typography.labelLarge,
|
||||
modifier = modifier,
|
||||
value = value,
|
||||
visualTransformation = visualTransformation,
|
||||
singleLine = singleLine,
|
||||
singleLine = true,
|
||||
interactionSource = interactionSource,
|
||||
onValueChange = { onValueChange(it) },
|
||||
label = {
|
||||
Text(
|
||||
label,
|
||||
color = MaterialTheme.colorScheme.onSurface,
|
||||
style = MaterialTheme.typography.labelMedium,
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
)
|
||||
},
|
||||
containerColor = MaterialTheme.colorScheme.surface,
|
||||
maxLines = 1,
|
||||
placeholder = {
|
||||
Text(
|
||||
hint,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.outline,
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
)
|
||||
},
|
||||
keyboardOptions = keyboardOptions,
|
||||
keyboardActions = keyboardActions,
|
||||
trailing = trailing,
|
||||
supportingText = supportingText,
|
||||
leading = leading,
|
||||
readOnly = readOnly,
|
||||
enabled = enabled,
|
||||
trailingIcon = trailing,
|
||||
)
|
||||
}
|
||||
+41
@@ -0,0 +1,41 @@
|
||||
package com.zaneschepke.wireguardautotunnel.ui.common.config
|
||||
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
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.text.style.TextAlign
|
||||
import com.zaneschepke.wireguardautotunnel.ui.common.button.ScaledSwitch
|
||||
|
||||
@Composable
|
||||
fun ConfigurationToggle(
|
||||
label: String,
|
||||
enabled: Boolean = true,
|
||||
checked: Boolean,
|
||||
onCheckChanged: (checked: Boolean) -> Unit,
|
||||
modifier: Modifier = Modifier,
|
||||
) {
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.SpaceBetween,
|
||||
) {
|
||||
Text(
|
||||
label,
|
||||
textAlign = TextAlign.Start,
|
||||
style = MaterialTheme.typography.labelLarge,
|
||||
modifier = Modifier.weight(weight = 1.0f, fill = false),
|
||||
softWrap = true,
|
||||
)
|
||||
ScaledSwitch(
|
||||
modifier = modifier,
|
||||
enabled = enabled,
|
||||
checked = checked,
|
||||
onClick = { onCheckChanged(it) },
|
||||
)
|
||||
}
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user